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

Merge upstream changes up to 8ba1487f30
2025-06-25 14:51:27 +02:00
parent f723718576 e44143db8c
commit fa9318083e
165 changed files with 1815 additions and 1334 deletions
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -11,6 +11,7 @@ const config: StorybookConfig = {
    name: '@storybook/react-vite',
    options: {},
  },
+  staticDirs: ['./static'],
 };

 export default config;
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -1,29 +0,0 @@
-import type { Preview } from '@storybook/react-vite';
-
-// If you want to run the dark theme during development,
-// you can change the below to `/application.scss`
-import '../app/javascript/styles/mastodon-light.scss';
-
-const preview: Preview = {
-  // Auto-generate docs: https://storybook.js.org/docs/writing-docs/autodocs
-  tags: ['autodocs'],
-  parameters: {
-    layout: 'centered',
-
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/i,
-      },
-    },
-
-    a11y: {
-      // 'todo' - show a11y violations in the test UI only
-      // 'error' - fail CI on a11y violations
-      // 'off' - skip a11y checks entirely
-      test: 'todo',
-    },
-  },
-};
-
-export default preview;
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -0,0 +1,136 @@
+import { useEffect, useState } from 'react';
+
+import { IntlProvider } from 'react-intl';
+
+import { configureStore } from '@reduxjs/toolkit';
+import { Provider } from 'react-redux';
+
+import type { Preview } from '@storybook/react-vite';
+import { http, passthrough } from 'msw';
+import { initialize, mswLoader } from 'msw-storybook-addon';
+
+import type { LocaleData } from '@/mastodon/locales';
+import { reducerWithInitialState, rootReducer } from '@/mastodon/reducers';
+import { defaultMiddleware } from '@/mastodon/store/store';
+
+// If you want to run the dark theme during development,
+// you can change the below to `/application.scss`
+import '../app/javascript/styles/mastodon-light.scss';
+
+const localeFiles = import.meta.glob('@/mastodon/locales/*.json', {
+  query: { as: 'json' },
+});
+
+// Initialize MSW
+initialize();
+
+const preview: Preview = {
+  // Auto-generate docs: https://storybook.js.org/docs/writing-docs/autodocs
+  tags: ['autodocs'],
+  globalTypes: {
+    locale: {
+      description: 'Locale for the story',
+      toolbar: {
+        title: 'Locale',
+        icon: 'globe',
+        items: Object.keys(localeFiles).map((path) =>
+          path.replace('/mastodon/locales/', '').replace('.json', ''),
+        ),
+        dynamicTitle: true,
+      },
+    },
+  },
+  initialGlobals: {
+    locale: 'en',
+  },
+  decorators: [
+    (Story, { parameters }) => {
+      const { state = {} } = parameters;
+      let reducer = rootReducer;
+      if (typeof state === 'object' && state) {
+        reducer = reducerWithInitialState(state as Record<string, unknown>);
+      }
+      const store = configureStore({
+        reducer,
+        middleware(getDefaultMiddleware) {
+          return getDefaultMiddleware(defaultMiddleware);
+        },
+      });
+      return (
+        <Provider store={store}>
+          <Story />
+        </Provider>
+      );
+    },
+    (Story, { globals }) => {
+      const currentLocale = (globals.locale as string) || 'en';
+      const [messages, setMessages] = useState<
+        Record<string, Record<string, string>>
+      >({});
+      const currentLocaleData = messages[currentLocale];
+
+      useEffect(() => {
+        async function loadLocaleData() {
+          const { default: localeFile } = (await import(
+            `@/mastodon/locales/${currentLocale}.json`
+          )) as { default: LocaleData['messages'] };
+          setMessages((prevLocales) => ({
+            ...prevLocales,
+            [currentLocale]: localeFile,
+          }));
+        }
+        if (!currentLocaleData) {
+          void loadLocaleData();
+        }
+      }, [currentLocale, currentLocaleData]);
+
+      return (
+        <IntlProvider
+          locale={currentLocale}
+          messages={currentLocaleData}
+          textComponent='span'
+        >
+          <Story />
+        </IntlProvider>
+      );
+    },
+  ],
+  loaders: [mswLoader],
+  parameters: {
+    layout: 'centered',
+
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+
+    a11y: {
+      // 'todo' - show a11y violations in the test UI only
+      // 'error' - fail CI on a11y violations
+      // 'off' - skip a11y checks entirely
+      test: 'todo',
+    },
+
+    state: {},
+
+    // Force docs to use an iframe as it breaks MSW handlers.
+    // See: https://github.com/mswjs/msw-storybook-addon/issues/83
+    docs: {
+      story: {
+        inline: false,
+      },
+    },
+
+    msw: {
+      handlers: [
+        http.get('/index.json', passthrough),
+        http.get('/packs-dev/*', passthrough),
+        http.get('/sounds/*', passthrough),
+      ],
+    },
+  },
+};
+
+export default preview;
--- a/.storybook/static/mockServiceWorker.js
+++ b/.storybook/static/mockServiceWorker.js
@@ -0,0 +1,344 @@
+/* eslint-disable */
+/* tslint:disable */
+
+/**
+ * Mock Service Worker.
+ * @see https://github.com/mswjs/msw
+ * - Please do NOT modify this file.
+ */
+
+const PACKAGE_VERSION = '2.10.2'
+const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
+const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
+const activeClientIds = new Set()
+
+addEventListener('install', function () {
+  self.skipWaiting()
+})
+
+addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim())
+})
+
+addEventListener('message', async function (event) {
+  const clientId = Reflect.get(event.source || {}, 'id')
+
+  if (!clientId || !self.clients) {
+    return
+  }
+
+  const client = await self.clients.get(clientId)
+
+  if (!client) {
+    return
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  switch (event.data) {
+    case 'KEEPALIVE_REQUEST': {
+      sendToClient(client, {
+        type: 'KEEPALIVE_RESPONSE',
+      })
+      break
+    }
+
+    case 'INTEGRITY_CHECK_REQUEST': {
+      sendToClient(client, {
+        type: 'INTEGRITY_CHECK_RESPONSE',
+        payload: {
+          packageVersion: PACKAGE_VERSION,
+          checksum: INTEGRITY_CHECKSUM,
+        },
+      })
+      break
+    }
+
+    case 'MOCK_ACTIVATE': {
+      activeClientIds.add(clientId)
+
+      sendToClient(client, {
+        type: 'MOCKING_ENABLED',
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
+      })
+      break
+    }
+
+    case 'MOCK_DEACTIVATE': {
+      activeClientIds.delete(clientId)
+      break
+    }
+
+    case 'CLIENT_CLOSED': {
+      activeClientIds.delete(clientId)
+
+      const remainingClients = allClients.filter((client) => {
+        return client.id !== clientId
+      })
+
+      // Unregister itself when there are no more clients
+      if (remainingClients.length === 0) {
+        self.registration.unregister()
+      }
+
+      break
+    }
+  }
+})
+
+addEventListener('fetch', function (event) {
+  // Bypass navigation requests.
+  if (event.request.mode === 'navigate') {
+    return
+  }
+
+  // Opening the DevTools triggers the "only-if-cached" request
+  // that cannot be handled by the worker. Bypass such requests.
+  if (
+    event.request.cache === 'only-if-cached' &&
+    event.request.mode !== 'same-origin'
+  ) {
+    return
+  }
+
+  // Bypass all requests when there are no active clients.
+  // Prevents the self-unregistered worked from handling requests
+  // after it's been deleted (still remains active until the next reload).
+  if (activeClientIds.size === 0) {
+    return
+  }
+
+  const requestId = crypto.randomUUID()
+  event.respondWith(handleRequest(event, requestId))
+})
+
+/**
+ * @param {FetchEvent} event
+ * @param {string} requestId
+ */
+async function handleRequest(event, requestId) {
+  const client = await resolveMainClient(event)
+  const requestCloneForEvents = event.request.clone()
+  const response = await getResponse(event, client, requestId)
+
+  // Send back the response clone for the "response:*" life-cycle events.
+  // Ensure MSW is active and ready to handle the message, otherwise
+  // this message will pend indefinitely.
+  if (client && activeClientIds.has(client.id)) {
+    const serializedRequest = await serializeRequest(requestCloneForEvents)
+
+    // Clone the response so both the client and the library could consume it.
+    const responseClone = response.clone()
+
+    sendToClient(
+      client,
+      {
+        type: 'RESPONSE',
+        payload: {
+          isMockedResponse: IS_MOCKED_RESPONSE in response,
+          request: {
+            id: requestId,
+            ...serializedRequest,
+          },
+          response: {
+            type: responseClone.type,
+            status: responseClone.status,
+            statusText: responseClone.statusText,
+            headers: Object.fromEntries(responseClone.headers.entries()),
+            body: responseClone.body,
+          },
+        },
+      },
+      responseClone.body ? [serializedRequest.body, responseClone.body] : [],
+    )
+  }
+
+  return response
+}
+
+/**
+ * Resolve the main client for the given event.
+ * Client that issues a request doesn't necessarily equal the client
+ * that registered the worker. It's with the latter the worker should
+ * communicate with during the response resolving phase.
+ * @param {FetchEvent} event
+ * @returns {Promise<Client | undefined>}
+ */
+async function resolveMainClient(event) {
+  const client = await self.clients.get(event.clientId)
+
+  if (activeClientIds.has(event.clientId)) {
+    return client
+  }
+
+  if (client?.frameType === 'top-level') {
+    return client
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  })
+
+  return allClients
+    .filter((client) => {
+      // Get only those clients that are currently visible.
+      return client.visibilityState === 'visible'
+    })
+    .find((client) => {
+      // Find the client ID that's recorded in the
+      // set of clients that have registered the worker.
+      return activeClientIds.has(client.id)
+    })
+}
+
+/**
+ * @param {FetchEvent} event
+ * @param {Client | undefined} client
+ * @param {string} requestId
+ * @returns {Promise<Response>}
+ */
+async function getResponse(event, client, requestId) {
+  // Clone the request because it might've been already used
+  // (i.e. its body has been read and sent to the client).
+  const requestClone = event.request.clone()
+
+  function passthrough() {
+    // Cast the request headers to a new Headers instance
+    // so the headers can be manipulated with.
+    const headers = new Headers(requestClone.headers)
+
+    // Remove the "accept" header value that marked this request as passthrough.
+    // This prevents request alteration and also keeps it compliant with the
+    // user-defined CORS policies.
+    const acceptHeader = headers.get('accept')
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim())
+      const filteredValues = values.filter(
+        (value) => value !== 'msw/passthrough',
+      )
+
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '))
+      } else {
+        headers.delete('accept')
+      }
+    }
+
+    return fetch(requestClone, { headers })
+  }
+
+  // Bypass mocking when the client is not active.
+  if (!client) {
+    return passthrough()
+  }
+
+  // Bypass initial page load requests (i.e. static assets).
+  // The absence of the immediate/parent client in the map of the active clients
+  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
+  // and is not ready to handle requests.
+  if (!activeClientIds.has(client.id)) {
+    return passthrough()
+  }
+
+  // Notify the client that a request has been intercepted.
+  const serializedRequest = await serializeRequest(event.request)
+  const clientMessage = await sendToClient(
+    client,
+    {
+      type: 'REQUEST',
+      payload: {
+        id: requestId,
+        ...serializedRequest,
+      },
+    },
+    [serializedRequest.body],
+  )
+
+  switch (clientMessage.type) {
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.data)
+    }
+
+    case 'PASSTHROUGH': {
+      return passthrough()
+    }
+  }
+
+  return passthrough()
+}
+
+/**
+ * @param {Client} client
+ * @param {any} message
+ * @param {Array<Transferable>} transferrables
+ * @returns {Promise<any>}
+ */
+function sendToClient(client, message, transferrables = []) {
+  return new Promise((resolve, reject) => {
+    const channel = new MessageChannel()
+
+    channel.port1.onmessage = (event) => {
+      if (event.data && event.data.error) {
+        return reject(event.data.error)
+      }
+
+      resolve(event.data)
+    }
+
+    client.postMessage(message, [
+      channel.port2,
+      ...transferrables.filter(Boolean),
+    ])
+  })
+}
+
+/**
+ * @param {Response} response
+ * @returns {Response}
+ */
+function respondWithMock(response) {
+  // Setting response status code to 0 is a no-op.
+  // However, when responding with a "Response.error()", the produced Response
+  // instance will have status code set to 0. Since it's not possible to create
+  // a Response instance with status code 0, handle that use-case separately.
+  if (response.status === 0) {
+    return Response.error()
+  }
+
+  const mockedResponse = new Response(response.body, response)
+
+  Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
+    value: true,
+    enumerable: true,
+  })
+
+  return mockedResponse
+}
+
+/**
+ * @param {Request} request
+ */
+async function serializeRequest(request) {
+  return {
+    url: request.url,
+    mode: request.mode,
+    method: request.method,
+    headers: Object.fromEntries(request.headers.entries()),
+    cache: request.cache,
+    credentials: request.credentials,
+    destination: request.destination,
+    integrity: request.integrity,
+    redirect: request.redirect,
+    referrer: request.referrer,
+    referrerPolicy: request.referrerPolicy,
+    body: await request.arrayBuffer(),
+    keepalive: request.keepalive,
+  }
+}
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
    bindata (2.5.1)
    binding_of_caller (1.0.1)
      debug_inspector (>= 1.2.0)
@@ -287,7 +287,7 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.62.0)
+    haml_lint (0.63.0)
      haml (>= 5.0)
      parallel (~> 1.10)
      rainbow
@@ -855,8 +855,8 @@ GEM
    stoplight (4.1.1)
      redlock (~> 1.0)
    stringio (3.1.7)
-    strong_migrations (2.3.0)
-      activerecord (>= 7)
+    strong_migrations (2.4.0)
+      activerecord (>= 7.1)
    swd (2.0.3)
      activesupport (>= 3)
      attr_required (>= 0.0.5)
--- a/app/controllers/admin/trends/tags_controller.rb
+++ b/app/controllers/admin/trends/tags_controller.rb
@@ -4,7 +4,7 @@ class Admin::Trends::TagsController < Admin::BaseController
  def index
    authorize :tag, :review?

-    @pending_tags_count = Tag.pending_review.async_count
+    @pending_tags_count = pending_tags.async_count
    @tags = filtered_tags.page(params[:page])
    @form = Trends::TagBatch.new
  end
@@ -22,6 +22,10 @@ class Admin::Trends::TagsController < Admin::BaseController

  private

+  def pending_tags
+    Trends::TagFilter.new(status: :pending_review).results
+  end
+
  def filtered_tags
    Trends::TagFilter.new(filter_params).results
  end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -101,7 +101,7 @@ class ApplicationController < ActionController::Base
  end

  def after_sign_out_path_for(_resource_or_scope)
-    if ENV['OMNIAUTH_ONLY'] == 'true' && ENV['OIDC_ENABLED'] == 'true'
+    if ENV['OMNIAUTH_ONLY'] == 'true' && Rails.configuration.x.omniauth.oidc_enabled?
      '/auth/auth/openid_connect/logout'
    else
      new_user_session_path
