Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream

app/controllers/api/v1/statuses_controller.rb

@@ -130,6 +130,8 @@ class Api::V1::StatusesController < Api::BaseController
     @status = Status.where(account: current_account).find(params[:id])
     authorize @status, :destroy?
 
+    # JSON is generated before `discard_with_reblogs` in order to have the proper URL
+    # for media attachments, as it would otherwise redirect to the media proxy
     json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true
 
     @status.discard_with_reblogs

app/javascript/mastodon/components/alt_text_badge/index.tsx

@@ -1,6 +1,6 @@
-import { useState, useCallback, useRef, useId } from 'react';
+import { useState, useCallback, useRef, useId, Fragment } from 'react';
 
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 
 import type {
   OffsetValue,
@@ -8,24 +8,37 @@ import type {
 } from 'react-overlays/esm/usePopper';
 import Overlay from 'react-overlays/Overlay';
 
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { useSelectableClick } from 'mastodon/hooks/useSelectableClick';
 
+import { IconButton } from '../icon_button';
+
+import classes from './styles.module.scss';
+
 const offset = [0, 4] as OffsetValue;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
 export const AltTextBadge: React.FC<{ description: string }> = ({
   description,
 }) => {
-  const accessibilityId = useId();
+  const intl = useIntl();
-  const anchorRef = useRef<HTMLButtonElement>(null);
+  const uniqueId = useId();
+  const popoverId = `${uniqueId}-popover`;
+  const titleId = `${uniqueId}-title`;
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const popoverRef = useRef<HTMLDivElement>(null);
   const [open, setOpen] = useState(false);
 
   const handleClick = useCallback(() => {
     setOpen((v) => !v);
+    setTimeout(() => {
+      popoverRef.current?.focus();
+    }, 0);
   }, [setOpen]);
 
   const handleClose = useCallback(() => {
     setOpen(false);
+    buttonRef.current?.focus();
   }, [setOpen]);
 
   const [handleMouseDown, handleMouseUp] = useSelectableClick(handleClose);
@@ -34,11 +47,12 @@ export const AltTextBadge: React.FC<{ description: string }> = ({
     <>
       <button
         type='button'
-        ref={anchorRef}
+        ref={buttonRef}
         className='media-gallery__alt__label'
         onClick={handleClick}
         aria-expanded={open}
-        aria-controls={accessibilityId}
+        aria-controls={popoverId}
+        aria-haspopup='dialog'
       >
         ALT
       </button>
@@ -47,7 +61,7 @@ export const AltTextBadge: React.FC<{ description: string }> = ({
         rootClose
         onHide={handleClose}
         show={open}
-        target={anchorRef}
+        target={buttonRef}
         placement='top-end'
         flip
         offset={offset}
@@ -57,17 +71,34 @@ export const AltTextBadge: React.FC<{ description: string }> = ({
           <div {...props} className='hover-card-controller'>
             <div // eslint-disable-line jsx-a11y/no-noninteractive-element-interactions
               className='info-tooltip dropdown-animation'
-              role='region'
+              role='dialog'
-              id={accessibilityId}
+              aria-labelledby={titleId}
+              ref={popoverRef}
+              id={popoverId}
               onMouseDown={handleMouseDown}
               onMouseUp={handleMouseUp}
+              // eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+              tabIndex={0}
             >
-              <h4>
+              <h4 id={titleId}>
                 <FormattedMessage
                   id='alt_text_badge.title'
                   defaultMessage='Alt text'
+                  tagName={Fragment}
                 />
               </h4>
+
+              <IconButton
+                title={intl.formatMessage({
+                  id: 'lightbox.close',
+                  defaultMessage: 'Close',
+                })}
+                icon='close'
+                iconComponent={CloseIcon}
+                onClick={handleClose}
+                className={classes.closeButton}
+              />
+
               <p>{description}</p>
             </div>
           </div>

app/javascript/mastodon/components/alt_text_badge/styles.module.scss

@@ -0,0 +1,17 @@
+.closeButton {
+  position: absolute;
+  top: 5px;
+  inset-inline-end: 2px;
+  padding: 10px;
+
+  --default-icon-color: var(--color-text-on-media);
+  --default-bg-color: transparent;
+  --hover-icon-color: var(--color-text-on-media);
+  --hover-bg-color: rgb(from var(--color-text-on-media) r g b / 10%);
+  --focus-outline-color: var(--color-text-on-media);
+
+  svg {
+    width: 20px;
+    height: 20px;
+  }
+}

app/javascript/mastodon/components/hover_card_controller.tsx

@@ -23,6 +23,7 @@ export const HoverCardController: React.FC = () => {
   const [open, setOpen] = useState(false);
   const [accountId, setAccountId] = useState<string | undefined>();
   const [anchor, setAnchor] = useState<HTMLElement | null>(null);
+  const isUsingTouchRef = useRef(false);
   const cardRef = useRef<HTMLDivElement | null>(null);
   const [setLeaveTimeout, cancelLeaveTimeout] = useTimeout();
   const [setEnterTimeout, cancelEnterTimeout, delayEnterTimeout] = useTimeout();
@@ -62,6 +63,12 @@ export const HoverCardController: React.FC = () => {
       setAccountId(undefined);
     };
 
+    const handleTouchStart = () => {
+      // Keeping track of touch events to prevent the
+      // hover card from being displayed on touch devices
+      isUsingTouchRef.current = true;
+    };
+
     const handleMouseEnter = (e: MouseEvent) => {
       const { target } = e;
 
@@ -71,6 +78,11 @@ export const HoverCardController: React.FC = () => {
         return;
       }
 
+      // Bail out if a touch is active
+      if (isUsingTouchRef.current) {
+        return;
+      }
+
       // We've entered an anchor
       if (!isScrolling && isHoverCardAnchor(target)) {
         cancelLeaveTimeout();
@@ -129,9 +141,16 @@ export const HoverCardController: React.FC = () => {
     };
 
     const handleMouseMove = () => {
+      if (isUsingTouchRef.current) {
+        isUsingTouchRef.current = false;
+      }
       delayEnterTimeout(enterDelay);
     };
 
+    document.body.addEventListener('touchstart', handleTouchStart, {
+      passive: true,
+    });
+
     document.body.addEventListener('mouseenter', handleMouseEnter, {
       passive: true,
       capture: true,
@@ -153,6 +172,7 @@ export const HoverCardController: React.FC = () => {
     });
 
     return () => {
+      document.body.removeEventListener('touchstart', handleTouchStart);
       document.body.removeEventListener('mouseenter', handleMouseEnter);
       document.body.removeEventListener('mousemove', handleMouseMove);
       document.body.removeEventListener('mouseleave', handleMouseLeave);

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

@@ -1,170 +0,0 @@
-import PropTypes from 'prop-types';
-import { Children, cloneElement, createContext, useContext, useCallback } from 'react';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { scrollRight } from '../../../scroll';
-import {
-  Compose,
-  Notifications,
-  HomeTimeline,
-  CommunityTimeline,
-  PublicTimeline,
-  HashtagTimeline,
-  DirectTimeline,
-  FavouritedStatuses,
-  BookmarkedStatuses,
-  ListTimeline,
-  Directory,
-} from '../util/async-components';
-import { useColumnsContext } from '../util/columns_context';
-
-import Bundle from './bundle';
-import BundleColumnError from './bundle_column_error';
-import { ColumnLoading } from './column_loading';
-import { ComposePanel, RedirectToMobileComposeIfNeeded } from './compose_panel';
-import DrawerLoading from './drawer_loading';
-import { CollapsibleNavigationPanel } from 'mastodon/features/navigation_panel';
-
-const componentMap = {
-  'COMPOSE': Compose,
-  'HOME': HomeTimeline,
-  'NOTIFICATIONS': Notifications,
-  'PUBLIC': PublicTimeline,
-  'REMOTE': PublicTimeline,
-  'COMMUNITY': CommunityTimeline,
-  'HASHTAG': HashtagTimeline,
-  'DIRECT': DirectTimeline,
-  'FAVOURITES': FavouritedStatuses,
-  'BOOKMARKS': BookmarkedStatuses,
-  'LIST': ListTimeline,
-  'DIRECTORY': Directory,
-};
-
-const TabsBarPortal = () => {
-  const {setTabsBarElement} = useColumnsContext();
-
-  const setRef = useCallback((element) => {
-    if(element)
-      setTabsBarElement(element);
-  }, [setTabsBarElement]);
-
-  return <div id='tabs-bar__portal' ref={setRef} />;
-};
-
-// Simple context to allow column children to know which column they're in
-export const ColumnIndexContext = createContext(1);
-/**
- * @returns {number}
- */
-export const useColumnIndexContext = () => useContext(ColumnIndexContext);
-
-export default class ColumnsArea extends ImmutablePureComponent {
-  static propTypes = {
-    columns: ImmutablePropTypes.list.isRequired,
-    isModalOpen: PropTypes.bool.isRequired,
-    singleColumn: PropTypes.bool,
-    children: PropTypes.node,
-  };
-
-  // Corresponds to (max-width: $no-gap-breakpoint - 1px) in SCSS
-  mediaQuery = 'matchMedia' in window && window.matchMedia('(max-width: 1174px)');
-
-  state = {
-    renderComposePanel: !(this.mediaQuery && this.mediaQuery.matches),
-  };
-
-  componentDidMount() {
-    if (this.mediaQuery) {
-      if (this.mediaQuery.addEventListener) {
-        this.mediaQuery.addEventListener('change', this.handleLayoutChange);
-      } else {
-        this.mediaQuery.addListener(this.handleLayoutChange);
-      }
-      this.setState({ renderComposePanel: !this.mediaQuery.matches });
-    }
-
-    this.isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');
-  }
-
-  componentWillUnmount () {
-    if (this.mediaQuery) {
-      if (this.mediaQuery.removeEventListener) {
-        this.mediaQuery.removeEventListener('change', this.handleLayoutChange);
-      } else {
-        this.mediaQuery.removeListener(this.handleLayoutChange);
-      }
-    }
-  }
-
-  handleChildrenContentChange() {
-    if (!this.props.singleColumn) {
-      const modifier = this.isRtlLayout ? -1 : 1;
-      scrollRight(this.node, (this.node.scrollWidth - window.innerWidth) * modifier);
-    }
-  }
-
-  handleLayoutChange = (e) => {
-    this.setState({ renderComposePanel: !e.matches });
-  };
-
-  setRef = (node) => {
-    this.node = node;
-  };
-
-  renderLoading = columnId => () => {
-    return columnId === 'COMPOSE' ? <DrawerLoading /> : <ColumnLoading multiColumn />;
-  };
-
-  renderError = (props) => {
-    return <BundleColumnError multiColumn errorType='network' {...props} />;
-  };
-
-  render () {
-    const { columns, children, singleColumn, isModalOpen } = this.props;
-    const { renderComposePanel } = this.state;
-
-    if (singleColumn) {
-      return (
-        <div className='columns-area__panels'>
-          <div className='columns-area__panels__pane columns-area__panels__pane--compositional'>
-            <div className='columns-area__panels__pane__inner'>
-              {renderComposePanel && <ComposePanel />}
-              <RedirectToMobileComposeIfNeeded />
-            </div>
-          </div>
-
-          <div className='columns-area__panels__main'>
-            <div className='tabs-bar__wrapper'><TabsBarPortal /></div>
-            <div className='columns-area columns-area--mobile'>{children}</div>
-          </div>
-
-          <CollapsibleNavigationPanel />
-        </div>
-      );
-    }
-
-    return (
-      <div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
-        {columns.map((column, index) => {
-          const params = column.get('params', null) === null ? null : column.get('params').toJS();
-          const other  = params && params.other ? params.other : {};
-
-          return (
-            <ColumnIndexContext.Provider value={index} key={column.get('uuid')}>
-              <Bundle fetchComponent={componentMap[column.get('id')]} loading={this.renderLoading(column.get('id'))} error={this.renderError}>
-                {SpecificComponent => <SpecificComponent columnId={column.get('uuid')} params={params} multiColumn {...other} />}
-              </Bundle>
-            </ColumnIndexContext.Provider>
-          );
-        })}
-
-        <ColumnIndexContext.Provider value={columns.size}>
-          {Children.map(children, child => cloneElement(child, { multiColumn: true }))}
-        </ColumnIndexContext.Provider>
-      </div>
-    );
-  }
-
-}

app/javascript/mastodon/features/ui/components/columns_area.tsx

@@ -0,0 +1,177 @@
+import {
+  Children,
+  cloneElement,
+  createContext,
+  forwardRef,
+  useCallback,
+  useContext,
+} from 'react';
+
+import classNames from 'classnames';
+
+import type { List, Record } from 'immutable';
+
+import { useAppSelector } from '@/mastodon/store';
+import { CollapsibleNavigationPanel } from 'mastodon/features/navigation_panel';
+
+import { useBreakpoint } from '../hooks/useBreakpoint';
+import {
+  Compose,
+  Notifications,
+  HomeTimeline,
+  CommunityTimeline,
+  PublicTimeline,
+  HashtagTimeline,
+  DirectTimeline,
+  FavouritedStatuses,
+  BookmarkedStatuses,
+  ListTimeline,
+  Directory,
+} from '../util/async-components';
+import { useColumnsContext } from '../util/columns_context';
+
+import Bundle from './bundle';
+import BundleColumnError from './bundle_column_error';
+import { ColumnLoading } from './column_loading';
+import { ComposePanel, RedirectToMobileComposeIfNeeded } from './compose_panel';
+import DrawerLoading from './drawer_loading';
+
+const componentMap = {
+  COMPOSE: Compose,
+  HOME: HomeTimeline,
+  NOTIFICATIONS: Notifications,
+  PUBLIC: PublicTimeline,
+  REMOTE: PublicTimeline,
+  COMMUNITY: CommunityTimeline,
+  HASHTAG: HashtagTimeline,
+  DIRECT: DirectTimeline,
+  FAVOURITES: FavouritedStatuses,
+  BOOKMARKS: BookmarkedStatuses,
+  LIST: ListTimeline,
+  DIRECTORY: Directory,
+} as const;
+
+const TabsBarPortal = () => {
+  const { setTabsBarElement } = useColumnsContext();
+
+  const setRef = useCallback(
+    (element: HTMLDivElement | null) => {
+      if (element) {
+        setTabsBarElement(element);
+      }
+    },
+    [setTabsBarElement],
+  );
+
+  return <div id='tabs-bar__portal' ref={setRef} />;
+};
+
+export const ColumnIndexContext = createContext(1);
+export const useColumnIndexContext = () => useContext(ColumnIndexContext);
+
+interface Column {
+  uuid: string;
+  id: keyof typeof componentMap;
+  params?: null | Record<{ other?: unknown }>;
+}
+
+type FetchedComponent = React.FC<{
+  columnId?: string;
+  multiColumn?: boolean;
+  params: unknown;
+}>;
+
+export const ColumnsArea = forwardRef<
+  HTMLDivElement,
+  {
+    singleColumn?: boolean;
+    children: React.ReactElement | React.ReactElement[];
+  }
+>(({ children, singleColumn }, ref) => {
+  const renderComposePanel = !useBreakpoint('full');
+  const columns = useAppSelector((state) =>
+    (state.settings as Record<{ columns: List<Record<Column>> }>).get(
+      'columns',
+    ),
+  );
+  const isModalOpen = useAppSelector(
+    (state) => !state.modal.get('stack').isEmpty(),
+  );
+
+  if (singleColumn) {
+    return (
+      <div className='columns-area__panels'>
+        <div className='columns-area__panels__pane columns-area__panels__pane--compositional'>
+          <div className='columns-area__panels__pane__inner'>
+            {renderComposePanel && <ComposePanel />}
+            <RedirectToMobileComposeIfNeeded />
+          </div>
+        </div>
+
+        <div className='columns-area__panels__main'>
+          <div className='tabs-bar__wrapper'>
+            <TabsBarPortal />
+          </div>
+          <div className='columns-area columns-area--mobile'>{children}</div>
+        </div>
+
+        <CollapsibleNavigationPanel />
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={classNames('columns-area', { unscrollable: isModalOpen })}
+      ref={ref}
+      tabIndex={isModalOpen ? undefined : 0}
+    >
+      {columns.map((column, index) => {
+        const params = column.get('params')
+          ? column.get('params')?.toJS()
+          : null;
+        const other = params?.other ?? {};
+        const uuid = column.get('uuid');
+        const id = column.get('id');
+
+        return (
+          <ColumnIndexContext.Provider value={index} key={uuid}>
+            <Bundle
+              key={uuid}
+              fetchComponent={componentMap[id]}
+              loading={renderLoading(id)}
+              error={ErrorComponent}
+            >
+              {(SpecificComponent: FetchedComponent) => (
+                <SpecificComponent
+                  columnId={uuid}
+                  params={params}
+                  multiColumn
+                  {...other}
+                />
+              )}
+            </Bundle>
+          </ColumnIndexContext.Provider>
+        );
+      })}
+
+      <ColumnIndexContext.Provider value={columns.size}>
+        {Children.map(children, (child) =>
+          cloneElement(child, { multiColumn: true }),
+        )}
+      </ColumnIndexContext.Provider>
+    </div>
+  );
+});
+
+ColumnsArea.displayName = 'ColumnsArea';
+
+const ErrorComponent = (props: { onRetry: () => void }) => {
+  return <BundleColumnError multiColumn errorType='network' {...props} />;
+};
+
+const renderLoading = (columnId: string) => {
+  const LoadingComponent =
+    columnId === 'COMPOSE' ? <DrawerLoading /> : <ColumnLoading multiColumn />;
+  return () => LoadingComponent;
+};

app/javascript/mastodon/features/ui/containers/columns_area_container.js

@@ -1,10 +0,0 @@
-import { connect } from 'react-redux';
-
-import ColumnsArea from '../components/columns_area';
-
-const mapStateToProps = state => ({
-  columns: state.getIn(['settings', 'columns']),
-  isModalOpen: !!state.get('modal').modalType,
-});
-
-export default connect(mapStateToProps, null, null, { forwardRef: true })(ColumnsArea);

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

@@ -10,6 +10,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
+import { scrollRight } from '../../scroll';
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { fetchNotifications } from 'mastodon/actions/notification_groups';
@@ -34,7 +35,7 @@ import BundleColumnError from './components/bundle_column_error';
 import { NavigationBar } from './components/navigation_bar';
 import { UploadArea } from './components/upload_area';
 import { HashtagMenuController } from './components/hashtag_menu_controller';
-import ColumnsAreaContainer from './containers/columns_area_container';
+import { ColumnsArea } from './components/columns_area';
 import LoadingBarContainer from './containers/loading_bar_container';
 import ModalContainer from './containers/modal_container';
 import {
@@ -125,7 +126,7 @@ class SwitchingColumnsArea extends PureComponent {
 
   componentDidUpdate (prevProps) {
     if (![this.props.location.pathname, '/'].includes(prevProps.location.pathname)) {
-      this.node.handleChildrenContentChange();
+      this.handleChildrenContentChange();
     }
 
     if (prevProps.singleColumn !== this.props.singleColumn) {
@@ -134,6 +135,16 @@ class SwitchingColumnsArea extends PureComponent {
     }
   }
 
+  handleChildrenContentChange() {
+    if (!this.props.singleColumn) {
+      const isRtlLayout = document.getElementsByTagName('body')[0]
+        ?.classList.contains('rtl');
+  	  const modifier = isRtlLayout ? -1 : 1;
+
+  	  scrollRight(this.node, (this.node.scrollWidth - window.innerWidth) * modifier);
+  	}
+  }
+
   setRef = c => {
     if (c) {
       this.node = c;
@@ -181,7 +192,7 @@ class SwitchingColumnsArea extends PureComponent {
 
     return (
       <ColumnsContextProvider multiColumn={!singleColumn}>
-        <ColumnsAreaContainer ref={this.setRef} singleColumn={singleColumn}>
+        <ColumnsArea ref={this.setRef} singleColumn={singleColumn}>
           <WrappedSwitch>
             {redirect}
 
@@ -261,7 +272,7 @@ class SwitchingColumnsArea extends PureComponent {
             }
             <Route component={BundleColumnError} />
           </WrappedSwitch>
-        </ColumnsAreaContainer>
+        </ColumnsArea>
       </ColumnsContextProvider>
     );
   }

app/javascript/mastodon/features/ui/util/focusUtils.ts

@@ -47,7 +47,7 @@ function focusColumnTitle(index: number, multiColumn: boolean) {
 
 /**
  * Move focus to the column of the passed index (1-based).
- * Focus is placed on the topmost visible item, or the column title
+ * Focus is placed on the topmost visible item, or the column title.
  */
 export function focusColumn(index = 1) {
   // Skip the leftmost drawer in multi-column mode
@@ -94,8 +94,16 @@ export function focusColumn(index = 1) {
     window.innerWidth || document.documentElement.clientWidth;
   const { item, rect } = itemToFocus;
 
+  const scrollParent = isMultiColumnLayout
+    ? container
+    : document.documentElement;
+  const columnHeaderHeight =
+    parseInt(
+      getComputedStyle(scrollParent).getPropertyValue('--column-header-height'),
+    ) || 0;
+
   if (
-    container.scrollTop > item.offsetTop ||
+    scrollParent.scrollTop > item.offsetTop - columnHeaderHeight ||
     rect.right > viewportWidth ||
     rect.left < 0
   ) {
@@ -141,11 +149,7 @@ export function focusFirstItem() {
 /**
  * Focus the item next to the one with the provided index
  */
-export function focusItemSibling(
+export function focusItemSibling(index: number, direction: 1 | -1) {
-  index: number,
-  direction: 1 | -1,
-  scrollThreshold = 62,
-) {
   const focusedElement = document.activeElement;
   const itemList = focusedElement?.closest('.item-list');
 
@@ -173,17 +177,9 @@ export function focusItemSibling(
   }
 
   if (targetElement) {
-    const elementRect = targetElement.getBoundingClientRect();
+    targetElement.scrollIntoView({
-
+      block: 'start',
-    const isFullyVisible =
+    });
-      elementRect.top >= scrollThreshold &&
-      elementRect.bottom <= window.innerHeight;
-
-    if (!isFullyVisible) {
-      targetElement.scrollIntoView({
-        block: direction === 1 ? 'start' : 'center',
-      });
-    }
 
     targetElement.focus();
   }

app/javascript/mastodon/locales/be.json

@@ -161,9 +161,19 @@
   "account_edit.featured_hashtags.title": "Выбраныя хэштэгі",
   "account_edit.name_modal.add_title": "Дадаць бачнае імя",
   "account_edit.name_modal.edit_title": "Змяніць бачнае імя",
+  "account_edit.profile_tab.button_label": "Змяніць",
+  "account_edit.profile_tab.hint.description": "Гэтыя налады змяняюць тое, што бачаць карыстальнікі {server} у афіцыйных праграм, але гэта можа не ўплываць на карыстальнікаў іншых сервераў і неафіцыйных праграм.",
+  "account_edit.profile_tab.hint.title": "Знешні выгляд можа адрознівацца",
+  "account_edit.profile_tab.show_featured.description": "\"Рэкамендаванае\" — гэта неабавязковая ўкладка, куды вы можаце дадаць для паказу іншыя ўліковыя запісы.",
+  "account_edit.profile_tab.show_featured.title": "Паказваць укладку \"Рэкамендаванае\"",
+  "account_edit.profile_tab.show_media.description": "\"Медыя\" — гэта неабавязковая ўкладка, якая паказвае Вашыя допісы, у якіх ёсць відарысы і відэа.",
+  "account_edit.profile_tab.show_media.title": "Паказваць укладку \"Медыя\"",
+  "account_edit.profile_tab.show_media_replies.description": "Калі ўключыць, укладка \"Медыя\" будзе адлюстроўваць як Вашыя допісы, гэтак і Вашыя адказы на допісы іншых людзей.",
+  "account_edit.profile_tab.show_media_replies.title": "Змяшчаць адказы ва ўкладцы \"Медыя\"",
   "account_edit.profile_tab.subtitle": "Змяняйце на свой густ укладкі свайго профілю і тое, што яны паказваюць.",
   "account_edit.profile_tab.title": "Налады ўкладкі профілю",
   "account_edit.save": "Захаваць",
+  "account_edit_tags.add_tag": "Дадаць #{tagName}",
   "account_edit_tags.column_title": "Змяніць выбраныя хэштэгі",
   "account_edit_tags.help_text": "Выбраныя хэштэгі дапамагаюць карыстальнікам знаходзіць Ваш профіль і ўзаемадзейнічаць з ім. Яны дзейнічаюць як фільтры пры праглядзе актыўнасці на Вашай старонцы.",
   "account_edit_tags.search_placeholder": "Увядзіце хэштэг…",
@@ -673,6 +683,7 @@
   "keyboard_shortcuts.direct": "Адкрыць слупок прыватных згадванняў",
   "keyboard_shortcuts.down": "Перамясціцца ўніз па спісе",
   "keyboard_shortcuts.enter": "Адкрыць допіс",
+  "keyboard_shortcuts.explore": "Адкрыць трэндавую стужку",
   "keyboard_shortcuts.favourite": "Упадабаць допіс",
   "keyboard_shortcuts.favourites": "Адкрыць спіс упадабанага",
   "keyboard_shortcuts.federated": "Адкрыць інтэграваную стужку",
@@ -1062,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon - найлепшы спосаб быць у курсе ўсяго, што адбываецца.",
   "sign_in_banner.sign_in": "Увайсці",
   "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
+  "skip_links.hotkey": "<span>Спалучэнне клавіш</span> {hotkey}",
+  "skip_links.skip_to_content": "Перайсці да асноўнага зместу",
+  "skip_links.skip_to_navigation": "Перайсці да асноўнай навігацыі",
   "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
   "status.admin_domain": "Адкрыць інтэрфейс мадэратара для {domain}",
   "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі",

app/javascript/mastodon/locales/cy.json

@@ -44,9 +44,11 @@
   "account.familiar_followers_two": "Wedi'i ddilyn gan {name1} a {name2}",
   "account.featured": "Nodwedd",
   "account.featured.accounts": "Proffilau",
+  "account.featured.collections": "Casgliadau",
   "account.featured.hashtags": "Hashnodau",
   "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
   "account.featured_tags.last_status_never": "Dim postiadau",
+  "account.field_overflow": "Dangos cynnwys llawn",
   "account.filters.all": "Pob gweithgaredd",
   "account.filters.boosts_toggle": "Dangos hybiau",
   "account.filters.posts_boosts": "Postiadau a hybiau",
@@ -144,6 +146,9 @@
   "account_edit.bio.title": "Cyflwyniad",
   "account_edit.bio_modal.add_title": "Ychwanegu cyflwyniad",
   "account_edit.bio_modal.edit_title": "Golygu'r cyflwyniad",
+  "account_edit.button.add": "Ychwanegu {item}",
+  "account_edit.button.delete": "Dileu {item}",
+  "account_edit.button.edit": "Golygu {item}",
   "account_edit.char_counter": "{currentLength}/{maxLength} nod",
   "account_edit.column_button": "Gorffen",
   "account_edit.column_title": "Golygu Proffil",
@@ -151,13 +156,28 @@
   "account_edit.custom_fields.title": "Meysydd cyfaddas",
   "account_edit.display_name.placeholder": "Eich enw dangos yw sut mae'ch enw'n ymddangos ar eich proffil ac mewn llinellau amser.",
   "account_edit.display_name.title": "Enw dangos",
+  "account_edit.featured_hashtags.item": "hashnodau",
   "account_edit.featured_hashtags.placeholder": "Helpwch eraill i adnabod, a chael mynediad cyflym at eich hoff bynciau.",
   "account_edit.featured_hashtags.title": "Hashnodau dan sylw",
   "account_edit.name_modal.add_title": "Ychwanegu enw dangos",
   "account_edit.name_modal.edit_title": "Golygu enw dangos",
+  "account_edit.profile_tab.button_label": "Cyfaddasu",
+  "account_edit.profile_tab.hint.description": "Mae'r gosodiadau hyn yn cyfaddasu'r hyn y mae defnyddwyr yn ei weld ar {server} yn yr apiau swyddogol, ond efallai fyddan nhw ddim yn berthnasol i ddefnyddwyr ar weinyddion eraill ac apiau trydydd parti.",
+  "account_edit.profile_tab.hint.title": "Mae'r dangosyddion yn dal i amrywio",
+  "account_edit.profile_tab.show_featured.description": "Tab dewisol yw ‘Nodwedd’ lle gallwch ddangos cyfrifon eraill.",
+  "account_edit.profile_tab.show_featured.title": "Dangos y tab ‘Nodwedd’",
+  "account_edit.profile_tab.show_media.description": "Tab dewisol yw ‘Cyfryngau’ sy’n dangos eich postiadau sy’n cynnwys delweddau neu fideos.",
+  "account_edit.profile_tab.show_media.title": "Dangos y tab ‘Cyfryngau’",
+  "account_edit.profile_tab.show_media_replies.description": "Pan fydd wedi'i alluogi, mae'r tab Cyfryngau yn dangos eich postiadau ac atebion i bostiadau pobl eraill.",
+  "account_edit.profile_tab.show_media_replies.title": "Cynhwyswch atebion ar y tab ‘Cyfryngau’",
   "account_edit.profile_tab.subtitle": "Cyfaddaswch y tabiau ar eich proffil a'r hyn maen nhw'n ei ddangos.",
   "account_edit.profile_tab.title": "Gosodiadau tab proffil",
   "account_edit.save": "Cadw",
+  "account_edit_tags.column_title": "Golygu hashnodau dan sylw",
+  "account_edit_tags.help_text": "Mae hashnodau dan sylw yn helpu defnyddwyr i ddarganfod a rhyngweithio â'ch proffil. Maen nhw'n ymddangos fel hidlwyr ar olwg Gweithgaredd eich tudalen Proffil.",
+  "account_edit_tags.search_placeholder": "Rhowch hashnod…",
+  "account_edit_tags.suggestions": "Awgrymiadau:",
+  "account_edit_tags.tag_status_count": "{count, plural, one {# postiad} other {# postsiad}}",
   "account_note.placeholder": "Clicio i ychwanegu nodyn",
   "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
   "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru",
@@ -260,6 +280,13 @@
   "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall",
   "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!",
   "closed_registrations_modal.title": "Cofrestru ar Mastodon",
+  "collection.share_modal.share_link_label": "Dolen rhannu gwahoddiad",
+  "collection.share_modal.share_via_post": "Postio ar Mastodon",
+  "collection.share_modal.share_via_system": "Rhannwch i…",
+  "collection.share_modal.title": "Rhannu casgliad",
+  "collection.share_modal.title_new": "Rhannwch eich casgliad newydd!",
+  "collection.share_template_other": "Edrychwch ar y casgliad trawiadol hwn: {link}",
+  "collection.share_template_own": "Edrychwch ar fy nghasgliad newydd: {link}",
   "collections.account_count": "{count, plural, one {# cyfrif} other {# cyfrif}}",
   "collections.accounts.empty_description": "Ychwanegwch hyd at {count} cyfrif rydych chi'n eu dilyn",
   "collections.accounts.empty_title": "Mae'r casgliad hwn yn wag",
@@ -294,12 +321,15 @@
   "collections.name_length_hint": "Terfyn o 40 nod",
   "collections.new_collection": "Casgliad newydd",
   "collections.no_collections_yet": "Dim casgliadau eto.",
+  "collections.old_last_post_note": "Postiwyd ddiwethaf dros wythnos yn ôl",
   "collections.remove_account": "Dileu'r cyfrif hwn",
+  "collections.report_collection": "Adroddwch am y casgliad hwn",
   "collections.search_accounts_label": "Chwiliwch am gyfrifon i'w hychwanegu…",
   "collections.search_accounts_max_reached": "Rydych chi wedi ychwanegu'r nifer mwyaf o gyfrifon",
   "collections.sensitive": "Sensitif",
   "collections.topic_hint": "Ychwanegwch hashnod sy'n helpu eraill i ddeall prif bwnc y casgliad hwn.",
   "collections.view_collection": "Gweld y casgliad",
+  "collections.view_other_collections_by_user": "Edrychwch ar gasgliadau eraill gan y defnyddiwr hwn",
   "collections.visibility_public": "Cyhoeddus",
   "collections.visibility_public_hint": "Mae modd eu canfod mewn canlyniadau chwilio a mannau eraill lle mae argymhellion yn ymddangos.",
   "collections.visibility_title": "Gwelededd",
@@ -434,6 +464,7 @@
   "conversation.open": "Gweld sgwrs",
   "conversation.with": "Gyda {names}",
   "copy_icon_button.copied": "Copïwyd i'r clipfwrdd",
+  "copy_icon_button.copy_this_text": "Copïo dolen i'r clipfwrdd",
   "copypaste.copied": "Wedi ei gopïo",
   "copypaste.copy_to_clipboard": "Copïo i'r clipfwrdd",
   "directory.federated": "O'r ffedysawd cyfan",
@@ -442,7 +473,7 @@
   "directory.recently_active": "Ar-lein yn ddiweddar",
   "disabled_account_banner.account_settings": "Gosodiadau'r cyfrif",
   "disabled_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd.",
-  "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl y caiff eu cyfrifon eu cynnal ar {domain}.",
+  "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl sydd a'u cyfrifon ar {domain}.",
   "dismissable_banner.dismiss": "Diystyru",
   "dismissable_banner.public_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl ar y ffedysawd y mae pobl ar {domain} yn eu dilyn.",
   "domain_block_modal.block": "Blocio gweinydd",
@@ -451,7 +482,7 @@
   "domain_block_modal.they_cant_follow": "All neb o'r gweinydd hwn eich dilyn.",
   "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
   "domain_block_modal.title": "Blocio parth?",
-  "domain_block_modal.you_will_lose_num_followers": "Byddwch yn colli {followersCount, plural, one {{followersCountDisplay} dilynwr} other {{followersCountDisplay} dilynwyr}} a {followingCount, plural, one {{followingCountDisplay} person rydych yn dilyn} other {{followingCountDisplay} o bobl rydych yn eu dilyn}}.",
+  "domain_block_modal.you_will_lose_num_followers": "Byddwch yn colli {followersCount, plural, one {{followersCountDisplay} dilynwr} other {{followersCountDisplay} dilynwr}} a {followingCount, plural, one {{followingCountDisplay} person rydych yn dilyn} other {{followingCountDisplay} o bobl rydych yn eu dilyn}}.",
   "domain_block_modal.you_will_lose_relationships": "Byddwch yn colli'r holl ddilynwyr a phobl rydych chi'n eu dilyn o'r gweinydd hwn.",
   "domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
   "domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
@@ -651,6 +682,7 @@
   "keyboard_shortcuts.direct": "Agor colofn sylwadau preifat",
   "keyboard_shortcuts.down": "Symud lawr yn y rhestr",
   "keyboard_shortcuts.enter": "Agor post",
+  "keyboard_shortcuts.explore": "Agor llinell amser trendio",
   "keyboard_shortcuts.favourite": "Ffafrio postiad",
   "keyboard_shortcuts.favourites": "Agor rhestr ffefrynnau",
   "keyboard_shortcuts.federated": "Agor ffrwd y ffederasiwn",
@@ -963,6 +995,7 @@
   "report.category.title_account": "proffil",
   "report.category.title_status": "post",
   "report.close": "Iawn",
+  "report.collection_comment": "Pam ydych chi eisiau rhoi gwybod am y casgliad hwn?",
   "report.comment.title": "Oes unrhyw beth arall y dylem ei wybod yn eich barn chi?",
   "report.forward": "Ymlaen i {target}",
   "report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
@@ -984,6 +1017,8 @@
   "report.rules.title": "Pa reolau sy'n cael eu torri?",
   "report.statuses.subtitle": "Dewiswch bob un sy'n berthnasol",
   "report.statuses.title": "Oes postiadau eraill sy'n cefnogi'r adroddiad hwn?",
+  "report.submission_error": "Doedd dim modd cyflwyno'r adroddiad",
+  "report.submission_error_details": "Gwiriwch eich cysylltiad rhwydwaith a cheisiwch eto yn nes ymlaen.",
   "report.submit": "Cyflwyno",
   "report.target": "Adrodd am {target}",
   "report.thanks.take_action": "Dyma'ch dewisiadau i reoli'r hyn a welwch ar Mastodon:",

app/javascript/mastodon/locales/da.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Tilpas fanerne på din profil og det, de viser.",
   "account_edit.profile_tab.title": "Indstillinger for profil-fane",
   "account_edit.save": "Gem",
+  "account_edit_tags.add_tag": "Tilføj #{tagName}",
   "account_edit_tags.column_title": "Rediger fremhævede hashtags",
   "account_edit_tags.help_text": "Fremhævede hashtags hjælper brugere med at finde og interagere med din profil. De vises som filtre i aktivitetsvisningen på din profilside.",
   "account_edit_tags.search_placeholder": "Angiv et hashtag…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Åbn kolonne med private omtaler",
   "keyboard_shortcuts.down": "Flyt nedad på listen",
   "keyboard_shortcuts.enter": "Åbn indlæg",
+  "keyboard_shortcuts.explore": "Åbn Trender-tidslinjen",
   "keyboard_shortcuts.favourite": "Føj indlæg til favoritter",
   "keyboard_shortcuts.favourites": "Åbn favoritlisten",
   "keyboard_shortcuts.federated": "Åbn fødereret tidslinje",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon er den bedste måde at holde sig ajour med, hvad der sker.",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
+  "skip_links.hotkey": "<span>Genvejstast</span> {hotkey}",
+  "skip_links.skip_to_content": "Gå til hovedindholdet",
+  "skip_links.skip_to_navigation": "Gå til hovednavigation",
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
   "status.admin_domain": "Åbn modereringsbrugerflade for {domain}",
   "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",

app/javascript/mastodon/locales/de.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Passe die Tabs deines Profils und deren Inhalte an.",
   "account_edit.profile_tab.title": "Profil-Tab-Einstellungen",
   "account_edit.save": "Speichern",
+  "account_edit_tags.add_tag": "#{tagName} hinzufügen",
   "account_edit_tags.column_title": "Vorgestellte Hashtags bearbeiten",
   "account_edit_tags.help_text": "Vorgestellte Hashtags können dabei helfen, dein Profil zu entdecken und besser mit dir zu interagieren. Sie dienen als Filter in der Aktivitätenübersicht deines Profils.",
   "account_edit_tags.search_placeholder": "Gib einen Hashtag ein …",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Private Erwähnungen öffnen",
   "keyboard_shortcuts.down": "Auswahl nach unten bewegen",
   "keyboard_shortcuts.enter": "Beitrag öffnen",
+  "keyboard_shortcuts.explore": "Trends aufrufen",
   "keyboard_shortcuts.favourite": "Beitrag favorisieren",
   "keyboard_shortcuts.favourites": "Favoriten öffnen",
   "keyboard_shortcuts.federated": "Föderierte Timeline öffnen",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon ist der beste Zugang, um auf dem Laufenden zu bleiben.",
   "sign_in_banner.sign_in": "Anmelden",
   "sign_in_banner.sso_redirect": "Anmelden oder registrieren",
+  "skip_links.hotkey": "<span>Tastenkürzel</span> {hotkey}",
+  "skip_links.skip_to_content": "Zum Hauptinhalt wechseln",
+  "skip_links.skip_to_navigation": "Zur Hauptnavigation wechseln",
   "status.admin_account": "@{name} moderieren",
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",

app/javascript/mastodon/locales/el.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Προσαρμόστε τις καρτέλες στο προφίλ σας και τι εμφανίζουν.",
   "account_edit.profile_tab.title": "Ρυθμίσεις καρτέλας προφίλ",
   "account_edit.save": "Αποθήκευση",
+  "account_edit_tags.add_tag": "Προσθήκη #{tagName}",
   "account_edit_tags.column_title": "Επεξεργασία αναδεδειγμένων ετικετών",
   "account_edit_tags.help_text": "Οι αναδεδειγμένες ετικέτες βοηθούν τους χρήστες να ανακαλύψουν και να αλληλεπιδράσουν με το προφίλ σας. Εμφανίζονται ως φίλτρα στην προβολή Δραστηριότητας της σελίδας προφίλ σας.",
   "account_edit_tags.search_placeholder": "Εισάγετε μια ετικέτα…",
@@ -496,7 +497,7 @@
   "domain_pill.who_they_are": "Από τη στιγμή που τα πλήρη ονόματα χρηστών λένε ποιος είναι κάποιος και πού είναι, μπορείς να αλληλεπιδράσεις με άτομα απ' όλο τον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
   "domain_pill.who_you_are": "Επειδή το πλήρες όνομα χρήστη σου λέει ποιος είσαι και πού βρίσκεσαι, άτομα μπορούν να αλληλεπιδράσουν μαζί σου στον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
   "domain_pill.your_handle": "Το πλήρες όνομα χρήστη σου:",
-  "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου.",
+  "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου μαζί.",
   "domain_pill.your_username": "Το μοναδικό σου αναγνωριστικό σε τούτο τον διακομιστή. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
   "dropdown.empty": "Διαλέξτε μια επιλογή",
   "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Άνοιγμα της στήλης ιδιωτικών επισημάνσεων",
   "keyboard_shortcuts.down": "Μετακίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "Άνοιγμα ανάρτησης",
+  "keyboard_shortcuts.explore": "Άνοιγμα χρονολογίου τάσεων",
   "keyboard_shortcuts.favourite": "Αγάπησε την ανάρτηση",
   "keyboard_shortcuts.favourites": "Άνοιγμα λίστας αγαπημένων",
   "keyboard_shortcuts.federated": "Άνοιγμα ομοσπονδιακής ροής",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Το Mastodon είναι ο καλύτερος τρόπος για να συμβαδίσεις με τα γεγονότα.",
   "sign_in_banner.sign_in": "Σύνδεση",
   "sign_in_banner.sso_redirect": "Συνδεθείτε ή Εγγραφείτε",
+  "skip_links.hotkey": "<span>Πλήκτρο συντόμευσης</span> {hotkey}",
+  "skip_links.skip_to_content": "Μετάβαση στο κύριο περιεχόμενο",
+  "skip_links.skip_to_navigation": "Μετάβαση στην κύρια πλοήγηση",
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για @{name}",
   "status.admin_domain": "Άνοιγμα διεπαφής συντονισμού για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
@@ -1128,7 +1133,7 @@
   "status.quote_followers_only": "Μόνο οι ακόλουθοι μπορούν να παραθέσουν αυτή την ανάρτηση",
   "status.quote_manual_review": "Ο συντάκτης θα επανεξετάσει χειροκίνητα",
   "status.quote_noun": "Παράθεση",
-  "status.quote_policy_change": "Αλλάξτε ποιός μπορεί να κάνει παράθεση",
+  "status.quote_policy_change": "Άλλαξε ποιός μπορεί να κάνει παράθεση",
   "status.quote_post_author": "Παρατίθεται μια ανάρτηση από @{name}",
   "status.quote_private": "Ιδιωτικές αναρτήσεις δεν μπορούν να παρατεθούν",
   "status.quotes.empty": "Κανείς δεν έχει παραθέσει αυτή την ανάρτηση ακόμη. Μόλις το κάνει, θα εμφανιστεί εδώ.",

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

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Customise the tabs on your profile and what they display.",
   "account_edit.profile_tab.title": "Profile tab settings",
   "account_edit.save": "Save",
+  "account_edit_tags.add_tag": "Add #{tagName}",
   "account_edit_tags.column_title": "Edit featured hashtags",
   "account_edit_tags.help_text": "Featured hashtags help users discover and interact with your profile. They appear as filters on your Profile page’s Activity view.",
   "account_edit_tags.search_placeholder": "Enter a hashtag…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Open private mentions column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.explore": "Open trending timeline",
   "keyboard_shortcuts.favourite": "Favourite post",
   "keyboard_shortcuts.favourites": "Open favourites list",
   "keyboard_shortcuts.federated": "to open federated timeline",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon is the best way to keep up with what's happening.",
   "sign_in_banner.sign_in": "Sign in",
   "sign_in_banner.sso_redirect": "Login or Register",
+  "skip_links.hotkey": "<span>Hotkey</span> {hotkey}",
+  "skip_links.skip_to_content": "Skip to main content",
+  "skip_links.skip_to_navigation": "Skip to main navigation",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this post in the moderation interface",

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

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Personalizá las pestañas en tu perfil y qué van a mostrar.",
   "account_edit.profile_tab.title": "Configuración de pestaña de perfil",
   "account_edit.save": "Guardar",
+  "account_edit_tags.add_tag": "Agregar #{tagName}",
   "account_edit_tags.column_title": "Editar etiquetas destacadas",
   "account_edit_tags.help_text": "Las etiquetas destacadas ayudan a los usuarios a descubrir e interactuar con tu perfil. Las etiquetas destacadas aparecen como filtros en la vista de actividad de la página de tu perfil.",
   "account_edit_tags.search_placeholder": "Ingresá una etiqueta…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Abrir columna de menciones privadas",
   "keyboard_shortcuts.down": "Bajar en la lista",
   "keyboard_shortcuts.enter": "Abrir mensaje",
+  "keyboard_shortcuts.explore": "Abrir línea temporal de tendencias",
   "keyboard_shortcuts.favourite": "Marcar mensaje como favorito",
   "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
   "keyboard_shortcuts.federated": "Abrir línea temporal federada",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon es la mejor manera de mantenerse al día sobre lo que está sucediendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciá sesión o registrate",
+  "skip_links.hotkey": "<span>Atajo</span> {hotkey}",
+  "skip_links.skip_to_content": "Ir al contenido principal",
+  "skip_links.skip_to_navigation": "Ir a la navegación principal",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir este mensaje en la interface de moderación",

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

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Personaliza las pestañas de tu perfil y lo que muestran.",
   "account_edit.profile_tab.title": "Configuración de la pestaña de perfil",
   "account_edit.save": "Guardar",
+  "account_edit_tags.add_tag": "Añadir #{tagName}",
   "account_edit_tags.column_title": "Editar etiquetas destacadas",
   "account_edit_tags.help_text": "Las etiquetas destacadas ayudan a los usuarios a descubrir tu perfil e interactuar con él. Aparecen como filtros en la vista Actividad de tu página de perfil.",
   "account_edit_tags.search_placeholder": "Introduce una etiqueta…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Abrir columna de menciones privadas",
   "keyboard_shortcuts.down": "Descender en la lista",
   "keyboard_shortcuts.enter": "Abrir publicación",
+  "keyboard_shortcuts.explore": "Abrir tendencias",
   "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
   "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
   "keyboard_shortcuts.federated": "Abrir cronología federada",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon es el mejor modo de mantenerse al día sobre qué está ocurriendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
+  "skip_links.hotkey": "<span>Atajos</span> {hotkey}",
+  "skip_links.skip_to_content": "Ir al contenido principal",
+  "skip_links.skip_to_navigation": "Ir a la navegación principal",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",

app/javascript/mastodon/locales/es.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Personaliza las pestañas de tu perfil y lo que muestran.",
   "account_edit.profile_tab.title": "Configuración de la pestaña de perfil",
   "account_edit.save": "Guardar",
+  "account_edit_tags.add_tag": "Agregar #{tagName}",
   "account_edit_tags.column_title": "Editar etiquetas destacadas",
   "account_edit_tags.help_text": "Las etiquetas destacadas ayudan a los usuarios a descubrir e interactuar con tu perfil. Aparecen como filtros en la vista de actividad de tu página de perfil.",
   "account_edit_tags.search_placeholder": "Introduce una etiqueta…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Abrir la columna de menciones privadas",
   "keyboard_shortcuts.down": "Moverse hacia abajo en la lista",
   "keyboard_shortcuts.enter": "Abrir publicación",
+  "keyboard_shortcuts.explore": "Abrir tendencias",
   "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
   "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
   "keyboard_shortcuts.federated": "Abrir la cronología federada",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon es el mejor modo de mantenerse al día sobre qué está ocurriendo.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Iniciar sesión o Registrarse",
+  "skip_links.hotkey": "<span>Atajo</span> {hotkey}",
+  "skip_links.skip_to_content": "Abrir Saltar al contenido principal",
+  "skip_links.skip_to_navigation": "Saltar a la navegación principal",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_domain": "Abrir interfaz de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación en la interfaz de moderación",

app/javascript/mastodon/locales/fi.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Mukauta profiilisi välilehtiä ja sitä, mitä niissä näkyy.",
   "account_edit.profile_tab.title": "Profiilin välilehtien asetukset",
   "account_edit.save": "Tallenna",
+  "account_edit_tags.add_tag": "Lisää #{tagName}",
   "account_edit_tags.column_title": "Muokkaa esiteltäviä aihetunnisteita",
   "account_edit_tags.help_text": "Esiteltävät aihetunnisteet auttavat käyttäjiä löytämään profiilisi ja olemaan vuorovaikutuksessa sen kanssa. Ne näkyvät suodattimina profiilisivusi Toiminta-näkymässä.",
   "account_edit_tags.search_placeholder": "Syötä aihetunniste…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Avaa yksityismainintojen sarake",
   "keyboard_shortcuts.down": "Siirry luettelossa eteenpäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
+  "keyboard_shortcuts.explore": "Avaa Suosittua-aikajana",
   "keyboard_shortcuts.favourite": "Lisää julkaisu suosikkeihin",
   "keyboard_shortcuts.favourites": "Avaa suosikkiluettelo",
   "keyboard_shortcuts.federated": "Avaa yleinen aikajana",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon on paras tapa pysyä ajan tasalla siitä, mitä ympärillä tapahtuu.",
   "sign_in_banner.sign_in": "Kirjaudu",
   "sign_in_banner.sso_redirect": "Kirjaudu tai rekisteröidy",
+  "skip_links.hotkey": "<span>Pikanäppäin</span> {hotkey}",
+  "skip_links.skip_to_content": "Siitty pääsisältöön",
+  "skip_links.skip_to_navigation": "Siirry päänavigaatioon",
   "status.admin_account": "Avaa tilin @{name} moderointinäkymä",
   "status.admin_domain": "Avaa palvelimen {domain} moderointinäkymä",
   "status.admin_status": "Avaa julkaisu moderointinäkymässä",

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

@@ -682,6 +682,7 @@
   "keyboard_shortcuts.direct": "Ouvrir la colonne des mentions privées",
   "keyboard_shortcuts.down": "Descendre dans la liste",
   "keyboard_shortcuts.enter": "Ouvrir cette publication",
+  "keyboard_shortcuts.explore": "Ouvrir le fil des tendances",
   "keyboard_shortcuts.favourite": "Ajouter la publication aux favoris",
   "keyboard_shortcuts.favourites": "Ouvrir la liste des favoris",
   "keyboard_shortcuts.federated": "Ouvrir le fil global",
@@ -1071,6 +1072,7 @@
   "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
+  "skip_links.hotkey": "<span>Raccourci</span> {hotkey}",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",

app/javascript/mastodon/locales/fr.json

@@ -682,6 +682,7 @@
   "keyboard_shortcuts.direct": "Ouvrir la colonne des mentions privées",
   "keyboard_shortcuts.down": "Descendre dans la liste",
   "keyboard_shortcuts.enter": "Ouvrir le message",
+  "keyboard_shortcuts.explore": "Ouvrir le fil des tendances",
   "keyboard_shortcuts.favourite": "Ajouter le message aux favoris",
   "keyboard_shortcuts.favourites": "Ouvrir la liste des favoris",
   "keyboard_shortcuts.federated": "Ouvrir le fil fédéré",
@@ -1071,6 +1072,7 @@
   "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
+  "skip_links.hotkey": "<span>Raccourci</span> {hotkey}",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",

app/javascript/mastodon/locales/ga.json

@@ -682,6 +682,7 @@
   "keyboard_shortcuts.direct": "Oscail colún tráchtanna príobháideacha",
   "keyboard_shortcuts.down": "Bog síos ar an liosta",
   "keyboard_shortcuts.enter": "Oscail postáil",
+  "keyboard_shortcuts.explore": "Oscail an amlíne treochta",
   "keyboard_shortcuts.favourite": "Postáil is fearr leat",
   "keyboard_shortcuts.favourites": "Oscail liosta ceanáin",
   "keyboard_shortcuts.federated": "Oscail amlíne cónaidhmithe",
@@ -1071,6 +1072,9 @@
   "sign_in_banner.mastodon_is": "Is é Mastodon an bealach is fearr le coinneáil suas lena bhfuil ag tarlú.",
   "sign_in_banner.sign_in": "Sinigh isteach",
   "sign_in_banner.sso_redirect": "Logáil isteach nó Cláraigh",
+  "skip_links.hotkey": "<span>Eochair Their</span> {hotkey}",
+  "skip_links.skip_to_content": "Léim go dtí an príomhábhar",
+  "skip_links.skip_to_navigation": "Léim go dtí an príomh-loingseoireacht",
   "status.admin_account": "Oscail comhéadan modhnóireachta do @{name}",
   "status.admin_domain": "Oscail comhéadan modhnóireachta le haghaidh {domain}",
   "status.admin_status": "Oscail an postáil seo sa chomhéadan modhnóireachta",

app/javascript/mastodon/locales/gl.json

@@ -163,6 +163,7 @@
   "account_edit.name_modal.edit_title": "Editar o nome público",
   "account_edit.profile_tab.button_label": "Personalizar",
   "account_edit.profile_tab.hint.description": "Estes axustes personalizan o que ven as usuarias de {server} nas apps oficiais, pero non se aplica ás usuarias de outros servidores nin apps alleas.",
+  "account_edit.profile_tab.hint.title": "A aparencia pode variar",
   "account_edit.profile_tab.show_featured.description": "'Destacado' é unha pestana optativa na que podes mostrar outras contas.",
   "account_edit.profile_tab.show_featured.title": "Mostrar pestana 'Destacado'",
   "account_edit.profile_tab.show_media.description": "'Multimedia' é unha pestana optativa na que aparecen as túas publicacións con fotos e vídeos.",
@@ -172,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Personaliza as pestanas e o seu contido no teu perfil.",
   "account_edit.profile_tab.title": "Perfil e axustes das pestanas",
   "account_edit.save": "Gardar",
+  "account_edit_tags.add_tag": "Engadir #{tagName}",
   "account_edit_tags.column_title": "Editar cancelos destacados",
   "account_edit_tags.help_text": "Os cancelos destacados axúdanlle ás usuarias a atopar e interactuar co teu perfil. Aparecen como filtros na túa páxina de perfil na vista Actividade.",
   "account_edit_tags.search_placeholder": "Escribe un cancelo…",
@@ -681,6 +683,7 @@
   "keyboard_shortcuts.direct": "Abrir a columna de mencións privadas",
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
+  "keyboard_shortcuts.explore": "Abrir cronoloxía coas tendencias",
   "keyboard_shortcuts.favourite": "Marcar como favorita",
   "keyboard_shortcuts.favourites": "Para abrir a lista das favoritas",
   "keyboard_shortcuts.federated": "Para abrir a cronoloxía federada",
@@ -1070,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon é o mellor xeito de estar ao día do que acontece.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Acceder ou Crear conta",
+  "skip_links.hotkey": "<span>Atallo</span> {hotkey}",
+  "skip_links.skip_to_content": "Ir ao contido principal",
+  "skip_links.skip_to_navigation": "Ir ao menú principal",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación na interface de moderación",

app/javascript/mastodon/locales/he.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "התאימו את הטאבים בפרופיל שלכם ומה שהם יציגו.",
   "account_edit.profile_tab.title": "הגדרות טאבים לפרופיל",
   "account_edit.save": "שמירה",
+  "account_edit_tags.add_tag": "הוספת #{tagName}",
   "account_edit_tags.column_title": "עריכת תגיות נבחרות",
   "account_edit_tags.help_text": "תגיות נבחרות עוזרות למשתמשים לגלות ולהשתמש בפרופיל שלך. הן יופיעו כסננים במבט הפעילויות על עמוד הפרופיל שלך.",
   "account_edit_tags.search_placeholder": "הזנת תגית…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "לפתוח עמודת שיחות פרטיות",
   "keyboard_shortcuts.down": "לנוע במורד הרשימה",
   "keyboard_shortcuts.enter": "פתח הודעה",
+  "keyboard_shortcuts.explore": "הצגת קו הזמן של ההודעות החמות",
   "keyboard_shortcuts.favourite": "חיבוב הודעה",
   "keyboard_shortcuts.favourites": "פתיחת רשימת מחובבות",
   "keyboard_shortcuts.federated": "פתיחת ציר זמן בין-קהילתי",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "מסטודון הוא הדרך הטובה ביותר לעקוב אחרי מה שקורה.",
   "sign_in_banner.sign_in": "התחברות",
   "sign_in_banner.sso_redirect": "התחברות/הרשמה",
+  "skip_links.hotkey": "<span>מקש קיצור</span> {hotkey}",
+  "skip_links.skip_to_content": "דלג לתוכן הראשי",
+  "skip_links.skip_to_navigation": "דילוג לניווט המרכזי",
   "status.admin_account": "פתח/י ממשק פיקוח דיון עבור @{name}",
   "status.admin_domain": "פתיחת ממשק פיקוח דיון עבור {domain}",
   "status.admin_status": "לפתוח הודעה זו במסך ניהול הדיונים",

app/javascript/mastodon/locales/is.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Sérsníddu flipana á notandasniðinu þínu og hvað þeir birta.",
   "account_edit.profile_tab.title": "Stillingar notandasniðsflipa",
   "account_edit.save": "Vista",
+  "account_edit_tags.add_tag": "Bæta við #{tagName}",
   "account_edit_tags.column_title": "Breyta myllumerkjum með aukið vægi",
   "account_edit_tags.help_text": "Myllumerki með aukið vægi hjálpa lesendum að finna og eiga við notandasíðuna þína. Þau birtast sem síur í virkniflipa notandasíðunnar þinnar.",
   "account_edit_tags.search_placeholder": "Settu inn myllumerki…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Opna dálk með einkaspjalli",
   "keyboard_shortcuts.down": "Fara neðar í listanum",
   "keyboard_shortcuts.enter": "Opna færslu",
+  "keyboard_shortcuts.explore": "Opna tímalínu yfir vinsælt",
   "keyboard_shortcuts.favourite": "Eftirlætisfærsla",
   "keyboard_shortcuts.favourites": "Opna eftirlætislista",
   "keyboard_shortcuts.federated": "Opna sameiginlega tímalínu",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon er besta leiðin til að fylgjast með hvað sé í gangi.",
   "sign_in_banner.sign_in": "Skrá inn",
   "sign_in_banner.sso_redirect": "Skrá inn eða nýskrá",
+  "skip_links.hotkey": "<span>Flýtilykill</span> {hotkey}",
+  "skip_links.skip_to_content": "Fara í aðalefni",
+  "skip_links.skip_to_navigation": "Fara í aðalflakk",
   "status.admin_account": "Opna umsjónarviðmót fyrir @{name}",
   "status.admin_domain": "Opna umsjónarviðmót fyrir @{domain}",
   "status.admin_status": "Opna þessa færslu í umsjónarviðmótinu",

app/javascript/mastodon/locales/it.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Personalizza le schede del tuo profilo e ciò che mostrano.",
   "account_edit.profile_tab.title": "Impostazioni della scheda del profilo",
   "account_edit.save": "Salva",
+  "account_edit_tags.add_tag": "Aggiungi #{tagName}",
   "account_edit_tags.column_title": "Modifica gli hashtag in evidenza",
   "account_edit_tags.help_text": "Gli hashtag in evidenza aiutano gli utenti a scoprire e interagire con il tuo profilo. Appaiono come filtri nella visualizzazione Attività della tua pagina del profilo.",
   "account_edit_tags.search_placeholder": "Inserisci un hashtag…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "Aprire la colonna delle menzioni private",
   "keyboard_shortcuts.down": "Scorri in basso nell'elenco",
   "keyboard_shortcuts.enter": "Apre il post",
+  "keyboard_shortcuts.explore": "Apri la timeline di tendenza",
   "keyboard_shortcuts.favourite": "Contrassegna il post come preferito",
   "keyboard_shortcuts.favourites": "Apre l'elenco dei preferiti",
   "keyboard_shortcuts.federated": "Apre la cronologia federata",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon è il modo migliore per tenere il passo con quello che sta accadendo.",
   "sign_in_banner.sign_in": "Accedi",
   "sign_in_banner.sso_redirect": "Accedi o Registrati",
+  "skip_links.hotkey": "<span>Scorciatoia</span> {hotkey}",
+  "skip_links.skip_to_content": "Salta al contenuto principale",
+  "skip_links.skip_to_navigation": "Salta alla navigazione principale",
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
   "status.admin_domain": "Apri l'interfaccia di moderazione per {domain}",
   "status.admin_status": "Apri questo post nell'interfaccia di moderazione",

app/javascript/mastodon/locales/nl.json

@@ -86,7 +86,7 @@
   "account.menu.copied": "Accountlink naar het klembord gekopieerd",
   "account.menu.copy": "Link kopiëren",
   "account.menu.direct": "Privébericht",
-  "account.menu.hide_reblogs": "Boosts in tijdlijn verbergen",
+  "account.menu.hide_reblogs": "Boosts op tijdlijn verbergen",
   "account.menu.mention": "Vermelding",
   "account.menu.mute": "Account negeren",
   "account.menu.note.description": "Alleen voor jou zichtbaar",
@@ -94,7 +94,7 @@
   "account.menu.remove_follower": "Volger verwijderen",
   "account.menu.report": "Account rapporteren",
   "account.menu.share": "Delen…",
-  "account.menu.show_reblogs": "Boosts in tijdlijn tonen",
+  "account.menu.show_reblogs": "Boosts op tijdlijn tonen",
   "account.menu.unblock": "Account deblokkeren",
   "account.menu.unblock_domain": "{domain} deblokkeren",
   "account.menu.unmute": "Account niet langer negeren",
@@ -142,7 +142,7 @@
   "account.unmute": "@{name} niet langer negeren",
   "account.unmute_notifications_short": "Meldingen niet langer negeren",
   "account.unmute_short": "Niet langer negeren",
-  "account_edit.bio.placeholder": "Voeg een korte introductie toe om anderen te helpen je te identificeren.",
+  "account_edit.bio.placeholder": "Vertel iets over jezelf, zodat anderen inzicht krijgen in wat voor persoon je bent.",
   "account_edit.bio.title": "Biografie",
   "account_edit.bio_modal.add_title": "Biografie toevoegen",
   "account_edit.bio_modal.edit_title": "Biografie bewerken",
@@ -153,19 +153,29 @@
   "account_edit.column_button": "Klaar",
   "account_edit.column_title": "Profiel bewerken",
   "account_edit.custom_fields.placeholder": "Voeg je voornaamwoorden, externe links of iets anders toe dat je wilt delen.",
-  "account_edit.custom_fields.title": "Aangepaste velden",
+  "account_edit.custom_fields.title": "Extra velden",
-  "account_edit.display_name.placeholder": "Je weergavenaam wordt weergegeven op jouw profiel en in tijdlijnen.",
+  "account_edit.display_name.placeholder": "Je weergavenaam wordt op jouw profiel en op tijdlijnen weergegeven.",
   "account_edit.display_name.title": "Weergavenaam",
   "account_edit.featured_hashtags.item": "hashtags",
-  "account_edit.featured_hashtags.placeholder": "Help anderen je favoriete onderwerpen te identificeren en er snel toegang toe te hebben.",
+  "account_edit.featured_hashtags.placeholder": "Geef anderen een overzicht van en snel toegang tot je favoriete onderwerpen.",
   "account_edit.featured_hashtags.title": "Uitgelichte hashtags",
   "account_edit.name_modal.add_title": "Weergavenaam toevoegen",
   "account_edit.name_modal.edit_title": "Weergavenaam bewerken",
-  "account_edit.profile_tab.subtitle": "Pas de tabbladen op je profiel aan en wat ze weergeven.",
+  "account_edit.profile_tab.button_label": "Aanpassen",
+  "account_edit.profile_tab.hint.description": "Deze instellingen passen wat gebruikers op {server} zien in de officiële apps aan, maar ze zijn mogelijk niet van toepassing op gebruikers op andere servers en in apps van derden.",
+  "account_edit.profile_tab.hint.title": "De weergave kan verschillen",
+  "account_edit.profile_tab.show_featured.description": "'Uitgelicht' is een optioneel tabblad waarop je andere accounts kunt aanbevelen.",
+  "account_edit.profile_tab.show_featured.title": "Tabblad 'Uitgelicht' tonen",
+  "account_edit.profile_tab.show_media.description": "'Media' is een optioneel tabblad waarop jouw berichten met afbeeldingen, video en audio staan.",
+  "account_edit.profile_tab.show_media.title": "Tabblad 'Media' tonen",
+  "account_edit.profile_tab.show_media_replies.description": "Wanneer dit is ingeschakeld, worden op het tabblad Media zowel jouw berichten en reacties op berichten van anderen weergegeven.",
+  "account_edit.profile_tab.show_media_replies.title": "Jouw reacties aan het tabblad 'Media' toevoegen",
+  "account_edit.profile_tab.subtitle": "De tabbladen op je profiel aanpassen en wat er op wordt weergegeven.",
   "account_edit.profile_tab.title": "Instellingen voor tabblad Profiel",
   "account_edit.save": "Opslaan",
-  "account_edit_tags.column_title": "Aanbevolen hashtags bewerken",
+  "account_edit_tags.add_tag": "#{tagName} toevoegen",
-  "account_edit_tags.help_text": "Aanbevolen hashtags helpen gebruikers je profiel te ontdekken en te communiceren. Ze verschijnen als filters op de activiteitenweergave van je pagina.",
+  "account_edit_tags.column_title": "Uitgelichte hashtags bewerken",
+  "account_edit_tags.help_text": "Uitgelichte hashtags helpen gebruikers je profiel te ontdekken en om er interactie mee te communiceren. Ze verschijnen als filters op je Profielpagina onder het tabblad Activiteit.",
   "account_edit_tags.search_placeholder": "Voer een hashtag in…",
   "account_edit_tags.suggestions": "Suggesties:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# bericht} other {# berichten}}",
@@ -271,14 +281,15 @@
   "closed_registrations_modal.find_another_server": "Een andere server zoeken",
   "closed_registrations_modal.preamble": "Mastodon is gedecentraliseerd. Op welke server je ook een account hebt, je kunt overal vandaan mensen op deze server volgen en er mee interactie hebben. Je kunt zelfs zelf een Mastodon-server hosten!",
   "closed_registrations_modal.title": "Registreren op Mastodon",
+  "collection.share_modal.share_link_label": "Uitnodigingslink delen",
   "collection.share_modal.share_via_post": "Bericht op Mastodon",
   "collection.share_modal.share_via_system": "Delen met…",
   "collection.share_modal.title": "Verzameling delen",
-  "collection.share_modal.title_new": "Deel je nieuwe verzameling!",
+  "collection.share_modal.title_new": "Je nieuwe verzameling delen!",
   "collection.share_template_other": "Bekijk deze coole verzameling: {link}",
   "collection.share_template_own": "Bekijk mijn nieuwe verzameling: {link}",
   "collections.account_count": "{count, plural, one {# account} other {# accounts}}",
-  "collections.accounts.empty_description": "Voeg tot {count} accounts toe die je volgt",
+  "collections.accounts.empty_description": "Tot {count} accounts die je volgt toevoegen",
   "collections.accounts.empty_title": "Deze verzameling is leeg",
   "collections.collection_description": "Omschrijving",
   "collections.collection_name": "Naam",
@@ -311,10 +322,10 @@
   "collections.name_length_hint": "Limiet van 40 tekens",
   "collections.new_collection": "Nieuwe verzameling",
   "collections.no_collections_yet": "Nog geen verzamelingen.",
-  "collections.old_last_post_note": "Laatst gepost over een week geleden",
+  "collections.old_last_post_note": "Meer dan een week geleden voor het laatst een bericht geplaatst",
-  "collections.remove_account": "Deze account verwijderen",
+  "collections.remove_account": "Dit account verwijderen",
   "collections.report_collection": "Deze verzameling rapporteren",
-  "collections.search_accounts_label": "Zoek naar accounts om toe te voegen…",
+  "collections.search_accounts_label": "Naar accounts zoeken om toe te voegen…",
   "collections.search_accounts_max_reached": "Je hebt het maximum aantal accounts toegevoegd",
   "collections.sensitive": "Gevoelig",
   "collections.topic_hint": "Voeg een hashtag toe die anderen helpt het hoofdonderwerp van deze verzameling te begrijpen.",
@@ -408,11 +419,11 @@
   "confirmations.discard_draft.post.title": "Conceptbericht verwijderen?",
   "confirmations.discard_edit_media.confirm": "Verwijderen",
   "confirmations.discard_edit_media.message": "Je hebt niet-opgeslagen wijzigingen in de mediabeschrijving of voorvertonning, wil je deze toch verwijderen?",
-  "confirmations.follow_to_collection.confirm": "Volgen en toevoegen aan verzameling",
+  "confirmations.follow_to_collection.confirm": "Volgen en aan verzameling toevoegen",
-  "confirmations.follow_to_collection.message": "Je moet {name} volgen om ze aan een verzameling toe te voegen.",
+  "confirmations.follow_to_collection.message": "Je moet {name} volgen om dit account aan een verzameling toe te kunnen voegen.",
   "confirmations.follow_to_collection.title": "Account volgen?",
   "confirmations.follow_to_list.confirm": "Volgen en toevoegen aan de lijst",
-  "confirmations.follow_to_list.message": "Je moet {name} volgen om ze toe te voegen aan een lijst.",
+  "confirmations.follow_to_list.message": "Je moet {name} volgen om dit account aan een lijst toe te kunnen voegen.",
   "confirmations.follow_to_list.title": "Gebruiker volgen?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
@@ -454,7 +465,7 @@
   "conversation.open": "Gesprek tonen",
   "conversation.with": "Met {names}",
   "copy_icon_button.copied": "Gekopieerd naar klembord",
-  "copy_icon_button.copy_this_text": "Link kopiëren naar klembord",
+  "copy_icon_button.copy_this_text": "Link naar klembord kopiëren",
   "copypaste.copied": "Gekopieerd",
   "copypaste.copy_to_clipboard": "Naar klembord kopiëren",
   "directory.federated": "Fediverse (wat bekend is)",
@@ -672,6 +683,7 @@
   "keyboard_shortcuts.direct": "Kolom met privéberichten openen",
   "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen",
   "keyboard_shortcuts.enter": "Volledig bericht tonen",
+  "keyboard_shortcuts.explore": "Trends openen",
   "keyboard_shortcuts.favourite": "Bericht als favoriet markeren",
   "keyboard_shortcuts.favourites": "Lijst met favorieten tonen",
   "keyboard_shortcuts.federated": "Globale tijdlijn tonen",
@@ -1006,7 +1018,7 @@
   "report.rules.title": "Welke regels worden geschonden?",
   "report.statuses.subtitle": "Selecteer wat van toepassing is",
   "report.statuses.title": "Zijn er berichten die deze rapportage ondersteunen?",
-  "report.submission_error": "Rapportering kon niet worden ingediend",
+  "report.submission_error": "Deze rapportage kon niet worden ingediend",
   "report.submission_error_details": "Controleer de netwerkverbinding en probeer het later opnieuw.",
   "report.submit": "Verzenden",
   "report.target": "{target} rapporteren",
@@ -1061,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon is de beste manier om wat er gebeurt bij te houden.",
   "sign_in_banner.sign_in": "Inloggen",
   "sign_in_banner.sso_redirect": "Inloggen of Registreren",
+  "skip_links.hotkey": "<span>Sneltoets</span> {hotkey}",
+  "skip_links.skip_to_content": "Ga naar de hoofdinhoud",
+  "skip_links.skip_to_navigation": "Ga naar de hoofdnavigatie",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_domain": "Moderatie-omgeving van {domain} openen",
   "status.admin_status": "Dit bericht in de moderatie-omgeving tonen",

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

@@ -44,9 +44,11 @@
   "account.familiar_followers_two": "Seguido por {name1} e {name2}",
   "account.featured": "Em destaque",
   "account.featured.accounts": "Perfis",
+  "account.featured.collections": "Coleções",
   "account.featured.hashtags": "Hashtags",
   "account.featured_tags.last_status_at": "Última publicação em {date}",
   "account.featured_tags.last_status_never": "Sem publicações",
+  "account.field_overflow": "Mostrar todo conteúdo",
   "account.filters.all": "Todas atividades",
   "account.filters.boosts_toggle": "Mostrar impulsos",
   "account.filters.posts_boosts": "Publicações e impulsos",
@@ -159,6 +161,13 @@
   "account_edit.featured_hashtags.title": "Hashtags em destaque",
   "account_edit.name_modal.add_title": "Inserir nome de exibição",
   "account_edit.name_modal.edit_title": "Editar nome de exibição",
+  "account_edit.profile_tab.button_label": "Personalizar",
+  "account_edit.profile_tab.hint.title": "Exibições divergem",
+  "account_edit.profile_tab.show_featured.title": "Mostrar aba \"Destaque\"",
+  "account_edit.profile_tab.show_media.description": "\"Mídia\" é uma aba opcional que mostra seus posts, contendo imagens ou vídeos.",
+  "account_edit.profile_tab.show_media.title": "Mostrar aba \"Mídia\"",
+  "account_edit.profile_tab.show_media_replies.description": "Quando ativa, a aba Mídia mostra seus posts e respostas nos posts de outras pessoas.",
+  "account_edit.profile_tab.show_media_replies.title": "Incluir respostas na aba \"Mídia\"",
   "account_edit.profile_tab.subtitle": "Personalizar as abas em seu perfil e o que elas exibem.",
   "account_edit.profile_tab.title": "Configurações da aba de perfil",
   "account_edit.save": "Salvar",
@@ -269,6 +278,13 @@
   "closed_registrations_modal.find_another_server": "Encontrar outro servidor",
   "closed_registrations_modal.preamble": "O Mastodon é descentralizado, não importa onde você criou a sua conta, será possível seguir e interagir com qualquer pessoa neste servidor. Você pode até mesmo criar o seu próprio servidor!",
   "closed_registrations_modal.title": "Inscrevendo-se no Mastodon",
+  "collection.share_modal.share_link_label": "Link para convite",
+  "collection.share_modal.share_via_post": "Postar no Mastodon",
+  "collection.share_modal.share_via_system": "Enviar para...",
+  "collection.share_modal.title": "Compartilhar coleção",
+  "collection.share_modal.title_new": "Compartilhe sua nova coleção!",
+  "collection.share_template_other": "Confira esta coleção incrível: {link}",
+  "collection.share_template_own": "Confira minha nova coleção: {link}",
   "collections.account_count": "{count, plural, one {# conta} other {# conta}}",
   "collections.accounts.empty_description": "Adicionar até {count} contas que você segue",
   "collections.accounts.empty_title": "Esta coleção está vazia",
@@ -305,11 +321,13 @@
   "collections.no_collections_yet": "Ainda não há coleções.",
   "collections.old_last_post_note": "Publicado pela última vez semana passada",
   "collections.remove_account": "Remover esta conta",
+  "collections.report_collection": "Denunciar esta coleção",
   "collections.search_accounts_label": "Buscar contas para adicionar…",
   "collections.search_accounts_max_reached": "Você acrescentou o numero máximo de contas",
   "collections.sensitive": "Sensível",
   "collections.topic_hint": "Adicione uma hashtag que ajude os outros a entender o tópico principal desta coleção.",
   "collections.view_collection": "Ver coleção",
+  "collections.view_other_collections_by_user": "Ver outras coleções deste usuário",
   "collections.visibility_public": "Público",
   "collections.visibility_public_hint": "Localizável em resultados de buscas e outras áreas onde recomendações aparecem.",
   "collections.visibility_title": "Visibilidade",
@@ -444,6 +462,7 @@
   "conversation.open": "Ver conversa",
   "conversation.with": "Com {names}",
   "copy_icon_button.copied": "Copiado para a área de transferência",
+  "copy_icon_button.copy_this_text": "Copiar link para área de transferência",
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
@@ -973,6 +992,7 @@
   "report.category.title_account": "perfil",
   "report.category.title_status": "publicação",
   "report.close": "Concluir",
+  "report.collection_comment": "Por que você quer denunciar esta coleção?",
   "report.comment.title": "Há algo mais que você acredita que devemos saber?",
   "report.forward": "Encaminhar para {target}",
   "report.forward_hint": "A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá?",
@@ -994,6 +1014,8 @@
   "report.rules.title": "Quais regras estão sendo violadas?",
   "report.statuses.subtitle": "Selecione tudo que se aplica",
   "report.statuses.title": "Existem postagens que respaldam esse relatório?",
+  "report.submission_error": "A denúncia não pôde ser enviada",
+  "report.submission_error_details": "Verifique sua conexão e tente novamente mais tarde",
   "report.submit": "Enviar",
   "report.target": "Denunciando {target}",
   "report.thanks.take_action": "Aqui estão suas opções para controlar o que você vê no Mastodon:",

app/javascript/mastodon/locales/sq.json

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Përshtatni skedat në profilin tuaj dhe ato çka shfaqet në to.",
   "account_edit.profile_tab.title": "Rregullime skede profili",
   "account_edit.save": "Ruaje",
+  "account_edit_tags.add_tag": "Shtoje #{tagName}",
   "account_edit_tags.column_title": "Përpunoni hashtag-ë të zgjedhur",
   "account_edit_tags.help_text": "Hashtag-ët e zgjedhur i ndihmojnë përdoruesit të zbulojnë dhe ndërveprojnë me profilin tuaj. Ata duken si filtra te pamja Veprimtari e faqes tuaj të Profilit.",
   "account_edit_tags.search_placeholder": "Jepni një hashtag…",
@@ -678,6 +679,7 @@
   "keyboard_shortcuts.direct": "Hap shtyllë përmendjesh private",
   "keyboard_shortcuts.down": "Për zbritje poshtë nëpër listë",
   "keyboard_shortcuts.enter": "Për hapje postimi",
+  "keyboard_shortcuts.explore": "Hap rrjedhë kohore të gjërave në modë",
   "keyboard_shortcuts.favourite": "I vini shenjë postimit si të parapëlqyer",
   "keyboard_shortcuts.favourites": "Hapni listë të parapëlqyerish",
   "keyboard_shortcuts.federated": "Për hapje rrjedhe kohore të të federuarave",
@@ -1067,6 +1069,8 @@
   "sign_in_banner.mastodon_is": "Mastodon-i është rruga më e mirë për të ndjekur se ç’ndodh.",
   "sign_in_banner.sign_in": "Hyni",
   "sign_in_banner.sso_redirect": "Bëni hyrjen, ose Regjistrohuni",
+  "skip_links.skip_to_content": "Kalo te lënda kryesore",
+  "skip_links.skip_to_navigation": "Kalo te menuja kryesore e lëvizjeve",
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
   "status.admin_domain": "Hap ndërfaqe moderimi për {domain}",
   "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit",

app/javascript/mastodon/locales/vi.json

@@ -64,7 +64,7 @@
   "account.follow_request_short": "Yêu cầu",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
-  "account.followers_counter": "{count, plural, other {{counter} Người theo dõi}}",
+  "account.followers_counter": "{count, plural, other {{counter} người theo dõi}}",
   "account.followers_you_know_counter": "{counter} bạn biết",
   "account.following": "Đang theo dõi",
   "account.following_counter": "{count, plural, other {{counter} theo dõi}}",
@@ -105,12 +105,12 @@
   "account.muted": "Đã phớt lờ",
   "account.muting": "Đang ẩn",
   "account.mutual": "Theo dõi nhau",
-  "account.name.help.domain": "{domain} là máy chủ lưu trữ hồ sơ và tút của người dùng.",
+  "account.name.help.domain": "{domain} là máy chủ lưu trữ hồ sơ và tút của tài khoản.",
   "account.name.help.domain_self": "{domain} là máy chủ lưu trữ hồ sơ và tút của bạn.",
-  "account.name.help.footer": "Giống như bạn có thể gửi email cho mọi người bằng các dịch vụ email khác nhau, bạn có thể tương tác với mọi người trên các máy chủ Mastodon khác – và với bất kỳ ai trên các ứng dụng xã hội khác được cung cấp bởi cùng một bộ quy tắc mà Mastodon sử dụng (giao thức ActivityPub).",
+  "account.name.help.footer": "Giống như bạn có thể gửi email cho mọi người trên các dịch vụ email khác nhau, bạn có thể tương tác với mọi người trên các máy chủ Mastodon khác – và trên các ứng dụng xã hội khác sử dụng cùng giao thức mà Mastodon sử dụng (ActivityPub).",
-  "account.name.help.header": "Một địa chỉ giống như một địa chỉ email",
+  "account.name.help.header": "Một địa chỉ giống như địa chỉ email",
-  "account.name.help.username": "{username} là tên người dùng của tài khoản này trên máy chủ của họ. Trên máy chủ khác có thể có tên người dùng giống vậy.",
+  "account.name.help.username": "{username} là tên người dùng duy nhất trên máy chủ này. Các máy chủ khác có thể cũng có tên người dùng giống vậy.",
-  "account.name.help.username_self": "{username} là tên người dùng của bạn trên máy chủ này. Trên máy chủ khác có thể có tên người dùng giống bạn.",
+  "account.name.help.username_self": "{username} là tên người dùng của bạn trên máy chủ này. Các máy chủ khác cũng có thể có tên người dùng giống bạn.",
   "account.name_info": "Điều này nghĩa là gì?",
   "account.no_bio": "Chưa có miêu tả.",
   "account.node_modal.callout": "Các ghi chú chỉ hiển thị với bạn.",
@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "Tùy chỉnh tab trên hồ sơ của bạn và những gì chúng hiển thị.",
   "account_edit.profile_tab.title": "Thiết lập tab hồ sơ",
   "account_edit.save": "Lưu",
+  "account_edit_tags.add_tag": "Thêm #{tagName}",
   "account_edit_tags.column_title": "Sửa hashtag thường dùng",
   "account_edit_tags.help_text": "Hashtag thường dùng giúp bạn mọi người khám phá và tương tác với hồ sơ của bạn. Chúng xuất hiện như những bộ lọc trên phần Hoạt động hồ sơ.",
   "account_edit_tags.search_placeholder": "Nhập một hashtag…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "mở nhắn riêng",
   "keyboard_shortcuts.down": "di chuyển xuống dưới danh sách",
   "keyboard_shortcuts.enter": "mở tút",
+  "keyboard_shortcuts.explore": "mở bảng tin xu hướng",
   "keyboard_shortcuts.favourite": "thích tút",
   "keyboard_shortcuts.favourites": "mở lượt thích",
   "keyboard_shortcuts.federated": "mở mạng liên hợp",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon là cách tốt nhất để nắm bắt những gì đang xảy ra.",
   "sign_in_banner.sign_in": "Đăng nhập",
   "sign_in_banner.sso_redirect": "Đăng nhập",
+  "skip_links.hotkey": "<span>Phím tắt</span> {hotkey}",
+  "skip_links.skip_to_content": "Chuyển tới nội dung chính",
+  "skip_links.skip_to_navigation": "Chuyển đến điều hướng chính",
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_domain": "Mở giao diện quản trị @{domain}",
   "status.admin_status": "Mở tút này trong giao diện quản trị",

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

@@ -173,6 +173,7 @@
   "account_edit.profile_tab.subtitle": "自訂您個人檔案之分頁與內容。",
   "account_edit.profile_tab.title": "個人檔案分頁設定",
   "account_edit.save": "儲存",
+  "account_edit_tags.add_tag": "加入 #{tagName}",
   "account_edit_tags.column_title": "編輯推薦主題標籤",
   "account_edit_tags.help_text": "推薦主題標籤幫助其他人發現並與您的個人檔案互動。它們將作為過濾器出現於您個人檔案頁面之動態中。",
   "account_edit_tags.search_placeholder": "請輸入主題標籤…",
@@ -682,6 +683,7 @@
   "keyboard_shortcuts.direct": "開啟私訊對話欄",
   "keyboard_shortcuts.down": "向下移動",
   "keyboard_shortcuts.enter": "檢視嘟文",
+  "keyboard_shortcuts.explore": "開啟熱門趨勢時間軸",
   "keyboard_shortcuts.favourite": "加到最愛",
   "keyboard_shortcuts.favourites": "開啟最愛列表",
   "keyboard_shortcuts.federated": "開啟聯邦時間軸",
@@ -1071,6 +1073,9 @@
   "sign_in_banner.mastodon_is": "Mastodon 是跟上時代潮流的最佳工具！",
   "sign_in_banner.sign_in": "登入",
   "sign_in_banner.sso_redirect": "登入或註冊",
+  "skip_links.hotkey": "<span>快速鍵</span> {hotkey}",
+  "skip_links.skip_to_content": "跳至主內容",
+  "skip_links.skip_to_navigation": "跳至主導航區",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "開啟 {domain} 的管理介面",
   "status.admin_status": "於管理介面開啟此嘟文",

app/javascript/styles/mastodon/basics.scss

@@ -19,6 +19,15 @@ html {
   &.rtl {
     --text-x-direction: -1;
   }
+
+  // Compensate for column header height when scrolling elements into view
+  --column-header-height: 62px;
+
+  scroll-padding-top: var(--column-header-height);
+
+  &:has(.layout-multi-column) {
+    --column-header-height: 0;
+  }
 }
 
 html.has-modal {

app/javascript/styles/mastodon/components.scss

@@ -285,6 +285,7 @@
   --default-bg-color: transparent;
   --hover-icon-color: var(--color-text-primary);
   --hover-bg-color: var(--color-bg-brand-softer);
+  --focus-outline-color: var(--color-text-brand);
 
   display: inline-flex;
   color: var(--default-icon-color);
@@ -313,7 +314,7 @@
   }
 
   &:focus-visible {
-    outline: 2px solid var(--color-text-brand);
+    outline: 2px solid var(--focus-outline-color);
   }
 
   &.disabled {
@@ -2983,8 +2984,6 @@ a.account__display-name {
     }
 
     &__main {
-      --column-header-height: 62px;
-
       box-sizing: border-box;
       width: 100%;
       flex: 0 1 auto;
@@ -5016,6 +5015,13 @@ a.status-card {
         background-color: rgb(from var(--color-bg-media-base) r g b / 90%);
       }
     }
+
+    &:focus-visible {
+      .spoiler-button__overlay__label {
+        outline: 2px solid var(--color-text-on-media);
+        outline-offset: -4px;
+      }
+    }
   }
 }
 
@@ -7077,6 +7083,13 @@ a.status-card {
     font-size: 14px;
     font-weight: 700;
     line-height: 20px;
+
+    &:focus-visible {
+      outline: none;
+      box-shadow:
+        inset 0 0 0 2px var(--color-text-on-media),
+        0 0 0 2px var(--color-bg-media);
+    }
   }
 }
 
@@ -7106,6 +7119,13 @@ a.status-card {
   cursor: pointer;
   pointer-events: auto;
 
+  &:focus-visible {
+    outline: none;
+    box-shadow:
+      inset 0 0 0 2px var(--color-text-on-media),
+      0 0 0 2px var(--color-bg-media);
+  }
+
   &--non-interactive {
     pointer-events: none;
   }
@@ -7130,6 +7150,16 @@ a.status-card {
   overflow-y: auto;
   z-index: 10;
 
+  &:focus-visible {
+    box-shadow:
+      var(--dropdown-shadow),
+      inset 0 0 0 2px var(--color-text-on-media);
+
+    // Extend background color for better visibility of the
+    // inset box-shadow "outline"
+    outline: 2px solid var(--color-bg-media);
+  }
+
   &--solid {
     color: var(--color-text-primary);
     background: var(--color-bg-primary);
@@ -7370,6 +7400,7 @@ a.status-card {
   color: var(--color-text-primary);
   position: relative;
   z-index: -1;
+  border-radius: inherit;
 
   &,
   img {
@@ -7380,6 +7411,23 @@ a.status-card {
   img {
     object-fit: cover;
   }
+
+  &:focus {
+    outline: none;
+    border-radius: inherit;
+  }
+
+  // Double focus outline for better visibility on photos
+  &:focus-visible::after {
+    content: '';
+    position: absolute;
+    inset: 2px;
+    z-index: 1;
+    border-radius: inherit;
+    border: 2px solid var(--color-text-on-inverted);
+    outline: 2px solid var(--color-bg-inverted);
+    pointer-events: none;
+  }
 }
 
 .media-gallery__preview {
@@ -9093,10 +9141,6 @@ noscript {
 .conversation {
   position: relative;
 
-  // When scrolling these elements into view, take into account
-  // the column header height
-  scroll-margin-top: var(--column-header-height, 0);
-
   &.unread {
     &::before {
       content: '';

config/locales/cy.yml

@@ -283,6 +283,7 @@ cy:
         demote_user_html: Mae %{name} wedi israddio defnyddiwr %{target}
         destroy_announcement_html: Mae %{name} wedi dileu cyhoeddiad %{target}
         destroy_canonical_email_block_html: Mae %{name} wedi dad-rwystro parth e-bost %{target}
+        destroy_collection_html: Mae %{name} wedi tynnu casgliad gan %{target}
         destroy_custom_emoji_html: Mae %{name} wedi dileu emoji %{target}
         destroy_domain_allow_html: Mae %{name} wedi gwrthod ffederasiwn gyda pharth %{target}
         destroy_domain_block_html: Mae %{name} wedi dad rwystro parth %{target}
@@ -322,6 +323,7 @@ cy:
         unsilence_account_html: Mae %{name} wedi dadwneud terfyn cyfrif %{target}
         unsuspend_account_html: Mae %{name} wedi dad atal cyfrif %{target}
         update_announcement_html: Mae %{name} wedi diweddaru cyhoeddiad %{target}
+        update_collection_html: Mae casgliad %{name} wedi'i ddiweddaru gan %{target}
         update_custom_emoji_html: Mae %{name} wedi diweddaru emoji %{target}
         update_domain_block_html: Mae %{name} wedi diweddaru bloc parth %{target}
         update_ip_block_html: Mae %{name} wedi newid rheol IP %{target}
@@ -745,6 +747,7 @@ cy:
       cancel: Canslo
       category: Categori
       category_description_html: Bydd y rheswm dros adrodd am y cyfrif a/neu’r cynnwys hwn yn cael ei ddyfynnu wrth gyfathrebu â’r cyfrif a adroddwyd
+      collections: "(%{count}) casgliad"
       comment:
         none: Dim
       comment_description_html: 'I ddarparu rhagor o wybodaeth, ysgrifennodd %{name}:'
@@ -780,6 +783,7 @@ cy:
       resolved_msg: Llwyddwyd i ddatrys yr adroddiad!
       skip_to_actions: Mynd i gamau gweithredu
       status: Statws
+      statuses: "(%{count}) postiad"
       statuses_description_html: Bydd cynnwys tramgwyddus yn cael ei ddyfynnu wrth gyfathrebu â'r cyfrif a adroddwyd
       summary:
         action_preambles:

config/locales/el.yml

@@ -1326,7 +1326,7 @@ el:
   author_attribution:
     example_title: Δείγμα κειμένου
     hint_html: Γράφεις ειδήσεις ή άρθρα blog εκτός του Mastodon; Έλεγξε πώς μπορείς να πάρεις τα εύσημα όταν κοινοποιούνται στο Mastodon.
-    instructions: 'Βεβαιώσου ότι ο κώδικας αυτός είναι στο HTML του άρθρου σου:'
+    instructions: 'Βεβαιώσου ότι ο κώδικας αυτός είναι στην HTML του άρθρου σου:'
     more_from_html: Περισσότερα από %{name}
     s_blog: Ιστολόγιο του/της %{name}
     then_instructions: Στη συνέχεια, πρόσθεσε το όνομα τομέα της δημοσίευσης στο παρακάτω πεδίο.
@@ -2187,9 +2187,9 @@ el:
     seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες.
     signed_in_as: 'Έχεις συνδεθεί ως:'
   verification:
-    extra_instructions_html: <strong>Συμβουλή:</strong> Ο σύνδεσμος στην ιστοσελίδα σου μπορεί να είναι αόρατος. Το σημαντικό μέρος είναι το <code>rel="me"</code> που αποτρέπει την μίμηση σε ιστοσελίδες με περιεχόμενο παραγόμενο από χρήστες. Μπορείς ακόμα να χρησιμοποιήσεις μια ετικέτα <code>συνδέσμου</code> στην κεφαλίδα της σελίδας αντί για <code>a</code>, αλλά ο κώδικας HTML πρέπει να είναι προσβάσιμος χωρίς την εκτέλεση JavaScript.
+    extra_instructions_html: <strong>Συμβουλή:</strong> Ο σύνδεσμος στην ιστοσελίδα σου μπορεί να είναι αόρατος. Το σημαντικό μέρος είναι το <code>rel="me"</code> που αποτρέπει την μίμηση σε ιστοσελίδες με περιεχόμενο παραγόμενο από χρήστες. Μπορείς ακόμα να χρησιμοποιήσεις μια ετικέτα <code>link</code> στην κεφαλίδα της σελίδας αντί για <code>a</code>, αλλά η HTML πρέπει να είναι προσβάσιμη χωρίς την εκτέλεση JavaScript.
     here_is_how: Δείτε πώς
-    hint_html: Η <strong>επαλήθευση της ταυτότητας στο Mastodon είναι για όλους.</strong> Βασισμένο σε ανοιχτά πρότυπα ιστού, τώρα και για πάντα δωρεάν. Το μόνο που χρειάζεσαι είναι μια προσωπική ιστοσελίδα που ο κόσμος να σε αναγνωρίζει από αυτή. Όταν συνδέεσαι σε αυτήν την ιστοσελίδα από το προφίλ σου, θα ελέγξουμε ότι η ιστοσελίδα συνδέεται πίσω στο προφίλ σου και θα δείξει μια οπτική ένδειξη σε αυτό.
+    hint_html: Η <strong>επαλήθευση της ταυτότητας στο Mastodon είναι για όλους.</strong> Βασισμένο σε ανοιχτά πρότυπα ιστού, τώρα και για πάντα δωρεάν. Το μόνο που χρειάζεσαι είναι μια προσωπική ιστοσελίδα που ο κόσμος να σε αναγνωρίζει από αυτή. Όταν βάζεις σύνδεσμο προς αυτήν την ιστοσελίδα από το προφίλ σου, θα ελέγξουμε ότι η ιστοσελίδα συνδέει πίσω στο προφίλ σου και θα δείξουμε μια οπτική ένδειξη σε αυτό.
     instructions_html: Αντέγραψε και επικόλλησε τον παρακάτω κώδικα στην HTML της ιστοσελίδας σου. Στη συνέχεια, πρόσθεσε τη διεύθυνση της ιστοσελίδας σου σε ένα από τα επιπλέον πεδία στο προφίλ σου από την καρτέλα "Επεξεργασία προφίλ" και αποθήκευσε τις αλλαγές.
     verification: Επαλήθευση
     verified_links: Οι επαληθευμένοι σύνδεσμοι σας

config/locales/nl.yml

@@ -267,7 +267,7 @@ nl:
         demote_user_html: Gebruiker %{target} is door %{name} gedegradeerd
         destroy_announcement_html: "%{name} heeft de mededeling %{target} verwijderd"
         destroy_canonical_email_block_html: "%{name} deblokkeerde e-mail met de hash %{target}"
-        destroy_collection_html: "%{name} heeft de verzameling van %{target} verwijderd"
+        destroy_collection_html: "%{name} heeft een verzameling van %{target} verwijderd"
         destroy_custom_emoji_html: "%{name} verwijderde de emoji %{target}"
         destroy_domain_allow_html: "%{name} heeft de federatie met het domein %{target} afgekeurd"
         destroy_domain_block_html: Domein %{target} is door %{name} gedeblokkeerd
@@ -307,7 +307,7 @@ nl:
         unsilence_account_html: Beperking van account %{target} is door %{name} opgeheven
         unsuspend_account_html: Opschorten van account %{target} is door %{name} opgeheven
         update_announcement_html: "%{name} heeft de mededeling %{target} bijgewerkt"
-        update_collection_html: "%{name} heeft de verzameling van %{target} bijgewerkt"
+        update_collection_html: "%{name} heeft een verzameling van %{target} bijgewerkt"
         update_custom_emoji_html: Emoji %{target} is door %{name} bijgewerkt
         update_domain_block_html: "%{name} heeft de domeinblokkade bijgewerkt voor %{target}"
         update_ip_block_html: "%{name} wijzigde de IP-regel voor %{target}"
@@ -351,7 +351,7 @@ nl:
         one: 1 account
         other: "%{count} accounts"
       open: Openen
-      view_publicly: Openbaar bericht bekijken
+      view_publicly: Openbare verzameling bekijken
     critical_update_pending: Kritieke update in behandeling
     custom_emojis:
       assign_category: Categorie toewijzen

config/locales/simple_form.el.yml

@@ -77,7 +77,7 @@ el:
         domain: Αυτό μπορεί να είναι το όνομα τομέα που εμφανίζεται στη διεύθυνση email ή η εγγραφή MX που χρησιμοποιεί. Θα ελέγχονται κατά την εγγραφή.
         with_dns_records: Θα γίνει απόπειρα ανάλυσης των εγγραφών DNS του τομέα και τα αποτελέσματα θα μπουν και αυτά σε μαύρη λίστα
       featured_tag:
-        name: 'Εδώ είναι μερικές από τις ετικέτες που χρησιμοποιήσατε περισσότερο πρόσφατα:'
+        name: 'Εδώ είναι μερικές από τις ετικέτες που χρησιμοποίησες περισσότερο πρόσφατα:'
       filters:
         action: Επιλέξτε ποια ενέργεια θα εκτελεστεί όταν μια ανάρτηση ταιριάζει με το φίλτρο
         actions:

config/locales/simple_form.nl.yml

@@ -54,7 +54,7 @@ nl:
         password: Gebruik tenminste 8 tekens
         phrase: Komt overeen ongeacht hoofd-/kleine letters of een inhoudswaarschuwing
         scopes: Tot welke API's heeft de toepassing toegang. Wanneer je een toestemming van het bovenste niveau kiest, hoef je geen individuele toestemmingen meer te kiezen.
-        setting_advanced_layout: Geef Mastodon in meerdere kolommen weer, waarmee je jouw tijdlijn, meldingen en een derde kolom naar keuze in een opslag kunt bekijken. Niet aanbevolen voor kleinere schermen.
+        setting_advanced_layout: Geef Mastodon in meerdere kolommen weer, waarmee je jouw tijdlijn, meldingen en een derde kolom naar keuze in één opslag kunt bekijken. Niet aanbevolen voor kleinere schermen.
         setting_aggregate_reblogs: Geen nieuwe boosts tonen voor berichten die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts)
         setting_always_send_emails: Normaliter worden er geen e-mailmeldingen verstuurd wanneer je actief Mastodon gebruikt
         setting_boost_modal: Wanneer dit is ingeschakeld, krijg je eerst een bevestigingsvenster te zien waarmee je de zichtbaarheid van je boost kunt wijzigen.
@@ -93,7 +93,7 @@ nl:
         content_cache_retention_period: Alle berichten van andere servers (inclusief boosts en reacties) worden verwijderd na het opgegeven aantal dagen, ongeacht enige lokale gebruikersinteractie met die berichten. Dit betreft ook berichten die een lokale gebruiker aan diens bladwijzers heeft toegevoegd of als favoriet heeft gemarkeerd. Privéberichten tussen gebruikers van verschillende servers gaan ook verloren en zijn onmogelijk te herstellen. Het gebruik van deze instelling is bedoeld voor servers die een speciaal doel dienen en overtreedt veel gebruikersverwachtingen wanneer deze voor algemeen gebruik wordt geïmplementeerd.
         custom_css: Je kunt aangepaste CSS toepassen op de webversie van deze Mastodon-server.
         favicon: WEBP, PNG, GIF of JPG. Vervangt de standaard Mastodon favicon met een aangepast pictogram.
-        landing_page: Selecteert welke pagina nieuwe bezoekers te zien krijgen wanneer ze voor het eerst op jouw server terechtkomen. Wanneer je ‘Trends’ selecteert, moeten trends ingeschakeld zijn onder 'Serverinstellingen > Ontdekken'. Als je ‘Lokale tijdlijn’ selecteert, moet ‘Toegang tot openbare lokale berichten’ worden ingesteld op ‘Iedereen’ onder 'Serverinstellingen > Ontdekken'.
+        landing_page: Selecteert welke pagina nieuwe bezoekers te zien krijgen wanneer ze voor het eerst op jouw server terechtkomen. Wanneer je ‘Trends’ selecteert, moeten trends ingeschakeld zijn onder 'Serverinstellingen > Ontdekken'. Wanneer je ‘Lokale tijdlijn’ selecteert, moet ‘Toegang tot openbare lokale berichten’ worden ingesteld op ‘Iedereen’ onder 'Serverinstellingen > Ontdekken'.
         mascot: Overschrijft de illustratie in de geavanceerde webomgeving.
         media_cache_retention_period: Mediabestanden van berichten van externe gebruikers worden op jouw server in de cache opgeslagen. Indien ingesteld op een positieve waarde, worden media verwijderd na het opgegeven aantal dagen. Als de mediagegevens worden opgevraagd nadat ze zijn verwijderd, worden ze opnieuw gedownload wanneer de originele inhoud nog steeds beschikbaar is. Vanwege beperkingen op hoe vaak linkvoorbeelden sites van derden raadplegen, wordt aanbevolen om deze waarde in te stellen op ten minste 14 dagen. Anders worden linkvoorbeelden niet op aanvraag bijgewerkt.
         min_age: Gebruikers krijgen tijdens hun inschrijving de vraag om hun geboortedatum te bevestigen
@@ -224,7 +224,7 @@ nl:
         email: E-mailadres
         expires_in: Vervalt na
         fields: Extra velden
-        filter_action: Filter-actie
+        filter_action: Filteractie
         header: Omslagfoto
         honeypot: "%{label} (niet invullen)"
         inbox_url: Inbox-URL van de relayserver
@@ -237,7 +237,7 @@ nl:
         password: Wachtwoord
         phrase: Trefwoord of zinsdeel
         setting_advanced_layout: Geavanceerde webomgeving inschakelen
-        setting_aggregate_reblogs: Boosts in tijdlijnen groeperen
+        setting_aggregate_reblogs: Boosts op tijdlijnen groeperen
         setting_always_send_emails: Altijd e-mailmeldingen verzenden
         setting_auto_play_gif: Geanimeerde GIF's automatisch afspelen
         setting_boost_modal: Zichtbaarheid van boosts

spec/requests/api/v1/statuses_spec.rb

@@ -516,6 +516,7 @@ RSpec.describe '/api/v1/statuses' do
 
       let(:scopes) { 'write:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
+      let!(:media) { Fabricate(:media_attachment, status: status) }
 
       it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
 
@@ -525,6 +526,15 @@ RSpec.describe '/api/v1/statuses' do
         expect(response).to have_http_status(200)
         expect(response.content_type)
           .to start_with('application/json')
+        expect(response.parsed_body).to include(
+          id: status.id.to_s,
+          media_attachments: contain_exactly(
+            a_hash_including(
+              id: media.id.to_s,
+              url: %r{/system/media_attachments/files/}
+            )
+          )
+        )
         expect(Status.find_by(id: status.id)).to be_nil
         expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => true })
       end