--- a/app/javascript/flavours/glitch/components/alt_text_badge.tsx
+++ b/app/javascript/flavours/glitch/components/alt_text_badge.tsx
@@ -33,6 +33,7 @@ export const AltTextBadge: React.FC<{
  return (
    <>
      <button
+        type='button'
        ref={anchorRef}
        className='media-gallery__alt__label'
        onClick={handleClick}
--- a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
+++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx
@@ -162,6 +162,14 @@ const AutosuggestTextarea = forwardRef(({
    }
  }, [suggestions, textareaRef, setSuggestionsHidden]);

+  // Hack to force Firefox to change language in autocorrect
+  useEffect(() => {
+    if (lang && textareaRef.current && textareaRef.current === document.activeElement) {
+      textareaRef.current.blur();
+      textareaRef.current.focus();
+    }
+  }, [lang]);
+
  const renderSuggestion = (suggestion, i) => {
    let inner, key;

--- a/app/javascript/flavours/glitch/components/button/index.tsx
+++ b/app/javascript/flavours/glitch/components/button/index.tsx
@@ -3,12 +3,15 @@ import { useCallback } from 'react';

 import classNames from 'classnames';

+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
+
 interface BaseProps
  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
  block?: boolean;
  secondary?: boolean;
  compact?: boolean;
  dangerous?: boolean;
+  loading?: boolean;
 }

 interface PropsChildren extends PropsWithChildren<BaseProps> {
@@ -22,6 +25,10 @@ interface PropsWithText extends BaseProps {

 type Props = PropsWithText | PropsChildren;

+/**
+ * Primary UI component for user interaction that doesn't result in navigation.
+ */
+
 export const Button: React.FC<Props> = ({
  type = 'button',
  onClick,
@@ -30,6 +37,7 @@ export const Button: React.FC<Props> = ({
  secondary,
  compact,
  dangerous,
+  loading,
  className,
  title,
  text,
@@ -38,13 +46,18 @@ export const Button: React.FC<Props> = ({
 }) => {
  const handleClick = useCallback<React.MouseEventHandler<HTMLButtonElement>>(
    (e) => {
-      if (!disabled && onClick) {
+      if (disabled || loading) {
+        e.stopPropagation();
+        e.preventDefault();
+      } else if (onClick) {
        onClick(e);
      }
    },
-    [disabled, onClick],
+    [disabled, loading, onClick],
  );

+  const label = text ?? children;
+
  return (
    <button
      className={classNames('button', className, {
@@ -52,14 +65,27 @@ export const Button: React.FC<Props> = ({
        'button--compact': compact,
        'button--block': block,
        'button--dangerous': dangerous,
+        loading,
      })}
-      disabled={disabled}
+      // Disabled buttons can't have focus, so we don't really
+      // disable the button during loading
+      disabled={disabled && !loading}
+      aria-disabled={loading}
+      // If the loading prop is used, announce label changes
+      aria-live={loading !== undefined ? 'polite' : undefined}
      onClick={handleClick}
      title={title}
      type={type}
      {...props}
    >
-      {text ?? children}
+      {loading ? (
+        <>
+          <span className='button__label-wrapper'>{label}</span>
+          <LoadingIndicator role='none' />
+        </>
+      ) : (
+        label
+      )}
    </button>
  );
 };
--- a/app/javascript/flavours/glitch/components/icon.tsx
+++ b/app/javascript/flavours/glitch/components/icon.tsx
@@ -13,14 +13,13 @@ interface Props extends React.SVGProps<SVGSVGElement> {
  children?: never;
  id: string;
  icon: IconProp;
-  title?: string;
 }

 export const Icon: React.FC<Props> = ({
  id,
  icon: IconComponent,
  className,
-  title: titleProp,
+  'aria-label': ariaLabel,
  ...other
 }) => {
  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -34,18 +33,19 @@ export const Icon: React.FC<Props> = ({
    IconComponent = CheckBoxOutlineBlankIcon;
  }

-  const ariaHidden = titleProp ? undefined : true;
+  const ariaHidden = ariaLabel ? undefined : true;
  const role = !ariaHidden ? 'img' : undefined;

  // Set the title to an empty string to remove the built-in SVG one if any
  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  const title = titleProp || '';
+  const title = ariaLabel || '';

  return (
    <IconComponent
      className={classNames('icon', `icon-${id}`, className)}
      title={title}
      aria-hidden={ariaHidden}
+      aria-label={ariaLabel}
      role={role}
      {...other}
    />
--- a/app/javascript/flavours/glitch/components/loading_indicator.tsx
+++ b/app/javascript/flavours/glitch/components/loading_indicator.tsx
@@ -6,15 +6,34 @@ const messages = defineMessages({
  loading: { id: 'loading_indicator.label', defaultMessage: 'Loading…' },
 });

-export const LoadingIndicator: React.FC = () => {
+interface LoadingIndicatorProps {
+  /**
+   * Use role='none' to opt out of the current default role 'progressbar'
+   * and aria attributes which we should re-visit to check if they're appropriate.
+   * In Firefox the aria-label is not applied, instead an implied value of `50` is
+   * used as the label.
+   */
+  role?: string;
+}
+
+export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
+  role = 'progressbar',
+}) => {
  const intl = useIntl();

+  const a11yProps =
+    role === 'progressbar'
+      ? ({
+          role,
+          'aria-busy': true,
+          'aria-live': 'polite',
+        } as const)
+      : undefined;
+
  return (
    <div
      className='loading-indicator'
-      role='progressbar'
-      aria-busy
-      aria-live='polite'
+      {...a11yProps}
      aria-label={intl.formatMessage(messages.loading)}
    >
      <CircularProgress size={50} strokeWidth={6} />
--- a/app/javascript/flavours/glitch/components/media_icon.tsx
+++ b/app/javascript/flavours/glitch/components/media_icon.tsx
@@ -48,7 +48,7 @@ export const MediaIcon: React.FC<{
      className={className}
      id={icon}
      icon={iconComponents[icon]}
-      title={intl.formatMessage(messages[icon])}
+      aria-label={intl.formatMessage(messages[icon])}
      aria-hidden='true'
    />
  );
--- a/app/javascript/flavours/glitch/components/poll.tsx
+++ b/app/javascript/flavours/glitch/components/poll.tsx
@@ -318,7 +318,7 @@ const PollOption: React.FC<PollOptionProps> = (props) => {
              id='check'
              icon={CheckIcon}
              className='poll__voted__mark'
-              title={intl.formatMessage(messages.voted)}
+              aria-label={intl.formatMessage(messages.voted)}
            />
          </span>
        )}
--- a/app/javascript/flavours/glitch/components/status_icons.jsx
+++ b/app/javascript/flavours/glitch/components/status_icons.jsx
@@ -61,16 +61,14 @@ class StatusIcons extends PureComponent {
            className='status__reply-icon'
            id='comment'
            icon={ForumIcon}
-            aria-hidden='true'
-            title={intl.formatMessage(messages.inReplyTo)}
+            aria-label={intl.formatMessage(messages.inReplyTo)}
          />
        ) : null}
        {settings.get('local_only') && status.get('local_only') &&
          <Icon
            id='home'
            icon={HomeIcon}
-            aria-hidden='true'
-            title={intl.formatMessage(messages.localOnly)}
+            aria-label={intl.formatMessage(messages.localOnly)}
          />}
        {settings.get('media') && !!mediaIcons && mediaIcons.map(icon => (<MediaIcon key={`media-icon--${icon}`} className='status__media-icon' icon={icon} />))}
        {settings.get('visibility') && <VisibilityIcon visibility={status.get('visibility')} />}
--- a/app/javascript/flavours/glitch/components/visibility_icon.tsx
+++ b/app/javascript/flavours/glitch/components/visibility_icon.tsx
@@ -58,7 +58,7 @@ export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
    <Icon
      id={visibilityIcon.icon}
      icon={visibilityIcon.iconComponent}
-      title={visibilityIcon.text}
+      aria-label={visibilityIcon.text}
      className={'status__visibility-icon'}
    />
  );
--- a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx
@@ -772,7 +772,7 @@ export const AccountHeader: React.FC<{
      <Icon
        id='lock'
        icon={LockIcon}
-        title={intl.formatMessage(messages.account_locked)}
+        aria-label={intl.formatMessage(messages.account_locked)}
      />
    );
  }
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.jsx
@@ -12,9 +12,10 @@ import { length } from 'stringz';

 import { missingAltTextModal } from 'flavours/glitch/initial_state';

-import AutosuggestInput from '../../../components/autosuggest_input';
-import AutosuggestTextarea from '../../../components/autosuggest_textarea';
-import { Button } from '../../../components/button';
+import AutosuggestInput from 'flavours/glitch/components/autosuggest_input';
+import AutosuggestTextarea from 'flavours/glitch/components/autosuggest_textarea';
+import { Button } from 'flavours/glitch/components/button';
+import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
@@ -242,9 +243,8 @@ class ComposeForm extends ImmutablePureComponent {
  };

  render () {
-    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars, isSubmitting } = this.props;
    const { highlighted } = this.state;
-    const disabled = this.props.isSubmitting;

    return (
      <form className='compose-form' onSubmit={this.handleSubmit}>
@@ -263,7 +263,7 @@ class ComposeForm extends ImmutablePureComponent {
                <AutosuggestInput
                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
                  value={this.props.spoilerText}
-                  disabled={disabled}
+                  disabled={isSubmitting}
                  onChange={this.handleChangeSpoilerText}
                  onKeyDown={this.handleKeyDown}
                  ref={this.setSpoilerText}
@@ -285,7 +285,7 @@ class ComposeForm extends ImmutablePureComponent {
            <AutosuggestTextarea
              ref={this.textareaRef}
              placeholder={intl.formatMessage(messages.placeholder)}
-              disabled={disabled}
+              disabled={isSubmitting}
              value={this.props.text}
              onChange={this.handleChange}
              suggestions={this.props.suggestions}
@@ -331,9 +331,15 @@ class ComposeForm extends ImmutablePureComponent {
                <Button
                  type='submit'
                  compact
-                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
                  disabled={!this.canSubmit()}
-                />
+                  loading={isSubmitting}
+                >
+                  {intl.formatMessage(
+                    this.props.isEditing ?
+                      messages.saveChanges : 
+                      (this.props.isInReply ? messages.reply : messages.publish)
+                  )}
+                </Button>
              </div>
            </div>
          </div>
--- a/app/javascript/flavours/glitch/features/compose/components/search.tsx
+++ b/app/javascript/flavours/glitch/features/compose/components/search.tsx
@@ -29,6 +29,7 @@ import { HASHTAG_REGEX } from 'flavours/glitch/utils/hashtags';

 const messages = defineMessages({
  placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
+  clearSearch: { id: 'search.clear', defaultMessage: 'Clear search' },
  placeholderSignedIn: {
    id: 'search.search_or_paste',
    defaultMessage: 'Search or paste URL',
@@ -50,6 +51,34 @@ const unfocus = () => {
  document.querySelector('.ui')?.parentElement?.focus();
 };

+const ClearButton: React.FC<{
+  onClick: () => void;
+  hasValue: boolean;
+}> = ({ onClick, hasValue }) => {
+  const intl = useIntl();
+
+  return (
+    <div
+      className={classNames('search__icon-wrapper', { 'has-value': hasValue })}
+    >
+      <Icon id='search' icon={SearchIcon} className='search__icon' />
+      <button
+        type='button'
+        onClick={onClick}
+        className='search__icon search__icon--clear-button'
+        tabIndex={hasValue ? undefined : -1}
+        aria-hidden={!hasValue}
+      >
+        <Icon
+          id='times-circle'
+          icon={CancelIcon}
+          aria-label={intl.formatMessage(messages.clearSearch)}
+        />
+      </button>
+    </div>
+  );
+};
+
 interface SearchOption {
  key: string;
  label: React.ReactNode;
@@ -380,6 +409,7 @@ export const Search: React.FC<{
    setValue('');
    setQuickActions([]);
    setSelectedOption(-1);
+    unfocus();
  }, [setValue, setQuickActions, setSelectedOption]);

  const handleKeyDown = useCallback(
@@ -474,19 +504,7 @@ export const Search: React.FC<{
        onBlur={handleBlur}
      />

-      <button type='button' className='search__icon' onClick={handleClear}>
-        <Icon
-          id='search'
-          icon={SearchIcon}
-          className={hasValue ? '' : 'active'}
-        />
-        <Icon
-          id='times-circle'
-          icon={CancelIcon}
-          className={hasValue ? 'active' : ''}
-          aria-label={intl.formatMessage(messages.placeholder)}
-        />
-      </button>
+      <ClearButton hasValue={hasValue} onClick={handleClear} />

      <div className='search__popout'>
        {!hasValue && (
--- a/app/javascript/flavours/glitch/reducers/index.ts
+++ b/app/javascript/flavours/glitch/reducers/index.ts
@@ -1,4 +1,4 @@
-import { Record as ImmutableRecord } from 'immutable';
+import { Record as ImmutableRecord, mergeDeep } from 'immutable';

 import { loadingBarReducer } from 'react-redux-loading-bar';
 import { combineReducers } from 'redux-immutable';
@@ -100,6 +100,15 @@ const initialRootState = Object.fromEntries(

 const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');

-const rootReducer = combineReducers(reducers, RootStateRecord);
+export const rootReducer = combineReducers(reducers, RootStateRecord);

-export { rootReducer };
+export function reducerWithInitialState(
+  stateOverrides: Record<string, unknown> = {},
+) {
+  const initialStateRecord = mergeDeep(initialRootState, stateOverrides);
+  const PatchedRootStateRecord = ImmutableRecord(
+    initialStateRecord,
+    'RootState',
+  );
+  return combineReducers(reducers, PatchedRootStateRecord);
+}
--- a/app/javascript/flavours/glitch/store/store.ts
+++ b/app/javascript/flavours/glitch/store/store.ts
@@ -6,24 +6,26 @@ import { errorsMiddleware } from './middlewares/errors';
 import { loadingBarMiddleware } from './middlewares/loading_bar';
 import { soundsMiddleware } from './middlewares/sounds';

+export const defaultMiddleware = {
+  // In development, Redux Toolkit enables 2 default middlewares to detect
+  // common issues with states. Unfortunately, our use of ImmutableJS for state
+  // triggers both, so lets disable them until our state is fully refactored
+
+  // https://redux-toolkit.js.org/api/serializabilityMiddleware
+  // This checks recursively that every values in the state are serializable in JSON
+  // Which is not the case, as we use ImmutableJS structures, but also File objects
+  serializableCheck: false,
+
+  // https://redux-toolkit.js.org/api/immutabilityMiddleware
+  // This checks recursively if every value in the state is immutable (ie, a JS primitive type)
+  // But this is not the case, as our Root State is an ImmutableJS map, which is an object
+  immutableCheck: false,
+} as const;
+
 export const store = configureStore({
  reducer: rootReducer,
  middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware({
-      // In development, Redux Toolkit enables 2 default middlewares to detect
-      // common issues with states. Unfortunately, our use of ImmutableJS for state
-      // triggers both, so lets disable them until our state is fully refactored
-
-      // https://redux-toolkit.js.org/api/serializabilityMiddleware
-      // This checks recursively that every values in the state are serializable in JSON
-      // Which is not the case, as we use ImmutableJS structures, but also File objects
-      serializableCheck: false,
-
-      // https://redux-toolkit.js.org/api/immutabilityMiddleware
-      // This checks recursively if every value in the state is immutable (ie, a JS primitive type)
-      // But this is not the case, as our Root State is an ImmutableJS map, which is an object
-      immutableCheck: false,
-    })
+    getDefaultMiddleware(defaultMiddleware)
      .concat(
        loadingBarMiddleware({
          promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'],
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@@ -249,6 +249,21 @@
    width: 100%;
  }

+  &.loading {
+    cursor: wait;
+
+    .button__label-wrapper {
+      // Hide the label only visually, so that
+      // it keeps its layout and accessibility
+      opacity: 0;
+    }
+
+    .loading-indicator {
+      position: absolute;
+      inset: 0;
+    }
+  }
+
  .icon {
    width: 18px;
    height: 18px;
@@ -1469,9 +1484,10 @@ body > [data-popper-placement] {
 }

 .focusable {
-  &:focus {
+  &:focus-visible {
    outline: 0;
    background: rgba($ui-highlight-color, 0.05);
+    box-shadow: inset 0 0 0 2px $ui-button-focus-outline-color;
  }
 }

@@ -1881,7 +1897,7 @@ body > [data-popper-placement] {
    background: color.mix($ui-base-color, $ui-highlight-color, 95%);
  }

-  &:focus {
+  &:focus-visible {
    .detailed-status,
    .detailed-status__action-bar {
      background: color.mix(
@@ -4776,14 +4792,20 @@ a.status-card {
 .icon-button .loading-indicator {
  position: static;
  transform: none;
+  color: inherit;

  .circular-progress {
-    color: $primary-text-color;
+    color: inherit;
    width: 22px;
    height: 22px;
  }
 }

+.button--compact .loading-indicator .circular-progress {
+  width: 17px;
+  height: 17px;
+}
+
 .icon-button .loading-indicator .circular-progress {
  color: lighten($ui-base-color, 26%);
  width: 12px;
@@ -5885,18 +5907,47 @@ a.status-card {
  }
 }

-.search__icon {
-  background: transparent;
-  border: 0;
-  padding: 0;
+.search__icon-wrapper {
  position: absolute;
-  top: 12px + 2px;
-  cursor: default;
-  pointer-events: none;
+  top: 14px;
+  display: grid;
  margin-inline-start: 16px - 2px;
  width: 20px;
  height: 20px;

+  .icon {
+    width: 100%;
+    height: 100%;
+  }
+
+  &:not(.has-value) {
+    pointer-events: none;
+  }
+}
+
+.search__icon {
+  grid-area: 1 / 1;
+  transition: all 100ms linear;
+  transition-property: transform, opacity;
+  color: $darker-text-color;
+}
+
+.search__icon.icon-search {
+  .has-value & {
+    pointer-events: none;
+    opacity: 0;
+    transform: rotate(90deg);
+  }
+}
+
+.search__icon--clear-button {
+  background: transparent;
+  border: 0;
+  padding: 0;
+  width: 20px;
+  height: 20px;
+  border-radius: 100%;
+
  &::-moz-focus-inner {
    border: 0;
  }
@@ -5906,39 +5957,14 @@ a.status-card {
    outline: 0 !important;
  }

-  .icon {
-    position: absolute;
-    top: 0;
-    inset-inline-start: 0;
+  &:focus-visible {
+    box-shadow: 0 0 0 2px $ui-button-focus-outline-color;
+  }
+
+  &[aria-hidden='true'] {
+    pointer-events: none;
    opacity: 0;
-    transition: all 100ms linear;
-    transition-property: transform, opacity;
-    width: 20px;
-    height: 20px;
-    color: $darker-text-color;
-
-    &.active {
-      pointer-events: auto;
-      opacity: 1;
-    }
-  }
-
-  .icon-search {
-    transform: rotate(90deg);
-
-    &.active {
-      pointer-events: none;
-      transform: rotate(0deg);
-    }
-  }
-
-  .icon-times-circle {
-    transform: rotate(0deg);
-    cursor: pointer;
-
-    &.active {
-      transform: rotate(90deg);
-    }
+    transform: rotate(-90deg);
  }
 }

--- a/app/javascript/mastodon/components/alt_text_badge.tsx
+++ b/app/javascript/mastodon/components/alt_text_badge.tsx
@@ -33,6 +33,7 @@ export const AltTextBadge: React.FC<{
  return (
    <>
      <button
+        type='button'
        ref={anchorRef}
        className='media-gallery__alt__label'
        onClick={handleClick}
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -162,6 +162,14 @@ const AutosuggestTextarea = forwardRef(({
    }
  }, [suggestions, textareaRef, setSuggestionsHidden]);

+  // Hack to force Firefox to change language in autocorrect
+  useEffect(() => {
+    if (lang && textareaRef.current && textareaRef.current === document.activeElement) {
+      textareaRef.current.blur();
+      textareaRef.current.focus();
+    }
+  }, [lang]);
+
  const renderSuggestion = (suggestion, i) => {
    let inner, key;

--- a/app/javascript/mastodon/components/button/button.stories.tsx
+++ b/app/javascript/mastodon/components/button/button.stories.tsx
@@ -11,6 +11,7 @@ const meta = {
    compact: false,
    dangerous: false,
    disabled: false,
+    loading: false,
    onClick: fn(),
  },
  argTypes: {
@@ -36,19 +37,11 @@ export default meta;
 type Story = StoryObj<typeof meta>;

 const buttonTest: Story['play'] = async ({ args, canvas, userEvent }) => {
-  await userEvent.click(canvas.getByRole('button'));
+  const button = await canvas.findByRole('button');
+  await userEvent.click(button);
  await expect(args.onClick).toHaveBeenCalled();
 };

-const disabledButtonTest: Story['play'] = async ({
-  args,
-  canvas,
-  userEvent,
-}) => {
-  await userEvent.click(canvas.getByRole('button'));
-  await expect(args.onClick).not.toHaveBeenCalled();
-};
-
 export const Primary: Story = {
  args: {
    children: 'Primary button',
@@ -80,6 +73,18 @@ export const Dangerous: Story = {
  play: buttonTest,
 };

+const disabledButtonTest: Story['play'] = async ({
+  args,
+  canvas,
+  userEvent,
+}) => {
+  const button = await canvas.findByRole('button');
+  await userEvent.click(button);
+  // Disabled controls can't be focused
+  await expect(button).not.toHaveFocus();
+  await expect(args.onClick).not.toHaveBeenCalled();
+};
+
 export const PrimaryDisabled: Story = {
  args: {
    ...Primary.args,
@@ -95,3 +100,24 @@ export const SecondaryDisabled: Story = {
  },
  play: disabledButtonTest,
 };
+
+const loadingButtonTest: Story['play'] = async ({
+  args,
+  canvas,
+  userEvent,
+}) => {
+  const button = await canvas.findByRole('button', {
+    name: 'Primary button Loading…',
+  });
+  await userEvent.click(button);
+  await expect(button).toHaveFocus();
+  await expect(args.onClick).not.toHaveBeenCalled();
+};
+
+export const Loading: Story = {
+  args: {
+    ...Primary.args,
+    loading: true,
+  },
+  play: loadingButtonTest,
+};
--- a/app/javascript/mastodon/components/button/index.tsx
+++ b/app/javascript/mastodon/components/button/index.tsx
@@ -3,12 +3,15 @@ import { useCallback } from 'react';

 import classNames from 'classnames';

+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+
 interface BaseProps
  extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
  block?: boolean;
  secondary?: boolean;
  compact?: boolean;
  dangerous?: boolean;
+  loading?: boolean;
 }

 interface PropsChildren extends PropsWithChildren<BaseProps> {
@@ -34,6 +37,7 @@ export const Button: React.FC<Props> = ({
  secondary,
  compact,
  dangerous,
+  loading,
  className,
  title,
  text,
@@ -42,13 +46,18 @@ export const Button: React.FC<Props> = ({
 }) => {
  const handleClick = useCallback<React.MouseEventHandler<HTMLButtonElement>>(
    (e) => {
-      if (!disabled && onClick) {
+      if (disabled || loading) {
+        e.stopPropagation();
+        e.preventDefault();
+      } else if (onClick) {
        onClick(e);
      }
    },
-    [disabled, onClick],
+    [disabled, loading, onClick],
  );

+  const label = text ?? children;
+
  return (
    <button
      className={classNames('button', className, {
@@ -56,14 +65,27 @@ export const Button: React.FC<Props> = ({
        'button--compact': compact,
        'button--block': block,
        'button--dangerous': dangerous,
+        loading,
      })}
-      disabled={disabled}
+      // Disabled buttons can't have focus, so we don't really
+      // disable the button during loading
+      disabled={disabled && !loading}
+      aria-disabled={loading}
+      // If the loading prop is used, announce label changes
+      aria-live={loading !== undefined ? 'polite' : undefined}
      onClick={handleClick}
      title={title}
      type={type}
      {...props}
    >
-      {text ?? children}
+      {loading ? (
+        <>
+          <span className='button__label-wrapper'>{label}</span>
+          <LoadingIndicator role='none' />
+        </>
+      ) : (
+        label
+      )}
    </button>
  );
 };
--- a/app/javascript/mastodon/components/icon.tsx
+++ b/app/javascript/mastodon/components/icon.tsx
@@ -13,14 +13,13 @@ interface Props extends React.SVGProps<SVGSVGElement> {
  children?: never;
  id: string;
  icon: IconProp;
-  title?: string;
 }

 export const Icon: React.FC<Props> = ({
  id,
  icon: IconComponent,
  className,
-  title: titleProp,
+  'aria-label': ariaLabel,
  ...other
 }) => {
  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -34,18 +33,19 @@ export const Icon: React.FC<Props> = ({
    IconComponent = CheckBoxOutlineBlankIcon;
  }

-  const ariaHidden = titleProp ? undefined : true;
+  const ariaHidden = ariaLabel ? undefined : true;
  const role = !ariaHidden ? 'img' : undefined;

  // Set the title to an empty string to remove the built-in SVG one if any
  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-  const title = titleProp || '';
+  const title = ariaLabel || '';

  return (
    <IconComponent
      className={classNames('icon', `icon-${id}`, className)}
      title={title}
      aria-hidden={ariaHidden}
+      aria-label={ariaLabel}
      role={role}
      {...other}
    />
--- a/app/javascript/mastodon/components/loading_indicator.tsx
+++ b/app/javascript/mastodon/components/loading_indicator.tsx
@@ -6,15 +6,34 @@ const messages = defineMessages({
  loading: { id: 'loading_indicator.label', defaultMessage: 'Loading…' },
 });

-export const LoadingIndicator: React.FC = () => {
+interface LoadingIndicatorProps {
+  /**
+   * Use role='none' to opt out of the current default role 'progressbar'
+   * and aria attributes which we should re-visit to check if they're appropriate.
+   * In Firefox the aria-label is not applied, instead an implied value of `50` is
+   * used as the label.
+   */
+  role?: string;
+}
+
+export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
+  role = 'progressbar',
+}) => {
  const intl = useIntl();

+  const a11yProps =
+    role === 'progressbar'
+      ? ({
+          role,
+          'aria-busy': true,
+          'aria-live': 'polite',
+        } as const)
+      : undefined;
+
  return (
    <div
      className='loading-indicator'
-      role='progressbar'
-      aria-busy
-      aria-live='polite'
+      {...a11yProps}
      aria-label={intl.formatMessage(messages.loading)}
    >
      <CircularProgress size={50} strokeWidth={6} />
--- a/app/javascript/mastodon/components/poll.tsx
+++ b/app/javascript/mastodon/components/poll.tsx
@@ -318,7 +318,7 @@ const PollOption: React.FC<PollOptionProps> = (props) => {
              id='check'
              icon={CheckIcon}
              className='poll__voted__mark'
-              title={intl.formatMessage(messages.voted)}
+              aria-label={intl.formatMessage(messages.voted)}
            />
          </span>
        )}
--- a/app/javascript/mastodon/components/visibility_icon.tsx
+++ b/app/javascript/mastodon/components/visibility_icon.tsx
@@ -58,7 +58,7 @@ export const VisibilityIcon: React.FC<{ visibility: StatusVisibility }> = ({
    <Icon
      id={visibilityIcon.icon}
      icon={visibilityIcon.iconComponent}
-      title={visibilityIcon.text}
+      aria-label={visibilityIcon.text}
    />
  );
 };
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -768,7 +768,7 @@ export const AccountHeader: React.FC<{
      <Icon
        id='lock'
        icon={LockIcon}
-        title={intl.formatMessage(messages.account_locked)}
+        aria-label={intl.formatMessage(messages.account_locked)}
      />
    );
  }
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -12,9 +12,10 @@ import { length } from 'stringz';

 import { missingAltTextModal } from 'mastodon/initial_state';

-import AutosuggestInput from '../../../components/autosuggest_input';
-import AutosuggestTextarea from '../../../components/autosuggest_textarea';
-import { Button } from '../../../components/button';
+import AutosuggestInput from 'mastodon/components/autosuggest_input';
+import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';
+import { Button } from 'mastodon/components/button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
@@ -225,9 +226,8 @@ class ComposeForm extends ImmutablePureComponent {
  };

  render () {
-    const { intl, onPaste, autoFocus, withoutNavigation, maxChars } = this.props;
+    const { intl, onPaste, autoFocus, withoutNavigation, maxChars, isSubmitting } = this.props;
    const { highlighted } = this.state;
-    const disabled = this.props.isSubmitting;

    return (
      <form className='compose-form' onSubmit={this.handleSubmit}>
@@ -246,7 +246,7 @@ class ComposeForm extends ImmutablePureComponent {
                <AutosuggestInput
                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
                  value={this.props.spoilerText}
-                  disabled={disabled}
+                  disabled={isSubmitting}
                  onChange={this.handleChangeSpoilerText}
                  onKeyDown={this.handleKeyDown}
                  ref={this.setSpoilerText}
@@ -268,7 +268,7 @@ class ComposeForm extends ImmutablePureComponent {
            <AutosuggestTextarea
              ref={this.textareaRef}
              placeholder={intl.formatMessage(messages.placeholder)}
-              disabled={disabled}
+              disabled={isSubmitting}
              value={this.props.text}
              onChange={this.handleChange}
              suggestions={this.props.suggestions}
@@ -305,9 +305,15 @@ class ComposeForm extends ImmutablePureComponent {
                <Button
                  type='submit'
                  compact
-                  text={intl.formatMessage(this.props.isEditing ? messages.saveChanges : (this.props.isInReply ? messages.reply : messages.publish))}
                  disabled={!this.canSubmit()}
-                />
+                  loading={isSubmitting}
+                >
+                  {intl.formatMessage(
+                    this.props.isEditing ?
+                      messages.saveChanges : 
+                      (this.props.isInReply ? messages.reply : messages.publish)
+                  )}
+                </Button>
              </div>
            </div>
          </div>
--- a/app/javascript/mastodon/features/compose/components/search.tsx
+++ b/app/javascript/mastodon/features/compose/components/search.tsx
@@ -29,6 +29,7 @@ import { HASHTAG_REGEX } from 'mastodon/utils/hashtags';

 const messages = defineMessages({
  placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
+  clearSearch: { id: 'search.clear', defaultMessage: 'Clear search' },
  placeholderSignedIn: {
    id: 'search.search_or_paste',
    defaultMessage: 'Search or paste URL',
@@ -50,6 +51,34 @@ const unfocus = () => {
  document.querySelector('.ui')?.parentElement?.focus();
 };

+const ClearButton: React.FC<{
+  onClick: () => void;
+  hasValue: boolean;
+}> = ({ onClick, hasValue }) => {
+  const intl = useIntl();
+
+  return (
+    <div
+      className={classNames('search__icon-wrapper', { 'has-value': hasValue })}
+    >
+      <Icon id='search' icon={SearchIcon} className='search__icon' />
+      <button
+        type='button'
+        onClick={onClick}
+        className='search__icon search__icon--clear-button'
+        tabIndex={hasValue ? undefined : -1}
+        aria-hidden={!hasValue}
+      >
+        <Icon
+          id='times-circle'
+          icon={CancelIcon}
+          aria-label={intl.formatMessage(messages.clearSearch)}
+        />
+      </button>
+    </div>
+  );
+};
+
 interface SearchOption {
  key: string;
  label: React.ReactNode;
@@ -380,6 +409,7 @@ export const Search: React.FC<{
    setValue('');
    setQuickActions([]);
    setSelectedOption(-1);
+    unfocus();
  }, [setValue, setQuickActions, setSelectedOption]);

  const handleKeyDown = useCallback(
@@ -474,19 +504,7 @@ export const Search: React.FC<{
        onBlur={handleBlur}
      />

-      <button type='button' className='search__icon' onClick={handleClear}>
-        <Icon
-          id='search'
-          icon={SearchIcon}
-          className={hasValue ? '' : 'active'}
-        />
-        <Icon
-          id='times-circle'
-          icon={CancelIcon}
-          className={hasValue ? 'active' : ''}
-          aria-label={intl.formatMessage(messages.placeholder)}
-        />
-      </button>
+      <ClearButton hasValue={hasValue} onClick={handleClear} />

      <div className='search__popout'>
        {!hasValue && (
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -95,7 +95,6 @@
  "column_header.pin": "Maak vas",
  "column_header.show_settings": "Wys instellings",
  "column_header.unpin": "Maak los",
-  "column_subheading.settings": "Instellings",
  "community.column_settings.local_only": "Slegs plaaslik",
  "community.column_settings.media_only": "Slegs media",
  "community.column_settings.remote_only": "Slegs elders",
@@ -217,15 +216,10 @@
  "moved_to_account_banner.text": "Jou rekening {disabledAccount} is tans gedeaktiveer omdat jy na {movedToAccount} verhuis het.",
  "navigation_bar.about": "Oor",
  "navigation_bar.bookmarks": "Boekmerke",
-  "navigation_bar.community_timeline": "Plaaslike tydlyn",
-  "navigation_bar.compose": "Skep nuwe plasing",
  "navigation_bar.domain_blocks": "Geblokkeerde domeine",
  "navigation_bar.lists": "Lyste",
  "navigation_bar.logout": "Teken uit",
-  "navigation_bar.personal": "Persoonlik",
-  "navigation_bar.pins": "Vasgemaakte plasings",
  "navigation_bar.preferences": "Voorkeure",
-  "navigation_bar.public_timeline": "Gefedereerde tydlyn",
  "navigation_bar.search": "Soek",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.reblog": "{name} het jou plasing aangestuur",
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -105,7 +105,6 @@
  "column_header.pin": "Fixar",
  "column_header.show_settings": "Amostrar achustes",
  "column_header.unpin": "Deixar de fixar",
-  "column_subheading.settings": "Achustes",
  "community.column_settings.local_only": "Solo local",
  "community.column_settings.media_only": "Solo media",
  "community.column_settings.remote_only": "Solo remoto",
@@ -289,23 +288,15 @@
  "navigation_bar.about": "Sobre",
  "navigation_bar.blocks": "Usuarios blocaus",
  "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Linia de tiempo local",
-  "navigation_bar.compose": "Escribir nueva publicación",
-  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios amagaus",
-  "navigation_bar.explore": "Explorar",
  "navigation_bar.filters": "Parolas silenciadas",
  "navigation_bar.follow_requests": "Solicitutz pa seguir-te",
  "navigation_bar.follows_and_followers": "Seguindo y seguidores",
  "navigation_bar.lists": "Listas",
  "navigation_bar.logout": "Zarrar sesión",
  "navigation_bar.mutes": "Usuarios silenciaus",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicacions fixadas",
  "navigation_bar.preferences": "Preferencias",
-  "navigation_bar.public_timeline": "Linia de tiempo federada",
  "navigation_bar.search": "Buscar",
-  "navigation_bar.security": "Seguranza",
  "not_signed_in_indicator.not_signed_in": "Amenestes iniciar sesión pa acceder ta este recurso.",
  "notification.admin.report": "{name} informó {target}",
  "notification.admin.sign_up": "{name} se rechistró",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -141,7 +141,6 @@
  "column_header.show_settings": "إظهار الإعدادات",
  "column_header.unpin": "إلغاء التَّثبيت",
  "column_search.cancel": "إلغاء",
-  "column_subheading.settings": "الإعدادات",
  "community.column_settings.local_only": "المحلي فقط",
  "community.column_settings.media_only": "الوسائط فقط",
  "community.column_settings.remote_only": "عن بُعد فقط",
@@ -445,12 +444,8 @@
  "navigation_bar.advanced_interface": "افتحه في واجهة الويب المتقدمة",
  "navigation_bar.blocks": "الحسابات المحجوبة",
  "navigation_bar.bookmarks": "الفواصل المرجعية",
-  "navigation_bar.community_timeline": "الخيط المحلي",
-  "navigation_bar.compose": "تحرير منشور جديد",
  "navigation_bar.direct": "الإشارات الخاصة",
-  "navigation_bar.discover": "اكتشف",
  "navigation_bar.domain_blocks": "النطاقات المحظورة",
-  "navigation_bar.explore": "استكشف",
  "navigation_bar.favourites": "المفضلة",
  "navigation_bar.filters": "الكلمات المكتومة",
  "navigation_bar.follow_requests": "طلبات المتابعة",
@@ -461,12 +456,8 @@
  "navigation_bar.moderation": "الإشراف",
  "navigation_bar.mutes": "الحسابات المكتومة",
  "navigation_bar.opened_in_classic_interface": "تُفتَح المنشورات والحسابات وغيرها من الصفحات الخاصة بشكل مبدئي على واجهة الويب التقليدية.",
-  "navigation_bar.personal": "شخصي",
-  "navigation_bar.pins": "المنشورات المُثَبَّتَة",
  "navigation_bar.preferences": "التفضيلات",
-  "navigation_bar.public_timeline": "الخيط الفيدرالي",
  "navigation_bar.search": "البحث",
-  "navigation_bar.security": "الأمان",
  "not_signed_in_indicator.not_signed_in": "تحتاج إلى تسجيل الدخول للوصول إلى هذا المصدر.",
  "notification.admin.report": "{name} أبلغ عن {target}",
  "notification.admin.sign_up": "أنشأ {name} حسابًا",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -121,7 +121,6 @@
  "column_header.show_settings": "Amosar la configuración",
  "column_header.unpin": "Lliberar",
  "column_search.cancel": "Encaboxar",
-  "column_subheading.settings": "Configuración",
  "community.column_settings.media_only": "Namás el conteníu multimedia",
  "community.column_settings.remote_only": "Namás lo remoto",
  "compose.language.change": "Camudar la llingua",
@@ -342,10 +341,8 @@
  "navigation_bar.about": "Tocante a",
  "navigation_bar.blocks": "Perfiles bloquiaos",
  "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Llinia de tiempu llocal",
  "navigation_bar.direct": "Menciones privaes",
  "navigation_bar.domain_blocks": "Dominios bloquiaos",
-  "navigation_bar.explore": "Esploración",
  "navigation_bar.favourites": "Favoritos",
  "navigation_bar.filters": "Pallabres desactivaes",
  "navigation_bar.follow_requests": "Solicitúes de siguimientu",
@@ -356,11 +353,7 @@
  "navigation_bar.moderation": "Moderación",
  "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
  "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Artículos fixaos",
  "navigation_bar.preferences": "Preferencies",
-  "navigation_bar.public_timeline": "Llinia de tiempu federada",
-  "navigation_bar.security": "Seguranza",
  "not_signed_in_indicator.not_signed_in": "Tienes d'aniciar la sesión p'acceder a esti recursu.",
  "notification.admin.report": "{name} informó de: {target}",
  "notification.admin.sign_up": "{name} rexistróse",
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -169,7 +169,6 @@
  "column_header.show_settings": "Parametrləri göstər",
  "column_header.unpin": "Bərkitmə",
  "column_search.cancel": "İmtina",
-  "column_subheading.settings": "Parametrlər",
  "community.column_settings.local_only": "Sadəcə lokalda",
  "community.column_settings.media_only": "Sadəcə media",
  "community.column_settings.remote_only": "Sadəcə uzaq serverlər",
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -161,7 +161,6 @@
  "column_header.show_settings": "Паказаць налады",
  "column_header.unpin": "Адмацаваць",
  "column_search.cancel": "Скасаваць",
-  "column_subheading.settings": "Налады",
  "community.column_settings.local_only": "Толькі лакальныя",
  "community.column_settings.media_only": "Толькі медыя",
  "community.column_settings.remote_only": "Толькі дыстанцыйна",
@@ -483,12 +482,8 @@
  "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
  "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
  "navigation_bar.bookmarks": "Закладкі",
-  "navigation_bar.community_timeline": "Лакальная стужка",
-  "navigation_bar.compose": "Стварыць новы допіс",
  "navigation_bar.direct": "Асабістыя згадванні",
-  "navigation_bar.discover": "Даведайцесь",
  "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
-  "navigation_bar.explore": "Агляд",
  "navigation_bar.favourites": "Упадабанае",
  "navigation_bar.filters": "Ігнараваныя словы",
  "navigation_bar.follow_requests": "Запыты на падпіску",
@@ -499,12 +494,8 @@
  "navigation_bar.moderation": "Мадэрацыя",
  "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
  "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
-  "navigation_bar.personal": "Асабістае",
-  "navigation_bar.pins": "Замацаваныя допісы",
  "navigation_bar.preferences": "Налады",
-  "navigation_bar.public_timeline": "Глабальная стужка",
  "navigation_bar.search": "Пошук",
-  "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}",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -180,7 +180,6 @@
  "column_header.show_settings": "Показване на настройките",
  "column_header.unpin": "Разкачане",
  "column_search.cancel": "Отказ",
-  "column_subheading.settings": "Настройки",
  "community.column_settings.local_only": "Само локално",
  "community.column_settings.media_only": "Само мултимедия",
  "community.column_settings.remote_only": "Само отдалечено",
@@ -538,12 +537,8 @@
  "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
  "navigation_bar.blocks": "Блокирани потребители",
  "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална хронология",
-  "navigation_bar.compose": "Съставяне на нова публикация",
  "navigation_bar.direct": "Частни споменавания",
-  "navigation_bar.discover": "Откриване",
  "navigation_bar.domain_blocks": "Блокирани домейни",
-  "navigation_bar.explore": "Разглеждане",
  "navigation_bar.favourites": "Любими",
  "navigation_bar.filters": "Заглушени думи",
  "navigation_bar.follow_requests": "Заявки за последване",
@@ -554,12 +549,8 @@
  "navigation_bar.moderation": "Модериране",
  "navigation_bar.mutes": "Заглушени потребители",
  "navigation_bar.opened_in_classic_interface": "Публикации, акаунти и други особени страници се отварят по подразбиране в класическия мрежови интерфейс.",
-  "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Закачени публикации",
  "navigation_bar.preferences": "Предпочитания",
-  "navigation_bar.public_timeline": "Федеративна хронология",
  "navigation_bar.search": "Търсене",
-  "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}",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -121,7 +121,6 @@
  "column_header.pin": "পিন দিয়ে রাখুন",
  "column_header.show_settings": "সেটিং দেখান",
  "column_header.unpin": "পিন খুলুন",
-  "column_subheading.settings": "সেটিং",
  "community.column_settings.local_only": "শুধুমাত্র স্থানীয়",
  "community.column_settings.media_only": "শুধুমাত্র ছবি বা ভিডিও",
  "community.column_settings.remote_only": "শুধুমাত্র দূরবর্তী",
@@ -279,11 +278,7 @@
  "navigation_bar.about": "পরিচিতি",
  "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
  "navigation_bar.bookmarks": "বুকমার্ক",
-  "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
-  "navigation_bar.compose": "নতুন টুট লিখুন",
-  "navigation_bar.discover": "ঘুরে দেখুন",
  "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
-  "navigation_bar.explore": "পরিব্রাজন",
  "navigation_bar.favourites": "পছন্দসমূহ",
  "navigation_bar.filters": "বন্ধ করা শব্দ",
  "navigation_bar.follow_requests": "অনুসরণের অনুরোধগুলি",
@@ -291,12 +286,8 @@
  "navigation_bar.lists": "তালিকাগুলো",
  "navigation_bar.logout": "বাইরে যান",
  "navigation_bar.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
-  "navigation_bar.personal": "নিজস্ব",
-  "navigation_bar.pins": "পিন দেওয়া টুট",
  "navigation_bar.preferences": "পছন্দসমূহ",
-  "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
  "navigation_bar.search": "অনুসন্ধান",
-  "navigation_bar.security": "নিরাপত্তা",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
  "notification.follow_request": "{name} আপনাকে অনুসরণ করার জন্য অনুরধ করেছে",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -139,7 +139,6 @@
  "column_header.show_settings": "Diskouez an arventennoù",
  "column_header.unpin": "Dispilhennañ",
  "column_search.cancel": "Nullañ",
-  "column_subheading.settings": "Arventennoù",
  "community.column_settings.local_only": "Nemet lec'hel",
  "community.column_settings.media_only": "Nemet Mediaoù",
  "community.column_settings.remote_only": "Nemet a-bell",
@@ -374,12 +373,8 @@
  "navigation_bar.automated_deletion": "Dilemel an embannadenn ent-emgefreek",
  "navigation_bar.blocks": "Implijer·ezed·ien berzet",
  "navigation_bar.bookmarks": "Sinedoù",
-  "navigation_bar.community_timeline": "Red-amzer lec'hel",
-  "navigation_bar.compose": "Skrivañ un toud nevez",
  "navigation_bar.direct": "Menegoù prevez",
-  "navigation_bar.discover": "Dizoleiñ",
  "navigation_bar.domain_blocks": "Domanioù kuzhet",
-  "navigation_bar.explore": "Furchal",
  "navigation_bar.favourites": "Muiañ-karet",
  "navigation_bar.filters": "Gerioù kuzhet",
  "navigation_bar.follow_requests": "Pedadoù heuliañ",
@@ -390,13 +385,9 @@
  "navigation_bar.logout": "Digennaskañ",
  "navigation_bar.more": "Muioc'h",
  "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
-  "navigation_bar.personal": "Personel",
-  "navigation_bar.pins": "Toudoù spilhennet",
  "navigation_bar.preferences": "Gwellvezioù",
-  "navigation_bar.public_timeline": "Red-amzer kevredet",
  "navigation_bar.search": "Klask",
  "navigation_bar.search_trends": "Klask / Diouzh ar c'hiz",
-  "navigation_bar.security": "Diogelroez",
  "not_signed_in_indicator.not_signed_in": "Ret eo deoc'h kevreañ evit tizhout an danvez-se.",
  "notification.admin.report": "Disklêriet eo bet {target} gant {name}",
  "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Mostra la configuració",
  "column_header.unpin": "Desfixa",
  "column_search.cancel": "Cancel·la",
-  "column_subheading.settings": "Configuració",
  "community.column_settings.local_only": "Només local",
  "community.column_settings.media_only": "Només contingut",
  "community.column_settings.remote_only": "Només remot",
@@ -554,12 +553,8 @@
  "navigation_bar.automated_deletion": "Esborrat automàtic de publicacions",
  "navigation_bar.blocks": "Usuaris blocats",
  "navigation_bar.bookmarks": "Marcadors",
-  "navigation_bar.community_timeline": "Línia de temps local",
-  "navigation_bar.compose": "Redacta un tut",
  "navigation_bar.direct": "Mencions privades",
-  "navigation_bar.discover": "Descobreix",
  "navigation_bar.domain_blocks": "Dominis blocats",
-  "navigation_bar.explore": "Explora",
  "navigation_bar.favourites": "Favorits",
  "navigation_bar.filters": "Paraules silenciades",
  "navigation_bar.follow_requests": "Sol·licituds de seguiment",
@@ -572,13 +567,9 @@
  "navigation_bar.more": "Més",
  "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",
-  "navigation_bar.pins": "Tuts fixats",
  "navigation_bar.preferences": "Preferències",
  "navigation_bar.privacy_and_reach": "Privacitat i abast",
-  "navigation_bar.public_timeline": "Línia de temps federada",
  "navigation_bar.search": "Cerca",
-  "navigation_bar.security": "Seguretat",
  "navigation_panel.collapse_lists": "Tanca el menú",
  "navigation_panel.expand_lists": "Expandeix el menú",
  "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.",
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -121,7 +121,6 @@
  "column_header.pin": "سنجاق",
  "column_header.show_settings": "نیشاندانی رێکخستنەکان",
  "column_header.unpin": "سنجاق نەکردن",
-  "column_subheading.settings": "رێکخستنەکان",
  "community.column_settings.local_only": "تەنها خۆماڵی",
  "community.column_settings.media_only": "تەنها میدیا",
  "community.column_settings.remote_only": "تەنها بۆ دوور",
@@ -333,12 +332,8 @@
  "navigation_bar.about": "دەربارە",
  "navigation_bar.blocks": "بەکارهێنەرە بلۆککراوەکان",
  "navigation_bar.bookmarks": "نیشانکراوەکان",
-  "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
-  "navigation_bar.compose": "نووسینی توتی نوێ",
  "navigation_bar.direct": "ئاماژەی تایبەت",
-  "navigation_bar.discover": "دۆزینەوە",
  "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
-  "navigation_bar.explore": "گەڕان",
  "navigation_bar.filters": "وشە کپەکان",
  "navigation_bar.follow_requests": "بەدواداچوی داواکاریەکان بکە",
  "navigation_bar.followed_tags": "هاشتاگی بەدوادا هات",
@@ -346,12 +341,8 @@
  "navigation_bar.lists": "لیستەکان",
  "navigation_bar.logout": "دەرچوون",
  "navigation_bar.mutes": "کپکردنی بەکارهێنەران",
-  "navigation_bar.personal": "کەسی",
-  "navigation_bar.pins": "توتی چەسپاو",
  "navigation_bar.preferences": "پەسەندەکان",
-  "navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
  "navigation_bar.search": "گەڕان",
-  "navigation_bar.security": "ئاسایش",
  "not_signed_in_indicator.not_signed_in": "پێویستە بچیتە ژوورەوە بۆ دەستگەیشتن بەم سەرچاوەیە.",
  "notification.admin.report": "{name} ڕاپۆرت کراوە {target}",
  "notification.admin.sign_up": "{name} تۆمارکرا",
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -62,7 +62,6 @@
  "column_header.pin": "Puntarulà",
  "column_header.show_settings": "Mustrà i parametri",
  "column_header.unpin": "Spuntarulà",
-  "column_subheading.settings": "Parametri",
  "community.column_settings.local_only": "Solu lucale",
  "community.column_settings.media_only": "Solu media",
  "community.column_settings.remote_only": "Solu distante",
@@ -200,9 +199,6 @@
  "load_pending": "{count, plural, one {# entrata nova} other {# entrate nove}}",
  "navigation_bar.blocks": "Utilizatori bluccati",
  "navigation_bar.bookmarks": "Segnalibri",
-  "navigation_bar.community_timeline": "Linea pubblica lucale",
-  "navigation_bar.compose": "Scrive un novu statutu",
-  "navigation_bar.discover": "Scopre",
  "navigation_bar.domain_blocks": "Duminii piattati",
  "navigation_bar.filters": "Parolle silenzate",
  "navigation_bar.follow_requests": "Dumande d'abbunamentu",
@@ -210,11 +206,7 @@
  "navigation_bar.lists": "Liste",
  "navigation_bar.logout": "Scunnettassi",
  "navigation_bar.mutes": "Utilizatori piattati",
-  "navigation_bar.personal": "Persunale",
-  "navigation_bar.pins": "Statuti puntarulati",
  "navigation_bar.preferences": "Preferenze",
-  "navigation_bar.public_timeline": "Linea pubblica glubale",
-  "navigation_bar.security": "Sicurità",
  "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",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Zobrazit nastavení",
  "column_header.unpin": "Odepnout",
  "column_search.cancel": "Zrušit",
-  "column_subheading.settings": "Nastavení",
  "community.column_settings.local_only": "Pouze místní",
  "community.column_settings.media_only": "Pouze média",
  "community.column_settings.remote_only": "Pouze vzdálené",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Automatické mazání příspěvků",
  "navigation_bar.blocks": "Blokovaní uživatelé",
  "navigation_bar.bookmarks": "Záložky",
-  "navigation_bar.community_timeline": "Místní časová osa",
-  "navigation_bar.compose": "Vytvořit nový příspěvek",
  "navigation_bar.direct": "Soukromé zmínky",
-  "navigation_bar.discover": "Objevit",
  "navigation_bar.domain_blocks": "Blokované domény",
-  "navigation_bar.explore": "Prozkoumat",
  "navigation_bar.favourites": "Oblíbené",
  "navigation_bar.filters": "Skrytá slova",
  "navigation_bar.follow_requests": "Žádosti o sledování",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Sledovaní a sledující",
  "navigation_bar.import_export": "Import a export",
  "navigation_bar.lists": "Seznamy",
+  "navigation_bar.live_feed_local": "Živý kanál (místní)",
+  "navigation_bar.live_feed_public": "Živý kanál (veřejný)",
  "navigation_bar.logout": "Odhlásit se",
  "navigation_bar.moderation": "Moderace",
  "navigation_bar.more": "Více",
  "navigation_bar.mutes": "Skrytí uživatelé",
  "navigation_bar.opened_in_classic_interface": "Příspěvky, účty a další specifické stránky jsou ve výchozím nastavení otevřeny v klasickém webovém rozhraní.",
-  "navigation_bar.personal": "Osobní",
-  "navigation_bar.pins": "Připnuté příspěvky",
  "navigation_bar.preferences": "Předvolby",
  "navigation_bar.privacy_and_reach": "Soukromí a dosah",
-  "navigation_bar.public_timeline": "Federovaná časová osa",
  "navigation_bar.search": "Hledat",
  "navigation_bar.search_trends": "Hledat / Populární",
-  "navigation_bar.security": "Zabezpečení",
  "navigation_panel.collapse_followed_tags": "Sbalit menu sledovaných hashtagů",
  "navigation_panel.collapse_lists": "Sbalit menu",
  "navigation_panel.expand_followed_tags": "Rozbalit menu sledovaných hashtagů",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Dangos gosodiadau",
  "column_header.unpin": "Dadbinio",
  "column_search.cancel": "Diddymu",
-  "column_subheading.settings": "Gosodiadau",
  "community.column_settings.local_only": "Lleol yn unig",
  "community.column_settings.media_only": "Cyfryngau yn unig",
  "community.column_settings.remote_only": "Pell yn unig",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Dileu postiadau'n awtomatig",
  "navigation_bar.blocks": "Defnyddwyr wedi'u rhwystro",
  "navigation_bar.bookmarks": "Nodau Tudalen",
-  "navigation_bar.community_timeline": "Ffrwd leol",
-  "navigation_bar.compose": "Cyfansoddi post newydd",
  "navigation_bar.direct": "Crybwylliadau preifat",
-  "navigation_bar.discover": "Darganfod",
  "navigation_bar.domain_blocks": "Parthau wedi'u rhwystro",
-  "navigation_bar.explore": "Darganfod",
  "navigation_bar.favourites": "Ffefrynnau",
  "navigation_bar.filters": "Geiriau wedi'u tewi",
  "navigation_bar.follow_requests": "Ceisiadau dilyn",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Rhagor",
  "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",
-  "navigation_bar.pins": "Postiadau wedi eu pinio",
  "navigation_bar.preferences": "Dewisiadau",
  "navigation_bar.privacy_and_reach": "Preifatrwydd a chyrhaeddiad",
-  "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
  "navigation_bar.search": "Chwilio",
  "navigation_bar.search_trends": "Chwilio / Trendio",
-  "navigation_bar.security": "Diogelwch",
  "navigation_panel.collapse_followed_tags": "Cau dewislen hashnodau dilyn",
  "navigation_panel.collapse_lists": "Cau dewislen y rhestr",
  "navigation_panel.expand_followed_tags": "Agor dewislen hashnodau dilyn",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Vis indstillinger",
  "column_header.unpin": "Frigør",
  "column_search.cancel": "Afbryd",
-  "column_subheading.settings": "Indstillinger",
  "community.column_settings.local_only": "Kun lokalt",
  "community.column_settings.media_only": "Kun medier",
  "community.column_settings.remote_only": "Kun udefra",
@@ -554,12 +553,8 @@
  "navigation_bar.automated_deletion": "Automatiseret sletning af indlæg",
  "navigation_bar.blocks": "Blokerede brugere",
  "navigation_bar.bookmarks": "Bogmærker",
-  "navigation_bar.community_timeline": "Lokal tidslinje",
-  "navigation_bar.compose": "Skriv nyt indlæg",
  "navigation_bar.direct": "Private omtaler",
-  "navigation_bar.discover": "Opdag",
  "navigation_bar.domain_blocks": "Blokerede domæner",
-  "navigation_bar.explore": "Udforsk",
  "navigation_bar.favourites": "Favoritter",
  "navigation_bar.filters": "Skjulte ord",
  "navigation_bar.follow_requests": "Følgeanmodninger",
@@ -567,19 +562,17 @@
  "navigation_bar.follows_and_followers": "Følges og følgere",
  "navigation_bar.import_export": "Import og eksport",
  "navigation_bar.lists": "Lister",
+  "navigation_bar.live_feed_local": "Live feed (lokalt)",
+  "navigation_bar.live_feed_public": "Live feed (offentligt)",
  "navigation_bar.logout": "Log af",
  "navigation_bar.moderation": "Moderering",
  "navigation_bar.more": "Mere",
  "navigation_bar.mutes": "Skjulte brugere",
  "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
-  "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Fastgjorte indlæg",
  "navigation_bar.preferences": "Præferencer",
  "navigation_bar.privacy_and_reach": "Fortrolighed og udbredelse",
-  "navigation_bar.public_timeline": "Fælles tidslinje",
  "navigation_bar.search": "Søg",
  "navigation_bar.search_trends": "Søg/Populære",
-  "navigation_bar.security": "Sikkerhed",
  "navigation_panel.collapse_followed_tags": "Sammenfold menuen Fulgte hashtags",
  "navigation_panel.expand_followed_tags": "Udfold menuen Fulgte hashtags",
  "not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Einstellungen anzeigen",
  "column_header.unpin": "Lösen",
  "column_search.cancel": "Abbrechen",
-  "column_subheading.settings": "Einstellungen",
  "community.column_settings.local_only": "Nur lokal",
  "community.column_settings.media_only": "Nur Beiträge mit Medien",
  "community.column_settings.remote_only": "Nur andere Mastodon-Server",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Automatisiertes Löschen",
  "navigation_bar.blocks": "Blockierte Profile",
  "navigation_bar.bookmarks": "Lesezeichen",
-  "navigation_bar.community_timeline": "Lokale Timeline",
-  "navigation_bar.compose": "Neuen Beitrag verfassen",
  "navigation_bar.direct": "Private Erwähnungen",
-  "navigation_bar.discover": "Entdecken",
  "navigation_bar.domain_blocks": "Blockierte Domains",
-  "navigation_bar.explore": "Entdecken",
  "navigation_bar.favourites": "Favoriten",
  "navigation_bar.filters": "Stummgeschaltete Wörter",
  "navigation_bar.follow_requests": "Follower-Anfragen",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Follower und Folge ich",
  "navigation_bar.import_export": "Importieren und exportieren",
  "navigation_bar.lists": "Listen",
+  "navigation_bar.live_feed_local": "Live-Feed (lokal)",
+  "navigation_bar.live_feed_public": "Live-Feed (öffentlich)",
  "navigation_bar.logout": "Abmelden",
  "navigation_bar.moderation": "Moderation",
  "navigation_bar.more": "Mehr",
  "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",
-  "navigation_bar.pins": "Angeheftete Beiträge",
  "navigation_bar.preferences": "Einstellungen",
  "navigation_bar.privacy_and_reach": "Datenschutz und Reichweite",
-  "navigation_bar.public_timeline": "Föderierte Timeline",
  "navigation_bar.search": "Suche",
  "navigation_bar.search_trends": "Suche / Angesagt",
-  "navigation_bar.security": "Sicherheit",
  "navigation_panel.collapse_followed_tags": "Menü für gefolgte Hashtags schließen",
  "navigation_panel.collapse_lists": "Listen-Menü schließen",
  "navigation_panel.expand_followed_tags": "Menü für gefolgte Hashtags öffnen",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Εμφάνιση ρυθμίσεων",
  "column_header.unpin": "Ξεκαρφίτσωμα",
  "column_search.cancel": "Ακύρωση",
-  "column_subheading.settings": "Ρυθμίσεις",
  "community.column_settings.local_only": "Τοπικά μόνο",
  "community.column_settings.media_only": "Μόνο πολυμέσα",
  "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Αυτοματοποιημένη διαγραφή αναρτήσεων",
  "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
  "navigation_bar.bookmarks": "Σελιδοδείκτες",
-  "navigation_bar.community_timeline": "Τοπική ροή",
-  "navigation_bar.compose": "Γράψε νέα ανάρτηση",
  "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
-  "navigation_bar.discover": "Ανακάλυψη",
  "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
-  "navigation_bar.explore": "Εξερεύνηση",
  "navigation_bar.favourites": "Αγαπημένα",
  "navigation_bar.filters": "Αποσιωπημένες λέξεις",
  "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Περισσότερα",
  "navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
  "navigation_bar.opened_in_classic_interface": "Δημοσιεύσεις, λογαριασμοί και άλλες συγκεκριμένες σελίδες ανοίγονται από προεπιλογή στην κλασική διεπαφή ιστού.",
-  "navigation_bar.personal": "Προσωπικά",
-  "navigation_bar.pins": "Καρφιτσωμένες αναρτήσεις",
  "navigation_bar.preferences": "Προτιμήσεις",
  "navigation_bar.privacy_and_reach": "Ιδιωτικότητα και προσιτότητα",
-  "navigation_bar.public_timeline": "Ροή συναλλαγών",
  "navigation_bar.search": "Αναζήτηση",
  "navigation_bar.search_trends": "Αναζήτηση / Τάσεις",
-  "navigation_bar.security": "Ασφάλεια",
  "navigation_panel.collapse_followed_tags": "Σύμπτυξη μενού ετικετών που ακολουθούνται",
  "navigation_panel.collapse_lists": "Σύμπτυξη μενού λίστας",
  "navigation_panel.expand_followed_tags": "Επέκταση μενού ετικετών που ακολουθούνται",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Show settings",
  "column_header.unpin": "Unpin",
  "column_search.cancel": "Cancel",
-  "column_subheading.settings": "Settings",
  "community.column_settings.local_only": "Local only",
  "community.column_settings.media_only": "Media Only",
  "community.column_settings.remote_only": "Remote only",
@@ -552,12 +551,8 @@
  "navigation_bar.advanced_interface": "Open in advanced web interface",
  "navigation_bar.blocks": "Blocked users",
  "navigation_bar.bookmarks": "Bookmarks",
-  "navigation_bar.community_timeline": "Local timeline",
-  "navigation_bar.compose": "Compose new post",
  "navigation_bar.direct": "Private mentions",
-  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Blocked domains",
-  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favourites",
  "navigation_bar.filters": "Muted words",
  "navigation_bar.follow_requests": "Follow requests",
@@ -568,12 +563,8 @@
  "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",
-  "navigation_bar.pins": "Pinned posts",
  "navigation_bar.preferences": "Preferences",
-  "navigation_bar.public_timeline": "Federated timeline",
  "navigation_bar.search": "Search",
-  "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}",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -804,6 +804,7 @@
  "report_notification.categories.violation": "Rule violation",
  "report_notification.categories.violation_sentence": "rule violation",
  "report_notification.open": "Open report",
+  "search.clear": "Clear search",
  "search.no_recent_searches": "No recent searches",
  "search.placeholder": "Search",
  "search.quick_action.account_search": "Profiles matching {x}",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -178,7 +178,6 @@
  "column_header.show_settings": "Montri agordojn",
  "column_header.unpin": "Malfiksi",
  "column_search.cancel": "Nuligi",
-  "column_subheading.settings": "Agordoj",
  "community.column_settings.local_only": "Nur loka",
  "community.column_settings.media_only": "Nur aŭdovidaĵoj",
  "community.column_settings.remote_only": "Nur fora",
@@ -538,12 +537,8 @@
  "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
  "navigation_bar.blocks": "Blokitaj uzantoj",
  "navigation_bar.bookmarks": "Legosignoj",
-  "navigation_bar.community_timeline": "Loka templinio",
-  "navigation_bar.compose": "Redakti novan afiŝon",
  "navigation_bar.direct": "Privataj mencioj",
-  "navigation_bar.discover": "Malkovri",
  "navigation_bar.domain_blocks": "Blokitaj domajnoj",
-  "navigation_bar.explore": "Esplori",
  "navigation_bar.favourites": "Stelumoj",
  "navigation_bar.filters": "Silentigitaj vortoj",
  "navigation_bar.follow_requests": "Petoj de sekvado",
@@ -554,12 +549,8 @@
  "navigation_bar.moderation": "Modereco",
  "navigation_bar.mutes": "Silentigitaj uzantoj",
  "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
-  "navigation_bar.personal": "Persone",
-  "navigation_bar.pins": "Alpinglitaj afiŝoj",
  "navigation_bar.preferences": "Preferoj",
-  "navigation_bar.public_timeline": "Fratara templinio",
  "navigation_bar.search": "Serĉi",
-  "navigation_bar.security": "Sekureco",
  "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
  "notification.admin.report": "{name} raportis {target}",
  "notification.admin.report_account": "{name} raportis {count, plural, one {afiŝon} other {# afiŝojn}} de {target} por {category}",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Mostrar configuración",
  "column_header.unpin": "Dejar de fijar",
  "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Configuración",
  "community.column_settings.local_only": "Sólo local",
  "community.column_settings.media_only": "Sólo medios",
  "community.column_settings.remote_only": "Sólo remoto",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Eliminación auto. de mensajes",
  "navigation_bar.blocks": "Usuarios bloqueados",
  "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Línea temporal local",
-  "navigation_bar.compose": "Redactar un nuevo mensaje",
  "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios bloqueados",
-  "navigation_bar.explore": "Explorá",
  "navigation_bar.favourites": "Favoritos",
  "navigation_bar.filters": "Palabras silenciadas",
  "navigation_bar.follow_requests": "Solicitudes de seguimiento",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
  "navigation_bar.import_export": "Importación y exportación",
  "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
  "navigation_bar.logout": "Cerrar sesión",
  "navigation_bar.moderation": "Moderación",
  "navigation_bar.more": "Más",
  "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",
-  "navigation_bar.pins": "Mensajes fijados",
  "navigation_bar.preferences": "Configuración",
  "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Línea temporal federada",
  "navigation_bar.search": "Buscar",
  "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
  "navigation_panel.collapse_followed_tags": "Contraer menú de etiquetas seguidas",
  "navigation_panel.collapse_lists": "Colapsar menú de lista",
  "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -5,7 +5,7 @@
  "about.disclaimer": "Mastodon es software libre de código abierto, y una marca comercial de Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "Motivo no disponible",
  "about.domain_blocks.preamble": "Mastodon generalmente te permite ver contenido e interactuar con usuarios de cualquier otro servidor del fediverso. Estas son las excepciones que se han hecho en este servidor en particular.",
-  "about.domain_blocks.silenced.explanation": "Normalmente no verás perfiles y contenido de este servidor, a menos que lo busques explicitamente o vayas a el siguiendo alguna cuenta.",
+  "about.domain_blocks.silenced.explanation": "Por lo general, no verás perfiles ni contenidos de este servidor, a menos que los busques explícitamente o que optes por seguirlo.",
  "about.domain_blocks.silenced.title": "Limitado",
  "about.domain_blocks.suspended.explanation": "Ningún dato de este servidor será procesado, almacenado o intercambiado, haciendo cualquier interacción o comunicación con los usuarios de este servidor imposible.",
  "about.domain_blocks.suspended.title": "Suspendido",
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Mostrar ajustes",
  "column_header.unpin": "Desfijar",
  "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Ajustes",
  "community.column_settings.local_only": "Solo local",
  "community.column_settings.media_only": "Solo media",
  "community.column_settings.remote_only": "Solo remoto",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Eliminación automática de publicaciones",
  "navigation_bar.blocks": "Usuarios bloqueados",
  "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Historia local",
-  "navigation_bar.compose": "Redactar una nueva publicación",
  "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.explore": "Explorar",
  "navigation_bar.favourites": "Favoritos",
  "navigation_bar.filters": "Palabras silenciadas",
  "navigation_bar.follow_requests": "Solicitudes para seguirte",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
  "navigation_bar.import_export": "Importar y exportar",
  "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
  "navigation_bar.logout": "Cerrar sesión",
  "navigation_bar.moderation": "Moderación",
  "navigation_bar.more": "Más",
  "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",
-  "navigation_bar.pins": "Publicaciones fijadas",
  "navigation_bar.preferences": "Preferencias",
  "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Historia federada",
  "navigation_bar.search": "Buscar",
  "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
  "navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
  "navigation_panel.collapse_lists": "Contraer el menú de la lista",
  "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Mostrar ajustes",
  "column_header.unpin": "Dejar de fijar",
  "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Ajustes",
  "community.column_settings.local_only": "Solo local",
  "community.column_settings.media_only": "Solo multimedia",
  "community.column_settings.remote_only": "Solo remoto",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Eliminación automática de publicaciones",
  "navigation_bar.blocks": "Usuarios bloqueados",
  "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Cronología local",
-  "navigation_bar.compose": "Escribir nueva publicación",
  "navigation_bar.direct": "Menciones privadas",
-  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios ocultos",
-  "navigation_bar.explore": "Explorar",
  "navigation_bar.favourites": "Favoritos",
  "navigation_bar.filters": "Palabras silenciadas",
  "navigation_bar.follow_requests": "Solicitudes para seguirte",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Siguiendo y seguidores",
  "navigation_bar.import_export": "Importar y exportar",
  "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Cronología local",
+  "navigation_bar.live_feed_public": "Cronología pública",
  "navigation_bar.logout": "Cerrar sesión",
  "navigation_bar.moderation": "Moderación",
  "navigation_bar.more": "Más",
  "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",
-  "navigation_bar.pins": "Publicaciones fijadas",
  "navigation_bar.preferences": "Preferencias",
  "navigation_bar.privacy_and_reach": "Privacidad y alcance",
-  "navigation_bar.public_timeline": "Cronología federada",
  "navigation_bar.search": "Buscar",
  "navigation_bar.search_trends": "Búsqueda / Tendencia",
-  "navigation_bar.security": "Seguridad",
  "navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
  "navigation_panel.collapse_lists": "Contraer el menú de la lista",
  "navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Näita sätteid",
  "column_header.unpin": "Eemalda kinnitus",
  "column_search.cancel": "Tühista",
-  "column_subheading.settings": "Sätted",
  "community.column_settings.local_only": "Ainult kohalik",
  "community.column_settings.media_only": "Ainult meedia",
  "community.column_settings.remote_only": "Ainult kaug",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Postituste automaatne kustutamine",
  "navigation_bar.blocks": "Blokeeritud kasutajad",
  "navigation_bar.bookmarks": "Järjehoidjad",
-  "navigation_bar.community_timeline": "Kohalik ajajoon",
-  "navigation_bar.compose": "Koosta uus postitus",
  "navigation_bar.direct": "Privaatsed mainimised",
-  "navigation_bar.discover": "Avasta",
  "navigation_bar.domain_blocks": "Peidetud domeenid",
-  "navigation_bar.explore": "Avasta",
  "navigation_bar.favourites": "Lemmikud",
  "navigation_bar.filters": "Vaigistatud sõnad",
  "navigation_bar.follow_requests": "Jälgimistaotlused",
@@ -573,13 +568,9 @@
  "navigation_bar.more": "Lisavalikud",
  "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",
-  "navigation_bar.pins": "Kinnitatud postitused",
  "navigation_bar.preferences": "Eelistused",
  "navigation_bar.privacy_and_reach": "Privaatsus ja ulatus",
-  "navigation_bar.public_timeline": "Föderatiivne ajajoon",
  "navigation_bar.search": "Otsing",
-  "navigation_bar.security": "Turvalisus",
  "navigation_panel.collapse_lists": "Ahenda loendimenüü",
  "navigation_panel.expand_lists": "Laienda loendimenüüd",
  "not_signed_in_indicator.not_signed_in": "Pead sisse logima, et saada ligipääsu sellele ressursile.",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -157,7 +157,6 @@
  "column_header.show_settings": "Erakutsi ezarpenak",
  "column_header.unpin": "Desfinkatu",
  "column_search.cancel": "Utzi",
-  "column_subheading.settings": "Ezarpenak",
  "community.column_settings.local_only": "Lokala soilik",
  "community.column_settings.media_only": "Edukiak soilik",
  "community.column_settings.remote_only": "Urrunekoa soilik",
@@ -480,12 +479,8 @@
  "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
  "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
  "navigation_bar.bookmarks": "Laster-markak",
-  "navigation_bar.community_timeline": "Denbora-lerro lokala",
-  "navigation_bar.compose": "Idatzi bidalketa berria",
  "navigation_bar.direct": "Aipamen pribatuak",
-  "navigation_bar.discover": "Aurkitu",
  "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
-  "navigation_bar.explore": "Arakatu",
  "navigation_bar.favourites": "Gogokoak",
  "navigation_bar.filters": "Mutututako hitzak",
  "navigation_bar.follow_requests": "Jarraitzeko eskaerak",
@@ -496,12 +491,8 @@
  "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",
-  "navigation_bar.pins": "Finkatutako bidalketak",
  "navigation_bar.preferences": "Hobespenak",
-  "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
  "navigation_bar.search": "Bilatu",
-  "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",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "نمایش تنظیمات",
  "column_header.unpin": "برداشتن سنجاق",
  "column_search.cancel": "لغو",
-  "column_subheading.settings": "تنظیمات",
  "community.column_settings.local_only": "فقط محلی",
  "community.column_settings.media_only": "فقط رسانه",
  "community.column_settings.remote_only": "تنها دوردست",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "حذف خودکار فرسته",
  "navigation_bar.blocks": "کاربران مسدود شده",
  "navigation_bar.bookmarks": "نشانک‌ها",
-  "navigation_bar.community_timeline": "خط زمانی محلی",
-  "navigation_bar.compose": "نوشتن فرستهٔ تازه",
  "navigation_bar.direct": "اشاره‌های خصوصی",
-  "navigation_bar.discover": "گشت و گذار",
  "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
-  "navigation_bar.explore": "کاوش",
  "navigation_bar.favourites": "برگزیده‌ها",
  "navigation_bar.filters": "واژه‌های خموش",
  "navigation_bar.follow_requests": "درخواست‌های پی‌گیری",
@@ -573,13 +568,9 @@
  "navigation_bar.more": "بیشتر",
  "navigation_bar.mutes": "کاربران خموشانده",
  "navigation_bar.opened_in_classic_interface": "فرسته‌ها، حساب‌ها و دیگر صفحه‌های خاص به طور پیش‌گزیده در میانای وب کلاسیک گشوده می‌شوند.",
-  "navigation_bar.personal": "شخصی",
-  "navigation_bar.pins": "فرسته‌های سنجاق شده",
  "navigation_bar.preferences": "ترجیحات",
-  "navigation_bar.public_timeline": "خط زمانی همگانی",
  "navigation_bar.search": "جست‌وجو",
  "navigation_bar.search_trends": "جستجو \\ پرطرفدار",
-  "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} را گزارش داد",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Näytä asetukset",
  "column_header.unpin": "Irrota",
  "column_search.cancel": "Peruuta",
-  "column_subheading.settings": "Asetukset",
  "community.column_settings.local_only": "Vain paikalliset",
  "community.column_settings.media_only": "Vain media",
  "community.column_settings.remote_only": "Vain etätilit",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Julkaisujen automaattipoisto",
  "navigation_bar.blocks": "Estetyt käyttäjät",
  "navigation_bar.bookmarks": "Kirjanmerkit",
-  "navigation_bar.community_timeline": "Paikallinen aikajana",
-  "navigation_bar.compose": "Luo uusi julkaisu",
  "navigation_bar.direct": "Yksityismaininnat",
-  "navigation_bar.discover": "Löydä uutta",
  "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
-  "navigation_bar.explore": "Selaa",
  "navigation_bar.favourites": "Suosikit",
  "navigation_bar.filters": "Mykistetyt sanat",
  "navigation_bar.follow_requests": "Seurantapyynnöt",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Seurattavat ja seuraajat",
  "navigation_bar.import_export": "Tuonti ja vienti",
  "navigation_bar.lists": "Listat",
+  "navigation_bar.live_feed_local": "Livesyöte (paikallinen)",
+  "navigation_bar.live_feed_public": "Livesyöte (julkinen)",
  "navigation_bar.logout": "Kirjaudu ulos",
  "navigation_bar.moderation": "Moderointi",
  "navigation_bar.more": "Lisää",
  "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",
-  "navigation_bar.pins": "Kiinnitetyt julkaisut",
  "navigation_bar.preferences": "Asetukset",
  "navigation_bar.privacy_and_reach": "Yksityisyys ja tavoittavuus",
-  "navigation_bar.public_timeline": "Yleinen aikajana",
  "navigation_bar.search": "Haku",
  "navigation_bar.search_trends": "Haku / Suosittua",
-  "navigation_bar.security": "Turvallisuus",
  "navigation_panel.collapse_followed_tags": "Supista seurattavien aihetunnisteiden valikko",
  "navigation_panel.collapse_lists": "Supista listavalikko",
  "navigation_panel.expand_followed_tags": "Laajenna seurattavien aihetunnisteiden valikko",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -108,7 +108,6 @@
  "column_header.pin": "I-paskil",
  "column_header.show_settings": "Ipakita ang mga setting",
  "column_header.unpin": "Tanggalin sa pagkapaskil",
-  "column_subheading.settings": "Mga setting",
  "community.column_settings.local_only": "Lokal lamang",
  "community.column_settings.media_only": "Medya Lamang",
  "community.column_settings.remote_only": "Liblib lamang",
@@ -244,13 +243,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.public_timeline": "Pinagsamang timeline",
  "navigation_bar.search": "Maghanap",
  "notification.admin.report": "Iniulat ni {name} si {target}",
  "notification.admin.report_statuses_other": "Iniulat ni {name} si {target}",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Vís stillingar",
  "column_header.unpin": "Loys",
  "column_search.cancel": "Angra",
-  "column_subheading.settings": "Stillingar",
  "community.column_settings.local_only": "Einans lokalt",
  "community.column_settings.media_only": "Einans miðlar",
  "community.column_settings.remote_only": "Einans útifrá",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Sjálvvirkandi striking av postum",
  "navigation_bar.blocks": "Bannaðir brúkarar",
  "navigation_bar.bookmarks": "Goymd",
-  "navigation_bar.community_timeline": "Lokal tíðarlinja",
-  "navigation_bar.compose": "Skriva nýggjan post",
  "navigation_bar.direct": "Privatar umrøður",
-  "navigation_bar.discover": "Uppdaga",
  "navigation_bar.domain_blocks": "Bannað økisnøvn",
-  "navigation_bar.explore": "Rannsaka",
  "navigation_bar.favourites": "Dámdir postar",
  "navigation_bar.filters": "Doyvd orð",
  "navigation_bar.follow_requests": "Umbønir um at fylgja",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Fylgd og fylgjarar",
  "navigation_bar.import_export": "Innflyt og útflyt",
  "navigation_bar.lists": "Listar",
+  "navigation_bar.live_feed_local": "Beinleiðis rásir (lokalar)",
+  "navigation_bar.live_feed_public": "Beinleiðis rásir (almennar)",
  "navigation_bar.logout": "Rita út",
  "navigation_bar.moderation": "Umsjón",
  "navigation_bar.more": "Meira",
  "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",
-  "navigation_bar.pins": "Festir postar",
  "navigation_bar.preferences": "Stillingar",
  "navigation_bar.privacy_and_reach": "Privatlív og skotmál",
-  "navigation_bar.public_timeline": "Felags tíðarlinja",
  "navigation_bar.search": "Leita",
  "navigation_bar.search_trends": "Leita / Rák",
-  "navigation_bar.security": "Trygd",
  "navigation_panel.collapse_followed_tags": "Minka valmynd við fylgdum frámerkjum",
  "navigation_panel.collapse_lists": "Minka listavalmynd",
  "navigation_panel.expand_followed_tags": "Víðka valmynd við fylgdum frámerkjum",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -171,7 +171,6 @@
  "column_header.show_settings": "Afficher les paramètres",
  "column_header.unpin": "Désépingler",
  "column_search.cancel": "Annuler",
-  "column_subheading.settings": "Paramètres",
  "community.column_settings.local_only": "Local seulement",
  "community.column_settings.media_only": "Média seulement",
  "community.column_settings.remote_only": "À distance seulement",
@@ -522,12 +521,8 @@
  "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
  "navigation_bar.blocks": "Comptes bloqués",
  "navigation_bar.bookmarks": "Signets",
-  "navigation_bar.community_timeline": "Fil local",
-  "navigation_bar.compose": "Rédiger un nouveau message",
  "navigation_bar.direct": "Mention privée",
-  "navigation_bar.discover": "Découvrir",
  "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.explore": "Explorer",
  "navigation_bar.favourites": "Favoris",
  "navigation_bar.filters": "Mots masqués",
  "navigation_bar.follow_requests": "Demandes d'abonnements",
@@ -538,12 +533,8 @@
  "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",
-  "navigation_bar.pins": "Publications épinglés",
  "navigation_bar.preferences": "Préférences",
-  "navigation_bar.public_timeline": "Fil global",
  "navigation_bar.search": "Rechercher",
-  "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}",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -171,7 +171,6 @@
  "column_header.show_settings": "Afficher les paramètres",
  "column_header.unpin": "Désépingler",
  "column_search.cancel": "Annuler",
-  "column_subheading.settings": "Paramètres",
  "community.column_settings.local_only": "Local seulement",
  "community.column_settings.media_only": "Média uniquement",
  "community.column_settings.remote_only": "Distant seulement",
@@ -522,12 +521,8 @@
  "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
  "navigation_bar.blocks": "Comptes bloqués",
  "navigation_bar.bookmarks": "Marque-pages",
-  "navigation_bar.community_timeline": "Fil public local",
-  "navigation_bar.compose": "Rédiger un nouveau message",
  "navigation_bar.direct": "Mention privée",
-  "navigation_bar.discover": "Découvrir",
  "navigation_bar.domain_blocks": "Domaines bloqués",
-  "navigation_bar.explore": "Explorer",
  "navigation_bar.favourites": "Favoris",
  "navigation_bar.filters": "Mots masqués",
  "navigation_bar.follow_requests": "Demandes d’abonnement",
@@ -538,12 +533,8 @@
  "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",
-  "navigation_bar.pins": "Messages épinglés",
  "navigation_bar.preferences": "Préférences",
-  "navigation_bar.public_timeline": "Fil fédéré",
  "navigation_bar.search": "Rechercher",
-  "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}",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Ynstellingen toane",
  "column_header.unpin": "Losmeitsje",
  "column_search.cancel": "Annulearje",
-  "column_subheading.settings": "Ynstellingen",
  "community.column_settings.local_only": "Allinnich lokaal",
  "community.column_settings.media_only": "Allinnich media",
  "community.column_settings.remote_only": "Allinnich oare servers",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Automatysk berjochten fuortsmite",
  "navigation_bar.blocks": "Blokkearre brûkers",
  "navigation_bar.bookmarks": "Blêdwizers",
-  "navigation_bar.community_timeline": "Lokale tiidline",
-  "navigation_bar.compose": "Nij berjocht skriuwe",
  "navigation_bar.direct": "Priveefermeldingen",
-  "navigation_bar.discover": "Untdekke",
  "navigation_bar.domain_blocks": "Blokkearre domeinen",
-  "navigation_bar.explore": "Ferkenne",
  "navigation_bar.favourites": "Favoriten",
  "navigation_bar.filters": "Negearre wurden",
  "navigation_bar.follow_requests": "Folchfersiken",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Mear",
  "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",
-  "navigation_bar.pins": "Fêstsette berjochten",
  "navigation_bar.preferences": "Ynstellingen",
  "navigation_bar.privacy_and_reach": "Privacy en berik",
-  "navigation_bar.public_timeline": "Globale tiidline",
  "navigation_bar.search": "Sykje",
  "navigation_bar.search_trends": "Sykje / Populêr",
-  "navigation_bar.security": "Befeiliging",
  "navigation_panel.collapse_followed_tags": "Menu foar folge hashtags ynklappe",
  "navigation_panel.collapse_lists": "Listmenu ynklappe",
  "navigation_panel.expand_followed_tags": "Menu foar folge hashtags útklappe",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Taispeáin socruithe",
  "column_header.unpin": "Bain pionna",
  "column_search.cancel": "Cealaigh",
-  "column_subheading.settings": "Socruithe",
  "community.column_settings.local_only": "Áitiúil amháin",
  "community.column_settings.media_only": "Meáin Amháin",
  "community.column_settings.remote_only": "Cian amháin",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Scriosadh uathoibrithe postála",
  "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í",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Tuilleadh",
  "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",
  "navigation_bar.privacy_and_reach": "Príobháideacht agus rochtain",
-  "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
  "navigation_bar.search": "Cuardaigh",
  "navigation_bar.search_trends": "Cuardaigh / Treochtaí",
-  "navigation_bar.security": "Slándáil",
  "navigation_panel.collapse_followed_tags": "Laghdaigh roghchlár hashtaganna leantóirí",
  "navigation_panel.collapse_lists": "Laghdaigh roghchlár an liosta",
  "navigation_panel.expand_followed_tags": "Leathnaigh roghchlár na hashtaganna a leanann tú",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Seall na roghainnean",
  "column_header.unpin": "Dì-phrìnich",
  "column_search.cancel": "Sguir dheth",
-  "column_subheading.settings": "Roghainnean",
  "community.column_settings.local_only": "Feadhainn ionadail a-mhàin",
  "community.column_settings.media_only": "Meadhanan a-mhàin",
  "community.column_settings.remote_only": "Feadhainn chèin a-mhàin",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Sguabadh às phostaichean",
  "navigation_bar.blocks": "Cleachdaichean bacte",
  "navigation_bar.bookmarks": "Comharran-lìn",
-  "navigation_bar.community_timeline": "Loidhne-ama ionadail",
-  "navigation_bar.compose": "Sgrìobh post ùr",
  "navigation_bar.direct": "Iomraidhean prìobhaideach",
-  "navigation_bar.discover": "Rùraich",
  "navigation_bar.domain_blocks": "Àrainnean bacte",
-  "navigation_bar.explore": "Rùraich",
  "navigation_bar.favourites": "Annsachdan",
  "navigation_bar.filters": "Faclan mùchte",
  "navigation_bar.follow_requests": "Iarrtasan leantainn",
@@ -573,13 +568,9 @@
  "navigation_bar.more": "Barrachd",
  "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",
-  "navigation_bar.pins": "Postaichean prìnichte",
  "navigation_bar.preferences": "Roghainnean",
  "navigation_bar.privacy_and_reach": "Prìobhaideachd ’s ruigse",
-  "navigation_bar.public_timeline": "Loidhne-ama cho-naisgte",
  "navigation_bar.search": "Lorg",
-  "navigation_bar.security": "Tèarainteachd",
  "navigation_panel.collapse_lists": "Co-theannaich clàr-taice na liosta",
  "navigation_panel.expand_lists": "Leudaich clàr-taice na liosta",
  "not_signed_in_indicator.not_signed_in": "Feumaidh tu clàradh a-steach mus fhaigh thu cothrom air a’ ghoireas seo.",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Amosar axustes",
  "column_header.unpin": "Desapegar",
  "column_search.cancel": "Cancelar",
-  "column_subheading.settings": "Axustes",
  "community.column_settings.local_only": "Só local",
  "community.column_settings.media_only": "Só multimedia",
  "community.column_settings.remote_only": "Só remoto",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Borrado automático das publicacións",
  "navigation_bar.blocks": "Usuarias bloqueadas",
  "navigation_bar.bookmarks": "Marcadores",
-  "navigation_bar.community_timeline": "Cronoloxía local",
-  "navigation_bar.compose": "Escribir unha nova publicación",
  "navigation_bar.direct": "Mencións privadas",
-  "navigation_bar.discover": "Descubrir",
  "navigation_bar.domain_blocks": "Dominios agochados",
-  "navigation_bar.explore": "Descubrir",
  "navigation_bar.favourites": "Favoritas",
  "navigation_bar.filters": "Palabras silenciadas",
  "navigation_bar.follow_requests": "Peticións de seguimento",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Máis",
  "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",
-  "navigation_bar.pins": "Publicacións fixadas",
  "navigation_bar.preferences": "Preferencias",
  "navigation_bar.privacy_and_reach": "Privacidade e alcance",
-  "navigation_bar.public_timeline": "Cronoloxía federada",
  "navigation_bar.search": "Buscar",
  "navigation_bar.search_trends": "Buscar / Popular",
-  "navigation_bar.security": "Seguranza",
  "navigation_panel.collapse_followed_tags": "Pregar o menú de cancelos seguidos",
  "navigation_panel.collapse_lists": "Pregar menú da lista",
  "navigation_panel.expand_followed_tags": "Despregar menú de cancelos seguidos",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "הצגת העדפות",
  "column_header.unpin": "שחרור הצמדה",
  "column_search.cancel": "ביטול",
-  "column_subheading.settings": "הגדרות",
  "community.column_settings.local_only": "מקומי בלבד",
  "community.column_settings.media_only": "מדיה בלבד",
  "community.column_settings.remote_only": "מרוחק בלבד",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "מחיקת הודעות אוטומטית",
  "navigation_bar.blocks": "משתמשים חסומים",
  "navigation_bar.bookmarks": "סימניות",
-  "navigation_bar.community_timeline": "פיד שרת מקומי",
-  "navigation_bar.compose": "צור הודעה חדשה",
  "navigation_bar.direct": "הודעות פרטיות",
-  "navigation_bar.discover": "גלה",
  "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
-  "navigation_bar.explore": "סיור",
  "navigation_bar.favourites": "חיבובים",
  "navigation_bar.filters": "מילים מושתקות",
  "navigation_bar.follow_requests": "בקשות מעקב",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
  "navigation_bar.import_export": "יבוא ויצוא",
  "navigation_bar.lists": "רשימות",
+  "navigation_bar.live_feed_local": "פיד ההודעות בזמן אמת (מקומי)",
+  "navigation_bar.live_feed_public": "פיד ההודעות בזמן אמת (פומבי)",
  "navigation_bar.logout": "התנתקות",
  "navigation_bar.moderation": "הנחיית דיונים",
  "navigation_bar.more": "עוד",
  "navigation_bar.mutes": "משתמשים בהשתקה",
  "navigation_bar.opened_in_classic_interface": "הודעות, חשבונות ושאר עמודי רשת יפתחו כברירת מחדל בדפדפן רשת קלאסי.",
-  "navigation_bar.personal": "אישי",
-  "navigation_bar.pins": "הודעות נעוצות",
  "navigation_bar.preferences": "העדפות",
  "navigation_bar.privacy_and_reach": "פרטיות ומידת חשיפה",
-  "navigation_bar.public_timeline": "פיד כללי (כל השרתים)",
  "navigation_bar.search": "חיפוש",
  "navigation_bar.search_trends": "חיפוש \\ מגמות",
-  "navigation_bar.security": "אבטחה",
  "navigation_panel.collapse_followed_tags": "קיפול תפריט תגיות במעקב",
  "navigation_panel.collapse_lists": "קיפול תפריט רשימות",
  "navigation_panel.expand_followed_tags": "פתיחת תפריט תגיות במעקב",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -129,7 +129,6 @@
  "column_header.pin": "पिन",
  "column_header.show_settings": "सेटिंग्स दिखाएँ",
  "column_header.unpin": "अनपिन",
-  "column_subheading.settings": "सेटिंग्स",
  "community.column_settings.local_only": "स्थानीय ही",
  "community.column_settings.media_only": "सिर्फ़ मीडिया",
  "community.column_settings.remote_only": "केवल सुदूर",
@@ -344,12 +343,8 @@
  "navigation_bar.about": "विवरण",
  "navigation_bar.blocks": "ब्लॉक्ड यूज़र्स",
  "navigation_bar.bookmarks": "पुस्तकचिह्न:",
-  "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
-  "navigation_bar.compose": "नया टूट् लिखें",
  "navigation_bar.direct": "निजी संदेश",
-  "navigation_bar.discover": "खोजें",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "अन्वेषण करें",
  "navigation_bar.favourites": "पसंदीदा",
  "navigation_bar.filters": "वारित शब्द",
  "navigation_bar.follow_requests": "अनुसरण करने के अनुरोध",
@@ -357,11 +352,8 @@
  "navigation_bar.lists": "सूचियाँ",
  "navigation_bar.logout": "बाहर जाए",
  "navigation_bar.mutes": "शांत किए गए सभ्य",
-  "navigation_bar.personal": "निजी",
-  "navigation_bar.pins": "Pinned toots",
  "navigation_bar.preferences": "पसंदे",
  "navigation_bar.search": "ढूंढें",
-  "navigation_bar.security": "सुरक्षा",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.reblog": "{name} boosted your status",
  "notification.status": "{name} ने अभी पोस्ट किया",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -115,7 +115,6 @@
  "column_header.pin": "Prikvači",
  "column_header.show_settings": "Prikaži postavke",
  "column_header.unpin": "Otkvači",
-  "column_subheading.settings": "Postavke",
  "community.column_settings.local_only": "Samo lokalno",
  "community.column_settings.media_only": "Samo medijski sadržaj",
  "community.column_settings.remote_only": "Samo udaljeno",
@@ -293,12 +292,8 @@
  "navigation_bar.about": "O aplikaciji",
  "navigation_bar.advanced_interface": "Otvori u naprednom web sučelju",
  "navigation_bar.blocks": "Blokirani korisnici",
-  "navigation_bar.community_timeline": "Lokalna vremenska crta",
-  "navigation_bar.compose": "Compose new toot",
  "navigation_bar.direct": "Privatna spominjanja",
-  "navigation_bar.discover": "Istraživanje",
  "navigation_bar.domain_blocks": "Blokirane domene",
-  "navigation_bar.explore": "Istraži",
  "navigation_bar.favourites": "Favoriti",
  "navigation_bar.filters": "Utišane riječi",
  "navigation_bar.follow_requests": "Zahtjevi za praćenje",
@@ -306,12 +301,8 @@
  "navigation_bar.lists": "Liste",
  "navigation_bar.logout": "Odjavi se",
  "navigation_bar.mutes": "Utišani korisnici",
-  "navigation_bar.personal": "Osobno",
-  "navigation_bar.pins": "Prikvačeni tootovi",
  "navigation_bar.preferences": "Postavke",
-  "navigation_bar.public_timeline": "Federalna vremenska crta",
  "navigation_bar.search": "Traži",
-  "navigation_bar.security": "Sigurnost",
  "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",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Beállítások megjelenítése",
  "column_header.unpin": "Kitűzés eltávolítása",
  "column_search.cancel": "Mégse",
-  "column_subheading.settings": "Beállítások",
  "community.column_settings.local_only": "Csak helyi",
  "community.column_settings.media_only": "Csak média",
  "community.column_settings.remote_only": "Csak távoli",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Bejegyzések automatikus törlése",
  "navigation_bar.blocks": "Letiltott felhasználók",
  "navigation_bar.bookmarks": "Könyvjelzők",
-  "navigation_bar.community_timeline": "Helyi idővonal",
-  "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 domainek",
-  "navigation_bar.explore": "Felfedezés",
  "navigation_bar.favourites": "Kedvencek",
  "navigation_bar.filters": "Némított szavak",
  "navigation_bar.follow_requests": "Követési kérések",
@@ -568,19 +563,17 @@
  "navigation_bar.follows_and_followers": "Követések és követők",
  "navigation_bar.import_export": "Importálás és exportálás",
  "navigation_bar.lists": "Listák",
+  "navigation_bar.live_feed_local": "Élő hírfolyam (helyi)",
+  "navigation_bar.live_feed_public": "Élő hírfolyam (nyilvános)",
  "navigation_bar.logout": "Kijelentkezés",
  "navigation_bar.moderation": "Moderáció",
  "navigation_bar.more": "Továbbiak",
  "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",
-  "navigation_bar.pins": "Kitűzött bejegyzések",
  "navigation_bar.preferences": "Beállítások",
  "navigation_bar.privacy_and_reach": "Adatvédelem és elérés",
-  "navigation_bar.public_timeline": "Föderációs idővonal",
  "navigation_bar.search": "Keresés",
  "navigation_bar.search_trends": "Keresés / felkapott",
-  "navigation_bar.security": "Biztonság",
  "navigation_panel.collapse_followed_tags": "Követett hashtagek menü összecsukása",
  "navigation_panel.collapse_lists": "Listamenü összecsukása",
  "navigation_panel.expand_followed_tags": "Követett hashtagek menü kibontása",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -96,7 +96,6 @@
  "column_header.pin": "Ամրացնել",
  "column_header.show_settings": "Ցուցադրել կարգաւորումները",
  "column_header.unpin": "Հանել",
-  "column_subheading.settings": "Կարգաւորումներ",
  "community.column_settings.local_only": "Միայն տեղական",
  "community.column_settings.media_only": "Միայն մեդիա",
  "community.column_settings.remote_only": "Միայն հեռակայ",
@@ -273,12 +272,8 @@
  "navigation_bar.about": "Մասին",
  "navigation_bar.blocks": "Արգելափակուած օգտատէրեր",
  "navigation_bar.bookmarks": "Էջանիշեր",
-  "navigation_bar.community_timeline": "Տեղական հոսք",
-  "navigation_bar.compose": "Ստեղծել նոր գրառում",
  "navigation_bar.direct": "Մասնաւոր յիշատակումներ",
-  "navigation_bar.discover": "Բացայայտել",
  "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
-  "navigation_bar.explore": "Բացայայտել",
  "navigation_bar.favourites": "Հաւանածներ",
  "navigation_bar.filters": "Լռեցուած բառեր",
  "navigation_bar.follow_requests": "Հետեւելու հայցեր",
@@ -287,12 +282,8 @@
  "navigation_bar.lists": "Ցանկեր",
  "navigation_bar.logout": "Դուրս գալ",
  "navigation_bar.mutes": "Լռեցրած օգտատէրեր",
-  "navigation_bar.personal": "Անձնական",
-  "navigation_bar.pins": "Ամրացուած գրառումներ",
  "navigation_bar.preferences": "Նախապատուութիւններ",
-  "navigation_bar.public_timeline": "Դաշնային հոսք",
  "navigation_bar.search": "Որոնել",
-  "navigation_bar.security": "Անվտանգութիւն",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.admin.sign_up": "{name}-ը գրանցուած է",
  "notification.favourite": "{name}-ը հաւանել է քո գրառումը",
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -181,7 +181,6 @@
  "column_header.show_settings": "Monstrar le parametros",
  "column_header.unpin": "Disfixar",
  "column_search.cancel": "Cancellar",
-  "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",
@@ -539,12 +538,8 @@
  "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",
-  "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": "Favorites",
  "navigation_bar.filters": "Parolas silentiate",
  "navigation_bar.follow_requests": "Requestas de sequimento",
@@ -555,12 +550,8 @@
  "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",
-  "navigation_bar.pins": "Messages fixate",
  "navigation_bar.preferences": "Preferentias",
-  "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 reportate {target}",
  "notification.admin.report_account": "{name} ha reportate {count, plural, one {un message} other {# messages}} de {target} per {category}",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -139,7 +139,6 @@
  "column_header.pin": "Sematkan",
  "column_header.show_settings": "Tampilkan pengaturan",
  "column_header.unpin": "Lepaskan",
-  "column_subheading.settings": "Pengaturan",
  "community.column_settings.local_only": "Hanya lokal",
  "community.column_settings.media_only": "Hanya media",
  "community.column_settings.remote_only": "Hanya jarak jauh",
@@ -393,11 +392,7 @@
  "navigation_bar.about": "Tentang",
  "navigation_bar.blocks": "Pengguna diblokir",
  "navigation_bar.bookmarks": "Markah",
-  "navigation_bar.community_timeline": "Linimasa lokal",
-  "navigation_bar.compose": "Tulis toot baru",
-  "navigation_bar.discover": "Temukan",
  "navigation_bar.domain_blocks": "Domain tersembunyi",
-  "navigation_bar.explore": "Jelajahi",
  "navigation_bar.filters": "Kata yang dibisukan",
  "navigation_bar.follow_requests": "Permintaan mengikuti",
  "navigation_bar.followed_tags": "Tagar yang diikuti",
@@ -405,12 +400,8 @@
  "navigation_bar.lists": "Daftar",
  "navigation_bar.logout": "Keluar",
  "navigation_bar.mutes": "Pengguna dibisukan",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Toot tersemat",
  "navigation_bar.preferences": "Pengaturan",
-  "navigation_bar.public_timeline": "Linimasa gabungan",
  "navigation_bar.search": "Cari",
-  "navigation_bar.security": "Keamanan",
  "not_signed_in_indicator.not_signed_in": "Anda harus masuk untuk mengakses sumber daya ini.",
  "notification.admin.report": "{name} melaporkan {target}",
  "notification.admin.sign_up": "{name} mendaftar",
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -129,7 +129,6 @@
  "column_header.pin": "Pinglar",
  "column_header.show_settings": "Monstrar parametres",
  "column_header.unpin": "Despinglar",
-  "column_subheading.settings": "Parametres",
  "community.column_settings.local_only": "Solmen local",
  "community.column_settings.media_only": "Solmen medie",
  "community.column_settings.remote_only": "Solmen external",
@@ -398,12 +397,8 @@
  "navigation_bar.advanced_interface": "Aperter in li web-interfacie avansat",
  "navigation_bar.blocks": "Bloccat usatores",
  "navigation_bar.bookmarks": "Marcatores",
-  "navigation_bar.community_timeline": "Local témpor-linea",
-  "navigation_bar.compose": "Composir un nov posta",
  "navigation_bar.direct": "Privat mentiones",
-  "navigation_bar.discover": "Decovrir",
  "navigation_bar.domain_blocks": "Bloccat dominias",
-  "navigation_bar.explore": "Explorar",
  "navigation_bar.favourites": "Favorites",
  "navigation_bar.filters": "Silentiat paroles",
  "navigation_bar.follow_requests": "Petitiones de sequer",
@@ -413,12 +408,8 @@
  "navigation_bar.logout": "Exear",
  "navigation_bar.mutes": "Silentiat usatores",
  "navigation_bar.opened_in_classic_interface": "Postas, contos e altri specific págines es customalmen apertet in li classic web-interfacie.",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinglat postas",
  "navigation_bar.preferences": "Preferenties",
-  "navigation_bar.public_timeline": "Federat témpor-linea",
  "navigation_bar.search": "Sercha",
-  "navigation_bar.security": "Securitá",
  "not_signed_in_indicator.not_signed_in": "On deve aperter session por accesser ti-ci ressurse.",
  "notification.admin.report": "{name} raportat {target}",
  "notification.admin.sign_up": "{name} adheret",
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -28,7 +28,6 @@
  "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ụ...",
@@ -109,7 +108,6 @@
  "lists.edit": "Dezie ndepụta",
  "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",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -167,7 +167,6 @@
  "column_header.show_settings": "Montrez ajusti",
  "column_header.unpin": "Depinglagez",
  "column_search.cancel": "Nuligar",
-  "column_subheading.settings": "Ajusti",
  "community.column_settings.local_only": "Lokala nur",
  "community.column_settings.media_only": "Nur audvidaji",
  "community.column_settings.remote_only": "Fora nur",
@@ -518,12 +517,8 @@
  "navigation_bar.advanced_interface": "Apertez per retintervizajo",
  "navigation_bar.blocks": "Blokusita uzeri",
  "navigation_bar.bookmarks": "Lektosigni",
-  "navigation_bar.community_timeline": "Lokala tempolineo",
-  "navigation_bar.compose": "Compose new toot",
  "navigation_bar.direct": "Privata mencioni",
-  "navigation_bar.discover": "Deskovrez",
  "navigation_bar.domain_blocks": "Blokusita domeni",
-  "navigation_bar.explore": "Explorez",
  "navigation_bar.favourites": "Favoriziti",
  "navigation_bar.filters": "Silencigita vorti",
  "navigation_bar.follow_requests": "Demandi di sequado",
@@ -534,12 +529,8 @@
  "navigation_bar.moderation": "Jero",
  "navigation_bar.mutes": "Celita uzeri",
  "navigation_bar.opened_in_classic_interface": "Posti, konti e altra pagini specifika apertesas en la retovidilo klasika.",
-  "navigation_bar.personal": "Personala",
-  "navigation_bar.pins": "Adpinglita afishi",
  "navigation_bar.preferences": "Preferi",
-  "navigation_bar.public_timeline": "Federata tempolineo",
  "navigation_bar.search": "Serchez",
-  "navigation_bar.security": "Sekureso",
  "not_signed_in_indicator.not_signed_in": "Vu mustas enirar por acesar ca moyeno.",
  "notification.admin.report": "{name} raportizis {target}",
  "notification.admin.report_account": "{name} raportis {count, plural,one {1 posto} other {# posti}} de {target} pro {category}",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Birta stillingar",
  "column_header.unpin": "Losa",
  "column_search.cancel": "Hætta við",
-  "column_subheading.settings": "Stillingar",
  "community.column_settings.local_only": "Einungis staðvært",
  "community.column_settings.media_only": "Einungis myndskrár",
  "community.column_settings.remote_only": "Einungis fjartengt",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Sjálfvirk eyðing færslna",
  "navigation_bar.blocks": "Útilokaðir notendur",
  "navigation_bar.bookmarks": "Bókamerki",
-  "navigation_bar.community_timeline": "Staðvær tímalína",
-  "navigation_bar.compose": "Semja nýja færslu",
  "navigation_bar.direct": "Einkaspjall",
-  "navigation_bar.discover": "Uppgötva",
  "navigation_bar.domain_blocks": "Útilokuð lén",
-  "navigation_bar.explore": "Kanna",
  "navigation_bar.favourites": "Eftirlæti",
  "navigation_bar.filters": "Þögguð orð",
  "navigation_bar.follow_requests": "Beiðnir um að fylgjast með",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Meira",
  "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",
-  "navigation_bar.pins": "Festar færslur",
  "navigation_bar.preferences": "Kjörstillingar",
  "navigation_bar.privacy_and_reach": "Gagnaleynd og útbreiðsla",
-  "navigation_bar.public_timeline": "Sameiginleg tímalína",
  "navigation_bar.search": "Leita",
  "navigation_bar.search_trends": "Leita / Vinsælt",
-  "navigation_bar.security": "Öryggi",
  "navigation_panel.collapse_followed_tags": "Fella saman valmynd myllumerkja sem fylgst er með",
  "navigation_panel.collapse_lists": "Fella saman valmyndalista",
  "navigation_panel.expand_followed_tags": "Fletta út valmynd myllumerkja sem fylgst er með",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Mostra le impostazioni",
  "column_header.unpin": "Non fissare",
  "column_search.cancel": "Annulla",
-  "column_subheading.settings": "Impostazioni",
  "community.column_settings.local_only": "Solo Locale",
  "community.column_settings.media_only": "Solo Media",
  "community.column_settings.remote_only": "Solo Remoto",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Cancellazione automatica dei post",
  "navigation_bar.blocks": "Utenti bloccati",
  "navigation_bar.bookmarks": "Segnalibri",
-  "navigation_bar.community_timeline": "Cronologia locale",
-  "navigation_bar.compose": "Componi nuovo toot",
  "navigation_bar.direct": "Menzioni private",
-  "navigation_bar.discover": "Scopri",
  "navigation_bar.domain_blocks": "Domini bloccati",
-  "navigation_bar.explore": "Esplora",
  "navigation_bar.favourites": "Preferiti",
  "navigation_bar.filters": "Parole silenziate",
  "navigation_bar.follow_requests": "Richieste di seguirti",
@@ -573,13 +568,9 @@
  "navigation_bar.more": "Altro",
  "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",
-  "navigation_bar.pins": "Post fissati",
  "navigation_bar.preferences": "Preferenze",
  "navigation_bar.privacy_and_reach": "Privacy e copertura",
-  "navigation_bar.public_timeline": "Cronologia federata",
  "navigation_bar.search": "Cerca",
-  "navigation_bar.security": "Sicurezza",
  "navigation_panel.collapse_lists": "Chiudi il menu elenco",
  "navigation_panel.expand_lists": "Espandi il menu elenco",
  "not_signed_in_indicator.not_signed_in": "Devi accedere per consultare questa risorsa.",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "設定を表示",
  "column_header.unpin": "ピン留めを外す",
  "column_search.cancel": "キャンセル",
-  "column_subheading.settings": "設定",
  "community.column_settings.local_only": "ローカルのみ表示",
  "community.column_settings.media_only": "メディアのみ表示",
  "community.column_settings.remote_only": "リモートのみ表示",
@@ -550,12 +549,8 @@
  "navigation_bar.advanced_interface": "上級者向けUIに戻る",
  "navigation_bar.blocks": "ブロックしたユーザー",
  "navigation_bar.bookmarks": "ブックマーク",
-  "navigation_bar.community_timeline": "ローカルタイムライン",
-  "navigation_bar.compose": "投稿の新規作成",
  "navigation_bar.direct": "非公開の返信",
-  "navigation_bar.discover": "見つける",
  "navigation_bar.domain_blocks": "ブロックしたドメイン",
-  "navigation_bar.explore": "探索する",
  "navigation_bar.favourites": "お気に入り",
  "navigation_bar.filters": "フィルター設定",
  "navigation_bar.follow_requests": "フォローリクエスト",
@@ -566,12 +561,8 @@
  "navigation_bar.moderation": "モデレーション",
  "navigation_bar.mutes": "ミュートしたユーザー",
  "navigation_bar.opened_in_classic_interface": "投稿やプロフィールを直接開いた場合は一時的に標準UIで表示されます。",
-  "navigation_bar.personal": "個人用",
-  "navigation_bar.pins": "固定した投稿",
  "navigation_bar.preferences": "ユーザー設定",
-  "navigation_bar.public_timeline": "連合タイムライン",
  "navigation_bar.search": "検索",
-  "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}」として通報しました",
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -54,7 +54,6 @@
  "column_header.pin": "მიმაგრება",
  "column_header.show_settings": "პარამეტრების ჩვენება",
  "column_header.unpin": "მოხსნა",
-  "column_subheading.settings": "პარამეტრები",
  "community.column_settings.media_only": "მხოლოდ მედია",
  "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.",
@@ -143,20 +142,13 @@
  "lists.delete": "სიის წაშლა",
  "lists.edit": "სიის შეცვლა",
  "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
-  "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
-  "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.discover": "აღმოაჩინე",
  "navigation_bar.domain_blocks": "დამალული დომენები",
  "navigation_bar.filters": "გაჩუმებული სიტყვები",
  "navigation_bar.follow_requests": "დადევნების მოთხოვნები",
  "navigation_bar.lists": "სიები",
  "navigation_bar.logout": "გასვლა",
  "navigation_bar.mutes": "გაჩუმებული მომხმარებლები",
-  "navigation_bar.personal": "პირადი",
-  "navigation_bar.pins": "აპინული ტუტები",
  "navigation_bar.preferences": "პრეფერენსიები",
-  "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
-  "navigation_bar.security": "უსაფრთხოება",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.follow": "{name} გამოგყვათ",
  "notification.reblog": "{name}-მა დაბუსტა თქვენი სტატუსი",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -130,7 +130,6 @@
  "column_header.show_settings": "Ssken iɣewwaṛen",
  "column_header.unpin": "Kkes asenteḍ",
  "column_search.cancel": "Semmet",
-  "column_subheading.settings": "Iɣewwaṛen",
  "community.column_settings.local_only": "Adigan kan",
  "community.column_settings.media_only": "Imidyaten kan",
  "community.column_settings.remote_only": "Anmeggag kan",
@@ -392,12 +391,8 @@
  "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",
-  "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",
  "navigation_bar.favourites": "Imenyafen",
  "navigation_bar.filters": "Awalen i yettwasgugmen",
  "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
@@ -408,12 +403,8 @@
  "navigation_bar.moderation": "Aseɣyed",
  "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",
-  "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
  "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}",
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -115,7 +115,6 @@
  "column_header.pin": "Жабыстыру",
  "column_header.show_settings": "Баптауларды көрсет",
  "column_header.unpin": "Алып тастау",
-  "column_subheading.settings": "Баптаулар",
  "community.column_settings.local_only": "Тек жергілікті",
  "community.column_settings.media_only": "Тек медиа",
  "community.column_settings.remote_only": "Тек сыртқы",
@@ -245,9 +244,6 @@
  "load_pending": "{count, plural, one {# жаңа нәрсе} other {# жаңа нәрсе}}",
  "navigation_bar.blocks": "Бұғатталғандар",
  "navigation_bar.bookmarks": "Бетбелгілер",
-  "navigation_bar.community_timeline": "Жергілікті желі",
-  "navigation_bar.compose": "Жаңа жазба бастау",
-  "navigation_bar.discover": "шарлау",
  "navigation_bar.domain_blocks": "Жабық домендер",
  "navigation_bar.filters": "Үнсіз сөздер",
  "navigation_bar.follow_requests": "Жазылуға сұранғандар",
@@ -255,11 +251,7 @@
  "navigation_bar.lists": "Тізімдер",
  "navigation_bar.logout": "Шығу",
  "navigation_bar.mutes": "Үнсіз қолданушылар",
-  "navigation_bar.personal": "Жеке",
-  "navigation_bar.pins": "Жабыстырылғандар",
  "navigation_bar.preferences": "Басымдықтар",
-  "navigation_bar.public_timeline": "Жаһандық желі",
-  "navigation_bar.security": "Қауіпсіздік",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.follow": "{name} сізге жазылды",
  "notification.follow_request": "{name} сізге жазылғысы келеді",
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -64,9 +64,7 @@
  "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",
-  "navigation_bar.compose": "Compose new toot",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.reblog": "{name} boosted your status",
  "notifications.column_settings.status": "New toots:",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "설정 보이기",
  "column_header.unpin": "고정 해제",
  "column_search.cancel": "취소",
-  "column_subheading.settings": "설정",
  "community.column_settings.local_only": "로컬만",
  "community.column_settings.media_only": "미디어만",
  "community.column_settings.remote_only": "원격지만",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "게시물 자동 삭제",
  "navigation_bar.blocks": "차단한 사용자",
  "navigation_bar.bookmarks": "북마크",
-  "navigation_bar.community_timeline": "로컬 타임라인",
-  "navigation_bar.compose": "새 게시물 작성",
  "navigation_bar.direct": "개인적인 멘션",
-  "navigation_bar.discover": "발견하기",
  "navigation_bar.domain_blocks": "차단한 도메인",
-  "navigation_bar.explore": "둘러보기",
  "navigation_bar.favourites": "좋아요",
  "navigation_bar.filters": "뮤트한 단어",
  "navigation_bar.follow_requests": "팔로우 요청",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "더 보기",
  "navigation_bar.mutes": "뮤트한 사용자",
  "navigation_bar.opened_in_classic_interface": "게시물, 계정, 기타 특정 페이지들은 기본적으로 기존 웹 인터페이스로 열리게 됩니다.",
-  "navigation_bar.personal": "개인용",
-  "navigation_bar.pins": "고정된 게시물",
  "navigation_bar.preferences": "환경설정",
  "navigation_bar.privacy_and_reach": "개인정보와 도달",
-  "navigation_bar.public_timeline": "연합 타임라인",
  "navigation_bar.search": "검색",
  "navigation_bar.search_trends": "검색 / 유행",
-  "navigation_bar.security": "보안",
  "navigation_panel.collapse_followed_tags": "팔로우 중인 해시태그 메뉴 접기",
  "navigation_panel.collapse_lists": "리스트 메뉴 접기",
  "navigation_panel.expand_followed_tags": "팔로우 중인 해시태그 메뉴 펼치기",
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -135,7 +135,6 @@
  "column_header.show_settings": "Sazkariyan nîşan bide",
  "column_header.unpin": "Bi derzî neke",
  "column_search.cancel": "Têk bibe",
-  "column_subheading.settings": "Sazkarî",
  "community.column_settings.local_only": "Tenê herêmî",
  "community.column_settings.media_only": "Tenê media",
  "community.column_settings.remote_only": "Tenê ji dûr ve",
@@ -337,12 +336,8 @@
  "navigation_bar.about": "Derbar",
  "navigation_bar.blocks": "Bikarhênerên astengkirî",
  "navigation_bar.bookmarks": "Şûnpel",
-  "navigation_bar.community_timeline": "Demnameya herêmî",
-  "navigation_bar.compose": "Şandiyeke nû binivsîne",
  "navigation_bar.direct": "Payemên taybet",
-  "navigation_bar.discover": "Vekolê",
  "navigation_bar.domain_blocks": "Navperên astengkirî",
-  "navigation_bar.explore": "Vekole",
  "navigation_bar.filters": "Peyvên bêdengkirî",
  "navigation_bar.follow_requests": "Daxwazên şopandinê",
  "navigation_bar.followed_tags": "Etîketên şopandî",
@@ -350,12 +345,8 @@
  "navigation_bar.lists": "Lîste",
  "navigation_bar.logout": "Derkeve",
  "navigation_bar.mutes": "Bikarhênerên bêdengkirî",
-  "navigation_bar.personal": "Kesanî",
-  "navigation_bar.pins": "Şandiya derzîkirî",
  "navigation_bar.preferences": "Sazkarî",
-  "navigation_bar.public_timeline": "Demnameya giştî",
  "navigation_bar.search": "Bigere",
-  "navigation_bar.security": "Ewlehî",
  "not_signed_in_indicator.not_signed_in": "Divê tu têketinê bikî da ku tu bigihîjî vê çavkaniyê.",
  "notification.admin.report": "{name} hate ragihandin {target}",
  "notification.admin.sign_up": "{name} tomar bû",
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -62,7 +62,6 @@
  "column_header.pin": "Fastya",
  "column_header.show_settings": "Diskwedhes dewisyow",
  "column_header.unpin": "Anfastya",
-  "column_subheading.settings": "Dewisyow",
  "community.column_settings.local_only": "Leel hepken",
  "community.column_settings.media_only": "Myski hepken",
  "community.column_settings.remote_only": "A-bell hepken",
@@ -199,9 +198,6 @@
  "load_pending": "{count, plural, one {# daklennowydh} other {# a daklennow nowydh}}",
  "navigation_bar.blocks": "Devnydhyoryon lettys",
  "navigation_bar.bookmarks": "Folennosow",
-  "navigation_bar.community_timeline": "Amserlin leel",
-  "navigation_bar.compose": "Komposya post nowydh",
-  "navigation_bar.discover": "Diskudha",
  "navigation_bar.domain_blocks": "Gorfarthow lettys",
  "navigation_bar.filters": "Geryow tawhes",
  "navigation_bar.follow_requests": "Govynnow holya",
@@ -209,11 +205,7 @@
  "navigation_bar.lists": "Rolyow",
  "navigation_bar.logout": "Digelmi",
  "navigation_bar.mutes": "Devnydhyoryon tawhes",
-  "navigation_bar.personal": "Menebel",
-  "navigation_bar.pins": "Postow fastys",
  "navigation_bar.preferences": "Erviransow",
-  "navigation_bar.public_timeline": "Amserlin geffrysys",
-  "navigation_bar.security": "Diogeledh",
  "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",
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -162,7 +162,6 @@
  "column_header.show_settings": "Amostra opsyones",
  "column_header.unpin": "Defiksar",
  "column_search.cancel": "Anula",
-  "column_subheading.settings": "Opsyones",
  "community.column_settings.local_only": "Solo lokalas",
  "community.column_settings.media_only": "Solo multimedia",
  "community.column_settings.remote_only": "Solo remotas",
@@ -469,12 +468,8 @@
  "navigation_bar.advanced_interface": "Avre en la enterfaz avanzada",
  "navigation_bar.blocks": "Utilizadores blokados",
  "navigation_bar.bookmarks": "Markadores",
-  "navigation_bar.community_timeline": "Linya de tiempo lokala",
-  "navigation_bar.compose": "Eskrivir mueva publikasyon",
  "navigation_bar.direct": "Enmentaduras privadas",
-  "navigation_bar.discover": "Diskuvre",
  "navigation_bar.domain_blocks": "Domenos blokados",
-  "navigation_bar.explore": "Eksplora",
  "navigation_bar.favourites": "Te plazen",
  "navigation_bar.filters": "Biervos silensiados",
  "navigation_bar.follow_requests": "Solisitudes de segimiento",
@@ -487,13 +482,9 @@
  "navigation_bar.more": "Mas",
  "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",
-  "navigation_bar.pins": "Publikasyones fiksadas",
  "navigation_bar.preferences": "Preferensyas",
  "navigation_bar.privacy_and_reach": "Privasita i alkanse",
-  "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.",
  "notification.admin.report": "{name} raporto {target}",
  "notification.admin.report_statuses": "{name} raporto {target} por {category}",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -178,7 +178,6 @@
  "column_header.show_settings": "Rodyti nustatymus",
  "column_header.unpin": "Atsegti",
  "column_search.cancel": "Atšaukti",
-  "column_subheading.settings": "Nustatymai",
  "community.column_settings.local_only": "Tik vietinis",
  "community.column_settings.media_only": "Tik medija",
  "community.column_settings.remote_only": "Tik nuotolinis",
@@ -531,12 +530,8 @@
  "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
  "navigation_bar.blocks": "Užblokuoti naudotojai",
  "navigation_bar.bookmarks": "Žymės",
-  "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": "Užblokuoti domenai",
-  "navigation_bar.explore": "Naršyti",
  "navigation_bar.favourites": "Mėgstami",
  "navigation_bar.filters": "Nutildyti žodžiai",
  "navigation_bar.follow_requests": "Sekimo prašymai",
@@ -547,12 +542,8 @@
  "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",
-  "navigation_bar.pins": "Prisegti įrašai",
  "navigation_bar.preferences": "Nuostatos",
-  "navigation_bar.public_timeline": "Federacinė laiko skalė",
  "navigation_bar.search": "Ieškoti",
-  "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}",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -178,7 +178,6 @@
  "column_header.show_settings": "Rādīt iestatījumus",
  "column_header.unpin": "Atspraust",
  "column_search.cancel": "Atcelt",
-  "column_subheading.settings": "Iestatījumi",
  "community.column_settings.local_only": "Tikai vietējie",
  "community.column_settings.media_only": "Tikai multivide",
  "community.column_settings.remote_only": "Tikai attālinātie",
@@ -495,12 +494,8 @@
  "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
  "navigation_bar.blocks": "Bloķētie lietotāji",
  "navigation_bar.bookmarks": "Grāmatzīmes",
-  "navigation_bar.community_timeline": "Vietējā laika līnija",
-  "navigation_bar.compose": "Izveidot jaunu ierakstu",
  "navigation_bar.direct": "Privātas pieminēšanas",
-  "navigation_bar.discover": "Atklāt",
  "navigation_bar.domain_blocks": "Bloķētie domēni",
-  "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",
@@ -511,12 +506,8 @@
  "navigation_bar.moderation": "Satura pārraudzība",
  "navigation_bar.mutes": "Apklusinātie lietotāji",
  "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": "Piespraustie ieraksti",
  "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": "Ir jāpiesakās, lai piekļūtu šim resursam.",
  "notification.admin.report": "{name} ziņoja par {target}",
  "notification.admin.report_account": "{name} ziņoja par {count, plural, one {# ierakstu} other {# ierakstiem}} no {target} ar iemeslu: {category}",
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -64,7 +64,6 @@
  "column_header.moveLeft_settings": "Премести колона влево",
  "column_header.moveRight_settings": "Премести колона вдесно",
  "column_header.show_settings": "Прикажи подесувања",
-  "column_subheading.settings": "Подесувања",
  "community.column_settings.media_only": "Само медиа",
  "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.",
@@ -159,7 +158,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",
-  "navigation_bar.compose": "Compose new toot",
  "navigation_bar.domain_blocks": "Hidden domains",
  "navigation_bar.filters": "Замолќени зборови",
  "navigation_bar.follow_requests": "Следи покани",
@@ -167,10 +165,6 @@
  "navigation_bar.lists": "Листи",
  "navigation_bar.logout": "Одјави се",
  "navigation_bar.mutes": "Заќутени корисници",
-  "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Pinned toots",
-  "navigation_bar.public_timeline": "Федеративен времеплов",
-  "navigation_bar.security": "Безбедност",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.reblog": "{name} boosted your status",
  "notifications.column_settings.poll": "Резултати од анкета:",
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -102,7 +102,6 @@
  "column_header.pin": "ഉറപ്പിച്ചു നിറുത്തുക",
  "column_header.show_settings": "ക്രമീകരണങ്ങൾ കാണിക്കുക",
  "column_header.unpin": "ഇളക്കി മാറ്റുക",
-  "column_subheading.settings": "ക്രമീകരണങ്ങള്‍",
  "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
  "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
  "community.column_settings.remote_only": "വിദൂര മാത്രം",
@@ -270,21 +269,14 @@
  "media_gallery.hide": "മറയ്ക്കുക",
  "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
  "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
-  "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
-  "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
-  "navigation_bar.discover": "കണ്ടെത്തുക",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "ആരായുക",
  "navigation_bar.favourites": "പ്രിയപ്പെട്ടതു്",
  "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
  "navigation_bar.lists": "ലിസ്റ്റുകൾ",
  "navigation_bar.logout": "ലോഗൗട്ട്",
  "navigation_bar.mutes": "നിശബ്ദമാക്കപ്പെട്ട ഉപയോക്താക്കൾ",
-  "navigation_bar.personal": "സ്വകാര്യ",
-  "navigation_bar.pins": "Pinned toots",
  "navigation_bar.preferences": "ക്രമീകരണങ്ങൾ",
  "navigation_bar.search": "തിരയുക",
-  "navigation_bar.security": "സുരക്ഷ",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു",
  "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു",
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -89,7 +89,6 @@
  "column_header.pin": "टाचण",
  "column_header.show_settings": "सेटिंग्स दाखवा",
  "column_header.unpin": "अनपिन करा",
-  "column_subheading.settings": "सेटिंग्ज",
  "community.column_settings.media_only": "केवळ मीडिया",
  "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.",
@@ -170,9 +169,7 @@
  "lists.replies_policy.list": "यादीतील सदस्य",
  "lists.replies_policy.none": "कोणीच नाही",
  "load_pending": "{count, plural, one {# new item} other {# new items}}",
-  "navigation_bar.compose": "Compose new toot",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
  "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
  "notification.reblog": "{name} boosted your status",
  "notifications.column_settings.push": "सूचना",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -171,7 +171,6 @@
  "column_header.show_settings": "Tunjukkan tetapan",
  "column_header.unpin": "Nyahsemat",
  "column_search.cancel": "Batal",
-  "column_subheading.settings": "Tetapan",
  "community.column_settings.local_only": "Tempatan sahaja",
  "community.column_settings.media_only": "Media sahaja",
  "community.column_settings.remote_only": "Jauh sahaja",
@@ -441,12 +440,8 @@
  "navigation_bar.advanced_interface": "Buka dalam antara muka web lanjutan",
  "navigation_bar.blocks": "Pengguna tersekat",
  "navigation_bar.bookmarks": "Tanda buku",
-  "navigation_bar.community_timeline": "Garis masa tempatan",
-  "navigation_bar.compose": "Karang hantaran baharu",
  "navigation_bar.direct": "Sebutan peribadi",
-  "navigation_bar.discover": "Teroka",
  "navigation_bar.domain_blocks": "Domain tersekat",
-  "navigation_bar.explore": "Teroka",
  "navigation_bar.favourites": "Sukaan",
  "navigation_bar.filters": "Perkataan teredam",
  "navigation_bar.follow_requests": "Permintaan ikutan",
@@ -456,12 +451,8 @@
  "navigation_bar.logout": "Log keluar",
  "navigation_bar.mutes": "Pengguna teredam",
  "navigation_bar.opened_in_classic_interface": "Kiriman, akaun dan halaman tertentu yang lain dibuka secara lalai di antara muka web klasik.",
-  "navigation_bar.personal": "Peribadi",
-  "navigation_bar.pins": "Hantaran disemat",
  "navigation_bar.preferences": "Keutamaan",
-  "navigation_bar.public_timeline": "Garis masa bersekutu",
  "navigation_bar.search": "Cari",
-  "navigation_bar.security": "Keselamatan",
  "not_signed_in_indicator.not_signed_in": "Anda perlu daftar masuk untuk mencapai sumber ini.",
  "notification.admin.report": "{name} melaporkan {target}",
  "notification.admin.sign_up": "{name} mendaftar",
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -120,7 +120,6 @@
  "column_header.pin": "ထိပ်တွင်တွဲထားမည်",
  "column_header.show_settings": "ဆက်တင်များကို ပြပါ။",
  "column_header.unpin": "မတွဲတော့ပါ",
-  "column_subheading.settings": "ဆက်တင်များ",
  "community.column_settings.local_only": "ပြည်တွင်း၌သာ",
  "community.column_settings.media_only": "Media only",
  "community.column_settings.remote_only": "အဝေးမှသာ",
@@ -335,12 +334,8 @@
  "navigation_bar.advanced_interface": "အဆင့်မြင့်ဝဘ်ပုံစံ ဖွင့်ပါ",
  "navigation_bar.blocks": "ဘလော့ထားသောအကောင့်များ",
  "navigation_bar.bookmarks": "မှတ်ထားသည်များ",
-  "navigation_bar.community_timeline": "ဒေသစံတော်ချိန်",
-  "navigation_bar.compose": "ပို့စ်အသစ်ရေးပါ",
  "navigation_bar.direct": "သီးသန့်ဖော်ပြချက်များ",
-  "navigation_bar.discover": "ရှာဖွေပါ",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.explore": "စူးစမ်းရန်",
  "navigation_bar.favourites": "Favorites",
  "navigation_bar.filters": "စကားလုံးများ ပိတ်ထားပါ",
  "navigation_bar.follow_requests": "စောင့်ကြည့်ရန် တောင်းဆိုမှုများ",
@@ -350,12 +345,8 @@
  "navigation_bar.logout": "ထွက်မယ်",
  "navigation_bar.mutes": "အသုံးပြုသူများကို ပိတ်ထားပါ",
  "navigation_bar.opened_in_classic_interface": "ပို့စ်များ၊ အကောင့်များနှင့် အခြားသီးခြားစာမျက်နှာများကို classic ဝဘ်အင်တာဖေ့စ်တွင် ဖွင့်ထားသည်။",
-  "navigation_bar.personal": "ကိုယ်ရေးကိုယ်တာ",
-  "navigation_bar.pins": "ပင်တွဲထားသောပို့စ်များ",
  "navigation_bar.preferences": "စိတ်ကြိုက်သတ်မှတ်ချက်များ",
-  "navigation_bar.public_timeline": "ဖက်ဒီစာမျက်နှာ",
  "navigation_bar.search": "ရှာရန်",
-  "navigation_bar.security": "လုံခြုံရေး",
  "not_signed_in_indicator.not_signed_in": "ဤရင်းမြစ်သို့ ဝင်ရောက်ရန်အတွက် သင်သည် အကောင့်ဝင်ရန် လိုအပ်ပါသည်။",
  "notification.admin.report": "{name} က {target} ကို တိုင်ကြားခဲ့သည်",
  "notification.admin.sign_up": "{name} က အကောင့်ဖွင့်ထားသည်",
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "顯示設定",
  "column_header.unpin": "Pak掉",
  "column_search.cancel": "取消",
-  "column_subheading.settings": "設定",
  "community.column_settings.local_only": "Kan-ta展示本地ê",
  "community.column_settings.media_only": "Kan-ta展示媒體",
  "community.column_settings.remote_only": "Kan-ta展示遠距離ê",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "自動thâi PO文",
  "navigation_bar.blocks": "封鎖ê用者",
  "navigation_bar.bookmarks": "冊籤",
-  "navigation_bar.community_timeline": "本地ê時間線",
-  "navigation_bar.compose": "寫新ê PO文",
  "navigation_bar.direct": "私人ê提起",
-  "navigation_bar.discover": "發現",
  "navigation_bar.domain_blocks": "封鎖ê域名",
-  "navigation_bar.explore": "探查",
  "navigation_bar.favourites": "Siōng kah意",
  "navigation_bar.filters": "消音ê詞",
  "navigation_bar.follow_requests": "跟tuè請求",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "其他",
  "navigation_bar.mutes": "消音ê用者",
  "navigation_bar.opened_in_classic_interface": "PO文、口座kap其他指定ê頁面，預設ē佇經典ê網頁界面內phah開。",
-  "navigation_bar.personal": "個人",
-  "navigation_bar.pins": "釘起來ê PO文",
  "navigation_bar.preferences": "偏愛ê設定",
  "navigation_bar.privacy_and_reach": "隱私kap資訊ê及至",
-  "navigation_bar.public_timeline": "聯邦ê時間線",
  "navigation_bar.search": "Tshiau-tshuē",
  "navigation_bar.search_trends": "Tshiau-tshuē / 趨勢",
-  "navigation_bar.security": "安全",
  "navigation_panel.collapse_followed_tags": "Kā跟tuè ê hashtag目錄嵌起來",
  "navigation_panel.collapse_lists": "Khàm掉列單目錄",
  "navigation_panel.expand_followed_tags": "Kā跟tuè ê hashtag目錄thián開",
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -101,7 +101,6 @@
  "column_header.pin": "पिन गर्नुहोस्",
  "column_header.unpin": "अनपिन गर्नुहोस्",
  "column_search.cancel": "रद्द गर्नुहोस्",
-  "column_subheading.settings": "सेटिङहरू",
  "community.column_settings.media_only": "मिडिया मात्र",
  "compose.language.change": "भाषा परिवर्तन गर्नुहोस्",
  "compose.language.search": "भाषाहरू खोज्नुहोस्...",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Instellingen tonen",
  "column_header.unpin": "Losmaken",
  "column_search.cancel": "Annuleren",
-  "column_subheading.settings": "Instellingen",
  "community.column_settings.local_only": "Alleen lokaal",
  "community.column_settings.media_only": "Alleen media",
  "community.column_settings.remote_only": "Alleen andere servers",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Automatisch berichten verwijderen",
  "navigation_bar.blocks": "Geblokkeerde gebruikers",
  "navigation_bar.bookmarks": "Bladwijzers",
-  "navigation_bar.community_timeline": "Lokale tijdlijn",
-  "navigation_bar.compose": "Nieuw bericht schrijven",
  "navigation_bar.direct": "Privéberichten",
-  "navigation_bar.discover": "Ontdekken",
  "navigation_bar.domain_blocks": "Geblokkeerde servers",
-  "navigation_bar.explore": "Verkennen",
  "navigation_bar.favourites": "Favorieten",
  "navigation_bar.filters": "Filters",
  "navigation_bar.follow_requests": "Volgverzoeken",
@@ -573,14 +568,10 @@
  "navigation_bar.more": "Meer",
  "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",
-  "navigation_bar.pins": "Vastgemaakte berichten",
  "navigation_bar.preferences": "Instellingen",
  "navigation_bar.privacy_and_reach": "Privacy en bereik",
-  "navigation_bar.public_timeline": "Globale tijdlijn",
  "navigation_bar.search": "Zoeken",
  "navigation_bar.search_trends": "Zoeken / Trends",
-  "navigation_bar.security": "Beveiliging",
  "navigation_panel.collapse_followed_tags": "Menu voor gevolgde hashtags inklappen",
  "navigation_panel.collapse_lists": "Lijstmenu inklappen",
  "navigation_panel.expand_followed_tags": "Menu voor gevolgde hashtags uitklappen",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -184,7 +184,6 @@
  "column_header.show_settings": "Vis innstillingar",
  "column_header.unpin": "Løys",
  "column_search.cancel": "Avbryt",
-  "column_subheading.settings": "Innstillingar",
  "community.column_settings.local_only": "Berre lokalt",
  "community.column_settings.media_only": "Berre media",
  "community.column_settings.remote_only": "Berre eksternt",
@@ -555,12 +554,8 @@
  "navigation_bar.automated_deletion": "Automatisert sletting av innlegg",
  "navigation_bar.blocks": "Blokkerte brukarar",
  "navigation_bar.bookmarks": "Bokmerke",
-  "navigation_bar.community_timeline": "Lokal tidsline",
-  "navigation_bar.compose": "Lag nytt tut",
  "navigation_bar.direct": "Private omtaler",
-  "navigation_bar.discover": "Oppdag",
  "navigation_bar.domain_blocks": "Skjulte domene",
-  "navigation_bar.explore": "Utforsk",
  "navigation_bar.favourites": "Favorittar",
  "navigation_bar.filters": "Målbundne ord",
  "navigation_bar.follow_requests": "Fylgjeførespurnader",
@@ -573,13 +568,9 @@
  "navigation_bar.more": "Mer",
  "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",
-  "navigation_bar.pins": "Festa tut",
  "navigation_bar.preferences": "Innstillingar",
  "navigation_bar.privacy_and_reach": "Personvern og rekkevidde",
-  "navigation_bar.public_timeline": "Føderert tidsline",
  "navigation_bar.search": "Søk",
-  "navigation_bar.security": "Tryggleik",
  "navigation_panel.collapse_lists": "Skjul listemeny",
  "navigation_panel.expand_lists": "Utvid listemeny",
  "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
--- a/Show More
+++ b/Show More