Merge commit 'e3f0b955b8' into kbtopic-remove-quoteMerge

.env.development

@@ -2,3 +2,5 @@
 ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=fkSxKD2bF396kdQbrP1EJ7WbU7ZgNokR
 ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=r0hvVmzBVsjxC7AMlwhOzmtc36ZCOS1E
 ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=PhdFyyfy5xJ7WVd2lWBpcPScRQHzRTNr
+
+MASTODON_USE_LIBVIPS=false

.prettierignore

@@ -63,7 +63,7 @@ docker-compose.override.yml
 
 # Ignore emoji map file
 /app/javascript/mastodon/features/emoji/emoji_map.json
-/app/javascript/mastodon/features/emoji/emoji_sheet.json
+/app/javascript/mastodon/features/emoji/emoji_data.json
 
 # Ignore locale files
 /app/javascript/mastodon/locales/*.json

Gemfile.lock

@@ -160,7 +160,7 @@ GEM
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.2)
+    connection_pool (2.5.3)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -711,7 +711,7 @@ GEM
     rotp (6.3.0)
     rouge (4.5.1)
     rpam2 (4.0.2)
-    rqrcode (3.0.0)
+    rqrcode (3.1.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 2.0)
     rqrcode_core (2.0.0)
@@ -743,7 +743,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.2)
-    rubocop (1.75.3)
+    rubocop (1.75.4)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -807,7 +807,7 @@ GEM
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
     semantic_range (3.1.0)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
       connection_pool (>= 2.2.5, < 3)

app/helpers/context_helper.rb

@@ -34,6 +34,14 @@ module ContextHelper
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
     attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
     misskey_license: { 'misskey' => 'https://misskey-hub.net/ns#', '_misskey_license' => 'misskey:_misskey_license' },
+    quote_requests: { 'QuoteRequest' => 'https://w3id.org/fep/044f#QuoteRequest' },
+    interaction_policies: {
+      'gts' => 'https://gotosocial.org/ns#',
+      'interactionPolicy' => { '@id' => 'gts:interactionPolicy', '@type' => '@id' },
+      'canQuote' => { '@id' => 'gts:canQuote', '@type' => '@id' },
+      'automaticApproval' => { '@id' => 'gts:automaticApproval', '@type' => '@id' },
+      'manualApproval' => { '@id' => 'gts:manualApproval', '@type' => '@id' },
+    },
   }.freeze
 
   def full_context

app/javascript/mastodon/actions/accounts_typed.ts

@@ -1,18 +1,18 @@
 import { createAction } from '@reduxjs/toolkit';
 
-import { apiRemoveAccountFromFollowers } from 'mastodon/api/accounts';
-import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+import {
+  apiRemoveAccountFromFollowers,
+  apiGetEndorsedAccounts,
+} from 'mastodon/api/accounts';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
+import { importFetchedAccounts } from './importer';
+
 export const revealAccount = createAction<{
   id: string;
 }>('accounts/revealAccount');
 
-export const importAccounts = createAction<{ accounts: ApiAccountJSON[] }>(
-  'accounts/importAccounts',
-);
-
 function actionWithSkipLoadingTrue<Args extends object>(args: Args) {
   return {
     payload: {
@@ -104,3 +104,12 @@ export const removeAccountFromFollowers = createDataLoadingThunk(
     apiRemoveAccountFromFollowers(accountId),
   (relationship) => ({ relationship }),
 );
+
+export const fetchEndorsedAccounts = createDataLoadingThunk(
+  'accounts/endorsements',
+  ({ accountId }: { accountId: string }) => apiGetEndorsedAccounts(accountId),
+  (data, { dispatch }) => {
+    dispatch(importFetchedAccounts(data));
+    return data;
+  },
+);

app/javascript/mastodon/actions/featured_tags.js

@@ -1,34 +0,0 @@
-import api from '../api';
-
-export const FEATURED_TAGS_FETCH_REQUEST = 'FEATURED_TAGS_FETCH_REQUEST';
-export const FEATURED_TAGS_FETCH_SUCCESS = 'FEATURED_TAGS_FETCH_SUCCESS';
-export const FEATURED_TAGS_FETCH_FAIL    = 'FEATURED_TAGS_FETCH_FAIL';
-
-export const fetchFeaturedTags = (id) => (dispatch, getState) => {
-  if (getState().getIn(['user_lists', 'featured_tags', id, 'items'])) {
-    return;
-  }
-
-  dispatch(fetchFeaturedTagsRequest(id));
-
-  api().get(`/api/v1/accounts/${id}/featured_tags`)
-    .then(({ data }) => dispatch(fetchFeaturedTagsSuccess(id, data)))
-    .catch(err => dispatch(fetchFeaturedTagsFail(id, err)));
-};
-
-export const fetchFeaturedTagsRequest = (id) => ({
-  type: FEATURED_TAGS_FETCH_REQUEST,
-  id,
-});
-
-export const fetchFeaturedTagsSuccess = (id, tags) => ({
-  type: FEATURED_TAGS_FETCH_SUCCESS,
-  id,
-  tags,
-});
-
-export const fetchFeaturedTagsFail = (id, error) => ({
-  type: FEATURED_TAGS_FETCH_FAIL,
-  id,
-  error,
-});

app/javascript/mastodon/actions/featured_tags.ts

@@ -0,0 +1,7 @@
+import { apiGetFeaturedTags } from 'mastodon/api/accounts';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+export const fetchFeaturedTags = createDataLoadingThunk(
+  'accounts/featured_tags',
+  ({ accountId }: { accountId: string }) => apiGetFeaturedTags(accountId),
+);

app/javascript/mastodon/actions/importer/accounts.ts

@@ -0,0 +1,7 @@
+import { createAction } from '@reduxjs/toolkit';
+
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
+
+export const importAccounts = createAction<{ accounts: ApiAccountJSON[] }>(
+  'accounts/importAccounts',
+);

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

@@ -1,7 +1,6 @@
 import { createPollFromServerJSON } from 'mastodon/models/poll';
 
-import { importAccounts } from '../accounts_typed';
-
+import { importAccounts } from './accounts';
 import { normalizeStatus } from './normalizer';
 import { importPolls } from './polls';
 

app/javascript/mastodon/actions/statuses.js

@@ -6,8 +6,11 @@ import api from '../api';
 import { fetchRelationships } from './accounts';
 import { ensureComposeIsVisible, setComposeToStatus } from './compose';
 import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer';
+import { fetchContext } from './statuses_typed';
 import { deleteFromTimelines } from './timelines';
 
+export * from './statuses_typed';
+
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
 export const STATUS_FETCH_FAIL    = 'STATUS_FETCH_FAIL';
@@ -16,10 +19,6 @@ export const STATUS_DELETE_REQUEST = 'STATUS_DELETE_REQUEST';
 export const STATUS_DELETE_SUCCESS = 'STATUS_DELETE_SUCCESS';
 export const STATUS_DELETE_FAIL    = 'STATUS_DELETE_FAIL';
 
-export const CONTEXT_FETCH_REQUEST = 'CONTEXT_FETCH_REQUEST';
-export const CONTEXT_FETCH_SUCCESS = 'CONTEXT_FETCH_SUCCESS';
-export const CONTEXT_FETCH_FAIL    = 'CONTEXT_FETCH_FAIL';
-
 export const STATUS_MUTE_REQUEST = 'STATUS_MUTE_REQUEST';
 export const STATUS_MUTE_SUCCESS = 'STATUS_MUTE_SUCCESS';
 export const STATUS_MUTE_FAIL    = 'STATUS_MUTE_FAIL';
@@ -58,7 +57,7 @@ export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) {
     const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null;
 
     if (alsoFetchContext) {
-      dispatch(fetchContext(id));
+      dispatch(fetchContext({ statusId: id }));
     }
 
     if (skipLoading) {
@@ -188,51 +187,6 @@ export function deleteStatusFail(id, error) {
 export const updateStatus = status => dispatch =>
   dispatch(importFetchedStatus(status));
 
-export function fetchContext(id) {
-  return (dispatch) => {
-    dispatch(fetchContextRequest(id));
-
-    api().get(`/api/v1/statuses/${id}/context?with_reference=1`).then(response => {
-      dispatch(importFetchedStatuses(response.data.ancestors.concat(response.data.descendants).concat(response.data.references)));
-      dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants, response.data.references));
-
-    }).catch(error => {
-      if (error.response && error.response.status === 404) {
-        dispatch(deleteFromTimelines(id));
-      }
-
-      dispatch(fetchContextFail(id, error));
-    });
-  };
-}
-
-export function fetchContextRequest(id) {
-  return {
-    type: CONTEXT_FETCH_REQUEST,
-    id,
-  };
-}
-
-export function fetchContextSuccess(id, ancestors, descendants, references) {
-  return {
-    type: CONTEXT_FETCH_SUCCESS,
-    id,
-    ancestors,
-    descendants,
-    references,
-    statuses: ancestors.concat(descendants),
-  };
-}
-
-export function fetchContextFail(id, error) {
-  return {
-    type: CONTEXT_FETCH_FAIL,
-    id,
-    error,
-    skipAlert: true,
-  };
-}
-
 export function muteStatus(id) {
   return (dispatch) => {
     dispatch(muteStatusRequest(id));

app/javascript/mastodon/actions/statuses_typed.ts

@@ -0,0 +1,20 @@
+import { apiGetContext } from 'mastodon/api/statuses';
+import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+
+import { importFetchedStatuses } from './importer';
+
+export const fetchContext = createDataLoadingThunk(
+  'status/context',
+  ({ statusId }: { statusId: string }) => apiGetContext(statusId),
+  (context, { dispatch }) => {
+    const statuses = context.ancestors
+      .concat(context.descendants)
+      .concat(context.references);
+
+    dispatch(importFetchedStatuses(statuses));
+
+    return {
+      context,
+    };
+  },
+);

app/javascript/mastodon/actions/tags_typed.ts

@@ -1,4 +1,10 @@
-import { apiGetTag, apiFollowTag, apiUnfollowTag } from 'mastodon/api/tags';
+import {
+  apiGetTag,
+  apiFollowTag,
+  apiUnfollowTag,
+  apiFeatureTag,
+  apiUnfeatureTag,
+} from 'mastodon/api/tags';
 import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
 export const fetchHashtag = createDataLoadingThunk(
@@ -15,3 +21,13 @@ export const unfollowHashtag = createDataLoadingThunk(
   'tags/unfollow',
   ({ tagId }: { tagId: string }) => apiUnfollowTag(tagId),
 );
+
+export const featureHashtag = createDataLoadingThunk(
+  'tags/feature',
+  ({ tagId }: { tagId: string }) => apiFeatureTag(tagId),
+);
+
+export const unfeatureHashtag = createDataLoadingThunk(
+  'tags/unfeature',
+  ({ tagId }: { tagId: string }) => apiUnfeatureTag(tagId),
+);

app/javascript/mastodon/api/accounts.ts

@@ -1,5 +1,7 @@
-import { apiRequestPost } from 'mastodon/api';
+import { apiRequestPost, apiRequestGet } from 'mastodon/api';
+import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
+import type { ApiHashtagJSON } from 'mastodon/api_types/tags';
 
 export const apiSubmitAccountNote = (id: string, value: string) =>
   apiRequestPost<ApiRelationshipJSON>(`v1/accounts/${id}/note`, {
@@ -23,3 +25,9 @@ export const apiRemoveAccountFromFollowers = (id: string) =>
   apiRequestPost<ApiRelationshipJSON>(
     `v1/accounts/${id}/remove_from_followers`,
   );
+
+export const apiGetFeaturedTags = (id: string) =>
+  apiRequestGet<ApiHashtagJSON>(`v1/accounts/${id}/featured_tags`);
+
+export const apiGetEndorsedAccounts = (id: string) =>
+  apiRequestGet<ApiAccountJSON>(`v1/accounts/${id}/endorsements`);

app/javascript/mastodon/api/statuses.ts

@@ -0,0 +1,7 @@
+import { apiRequestGet } from 'mastodon/api';
+import type { ApiContextJSON } from 'mastodon/api_types/statuses';
+
+export const apiGetContext = (statusId: string) =>
+  apiRequestGet<ApiContextJSON>(
+    `v1/statuses/${statusId}/context?with_reference=1`,
+  );

app/javascript/mastodon/api/tags.ts

@@ -10,6 +10,12 @@ export const apiFollowTag = (tagId: string) =>
 export const apiUnfollowTag = (tagId: string) =>
   apiRequestPost<ApiHashtagJSON>(`v1/tags/${tagId}/unfollow`);
 
+export const apiFeatureTag = (tagId: string) =>
+  apiRequestPost<ApiHashtagJSON>(`v1/tags/${tagId}/feature`);
+
+export const apiUnfeatureTag = (tagId: string) =>
+  apiRequestPost<ApiHashtagJSON>(`v1/tags/${tagId}/unfeature`);
+
 export const apiGetFollowedTags = async (url?: string) => {
   const response = await api().request<ApiHashtagJSON[]>({
     method: 'GET',

app/javascript/mastodon/api_types/statuses.ts

@@ -125,3 +125,9 @@ export interface ApiStatusJSON {
   card?: ApiPreviewCardJSON;
   poll?: ApiPollJSON;
 }
+
+export interface ApiContextJSON {
+  ancestors: ApiStatusJSON[];
+  descendants: ApiStatusJSON[];
+  references: ApiStatusJSON[];
+}

app/javascript/mastodon/api_types/tags.ts

@@ -10,4 +10,5 @@ export interface ApiHashtagJSON {
   url: string;
   history: [ApiHistoryJSON, ...ApiHistoryJSON[]];
   following?: boolean;
+  featuring?: boolean;
 }

app/javascript/mastodon/components/dropdown_menu.tsx

@@ -26,11 +26,12 @@ import {
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import { CircularProgress } from 'mastodon/components/circular_progress';
 import { isUserTouching } from 'mastodon/is_mobile';
-import type {
-  MenuItem,
-  ActionMenuItem,
-  ExternalLinkMenuItem,
+import {
+  isMenuItem,
+  isActionItem,
+  isExternalLinkItem,
 } from 'mastodon/models/dropdown_menu';
+import type { MenuItem } from 'mastodon/models/dropdown_menu';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import type { IconProp } from './icon';
@@ -38,30 +39,6 @@ import { IconButton } from './icon_button';
 
 let id = 0;
 
-const isMenuItem = (item: unknown): item is MenuItem => {
-  if (item === null) {
-    return true;
-  }
-
-  return typeof item === 'object' && 'text' in item;
-};
-
-const isActionItem = (item: unknown): item is ActionMenuItem => {
-  if (!item || !isMenuItem(item)) {
-    return false;
-  }
-
-  return 'action' in item;
-};
-
-const isExternalLinkItem = (item: unknown): item is ExternalLinkMenuItem => {
-  if (!item || !isMenuItem(item)) {
-    return false;
-  }
-
-  return 'href' in item;
-};
-
 type RenderItemFn<Item = MenuItem> = (
   item: Item,
   index: number,
@@ -321,6 +298,7 @@ interface DropdownProps<Item = MenuItem> {
   active?: boolean;
   scrollKey?: string;
   status?: ImmutableMap<string, unknown>;
+  forceDropdown?: boolean;
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
   onOpen?: () => void;
@@ -341,6 +319,7 @@ export const Dropdown = <Item = MenuItem,>({
   scrollable,
   active,
   status,
+  forceDropdown = false,
   renderItem,
   renderHeader,
   onOpen,
@@ -356,6 +335,9 @@ export const Dropdown = <Item = MenuItem,>({
   const open = currentId === openDropdownId;
   const activeElement = useRef<HTMLElement | null>(null);
   const targetRef = useRef<HTMLButtonElement | null>(null);
+  const prefetchAccountId = status
+    ? status.getIn(['account', 'id'])
+    : undefined;
 
   const handleClose = useCallback(() => {
     if (activeElement.current) {
@@ -404,16 +386,15 @@ export const Dropdown = <Item = MenuItem,>({
       } else {
         onOpen?.();
 
-        if (status) {
-          dispatch(fetchRelationships([status.getIn(['account', 'id'])]));
+        if (prefetchAccountId) {
+          dispatch(fetchRelationships([prefetchAccountId]));
         }
 
-        if (isUserTouching()) {
+        if (isUserTouching() && !forceDropdown) {
           dispatch(
             openModal({
               modalType: 'ACTIONS',
               modalProps: {
-                status,
                 actions: items,
                 onClick: handleItemClick,
               },
@@ -433,12 +414,13 @@ export const Dropdown = <Item = MenuItem,>({
     [
       dispatch,
       currentId,
+      prefetchAccountId,
       scrollKey,
       onOpen,
       handleItemClick,
       open,
-      status,
       items,
+      forceDropdown,
       handleClose,
     ],
   );

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

@@ -116,6 +116,7 @@ export const EditedTimestamp: React.FC<{
       renderHeader={renderHeader}
       onOpen={handleOpen}
       onItemClick={handleItemClick}
+      forceDropdown
     >
       <button className='dropdown-menu__text-button'>
         <FormattedMessage

app/javascript/mastodon/components/load_more.tsx

@@ -1,24 +1,32 @@
 import { FormattedMessage } from 'react-intl';
 
+import { LoadingIndicator } from './loading_indicator';
+
 interface Props {
   onClick: (event: React.MouseEvent) => void;
   disabled?: boolean;
   visible?: boolean;
+  loading?: boolean;
 }
 export const LoadMore: React.FC<Props> = ({
   onClick,
   disabled,
   visible = true,
+  loading = false,
 }) => {
   return (
     <button
       type='button'
       className='load-more'
-      disabled={disabled || !visible}
+      disabled={disabled || loading || !visible}
       style={{ visibility: visible ? 'visible' : 'hidden' }}
       onClick={onClick}
     >
-      <FormattedMessage id='status.load_more' defaultMessage='Load more' />
+      {loading ? (
+        <LoadingIndicator />
+      ) : (
+        <FormattedMessage id='status.load_more' defaultMessage='Load more' />
+      )}
     </button>
   );
 };

app/javascript/mastodon/features/account_featured/index.tsx

@@ -7,19 +7,21 @@ import { useParams } from 'react-router';
 import type { Map as ImmutableMap } from 'immutable';
 import { List as ImmutableList } from 'immutable';
 
+import { fetchEndorsedAccounts } from 'mastodon/actions/accounts';
 import { fetchFeaturedTags } from 'mastodon/actions/featured_tags';
 import { expandAccountFeaturedTimeline } from 'mastodon/actions/timelines';
+import { Account } from 'mastodon/components/account';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { RemoteHint } from 'mastodon/components/remote_hint';
 import StatusContainer from 'mastodon/containers/status_container';
+import { AccountHeader } from 'mastodon/features/account_timeline/components/account_header';
+import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
+import Column from 'mastodon/features/ui/components/column';
 import { useAccountId } from 'mastodon/hooks/useAccountId';
 import { useAccountVisibility } from 'mastodon/hooks/useAccountVisibility';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
-import { AccountHeader } from '../account_timeline/components/account_header';
-import Column from '../ui/components/column';
-
 import { EmptyMessage } from './components/empty_message';
 import { FeaturedTag } from './components/featured_tag';
 import type { TagMap } from './components/featured_tag';
@@ -29,7 +31,9 @@ interface Params {
   id?: string;
 }
 
-const AccountFeatured = () => {
+const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
+  multiColumn,
+}) => {
   const accountId = useAccountId();
   const { suspended, blockedBy, hidden } = useAccountVisibility(accountId);
   const forceEmptyState = suspended || blockedBy || hidden;
@@ -40,7 +44,8 @@ const AccountFeatured = () => {
   useEffect(() => {
     if (accountId) {
       void dispatch(expandAccountFeaturedTimeline(accountId));
-      dispatch(fetchFeaturedTags(accountId));
+      void dispatch(fetchFeaturedTags({ accountId }));
+      void dispatch(fetchEndorsedAccounts({ accountId }));
     }
   }, [accountId, dispatch]);
 
@@ -67,6 +72,17 @@ const AccountFeatured = () => {
         ImmutableList(),
       ) as ImmutableList<string>,
   );
+  const featuredAccountIds = useAppSelector(
+    (state) =>
+      state.user_lists.getIn(
+        ['featured_accounts', accountId, 'items'],
+        ImmutableList(),
+      ) as ImmutableList<string>,
+  );
+
+  if (accountId === null) {
+    return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
+  }
 
   if (isLoading) {
     return (
@@ -78,7 +94,11 @@ const AccountFeatured = () => {
     );
   }
 
-  if (featuredStatusIds.isEmpty() && featuredTags.isEmpty()) {
+  if (
+    featuredStatusIds.isEmpty() &&
+    featuredTags.isEmpty() &&
+    featuredAccountIds.isEmpty()
+  ) {
     return (
       <AccountFeaturedWrapper accountId={accountId}>
         <EmptyMessage
@@ -131,6 +151,19 @@ const AccountFeatured = () => {
             ))}
           </>
         )}
+        {!featuredAccountIds.isEmpty() && (
+          <>
+            <h4 className='column-subheading'>
+              <FormattedMessage
+                id='account.featured.accounts'
+                defaultMessage='Profiles'
+              />
+            </h4>
+            {featuredAccountIds.map((featuredAccountId) => (
+              <Account key={featuredAccountId} id={featuredAccountId} />
+            ))}
+          </>
+        )}
         <RemoteHint accountId={accountId} />
       </div>
     </Column>

app/javascript/mastodon/features/account_gallery/index.tsx

@@ -147,7 +147,7 @@ export const AccountGallery: React.FC<{
     [dispatch],
   );
 
-  if (accountId && !isAccount) {
+  if (accountId === null) {
     return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
   }
 

app/javascript/mastodon/features/account_timeline/components/account_header.tsx

@@ -115,7 +115,6 @@ const messages = defineMessages({
     id: 'account.disable_notifications',
     defaultMessage: 'Stop notifying me when @{name} posts',
   },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: {
     id: 'navigation_bar.preferences',
     defaultMessage: 'Preferences',
@@ -523,7 +522,6 @@ export const AccountHeader: React.FC<{
         text: intl.formatMessage(messages.preferences),
         href: '/settings/preferences',
       });
-      arr.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
       arr.push(null);
       arr.push({
         text: intl.formatMessage(messages.follow_requests),

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

@@ -13,7 +13,6 @@ import { normalizeForLookup } from 'mastodon/reducers/accounts_map';
 import { getAccountHidden } from 'mastodon/selectors/accounts';
 
 import { lookupAccount, fetchAccount } from '../../actions/accounts';
-import { fetchFeaturedTags } from '../../actions/featured_tags';
 import { expandAccountFeaturedTimeline, expandAccountTimeline, connectTimeline, disconnectTimeline } from '../../actions/timelines';
 import { ColumnBackButton } from '../../components/column_back_button';
 import { LoadingIndicator } from '../../components/loading_indicator';
@@ -27,7 +26,7 @@ import { LimitedAccountHint } from './components/limited_account_hint';
 const emptyList = ImmutableList();
 
 const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = false }) => {
-  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
+  const accountId = id || state.accounts_map[normalizeForLookup(acct)];
 
   if (accountId === null) {
     return {
@@ -86,7 +85,6 @@ class AccountTimeline extends ImmutablePureComponent {
       dispatch(expandAccountFeaturedTimeline(accountId, { tagged }));
     }
 
-    dispatch(fetchFeaturedTags(accountId));
     dispatch(expandAccountTimeline(accountId, { withReplies, tagged }));
 
     if (accountId === me) {

app/javascript/mastodon/features/compose/components/action_bar.tsx

@@ -9,7 +9,6 @@ import { useAppDispatch } from 'mastodon/store';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-  pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
   preferences: {
     id: 'navigation_bar.preferences',
     defaultMessage: 'Preferences',
@@ -61,7 +60,6 @@ export const ActionBar: React.FC = () => {
         text: intl.formatMessage(messages.preferences),
         href: '/settings/preferences',
       },
-      { text: intl.formatMessage(messages.pins), to: '/pinned' },
       null,
       {
         text: intl.formatMessage(messages.follow_requests),

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx

@@ -40,7 +40,7 @@ let EmojiPicker, Emoji; // load asynchronously
 
 const listenerOptions = supportsPassiveEvents ? { passive: true, capture: true } : true;
 
-const backgroundImageFn = () => `${assetHost}/emoji/sheet_15.png`;
+const backgroundImageFn = () => `${assetHost}/emoji/sheet_15_1.png`;
 
 const notFoundFn = () => (
   <div className='emoji-mart-no-results'>

app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx

@@ -51,9 +51,6 @@ const messages = defineMessages({
 class PrivacyDropdown extends PureComponent {
 
   static propTypes = {
-    isUserTouching: PropTypes.func,
-    onModalOpen: PropTypes.func,
-    onModalClose: PropTypes.func,
     value: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,
     noDirect: PropTypes.bool,

app/javascript/mastodon/features/compose/containers/privacy_dropdown_container.js

@@ -15,17 +15,16 @@ const mapDispatchToProps = dispatch => ({
   onChange (value) {
     dispatch(changeComposeVisibility(value));
   },
-
-  isUserTouching,
+  
   onModalOpen: props => dispatch(openModal({  // kmyblue: Do not remove
     modalType: 'ACTIONS',
     modalProps: props,
   })),
+
   onModalClose: () => dispatch(closeModal({  // kmyblue: Do not remove
     modalType: undefined,
     ignoreFocus: false,
   })),
-
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(PrivacyDropdown);

app/javascript/mastodon/features/directory/index.tsx

@@ -130,6 +130,7 @@ export const Directory: React.FC<{
   }, [dispatch, order, local]);
 
   const pinned = !!columnId;
+  const initialLoad = isLoading && accountIds.size === 0;
 
   const scrollableArea = (
     <div className='scrollable'>
@@ -170,7 +171,7 @@ export const Directory: React.FC<{
       </div>
 
       <div className='directory__list'>
-        {isLoading ? (
+        {initialLoad ? (
           <LoadingIndicator />
         ) : (
           accountIds.map((accountId) => (
@@ -179,7 +180,11 @@ export const Directory: React.FC<{
         )}
       </div>
 
-      <LoadMore onClick={handleLoadMore} visible={!isLoading} />
+      <LoadMore
+        onClick={handleLoadMore}
+        visible={!initialLoad}
+        loading={isLoading}
+      />
     </div>
   );
 

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

@@ -7,94 +7,21 @@
 
 // This version comment should be bumped each time the emoji data is changed
 // to ensure that the prevaled file is regenerated by Babel
-// version: 3
+// version: 4
 
-// This json file contains the names of the categories.
-const emojiMart5LocalesData = require('@emoji-mart/data/i18n/en.json');
-const emojiMart5Data = require('@emoji-mart/data/sets/15/all.json');
+const { NimbleEmojiIndex } = require('emoji-mart');
 const { uncompress: emojiMartUncompress } = require('emoji-mart/dist/utils/data');
-const _ = require('lodash');
 
 
+let data = require('./emoji_data.json');
 const emojiMap = require('./emoji_map.json');
-// This json file is downloaded from https://github.com/iamcal/emoji-data/
-// and is used to correct the sheet coordinates since we're using that repo's sheet
-const emojiSheetData = require('./emoji_sheet.json');
 const { unicodeToFilename } = require('./unicode_to_filename_s');
 const { unicodeToUnifiedName } = require('./unicode_to_unified_name_s');
 
-// Grabbed from `emoji_utils` to avoid circular dependency
-function unifiedToNative(unified) {
-  let unicodes = unified.split('-'),
-    codePoints = unicodes.map((u) => `0x${u}`);
-
-  return String.fromCodePoint(...codePoints);
-}
-
-let data = {
-  compressed: true,
-  categories: emojiMart5Data.categories.map(cat => {
-    return {
-      ...cat,
-      name: emojiMart5LocalesData.categories[cat.id]
-    };
-  }),
-  aliases: emojiMart5Data.aliases,
-  emojis: _(emojiMart5Data.emojis).values().map(emoji => {
-    let skin_variations = {};
-    const unified = emoji.skins[0].unified.toUpperCase();
-    const emojiFromRawData = emojiSheetData.find(e => e.unified === unified);
-
-    if (!emojiFromRawData) {
-      return undefined;
-    }
-
-    if (emoji.skins.length > 1) {
-      const [, ...nonDefaultSkins] = emoji.skins;
-      nonDefaultSkins.forEach(skin => {
-        const [matchingRawCodePoints,matchingRawEmoji] = Object.entries(emojiFromRawData.skin_variations).find((pair) => {
-          const [, value] = pair;
-          return value.unified.toLowerCase() === skin.unified;
-        });
-
-        if (matchingRawEmoji && matchingRawCodePoints) {
-          // At the time of writing, the json from `@emoji-mart/data` doesn't have data
-          // for emoji like `woman-heart-woman` with two different skin tones.
-          const skinToneCode = matchingRawCodePoints.split('-')[0];
-          skin_variations[skinToneCode] = {
-            unified: matchingRawEmoji.unified.toUpperCase(),
-            non_qualified: null,
-            sheet_x: matchingRawEmoji.sheet_x,
-            sheet_y: matchingRawEmoji.sheet_y,
-            has_img_twitter: true,
-            native: unifiedToNative(matchingRawEmoji.unified.toUpperCase())
-          };
-        }
-      });
-    }
-
-    return {
-      a: emoji.name,
-      b: unified,
-      c: undefined,
-      f: true,
-      j: [emoji.id, ...emoji.keywords],
-      k: [emojiFromRawData.sheet_x, emojiFromRawData.sheet_y],
-      m: emoji.emoticons?.[0],
-      l: emoji.emoticons,
-      o: emoji.version,
-      id: emoji.id,
-      skin_variations,
-      native: unifiedToNative(unified.toUpperCase())
-    };
-  }).compact().keyBy(e => e.id).mapValues(e => _.omit(e, 'id')).value()
-};
-
-if (data.compressed) {
-  emojiMartUncompress(data);
-}
+emojiMartUncompress(data);
 
 const emojiMartData = data;
+const emojiIndex = new NimbleEmojiIndex(emojiMartData);
 
 const excluded       = ['®', '©', '™'];
 const skinTones      = ['🏻', '🏼', '🏽', '🏾', '🏿'];
@@ -103,10 +30,15 @@ const shortcodeMap   = {};
 const shortCodesToEmojiData = {};
 const emojisWithoutShortCodes = [];
 
-Object.keys(emojiMart5Data.emojis).forEach(key => {
-  let emoji = emojiMart5Data.emojis[key];
+Object.keys(emojiIndex.emojis).forEach(key => {
+  let emoji = emojiIndex.emojis[key];
 
-  shortcodeMap[emoji.skins[0].native] = emoji.id;
+  // Emojis with skin tone modifiers are stored like this
+  if (Object.hasOwn(emoji, '1')) {
+    emoji = emoji['1'];
+  }
+
+  shortcodeMap[emoji.native] = emoji.id;
 });
 
 const stripModifiers = unicode => {
@@ -150,9 +82,13 @@ Object.keys(emojiMap).forEach(key => {
   }
 });
 
-Object.keys(emojiMartData.emojis).forEach(key => {
-  let emoji = emojiMartData.emojis[key];
+Object.keys(emojiIndex.emojis).forEach(key => {
+  let emoji = emojiIndex.emojis[key];
 
+  // Emojis with skin tone modifiers are stored like this
+  if (Object.hasOwn(emoji, '1')) {
+    emoji = emoji['1'];
+  }
 
   const { native } = emoji;
   let { short_names, search, unified } = emojiMartData.emojis[key];

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

@@ -30,7 +30,7 @@ import { LimitedAccountHint } from '../account_timeline/components/limited_accou
 import Column from '../ui/components/column';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
+  const accountId = id || state.accounts_map[normalizeForLookup(acct)];
 
   if (!accountId) {
     return {

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

@@ -30,7 +30,7 @@ import { LimitedAccountHint } from '../account_timeline/components/limited_accou
 import Column from '../ui/components/column';
 
 const mapStateToProps = (state, { params: { acct, id } }) => {
-  const accountId = id || state.getIn(['accounts_map', normalizeForLookup(acct)]);
+  const accountId = id || state.accounts_map[normalizeForLookup(acct)];
 
   if (!accountId) {
     return {

app/javascript/mastodon/features/hashtag_timeline/components/hashtag_header.tsx

@@ -9,6 +9,8 @@ import {
   fetchHashtag,
   followHashtag,
   unfollowHashtag,
+  featureHashtag,
+  unfeatureHashtag,
 } from 'mastodon/actions/tags_typed';
 import type { ApiHashtagJSON } from 'mastodon/api_types/tags';
 import { Button } from 'mastodon/components/button';
@@ -28,6 +30,11 @@ const messages = defineMessages({
     id: 'hashtag.admin_moderation',
     defaultMessage: 'Open moderation interface for #{name}',
   },
+  feature: { id: 'hashtag.feature', defaultMessage: 'Feature on profile' },
+  unfeature: {
+    id: 'hashtag.unfeature',
+    defaultMessage: "Don't feature on profile",
+  },
 });
 
 const usesRenderer = (displayNumber: React.ReactNode, pluralReady: number) => (
@@ -88,22 +95,51 @@ export const HashtagHeader: React.FC<{
   }, [dispatch, tagId, setTag]);
 
   const menu = useMemo(() => {
-    const tmp = [];
+    const arr = [];
 
-    if (
-      tag &&
-      signedIn &&
-      (permissions & PERMISSION_MANAGE_TAXONOMIES) ===
-        PERMISSION_MANAGE_TAXONOMIES
-    ) {
-      tmp.push({
-        text: intl.formatMessage(messages.adminModeration, { name: tag.id }),
-        href: `/admin/tags/${tag.id}`,
+    if (tag && signedIn) {
+      const handleFeature = () => {
+        if (tag.featuring) {
+          void dispatch(unfeatureHashtag({ tagId })).then((result) => {
+            if (isFulfilled(result)) {
+              setTag(result.payload);
+            }
+
+            return '';
+          });
+        } else {
+          void dispatch(featureHashtag({ tagId })).then((result) => {
+            if (isFulfilled(result)) {
+              setTag(result.payload);
+            }
+
+            return '';
+          });
+        }
+      };
+
+      arr.push({
+        text: intl.formatMessage(
+          tag.featuring ? messages.unfeature : messages.feature,
+        ),
+        action: handleFeature,
       });
+
+      arr.push(null);
+
+      if (
+        (permissions & PERMISSION_MANAGE_TAXONOMIES) ===
+        PERMISSION_MANAGE_TAXONOMIES
+      ) {
+        arr.push({
+          text: intl.formatMessage(messages.adminModeration, { name: tagId }),
+          href: `/admin/tags/${tag.id}`,
+        });
+      }
     }
 
-    return tmp;
-  }, [signedIn, permissions, intl, tag]);
+    return arr;
+  }, [setTag, dispatch, tagId, signedIn, permissions, intl, tag]);
 
   const handleFollow = useCallback(() => {
     if (!signedIn || !tag) {

app/javascript/mastodon/features/notifications_v2/components/notification_mention.tsx

@@ -39,9 +39,9 @@ export const NotificationMention: React.FC<{
   unread: boolean;
 }> = ({ notification, unread }) => {
   const [isDirect, isReply] = useAppSelector((state) => {
-    const status = state.statuses.get(notification.statusId) as
-      | Status
-      | undefined;
+    const status = notification.statusId
+      ? (state.statuses.get(notification.statusId) as Status | undefined)
+      : undefined;
 
     if (!status) return [false, false] as const;
 

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

@@ -68,6 +68,7 @@ import { textForScreenReader, defaultMediaVisibility } from '../../components/st
 import StatusContainer from '../../containers/status_container';
 import { bookmarkCategoryNeeded, deleteModal } from '../../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../../selectors';
+import { getAncestorsIds, getDescendantsIds, getReferencesIds } from 'mastodon/selectors/contexts';
 import Column from '../ui/components/column';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
 
@@ -86,77 +87,17 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
   const getPictureInPicture = makeGetPictureInPicture();
 
-  const getReferenceIds = createSelector([
-    (state, { id }) => state.getIn(['contexts', 'references', id]) || ImmutableList(),
-  ], (references) => {
-    return references;
-  });
-
-  const getAncestorsIds = createSelector([
-    (_, { id }) => id,
-    state => state.getIn(['contexts', 'inReplyTos']),
-  ], (statusId, inReplyTos) => {
-    let ancestorsIds = ImmutableList();
-    ancestorsIds = ancestorsIds.withMutations(mutable => {
-      let id = statusId;
-
-      while (id && !mutable.includes(id)) {
-        mutable.unshift(id);
-        id = inReplyTos.get(id);
-      }
-    });
-
-    return ancestorsIds;
-  });
-
-  const getDescendantsIds = createSelector([
-    (_, { id }) => id,
-    state => state.getIn(['contexts', 'replies']),
-    state => state.get('statuses'),
-  ], (statusId, contextReplies, statuses) => {
-    let descendantsIds = [];
-    const ids = [statusId];
-
-    while (ids.length > 0) {
-      let id        = ids.pop();
-      const replies = contextReplies.get(id);
-
-      if (statusId !== id) {
-        descendantsIds.push(id);
-      }
-
-      if (replies) {
-        replies.reverse().forEach(reply => {
-          if (!ids.includes(reply) && !descendantsIds.includes(reply) && statusId !== reply) ids.push(reply);
-        });
-      }
-    }
-
-    let insertAt = descendantsIds.findIndex((id) => statuses.get(id).get('in_reply_to_account_id') !== statuses.get(id).get('account'));
-    if (insertAt !== -1) {
-      descendantsIds.forEach((id, idx) => {
-        if (idx > insertAt && statuses.get(id).get('in_reply_to_account_id') === statuses.get(id).get('account')) {
-          descendantsIds.splice(idx, 1);
-          descendantsIds.splice(insertAt, 0, id);
-          insertAt += 1;
-        }
-      });
-    }
-
-    return ImmutableList(descendantsIds);
-  });
-
   const mapStateToProps = (state, props) => {
     const status = getStatus(state, { id: props.params.statusId, contextType: 'detailed' });
 
-    let ancestorsIds   = ImmutableList();
-    let descendantsIds = ImmutableList();
-    let referenceIds   = ImmutableList();
+    let ancestorsIds   = [];
+    let descendantsIds = [];
+    let referencesIds = [];
 
     if (status) {
-      ancestorsIds   = getAncestorsIds(state, { id: status.get('in_reply_to_id') });
-      descendantsIds = getDescendantsIds(state, { id: status.get('id') });
-      referenceIds   = getReferenceIds(state, { id: status.get('id') });
+      ancestorsIds   = getAncestorsIds(state, status.get('in_reply_to_id'));
+      descendantsIds = getDescendantsIds(state, status.get('id'));
+      referencesIds  = getReferencesIds(state, status.get('id'));
     }
 
     return {
@@ -164,7 +105,7 @@ const makeMapStateToProps = () => {
       status,
       ancestorsIds,
       descendantsIds,
-      referenceIds,
+      referencesIds,
       askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
       domain: state.getIn(['meta', 'domain']),
       pictureInPicture: getPictureInPicture(state, { id: props.params.statusId }),
@@ -200,9 +141,9 @@ class Status extends ImmutablePureComponent {
     dispatch: PropTypes.func.isRequired,
     status: ImmutablePropTypes.map,
     isLoading: PropTypes.bool,
-    ancestorsIds: ImmutablePropTypes.list.isRequired,
-    descendantsIds: ImmutablePropTypes.list.isRequired,
-    referenceIds: ImmutablePropTypes.list.isRequired,
+    ancestorsIds: PropTypes.arrayOf(PropTypes.string).isRequired,
+    descendantsIds: PropTypes.arrayOf(PropTypes.string).isRequired,
+    referencesIds: PropTypes.arrayOf(PropTypes.string).isRequired,
     intl: PropTypes.object.isRequired,
     askReplyConfirmation: PropTypes.bool,
     multiColumn: PropTypes.bool,
@@ -440,8 +381,8 @@ class Status extends ImmutablePureComponent {
   };
 
   handleToggleAll = () => {
-    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
-    const statusIds = [status.get('id')].concat(ancestorsIds.toJS(), descendantsIds.toJS(), referenceIds.toJS());
+    const { status, ancestorsIds, descendantsIds, referencesIds } = this.props;
+    const statusIds = [status.get('id')].concat(ancestorsIds, descendantsIds, referencesIds);
 
     if (status.get('hidden')) {
       this.props.dispatch(revealStatus(statusIds));
@@ -537,45 +478,45 @@ class Status extends ImmutablePureComponent {
   };
 
   handleMoveUp = id => {
-    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
+    const { status, ancestorsIds, descendantsIds, referencesIds } = this.props;
 
     if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size + referenceIds.size - 1, true);
+      this._selectChild(ancestorsIds.length + referencesIds.length - 1, true);
     } else {
       let index = ancestorsIds.indexOf(id);
 
       if (index === -1) {
         index = descendantsIds.indexOf(id);
         if (index === -1) {
-          index = referenceIds.indexOf(id);
+          index = referencesIds.indexOf(id);
           this._selectChild(index - 1, true);
         } else {
-          this._selectChild(ancestorsIds.size + referenceIds.size + index, true);
+          this._selectChild(ancestorsIds.length + referencesIds.length + index, true);
         }
       } else {
-        this._selectChild(referenceIds.size + index - 1, true);
+        this._selectChild(referencesIds.length + index - 1, true);
       }
     }
   };
 
   handleMoveDown = id => {
-    const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
+    const { status, ancestorsIds, descendantsIds, referencesIds } = this.props;
 
     if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.size + referenceIds.size + 1, false);
+      this._selectChild(ancestorsIds.length + referencesIds.length + 1, false);
     } else {
       let index = ancestorsIds.indexOf(id);
 
       if (index === -1) {
         index = descendantsIds.indexOf(id);
         if (index === -1) {
-          index = referenceIds.indexOf(id);
+          index = referencesIds.indexOf(id);
           this._selectChild(index + 1, false);
         } else {
-          this._selectChild(ancestorsIds.size + referenceIds.size + index + 2, false);
+          this._selectChild(ancestorsIds.length + referencesIds.length + index + 2, false);
         }
       } else {
-        this._selectChild(referenceIds.size + index + 1, false);
+        this._selectChild(referencesIds.length + index + 1, false);
       }
     }
   };
@@ -604,8 +545,8 @@ class Status extends ImmutablePureComponent {
         onMoveUp={this.handleMoveUp}
         onMoveDown={this.handleMoveDown}
         contextType='thread'
-        previousId={i > 0 ? list.get(i - 1) : undefined}
-        nextId={list.get(i + 1) || (ancestors && statusId)}
+        previousId={i > 0 ? list[i - 1] : undefined}
+        nextId={list[i + 1] || (ancestors && statusId)}
         rootId={statusId}
       />
     ));
@@ -640,9 +581,9 @@ class Status extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { status, ancestorsIds, referenceIds } = this.props;
+    const { status, ancestorsIds, referencesIds } = this.props;
 
-    if (status && (ancestorsIds.size + referenceIds.size > prevProps.ancestorsIds.size + prevProps.referenceIds.size || prevProps.status?.get('id') !== status.get('id'))) {
+    if (status && (ancestorsIds.length + referencesIds.length > prevProps.ancestorsIds.length + prevProps.referencesIds.length || prevProps.status?.get('id') !== status.get('id'))) {
       this._scrollStatusIntoView();
     }
   }
@@ -672,7 +613,7 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let ancestors, descendants, references, remoteHint;
-    const { isLoading, status, ancestorsIds, descendantsIds, referenceIds, intl, domain, multiColumn, pictureInPicture } = this.props;
+    const { isLoading, status, ancestorsIds, descendantsIds, referencesIds, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
     if (isLoading) {
@@ -689,15 +630,15 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    if (referenceIds && referenceIds.size > 0) {
-      references = <>{this.renderChildren(referenceIds, true)}</>;
+    if (referencesIds && referencesIds.length > 0) {
+      references = <>{this.renderChildren(referencesIds, true)}</>;
     }
 
-    if (ancestorsIds && ancestorsIds.size > 0) {
+    if (ancestorsIds && ancestorsIds.length > 0) {
       ancestors = <>{this.renderChildren(ancestorsIds, true)}</>;
     }
 
-    if (descendantsIds && descendantsIds.size > 0) {
+    if (descendantsIds && descendantsIds.length > 0) {
       descendants = <>{this.renderChildren(descendantsIds)}</>;
     }
 

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

@@ -1,48 +0,0 @@
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-
-import { IconButton } from '../../../components/icon_button';
-
-export default class ActionsModal extends ImmutablePureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.map,
-    actions: PropTypes.array,
-    onClick: PropTypes.func,
-  };
-
-  renderAction = (action, i) => {
-    if (action === null) {
-      return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
-    }
-
-    const { icon = null, iconComponent = null, text, meta = null, active = false, href = '#' } = action;
-
-    return (
-      <li key={`${text}-${i}`}>
-        <a href={href} target='_blank' rel='noopener' onClick={this.props.onClick} data-index={i} className={classNames({ active })}>
-          {icon && <IconButton title={text} icon={icon} iconComponent={iconComponent} role='presentation' tabIndex={-1} inverted />}
-          <div>
-            <div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div>
-            <div>{meta}</div>
-          </div>
-        </a>
-      </li>
-    );
-  };
-
-  render () {
-    return (
-      <div className='modal-root__modal actions-modal'>
-        <ul className={classNames({ 'with-status': !!status })}>
-          {this.props.actions.map(this.renderAction)}
-        </ul>
-      </div>
-    );
-  }
-
-}

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

@@ -0,0 +1,65 @@
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import type { MenuItem } from 'mastodon/models/dropdown_menu';
+import {
+  isActionItem,
+  isExternalLinkItem,
+} from 'mastodon/models/dropdown_menu';
+
+export const ActionsModal: React.FC<{
+  actions: MenuItem[];
+  onClick: React.MouseEventHandler;
+}> = ({ actions, onClick }) => (
+  <div className='modal-root__modal actions-modal'>
+    <ul>
+      {actions.map((option, i: number) => {
+        if (option === null) {
+          return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
+        }
+
+        const { text, dangerous } = option;
+
+        let element: React.ReactElement;
+
+        if (isActionItem(option)) {
+          element = (
+            <button onClick={onClick} data-index={i}>
+              {text}
+            </button>
+          );
+        } else if (isExternalLinkItem(option)) {
+          element = (
+            <a
+              href={option.href}
+              target={option.target ?? '_target'}
+              data-method={option.method}
+              rel='noopener'
+              onClick={onClick}
+              data-index={i}
+            >
+              {text}
+            </a>
+          );
+        } else {
+          element = (
+            <Link to={option.to} onClick={onClick} data-index={i}>
+              {text}
+            </Link>
+          );
+        }
+
+        return (
+          <li
+            className={classNames({
+              'dropdown-menu__item--dangerous': dangerous,
+            })}
+            key={`${text}-${i}`}
+          >
+            {element}
+          </li>
+        );
+      })}
+    </ul>
+  </div>
+);

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

@@ -27,7 +27,7 @@ import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
 
 import BundleContainer from '../containers/bundle_container';
 
-import ActionsModal from './actions_modal';
+import { ActionsModal } from './actions_modal';
 import AudioModal from './audio_modal';
 import { BoostModal } from './boost_modal';
 import {

app/javascript/mastodon/hooks/useAccountId.ts

@@ -11,27 +11,25 @@ interface Params {
   id?: string;
 }
 
-export function useAccountId() {
+export const useAccountId = () => {
   const { acct, id } = useParams<Params>();
+  const dispatch = useAppDispatch();
   const accountId = useAppSelector(
     (state) =>
-      id ??
-      (state.accounts_map.get(normalizeForLookup(acct)) as string | undefined),
+      id ?? (acct ? state.accounts_map[normalizeForLookup(acct)] : undefined),
   );
-
   const account = useAppSelector((state) =>
     accountId ? state.accounts.get(accountId) : undefined,
   );
-  const isAccount = !!account;
+  const accountInStore = !!account;
 
-  const dispatch = useAppDispatch();
   useEffect(() => {
-    if (!accountId) {
+    if (typeof accountId === 'undefined' && acct) {
       dispatch(lookupAccount(acct));
-    } else if (!isAccount) {
+    } else if (accountId && !accountInStore) {
       dispatch(fetchAccount(accountId));
     }
-  }, [dispatch, accountId, acct, isAccount]);
+  }, [dispatch, accountId, acct, accountInStore]);
 
   return accountId;
-}
+};

app/javascript/mastodon/hooks/useAccountVisibility.ts

@@ -1,12 +1,14 @@
 import { getAccountHidden } from 'mastodon/selectors/accounts';
 import { useAppSelector } from 'mastodon/store';
 
-export function useAccountVisibility(accountId?: string) {
-  const blockedBy = useAppSelector(
-    (state) => !!state.relationships.getIn([accountId, 'blocked_by'], false),
+export function useAccountVisibility(accountId?: string | null) {
+  const blockedBy = useAppSelector((state) =>
+    accountId
+      ? !!state.relationships.getIn([accountId, 'blocked_by'], false)
+      : false,
   );
-  const suspended = useAppSelector(
-    (state) => !!state.accounts.getIn([accountId, 'suspended'], false),
+  const suspended = useAppSelector((state) =>
+    accountId ? !!state.accounts.getIn([accountId, 'suspended'], false) : false,
   );
   const hidden = useAppSelector((state) =>
     accountId ? Boolean(getAccountHidden(state, accountId)) : false,

app/javascript/mastodon/locales/af.json

@@ -86,7 +86,6 @@
   "column.lists": "Lyste",
   "column.mutes": "Uitgedoofte gebruikers",
   "column.notifications": "Kennisgewings",
-  "column.pins": "Vasgemaakte plasings",
   "column.public": "Gefedereerde tydlyn",
   "column_back_button.label": "Terug",
   "column_header.hide_settings": "Versteek instellings",
@@ -196,7 +195,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "Vertoon kennisgewingkolom",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "Vertoon vasgemaakte plasings",
   "keyboard_shortcuts.profile": "Vertoon skrywersprofiel",
   "keyboard_shortcuts.reply": "Reageer op plasing",
   "keyboard_shortcuts.requests": "Sien volgversoeke",
@@ -224,7 +222,6 @@
   "navigation_bar.lists": "Lyste",
   "navigation_bar.logout": "Teken uit",
   "navigation_bar.personal": "Persoonlik",
-  "navigation_bar.pins": "Vasgemaakte plasings",
   "navigation_bar.preferences": "Voorkeure",
   "navigation_bar.public_timeline": "Gefedereerde tydlyn",
   "navigation_bar.search": "Soek",
@@ -262,7 +259,6 @@
   "status.copy": "Kopieer skakel na hierdie plasing",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Brei hierdie plasing uit",
-  "status.pinned": "Vasgemaakte plasing",
   "status.reblog": "Stuur aan",
   "status.reblog_private": "Stuur aan met oorspronklike sigbaarheid",
   "status.reblogged_by": "Aangestuur deur {name}",

app/javascript/mastodon/locales/an.json

@@ -96,7 +96,6 @@
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciaus",
   "column.notifications": "Notificacions",
-  "column.pins": "Publicacions fixadas",
   "column.public": "Linia de tiempo federada",
   "column_back_button.label": "Dezaga",
   "column_header.hide_settings": "Amagar configuración",
@@ -264,7 +263,6 @@
   "keyboard_shortcuts.my_profile": "Ubrir lo tuyo perfil",
   "keyboard_shortcuts.notifications": "Ubrir la columna de notificacions",
   "keyboard_shortcuts.open_media": "Ubrir fichers multimedia",
-  "keyboard_shortcuts.pinned": "Ubrir la lista de publicacions destacadas",
   "keyboard_shortcuts.profile": "Ubrir lo perfil de l'autor",
   "keyboard_shortcuts.reply": "Responder publicación",
   "keyboard_shortcuts.requests": "Ubrir la lista de peticions de seguidores",
@@ -303,7 +301,6 @@
   "navigation_bar.logout": "Zarrar sesión",
   "navigation_bar.mutes": "Usuarios silenciaus",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicacions fixadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Linia de tiempo federada",
   "navigation_bar.search": "Buscar",
@@ -452,8 +449,6 @@
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estau",
-  "status.pin": "Fixar",
-  "status.pinned": "Publicación fixada",
   "status.read_more": "Leyer mas",
   "status.reblog": "Retutar",
   "status.reblog_private": "Empentar con l'audiencia orichinal",
@@ -474,7 +469,6 @@
   "status.translate": "Traducir",
   "status.translated_from_with": "Traduciu de {lang} usando {provider}",
   "status.unmute_conversation": "Deixar de silenciar conversación",
-  "status.unpin": "Deixar de fixar",
   "subscribed_languages.lead": "Nomás los mensaches en os idiomas triaus amaneixerán en o suyo inicio y atras linias de tiempo dimpués d'o cambio. Tríe garra pa recibir mensaches en totz los idiomas.",
   "subscribed_languages.save": "Alzar cambios",
   "subscribed_languages.target": "Cambiar idiomas suscritos pa {target}",

app/javascript/mastodon/locales/ar.json

@@ -131,7 +131,6 @@
   "column.lists": "القوائم",
   "column.mutes": "المُستَخدِمون المَكتومون",
   "column.notifications": "الإشعارات",
-  "column.pins": "المنشورات المُثَبَّتَة",
   "column.public": "الخيط الفيدرالي",
   "column_back_button.label": "العودة",
   "column_header.hide_settings": "إخفاء الإعدادات",
@@ -395,7 +394,6 @@
   "keyboard_shortcuts.my_profile": "لفتح ملفك التعريفي",
   "keyboard_shortcuts.notifications": "لفتح عمود الإشعارات",
   "keyboard_shortcuts.open_media": "لفتح الوسائط",
-  "keyboard_shortcuts.pinned": "لفتح قائمة المنشورات المثبتة",
   "keyboard_shortcuts.profile": "لفتح الملف التعريفي للناشر",
   "keyboard_shortcuts.reply": "للردّ",
   "keyboard_shortcuts.requests": "لفتح قائمة طلبات المتابعة",
@@ -464,7 +462,6 @@
   "navigation_bar.mutes": "الحسابات المكتومة",
   "navigation_bar.opened_in_classic_interface": "تُفتَح المنشورات والحسابات وغيرها من الصفحات الخاصة بشكل مبدئي على واجهة الويب التقليدية.",
   "navigation_bar.personal": "شخصي",
-  "navigation_bar.pins": "المنشورات المُثَبَّتَة",
   "navigation_bar.preferences": "التفضيلات",
   "navigation_bar.public_timeline": "الخيط الفيدرالي",
   "navigation_bar.search": "البحث",
@@ -724,8 +721,6 @@
   "status.mute": "أكتم @{name}",
   "status.mute_conversation": "كتم المحادثة",
   "status.open": "وسّع هذا المنشور",
-  "status.pin": "دبّسه على الصفحة التعريفية",
-  "status.pinned": "منشور مثبَّت",
   "status.read_more": "اقرأ المزيد",
   "status.reblog": "إعادة النشر",
   "status.reblog_private": "إعادة النشر إلى الجمهور الأصلي",
@@ -749,7 +744,6 @@
   "status.translated_from_with": "مترجم من {lang} باستخدام {provider}",
   "status.uncached_media_warning": "المعاينة غير متوفرة",
   "status.unmute_conversation": "فك الكتم عن المحادثة",
-  "status.unpin": "فك التدبيس من الصفحة التعريفية",
   "subscribed_languages.lead": "فقط المنشورات في اللغات المحددة ستظهر في خيطك الرئيسي وتسرد في الجداول الزمنية بعد تأكيد التغيير. لا تقم بأي خيار لتلقي المنشورات في جميع اللغات.",
   "subscribed_languages.save": "حفظ التغييرات",
   "subscribed_languages.target": "تغيير اللغات المشتركة لـ {target}",

app/javascript/mastodon/locales/ast.json

@@ -112,7 +112,6 @@
   "column.lists": "Llistes",
   "column.mutes": "Perfiles colos avisos desactivaos",
   "column.notifications": "Avisos",
-  "column.pins": "Artículos fixaos",
   "column.public": "Llinia de tiempu federada",
   "column_back_button.label": "Atrás",
   "column_header.moveLeft_settings": "Mover la columna a la esquierda",
@@ -309,7 +308,6 @@
   "keyboard_shortcuts.my_profile": "Abrir el to perfil",
   "keyboard_shortcuts.notifications": "Abrir la columna d'avisos",
   "keyboard_shortcuts.open_media": "Abrir el conteníu mutimedia",
-  "keyboard_shortcuts.pinned": "Abrir la llista d'artículos fixaos",
   "keyboard_shortcuts.profile": "Abrir el perfil del autor/a",
   "keyboard_shortcuts.reply": "Responder a una publicación",
   "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
@@ -359,7 +357,6 @@
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
   "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
   "navigation_bar.security": "Seguranza",
@@ -529,8 +526,6 @@
   "status.mute": "Desactivar los avisos de @{name}",
   "status.mute_conversation": "Desactivar los avisos de la conversación",
   "status.open": "Espander esta publicación",
-  "status.pin": "Fixar nel perfil",
-  "status.pinned": "Publicación fixada",
   "status.read_more": "Lleer más",
   "status.reblog": "Compartir",
   "status.reblogged_by": "{name} compartió",
@@ -548,7 +543,6 @@
   "status.translated_from_with": "Tradúxose del {lang} con {provider}",
   "status.uncached_media_warning": "La previsualización nun ta disponible",
   "status.unmute_conversation": "Activar los avisos de la conversación",
-  "status.unpin": "Lliberar del perfil",
   "subscribed_languages.save": "Guardar los cambeos",
   "tabs_bar.home": "Aniciu",
   "tabs_bar.notifications": "Avisos",

app/javascript/mastodon/locales/az.json

@@ -157,7 +157,6 @@
   "column.lists": "Siyahılar",
   "column.mutes": "Səssizləşdirilmiş istifadəçilər",
   "column.notifications": "Bildirişlər",
-  "column.pins": "Bərkidilmiş paylaşımlar",
   "column.public": "Federasiya zaman qrafiki",
   "column_back_button.label": "Geriyə",
   "column_header.hide_settings": "Parametrləri gizlət",

app/javascript/mastodon/locales/be.json

@@ -151,7 +151,6 @@
   "column.lists": "Спісы",
   "column.mutes": "Ігнараваныя карыстальнікі",
   "column.notifications": "Апавяшчэнні",
-  "column.pins": "Замацаваныя допісы",
   "column.public": "Інтэграваная стужка",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Схаваць налады",
@@ -440,7 +439,6 @@
   "keyboard_shortcuts.my_profile": "Адкрыць ваш профіль",
   "keyboard_shortcuts.notifications": "Адкрыць слупок апавяшчэнняў",
   "keyboard_shortcuts.open_media": "Адкрыць медыя",
-  "keyboard_shortcuts.pinned": "Адкрыць спіс замацаваных допісаў",
   "keyboard_shortcuts.profile": "Адкрыць профіль аўтара",
   "keyboard_shortcuts.reply": "Адказаць на допіс",
   "keyboard_shortcuts.requests": "Адкрыць спіс запытаў на падпіску",
@@ -505,7 +503,6 @@
   "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
   "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
   "navigation_bar.personal": "Асабістае",
-  "navigation_bar.pins": "Замацаваныя допісы",
   "navigation_bar.preferences": "Налады",
   "navigation_bar.public_timeline": "Глабальная стужка",
   "navigation_bar.search": "Пошук",
@@ -782,8 +779,6 @@
   "status.mute": "Ігнараваць @{name}",
   "status.mute_conversation": "Ігнараваць размову",
   "status.open": "Разгарнуць гэты допіс",
-  "status.pin": "Замацаваць у профілі",
-  "status.pinned": "Замацаваны допіс",
   "status.read_more": "Чытаць болей",
   "status.reblog": "Пашырыць",
   "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
@@ -807,7 +802,6 @@
   "status.translated_from_with": "Перакладзена з {lang} з дапамогай {provider}",
   "status.uncached_media_warning": "Перадпрагляд недаступны",
   "status.unmute_conversation": "Не ігнараваць размову",
-  "status.unpin": "Адмацаваць ад профілю",
   "subscribed_languages.lead": "Толькі допісы ў абраных мовах будуць паказвацца ў вашых стужках пасля змены. Не абірайце нічога, каб бачыць допісы на ўсіх мовах.",
   "subscribed_languages.save": "Захаваць змены",
   "subscribed_languages.target": "Змяніць мовы падпіскі для {target}",

app/javascript/mastodon/locales/bg.json

@@ -162,7 +162,6 @@
   "column.lists": "Списъци",
   "column.mutes": "Заглушени потребители",
   "column.notifications": "Известия",
-  "column.pins": "Закачени публикации",
   "column.public": "Федеративна хронология",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Скриване на настройките",
@@ -465,7 +464,6 @@
   "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
   "keyboard_shortcuts.notifications": "Отваряне на колоната с известия",
   "keyboard_shortcuts.open_media": "Отваряне на мултимедията",
-  "keyboard_shortcuts.pinned": "Отваряне на списъка със закачени публикации",
   "keyboard_shortcuts.profile": "Отваряне на профила на автора",
   "keyboard_shortcuts.reply": "Отговаряне на публикация",
   "keyboard_shortcuts.requests": "Отваряне на списъка със заявки за последване",
@@ -549,7 +547,6 @@
   "navigation_bar.mutes": "Заглушени потребители",
   "navigation_bar.opened_in_classic_interface": "Публикации, акаунти и други особени страници се отварят по подразбиране в класическия мрежови интерфейс.",
   "navigation_bar.personal": "Лично",
-  "navigation_bar.pins": "Закачени публикации",
   "navigation_bar.preferences": "Предпочитания",
   "navigation_bar.public_timeline": "Федеративна хронология",
   "navigation_bar.search": "Търсене",
@@ -845,8 +842,6 @@
   "status.mute": "Заглушаване на @{name}",
   "status.mute_conversation": "Заглушаване на разговора",
   "status.open": "Разширяване на публикацията",
-  "status.pin": "Закачане в профила",
-  "status.pinned": "Закачена публикация",
   "status.read_more": "Още за четене",
   "status.reblog": "Подсилване",
   "status.reblog_private": "Подсилване с оригиналната видимост",
@@ -871,7 +866,6 @@
   "status.translated_from_with": "Преведено от {lang}, използвайки {provider}",
   "status.uncached_media_warning": "Онагледяването не е налично",
   "status.unmute_conversation": "Без заглушаването на разговора",
-  "status.unpin": "Разкачане от профила",
   "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в хронологичните списъци след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
   "subscribed_languages.save": "Запазване на промените",
   "subscribed_languages.target": "Промяна на абонираните езици за {target}",

app/javascript/mastodon/locales/bn.json

@@ -112,7 +112,6 @@
   "column.lists": "তালিকাগুলো",
   "column.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
   "column.notifications": "প্রজ্ঞাপনগুলো",
-  "column.pins": "পিন করা টুট",
   "column.public": "যুক্ত সময়রেখা",
   "column_back_button.label": "পেছনে",
   "column_header.hide_settings": "সেটিংগুলো সরান",
@@ -258,7 +257,6 @@
   "keyboard_shortcuts.my_profile": "আপনার নিজের পাতা দেখতে",
   "keyboard_shortcuts.notifications": "প্রজ্ঞাপনের কলাম খুলতে",
   "keyboard_shortcuts.open_media": "মিডিয়া খলার জন্য",
-  "keyboard_shortcuts.pinned": "পিন দেওয়া টুটের তালিকা খুলতে",
   "keyboard_shortcuts.profile": "লেখকের পাতা দেখতে",
   "keyboard_shortcuts.reply": "মতামত দিতে",
   "keyboard_shortcuts.requests": "অনুসরণ অনুরোধের তালিকা দেখতে",
@@ -294,7 +292,6 @@
   "navigation_bar.logout": "বাইরে যান",
   "navigation_bar.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
   "navigation_bar.personal": "নিজস্ব",
-  "navigation_bar.pins": "পিন দেওয়া টুট",
   "navigation_bar.preferences": "পছন্দসমূহ",
   "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
   "navigation_bar.search": "অনুসন্ধান",
@@ -389,8 +386,6 @@
   "status.mute": "@{name}র কার্যক্রম সরিয়ে ফেলতে",
   "status.mute_conversation": "কথোপকথননের প্রজ্ঞাপন সরিয়ে ফেলতে",
   "status.open": "এটার সম্পূর্ণটা দেখতে",
-  "status.pin": "নিজের পাতায় এটা পিন করতে",
-  "status.pinned": "পিন করা টুট",
   "status.read_more": "আরো পড়ুন",
   "status.reblog": "সমর্থন দিতে",
   "status.reblog_private": "আপনার অনুসরণকারীদের কাছে এটার সমর্থন দেখাতে",
@@ -408,7 +403,6 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "অনুবাদ",
   "status.unmute_conversation": "আলোচনার প্রজ্ঞাপন চালু করতে",
-  "status.unpin": "নিজের পাতা থেকে পিন করে রাখাটির পিন খুলতে",
   "tabs_bar.home": "বাড়ি",
   "tabs_bar.notifications": "প্রজ্ঞাপনগুলো",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} বাকি আছে",

app/javascript/mastodon/locales/br.json

@@ -124,7 +124,6 @@
   "column.lists": "Listennoù",
   "column.mutes": "Implijer·ion·ezed kuzhet",
   "column.notifications": "Kemennoù",
-  "column.pins": "Embannadurioù spilhennet",
   "column.public": "Red-amzer kevredet",
   "column_back_button.label": "Distreiñ",
   "column_header.hide_settings": "Kuzhat an arventennoù",
@@ -329,7 +328,6 @@
   "keyboard_shortcuts.my_profile": "Digeriñ ho profil",
   "keyboard_shortcuts.notifications": "Digeriñ bann ar c'hemennoù",
   "keyboard_shortcuts.open_media": "Digeriñ ar media",
-  "keyboard_shortcuts.pinned": "Digeriñ listenn an toudoù spilhennet",
   "keyboard_shortcuts.profile": "Digeriñ profil an aozer.ez",
   "keyboard_shortcuts.reply": "Respont d'an toud",
   "keyboard_shortcuts.requests": "Digeriñ roll goulennoù heuliañ",
@@ -378,7 +376,6 @@
   "navigation_bar.logout": "Digennaskañ",
   "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
   "navigation_bar.personal": "Personel",
-  "navigation_bar.pins": "Toudoù spilhennet",
   "navigation_bar.preferences": "Gwellvezioù",
   "navigation_bar.public_timeline": "Red-amzer kevredet",
   "navigation_bar.search": "Klask",
@@ -578,8 +575,6 @@
   "status.mute": "Kuzhat @{name}",
   "status.mute_conversation": "Kuzhat ar gaozeadenn",
   "status.open": "Digeriñ ar c'hannad-mañ",
-  "status.pin": "Spilhennañ d'ar profil",
-  "status.pinned": "Toud spilhennet",
   "status.read_more": "Lenn muioc'h",
   "status.reblog": "Skignañ",
   "status.reblog_private": "Skignañ gant ar weledenn gentañ",
@@ -601,7 +596,6 @@
   "status.translated_from_with": "Troet diwar {lang} gant {provider}",
   "status.uncached_media_warning": "Rakwel n'eo ket da gaout",
   "status.unmute_conversation": "Diguzhat ar gaozeadenn",
-  "status.unpin": "Dispilhennañ eus ar profil",
   "subscribed_languages.save": "Enrollañ ar cheñchamantoù",
   "subscribed_languages.target": "Cheñch ar yezhoù koumanantet evit {target}",
   "tabs_bar.home": "Degemer",

app/javascript/mastodon/locales/bs.json

@@ -2,7 +2,6 @@
   "account.badges.bot": "Bot",
   "account.cancel_follow_request": "Withdraw follow request",
   "account_note.placeholder": "Click to add a note",
-  "column.pins": "Pinned post",
   "community.column_settings.media_only": "Media only",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
@@ -34,7 +33,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",

app/javascript/mastodon/locales/ca.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Notifica'm els tuts de @{name}",
   "account.endorse": "Recomana en el perfil",
   "account.featured": "Destacat",
+  "account.featured.accounts": "Perfils",
   "account.featured.hashtags": "Etiquetes",
   "account.featured.posts": "Publicacions",
   "account.featured_tags.last_status_at": "Darrer tut el {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Llistes",
   "column.mutes": "Usuaris silenciats",
   "column.notifications": "Notificacions",
-  "column.pins": "Tuts fixats",
+  "column.pins": "Publicacions destacades",
   "column.public": "Línia de temps federada",
   "column_back_button.label": "Enrere",
   "column_header.hide_settings": "Amaga la configuració",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} tut} other {{counter} tuts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} tut} other {{counter} tuts}} avui",
+  "hashtag.feature": "Destaca al perfil",
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.mute": "Silencia #{hashtag}",
+  "hashtag.unfeature": "No destaquis al perfil",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
   "hints.profiles.followers_may_be_missing": "Es poden haver perdut seguidors d'aquest perfil.",
@@ -476,7 +479,7 @@
   "keyboard_shortcuts.my_profile": "Obre el teu perfil",
   "keyboard_shortcuts.notifications": "Obre la columna de notificacions",
   "keyboard_shortcuts.open_media": "Obre mèdia",
-  "keyboard_shortcuts.pinned": "Obre la llista de tuts fixats",
+  "keyboard_shortcuts.pinned": "Obre la llista de publicacions destacades",
   "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
   "keyboard_shortcuts.reply": "Respon al tut",
   "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
@@ -560,7 +563,7 @@
   "navigation_bar.mutes": "Usuaris silenciats",
   "navigation_bar.opened_in_classic_interface": "Els tuts, comptes i altres pàgines especifiques s'obren per defecte en la interfície web clàssica.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Tuts fixats",
+  "navigation_bar.pins": "Publicacions destacades",
   "navigation_bar.preferences": "Preferències",
   "navigation_bar.public_timeline": "Línia de temps federada",
   "navigation_bar.search": "Cerca",
@@ -856,8 +859,7 @@
   "status.mute": "Silencia @{name}",
   "status.mute_conversation": "Silencia la conversa",
   "status.open": "Amplia el tut",
-  "status.pin": "Fixa en el perfil",
-  "status.pinned": "Tut fixat",
+  "status.pin": "Destaca al perfil",
   "status.read_more": "Més informació",
   "status.reblog": "Impulsa",
   "status.reblog_private": "Impulsa amb la visibilitat original",
@@ -882,7 +884,7 @@
   "status.translated_from_with": "Traduït del {lang} fent servir {provider}",
   "status.uncached_media_warning": "Previsualització no disponible",
   "status.unmute_conversation": "Deixa de silenciar la conversa",
-  "status.unpin": "Desfixa del perfil",
+  "status.unpin": "No destaquis al perfil",
   "subscribed_languages.lead": "Només els tuts en les llengües seleccionades apareixeran en les teves línies de temps \"Inici\" i \"Llistes\" després del canvi. No en seleccionis cap per a rebre tuts en totes les llengües.",
   "subscribed_languages.save": "Desa els canvis",
   "subscribed_languages.target": "Canvia les llengües subscrites per a {target}",

app/javascript/mastodon/locales/ckb.json

@@ -112,7 +112,6 @@
   "column.lists": "پێرست",
   "column.mutes": "بێدەنگکردنی بەکارهێنەران",
   "column.notifications": "ئاگادارییەکان",
-  "column.pins": "تووتسی چەسپاو",
   "column.public": "نووسراوەکانی هەمووشوێنێک",
   "column_back_button.label": "دواوە",
   "column_header.hide_settings": "شاردنەوەی ڕێکخستنەکان",
@@ -308,7 +307,6 @@
   "keyboard_shortcuts.my_profile": "بۆ کردنەوەی پرۆفایڵ",
   "keyboard_shortcuts.notifications": "بۆ کردنەوەی ستوونی ئاگانامەکان",
   "keyboard_shortcuts.open_media": "بۆ کردنەوەی میدیا",
-  "keyboard_shortcuts.pinned": "بۆ کردنەوەی لیستی توتەکانی چەسپێنراو",
   "keyboard_shortcuts.profile": "بۆ کردنەوەی پرۆفایڵی نووسەر",
   "keyboard_shortcuts.reply": "بۆ وەڵامدانەوە",
   "keyboard_shortcuts.requests": "بۆ کردنەوەی لیستی داواکاریەکانی بەدوادا",
@@ -349,7 +347,6 @@
   "navigation_bar.logout": "دەرچوون",
   "navigation_bar.mutes": "کپکردنی بەکارهێنەران",
   "navigation_bar.personal": "کەسی",
-  "navigation_bar.pins": "توتی چەسپاو",
   "navigation_bar.preferences": "پەسەندەکان",
   "navigation_bar.public_timeline": "نووسراوەکانی هەمووشوێنێک",
   "navigation_bar.search": "گەڕان",
@@ -508,8 +505,6 @@
   "status.mute": "@{name} بێدەنگ بکە",
   "status.mute_conversation": "بێدەنگی بکە",
   "status.open": "ئەم توتە فراوان بکە",
-  "status.pin": "لکاندن لەسەر پرۆفایل",
-  "status.pinned": "توتی چەسپکراو",
   "status.read_more": "زیاتر بخوێنەوە",
   "status.reblog": "بەهێزکردن",
   "status.reblog_private": "بەهێزکردن بۆ بینەرانی سەرەتایی",
@@ -530,7 +525,6 @@
   "status.translate": "وەریبگێرە",
   "status.translated_from_with": "لە {lang} وەرگێڕدراوە بە بەکارهێنانی {provider}",
   "status.unmute_conversation": "گفتوگۆی بێدەنگ",
-  "status.unpin": "لە سەرەوە لایبە",
   "subscribed_languages.lead": "تەنها پۆستەکان بە زمانە هەڵبژێردراوەکان لە ماڵەکەتدا دەردەکەون و هێڵەکانی کاتی لیستەکەت دوای گۆڕانکارییەکە. هیچیان هەڵبژێرە بۆ وەرگرتنی پۆست بە هەموو زمانەکان.",
   "subscribed_languages.save": "پاشکەوتی گۆڕانکاریەکان",
   "subscribed_languages.target": "گۆڕینی زمانە بەشداربووەکان بۆ {target}",

app/javascript/mastodon/locales/co.json

@@ -53,7 +53,6 @@
   "column.lists": "Liste",
   "column.mutes": "Utilizatori piattati",
   "column.notifications": "Nutificazione",
-  "column.pins": "Statuti puntarulati",
   "column.public": "Linea pubblica glubale",
   "column_back_button.label": "Ritornu",
   "column_header.hide_settings": "Piattà i parametri",
@@ -178,7 +177,6 @@
   "keyboard_shortcuts.my_profile": "per apre u vostru prufile",
   "keyboard_shortcuts.notifications": "per apre a culonna di nutificazione",
   "keyboard_shortcuts.open_media": "per apre i media",
-  "keyboard_shortcuts.pinned": "per apre a lista di statuti puntarulati",
   "keyboard_shortcuts.profile": "per apre u prufile di l'autore",
   "keyboard_shortcuts.reply": "risponde",
   "keyboard_shortcuts.requests": "per apre a lista di dumande d'abbunamentu",
@@ -212,7 +210,6 @@
   "navigation_bar.logout": "Scunnettassi",
   "navigation_bar.mutes": "Utilizatori piattati",
   "navigation_bar.personal": "Persunale",
-  "navigation_bar.pins": "Statuti puntarulati",
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.public_timeline": "Linea pubblica glubale",
   "navigation_bar.security": "Sicurità",
@@ -296,8 +293,6 @@
   "status.mute": "Piattà @{name}",
   "status.mute_conversation": "Piattà a cunversazione",
   "status.open": "Apre stu statutu",
-  "status.pin": "Puntarulà à u prufile",
-  "status.pinned": "Statutu puntarulatu",
   "status.read_more": "Leghje di più",
   "status.reblog": "Sparte",
   "status.reblog_private": "Sparte à l'audienza uriginale",
@@ -314,7 +309,6 @@
   "status.show_more_all": "Slibrà tuttu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",
-  "status.unpin": "Spuntarulà da u prufile",
   "tabs_bar.home": "Accolta",
   "tabs_bar.notifications": "Nutificazione",
   "time_remaining.days": "{number, plural, one {# ghjornu ferma} other {# ghjorni fermanu}}",

app/javascript/mastodon/locales/cs.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Oznamovat mi příspěvky @{name}",
   "account.endorse": "Zvýraznit na profilu",
   "account.featured": "Zvýrazněné",
+  "account.featured.accounts": "Profily",
   "account.featured.hashtags": "Hashtagy",
   "account.featured.posts": "Příspěvky",
   "account.featured_tags.last_status_at": "Poslední příspěvek {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Seznamy",
   "column.mutes": "Skrytí uživatelé",
   "column.notifications": "Oznámení",
-  "column.pins": "Připnuté příspěvky",
+  "column.pins": "Zvýrazněné příspěvky",
   "column.public": "Federovaná časová osa",
   "column_back_button.label": "Zpět",
   "column_header.hide_settings": "Skrýt nastavení",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník*ice} few {{counter} účastníci} other {{counter} účastníků}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
+  "hashtag.feature": "Zvýraznit na profilu",
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.mute": "Skrýt #{hashtag}",
+  "hashtag.unfeature": "Nezvýrazňovat na profilu",
   "hashtag.unfollow": "Přestat sledovat hashtag",
   "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
   "hints.profiles.followers_may_be_missing": "Sledující mohou pro tento profil chybět.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Otevřít váš profil",
   "keyboard_shortcuts.notifications": "Otevřít sloupec oznámení",
   "keyboard_shortcuts.open_media": "Otevřít média",
-  "keyboard_shortcuts.pinned": "Otevřít seznam připnutých příspěvků",
+  "keyboard_shortcuts.pinned": "Otevřít seznam zvýrazněných příspěvků",
   "keyboard_shortcuts.profile": "Otevřít autorův profil",
   "keyboard_shortcuts.reply": "Odpovědět na příspěvek",
   "keyboard_shortcuts.requests": "Otevřít seznam žádostí o sledování",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Skrytí uživatelé",
   "navigation_bar.opened_in_classic_interface": "Příspěvky, účty a další specifické stránky jsou ve výchozím nastavení otevřeny v klasickém webovém rozhraní.",
   "navigation_bar.personal": "Osobní",
-  "navigation_bar.pins": "Připnuté příspěvky",
+  "navigation_bar.pins": "Zvýrazněné příspěvky",
   "navigation_bar.preferences": "Předvolby",
   "navigation_bar.public_timeline": "Federovaná časová osa",
   "navigation_bar.search": "Hledat",
@@ -857,8 +860,7 @@
   "status.mute": "Skrýt @{name}",
   "status.mute_conversation": "Skrýt konverzaci",
   "status.open": "Rozbalit tento příspěvek",
-  "status.pin": "Připnout na profil",
-  "status.pinned": "Připnutý příspěvek",
+  "status.pin": "Zvýraznit na profilu",
   "status.read_more": "Číst více",
   "status.reblog": "Boostnout",
   "status.reblog_private": "Boostnout s původní viditelností",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Přeloženo z {lang} pomocí {provider}",
   "status.uncached_media_warning": "Náhled není k dispozici",
   "status.unmute_conversation": "Zrušit skrytí konverzace",
-  "status.unpin": "Odepnout z profilu",
+  "status.unpin": "Nezvýrazňovat na profilu",
   "subscribed_languages.lead": "Ve vašem domovském kanálu a časových osách se po změně budou objevovat pouze příspěvky ve vybraných jazycích. Pro příjem příspěvků ve všech jazycích nevyberte žádný jazyk.",
   "subscribed_languages.save": "Uložit změny",
   "subscribed_languages.target": "Změnit odebírané jazyky na {target}",

app/javascript/mastodon/locales/cy.json

@@ -6,19 +6,19 @@
   "about.domain_blocks.preamble": "Fel rheol, mae Mastodon yn caniatáu i chi weld cynnwys gan unrhyw weinyddwr arall yn y ffedysawd a rhyngweithio â hi. Dyma'r eithriadau a wnaed ar y gweinydd penodol hwn.",
   "about.domain_blocks.silenced.explanation": "Fel rheol, fyddwch chi ddim yn gweld proffiliau a chynnwys o'r gweinydd hwn, oni bai eich bod yn chwilio'n benodol amdano neu yn ymuno drwy ei ddilyn.",
   "about.domain_blocks.silenced.title": "Cyfyngedig",
-  "about.domain_blocks.suspended.explanation": "Ni fydd data o'r gweinydd hwn yn cael ei brosesu, ei gadw na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
+  "about.domain_blocks.suspended.explanation": "Fydd data o'r gweinydd hwn ddim yn cael ei brosesu, ei gadw na'i gyfnewid, gan wneud unrhyw ryngweithio neu gyfathrebu gyda defnyddwyr o'r gweinydd hwn yn amhosibl.",
   "about.domain_blocks.suspended.title": "Wedi'i atal",
-  "about.not_available": "Nid yw'r wybodaeth hon ar gael ar y gweinydd hwn.",
+  "about.not_available": "Dyw'r wybodaeth yma heb ei wneud ar gael ar y gweinydd hwn.",
   "about.powered_by": "Cyfrwng cymdeithasol datganoledig wedi ei yrru gan {mastodon}",
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn personol",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
   "account.badges.bot": "Awtomataidd",
   "account.badges.group": "Grŵp",
-  "account.block": "Blocio @{name}",
-  "account.block_domain": "Blocio'r parth {domain}",
-  "account.block_short": "Blocio",
-  "account.blocked": "Blociwyd",
+  "account.block": "Rhwystro @{name}",
+  "account.block_domain": "Rhwystro'r parth {domain}",
+  "account.block_short": "Rhwystro",
+  "account.blocked": "Wedi'i rwystro",
   "account.blocking": "Yn Rhwystro",
   "account.cancel_follow_request": "Tynnu cais i ddilyn",
   "account.copy": "Copïo dolen i'r proffil",
@@ -28,7 +28,7 @@
   "account.edit_profile": "Golygu'r proffil",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
-  "account.featured": "Dethol",
+  "account.featured": "Nodwedd",
   "account.featured.hashtags": "Hashnodau",
   "account.featured.posts": "Postiadau",
   "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
@@ -40,7 +40,7 @@
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
   "account.following": "Yn dilyn",
   "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter} arall}}",
-  "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
+  "account.follows.empty": "Dyw'r defnyddiwr hwn ddim yn dilyn unrhyw un eto.",
   "account.follows_you": "Yn eich dilyn chi",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@@ -168,7 +168,7 @@
   "column.lists": "Rhestrau",
   "column.mutes": "Defnyddwyr wedi'u tewi",
   "column.notifications": "Hysbysiadau",
-  "column.pins": "Postiadau wedi eu pinio",
+  "column.pins": "Postiadau nodwedd",
   "column.public": "Ffrwd y ffederasiwn",
   "column_back_button.label": "Nôl",
   "column_header.hide_settings": "Cuddio'r dewisiadau",
@@ -477,7 +477,7 @@
   "keyboard_shortcuts.my_profile": "Agor eich proffil",
   "keyboard_shortcuts.notifications": "Agor colofn hysbysiadau",
   "keyboard_shortcuts.open_media": "Agor cyfryngau",
-  "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
+  "keyboard_shortcuts.pinned": "Agor rhestr postiadau nodwedd",
   "keyboard_shortcuts.profile": "Agor proffil yr awdur",
   "keyboard_shortcuts.reply": "Ymateb i bostiad",
   "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
@@ -561,7 +561,7 @@
   "navigation_bar.mutes": "Defnyddwyr wedi'u tewi",
   "navigation_bar.opened_in_classic_interface": "Mae postiadau, cyfrifon a thudalennau penodol eraill yn cael eu hagor fel rhagosodiad yn y rhyngwyneb gwe clasurol.",
   "navigation_bar.personal": "Personol",
-  "navigation_bar.pins": "Postiadau wedi eu pinio",
+  "navigation_bar.pins": "Postiadau nodwedd",
   "navigation_bar.preferences": "Dewisiadau",
   "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
   "navigation_bar.search": "Chwilio",
@@ -857,8 +857,7 @@
   "status.mute": "Anwybyddu @{name}",
   "status.mute_conversation": "Anwybyddu sgwrs",
   "status.open": "Ehangu'r post hwn",
-  "status.pin": "Pinio ar y proffil",
-  "status.pinned": "Postiad wedi'i binio",
+  "status.pin": "Dangos ar y proffil",
   "status.read_more": "Darllen rhagor",
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
@@ -883,7 +882,7 @@
   "status.translated_from_with": "Cyfieithwyd o {lang} gan ddefnyddio {provider}",
   "status.uncached_media_warning": "Dim rhagolwg ar gael",
   "status.unmute_conversation": "Dad-dewi sgwrs",
-  "status.unpin": "Dadbinio o'r proffil",
+  "status.unpin": "Peidio a'i ddangos ar fy mhroffil",
   "subscribed_languages.lead": "Dim ond postiadau mewn ieithoedd penodol fydd yn ymddangos yn eich ffrydiau cartref a rhestr ar ôl y newid. Dewiswch ddim byd i dderbyn postiadau ym mhob iaith.",
   "subscribed_languages.save": "Cadw'r newidiadau",
   "subscribed_languages.target": "Newid ieithoedd tanysgrifio {target}",

app/javascript/mastodon/locales/da.json

@@ -168,7 +168,7 @@
   "column.lists": "Lister",
   "column.mutes": "Skjulte brugere",
   "column.notifications": "Notifikationer",
-  "column.pins": "Fastgjorte indlæg",
+  "column.pins": "Fremhævede indlæg",
   "column.public": "Fælles tidslinje",
   "column_back_button.label": "Tilbage",
   "column_header.hide_settings": "Skjul indstillinger",
@@ -405,8 +405,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltager} other {{counter} deltagere}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
+  "hashtag.feature": "Fremhæv på profil",
   "hashtag.follow": "Følg etiket",
   "hashtag.mute": "Tavsgør #{hashtag}",
+  "hashtag.unfeature": "Fremhæv ikke på profil",
   "hashtag.unfollow": "Stop med at følge etiket",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
   "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",
@@ -477,7 +479,7 @@
   "keyboard_shortcuts.my_profile": "Åbn din profil",
   "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen",
   "keyboard_shortcuts.open_media": "Åbn medier",
-  "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
+  "keyboard_shortcuts.pinned": "Åbn liste over fremhævede indlæg",
   "keyboard_shortcuts.profile": "Åbn forfatters profil",
   "keyboard_shortcuts.reply": "Besvar indlægget",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
@@ -561,7 +563,7 @@
   "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.personal": "Personlig",
-  "navigation_bar.pins": "Fastgjorte indlæg",
+  "navigation_bar.pins": "Fremhævede indlæg",
   "navigation_bar.preferences": "Præferencer",
   "navigation_bar.public_timeline": "Fælles tidslinje",
   "navigation_bar.search": "Søg",
@@ -857,8 +859,7 @@
   "status.mute": "Skjul @{name}",
   "status.mute_conversation": "Skjul samtale",
   "status.open": "Udvid dette indlæg",
-  "status.pin": "Fastgør til profil",
-  "status.pinned": "Fastgjort indlæg",
+  "status.pin": "Fremhæv på profil",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
   "status.reblog_private": "Fremhæv med oprindelig synlighed",
@@ -883,7 +884,7 @@
   "status.translated_from_with": "Oversat fra {lang} ved brug af {provider}",
   "status.uncached_media_warning": "Ingen forhåndsvisning",
   "status.unmute_conversation": "Genaktivér samtale",
-  "status.unpin": "Frigør fra profil",
+  "status.unpin": "Fremhæv ikke på profil",
   "subscribed_languages.lead": "Kun indlæg på udvalgte sprog vil fremgå på dine hjemme- og listetidslinjer efter ændringen. Vælg ingen for at modtage indlæg på alle sprog.",
   "subscribed_languages.save": "Gem ændringer",
   "subscribed_languages.target": "Skift abonnementssprog for {target}",

app/javascript/mastodon/locales/de.json

@@ -27,8 +27,9 @@
   "account.domain_blocking": "Domain blockiert",
   "account.edit_profile": "Profil bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
-  "account.endorse": "Im Profil empfehlen",
+  "account.endorse": "Im Profil vorstellen",
   "account.featured": "Vorgestellt",
+  "account.featured.accounts": "Profile",
   "account.featured.hashtags": "Hashtags",
   "account.featured.posts": "Beiträge",
   "account.featured_tags.last_status_at": "Letzter Beitrag am {date}",
@@ -74,7 +75,7 @@
   "account.unblock_domain": "Blockierung von {domain} aufheben",
   "account.unblock_domain_short": "Entsperren",
   "account.unblock_short": "Blockierung aufheben",
-  "account.unendorse": "Im Profil nicht mehr empfehlen",
+  "account.unendorse": "Im Profil nicht mehr vorstellen",
   "account.unfollow": "Entfolgen",
   "account.unmute": "Stummschaltung von @{name} aufheben",
   "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben",
@@ -168,7 +169,7 @@
   "column.lists": "Listen",
   "column.mutes": "Stummgeschaltete Profile",
   "column.notifications": "Benachrichtigungen",
-  "column.pins": "Angeheftete Beiträge",
+  "column.pins": "Vorgestellte Beiträge",
   "column.public": "Föderierte Timeline",
   "column_back_button.label": "Zurück",
   "column_header.hide_settings": "Einstellungen ausblenden",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one{{counter} Beteiligte*r} other{{counter} Beteiligte}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}} heute",
+  "hashtag.feature": "Im Profil vorstellen",
   "hashtag.follow": "Hashtag folgen",
   "hashtag.mute": "#{hashtag} stummschalten",
+  "hashtag.unfeature": "Im Profil nicht mehr vorstellen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
   "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Eigenes Profil aufrufen",
   "keyboard_shortcuts.notifications": "Benachrichtigungen aufrufen",
   "keyboard_shortcuts.open_media": "Medieninhalt öffnen",
-  "keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen",
+  "keyboard_shortcuts.pinned": "Liste vorgestellter Beiträge öffnen",
   "keyboard_shortcuts.profile": "Profil aufrufen",
   "keyboard_shortcuts.reply": "Auf Beitrag antworten",
   "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Stummgeschaltete Profile",
   "navigation_bar.opened_in_classic_interface": "Beiträge, Konten und andere bestimmte Seiten werden standardmäßig im klassischen Webinterface geöffnet.",
   "navigation_bar.personal": "Persönlich",
-  "navigation_bar.pins": "Angeheftete Beiträge",
+  "navigation_bar.pins": "Vorgestellte Beiträge",
   "navigation_bar.preferences": "Einstellungen",
   "navigation_bar.public_timeline": "Föderierte Timeline",
   "navigation_bar.search": "Suche",
@@ -857,8 +860,7 @@
   "status.mute": "@{name} stummschalten",
   "status.mute_conversation": "Unterhaltung stummschalten",
   "status.open": "Beitrag öffnen",
-  "status.pin": "Im Profil anheften",
-  "status.pinned": "Angehefteter Beitrag",
+  "status.pin": "Im Profil vorstellen",
   "status.read_more": "Gesamten Beitrag anschauen",
   "status.reblog": "Teilen",
   "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Aus {lang} mittels {provider} übersetzt",
   "status.uncached_media_warning": "Vorschau nicht verfügbar",
   "status.unmute_conversation": "Stummschaltung der Unterhaltung aufheben",
-  "status.unpin": "Vom Profil lösen",
+  "status.unpin": "Im Profil nicht mehr vorstellen",
   "subscribed_languages.lead": "Nach der Änderung werden nur noch Beiträge in den ausgewählten Sprachen in den Timelines deiner Startseite und deiner Listen angezeigt. Wähle keine Sprache aus, um alle Beiträge zu sehen.",
   "subscribed_languages.save": "Änderungen speichern",
   "subscribed_languages.target": "Abonnierte Sprachen für {target} ändern",

app/javascript/mastodon/locales/el.json

@@ -161,7 +161,6 @@
   "column.lists": "Λίστες",
   "column.mutes": "Αποσιωπημένοι χρήστες",
   "column.notifications": "Ειδοποιήσεις",
-  "column.pins": "Καρφιτσωμένα τουτ",
   "column.public": "Ομοσπονδιακή ροή",
   "column_back_button.label": "Πίσω",
   "column_header.hide_settings": "Απόκρυψη ρυθμίσεων",
@@ -464,7 +463,6 @@
   "keyboard_shortcuts.my_profile": "Άνοιγμα του προφίλ σου",
   "keyboard_shortcuts.notifications": "Άνοιγμα στήλης ειδοποιήσεων",
   "keyboard_shortcuts.open_media": "Άνοιγμα πολυμέσων",
-  "keyboard_shortcuts.pinned": "Άνοιγμα λίστας καρφιτσωμένων αναρτήσεων",
   "keyboard_shortcuts.profile": "Άνοιγμα προφίλ συγγραφέα",
   "keyboard_shortcuts.reply": "Απάντηση στην ανάρτηση",
   "keyboard_shortcuts.requests": "Άνοιγμα λίστας αιτημάτων ακολούθησης",
@@ -548,7 +546,6 @@
   "navigation_bar.mutes": "Αποσιωπημένοι χρήστες",
   "navigation_bar.opened_in_classic_interface": "Δημοσιεύσεις, λογαριασμοί και άλλες συγκεκριμένες σελίδες ανοίγονται από προεπιλογή στην κλασική διεπαφή ιστού.",
   "navigation_bar.personal": "Προσωπικά",
-  "navigation_bar.pins": "Καρφιτσωμένες αναρτήσεις",
   "navigation_bar.preferences": "Προτιμήσεις",
   "navigation_bar.public_timeline": "Ροή συναλλαγών",
   "navigation_bar.search": "Αναζήτηση",
@@ -844,8 +841,6 @@
   "status.mute": "Σίγαση σε @{name}",
   "status.mute_conversation": "Σίγαση συνομιλίας",
   "status.open": "Επέκταση ανάρτησης",
-  "status.pin": "Καρφίτσωσε στο προφίλ",
-  "status.pinned": "Καρφιτσωμένη ανάρτηση",
   "status.read_more": "Διάβασε περισότερα",
   "status.reblog": "Ενίσχυση",
   "status.reblog_private": "Ενίσχυση με αρχική ορατότητα",
@@ -870,7 +865,6 @@
   "status.translated_from_with": "Μεταφράστηκε από {lang} χρησιμοποιώντας {provider}",
   "status.uncached_media_warning": "Μη διαθέσιμη προεπισκόπηση",
   "status.unmute_conversation": "Αναίρεση σίγασης συνομιλίας",
-  "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
   "subscribed_languages.lead": "Μόνο αναρτήσεις σε επιλεγμένες γλώσσες θα εμφανίζονται στην αρχική σου και θα παραθέτονται χρονοδιαγράμματα μετά την αλλαγή. Επέλεξε καμία για να λαμβάνεις αναρτήσεις σε όλες τις γλώσσες.",
   "subscribed_languages.save": "Αποθήκευση αλλαγών",
   "subscribed_languages.target": "Αλλαγή εγγεγραμμένων γλωσσών για {target}",

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

@@ -157,7 +157,6 @@
   "column.lists": "Lists",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
-  "column.pins": "Pinned posts",
   "column.public": "Federated timeline",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
@@ -457,7 +456,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "Open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",
@@ -541,7 +539,6 @@
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.opened_in_classic_interface": "Posts, accounts, and other specific pages are opened by default in the classic web interface.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned posts",
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.search": "Search",
@@ -837,8 +834,6 @@
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this post",
-  "status.pin": "Pin on profile",
-  "status.pinned": "Pinned post",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
@@ -863,7 +858,6 @@
   "status.translated_from_with": "Translated from {lang} using {provider}",
   "status.uncached_media_warning": "Preview not available",
   "status.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
   "subscribed_languages.lead": "Only posts in selected languages will appear on your home and list timelines after the change. Select none to receive posts in all languages.",
   "subscribed_languages.save": "Save changes",
   "subscribed_languages.target": "Change subscribed languages for {target}",

app/javascript/mastodon/locales/en.json

@@ -40,6 +40,7 @@
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.featured": "Featured",
+  "account.featured.accounts": "Profiles",
   "account.featured.hashtags": "Hashtags",
   "account.featured.posts": "Posts",
   "account.featured_tags.last_status_at": "Last post on {date}",
@@ -550,8 +551,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participant} other {{counter} participants}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
+  "hashtag.feature": "Feature on profile",
   "hashtag.follow": "Follow hashtag",
   "hashtag.mute": "Mute #{hashtag}",
+  "hashtag.unfeature": "Don't feature on profile",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, other {# more}}",
   "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",

app/javascript/mastodon/locales/eo.json

@@ -26,7 +26,7 @@
   "account.disable_notifications": "Ĉesu sciigi min kiam @{name} afiŝas",
   "account.edit_profile": "Redakti la profilon",
   "account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
-  "account.endorse": "Prezenti ĉe via profilo",
+  "account.endorse": "Montri en profilo",
   "account.featured.hashtags": "Kradvortoj",
   "account.featured.posts": "Afiŝoj",
   "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
@@ -162,7 +162,6 @@
   "column.lists": "Listoj",
   "column.mutes": "Silentigitaj uzantoj",
   "column.notifications": "Sciigoj",
-  "column.pins": "Alpinglitaj afiŝoj",
   "column.public": "Fratara templinio",
   "column_back_button.label": "Reveni",
   "column_header.hide_settings": "Kaŝi la agordojn",
@@ -462,7 +461,6 @@
   "keyboard_shortcuts.my_profile": "Malfermu vian profilon",
   "keyboard_shortcuts.notifications": "Malfermu la sciigajn kolumnon",
   "keyboard_shortcuts.open_media": "Malfermi vidaŭdaĵon",
-  "keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
   "keyboard_shortcuts.profile": "Malfermu la profilon de aŭtoroprofilo",
   "keyboard_shortcuts.reply": "Respondu al afiŝo",
   "keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
@@ -546,7 +544,6 @@
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
   "navigation_bar.personal": "Persone",
-  "navigation_bar.pins": "Alpinglitaj afiŝoj",
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.public_timeline": "Fratara templinio",
   "navigation_bar.search": "Serĉi",
@@ -842,8 +839,6 @@
   "status.mute": "Silentigi @{name}",
   "status.mute_conversation": "Silentigi konversacion",
   "status.open": "Pligrandigu ĉi tiun afiŝon",
-  "status.pin": "Alpingli al la profilo",
-  "status.pinned": "Alpinglita afiŝo",
   "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
   "status.reblog_private": "Diskonigi kun la sama videbleco",
@@ -868,7 +863,6 @@
   "status.translated_from_with": "Tradukita el {lang} per {provider}",
   "status.uncached_media_warning": "Antaŭrigardo ne disponebla",
   "status.unmute_conversation": "Malsilentigi la konversacion",
-  "status.unpin": "Depingli de profilo",
   "subscribed_languages.lead": "Nur afiŝoj en elektitaj lingvoj aperos en viaj hejma kaj lista templinioj post la ŝanĝo. Elektu nenion por ricevi afiŝojn en ĉiuj lingvoj.",
   "subscribed_languages.save": "Konservi ŝanĝojn",
   "subscribed_languages.target": "Ŝanĝu abonitajn lingvojn por {target}",

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

@@ -24,11 +24,12 @@
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
-  "account.domain_blocking": "Bloqueando dominio",
+  "account.domain_blocking": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
   "account.enable_notifications": "Notificarme cuando @{name} envíe mensajes",
   "account.endorse": "Destacar en el perfil",
   "account.featured": "Destacados",
+  "account.featured.accounts": "Perfiles",
   "account.featured.hashtags": "Etiquetas",
   "account.featured.posts": "Mensajes",
   "account.featured_tags.last_status_at": "Último mensaje: {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
-  "column.pins": "Mensajes fijados",
+  "column.pins": "Mensajes destacados",
   "column.public": "Línea temporal federada",
   "column_back_button.label": "Volver",
   "column_header.hide_settings": "Ocultar configuración",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}} hoy",
+  "hashtag.feature": "Destacar en el perfil",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.mute": "Silenciar #{hashtag}",
+  "hashtag.unfeature": "No destacar en el perfil",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Es posible que falten seguidores de este perfil.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Abrir tu perfil",
   "keyboard_shortcuts.notifications": "Abrir columna de notificaciones",
   "keyboard_shortcuts.open_media": "Abrir archivos de medios",
-  "keyboard_shortcuts.pinned": "Abrir lista de mensajes fijados",
+  "keyboard_shortcuts.pinned": "Abrir lista de mensajes destacados",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
   "keyboard_shortcuts.reply": "Responder al mensaje",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Los mensajes, las cuentas y otras páginas específicas se abren predeterminadamente en la interface web clásica.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Mensajes fijados",
+  "navigation_bar.pins": "Mensajes destacados",
   "navigation_bar.preferences": "Configuración",
   "navigation_bar.public_timeline": "Línea temporal federada",
   "navigation_bar.search": "Buscar",
@@ -857,8 +860,7 @@
   "status.mute": "Silenciar a @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir este mensaje",
-  "status.pin": "Fijar en el perfil",
-  "status.pinned": "Mensaje fijado",
+  "status.pin": "Destacar en el perfil",
   "status.read_more": "Leé más",
   "status.reblog": "Adherir",
   "status.reblog_private": "Adherir a la audiencia original",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Traducido desde el {lang} vía {provider}",
   "status.uncached_media_warning": "Previsualización no disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
-  "status.unpin": "Dejar de fijar",
+  "status.unpin": "No destacar en el perfil",
   "subscribed_languages.lead": "Después del cambio, sólo los mensajes en los idiomas seleccionados aparecerán en tu línea temporal Principal y en las líneas de tiempo de lista. No seleccionés ningún idioma para poder recibir mensajes en todos los idiomas.",
   "subscribed_languages.save": "Guardar cambios",
   "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",

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

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
   "account.featured": "Destacado",
+  "account.featured.accounts": "Perfiles",
   "account.featured.hashtags": "Etiquetas",
   "account.featured.posts": "Publicaciones",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
-  "column.pins": "Publicaciones fijadas",
+  "column.pins": "Publicaciones destacadas",
   "column.public": "Línea de tiempo federada",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Ocultar configuración",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
+  "hashtag.feature": "Destacar en el perfil",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.mute": "Silenciar #{hashtag}",
+  "hashtag.unfeature": "No destacar en el perfil",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Abrir tu perfil",
   "keyboard_shortcuts.notifications": "Abrir la columna de notificaciones",
   "keyboard_shortcuts.open_media": "Abrir multimedia",
-  "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones fijadas",
+  "keyboard_shortcuts.pinned": "Abrir lista de publicaciones destacadas",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
   "keyboard_shortcuts.reply": "Responder a la publicación",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicaciones fijadas",
+  "navigation_bar.pins": "Publicaciones destacadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Historia federada",
   "navigation_bar.search": "Buscar",
@@ -857,8 +860,7 @@
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
-  "status.pin": "Fijar",
-  "status.pinned": "Publicación fijada",
+  "status.pin": "Destacar en el perfil",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Implusar a la audiencia original",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Traducido del {lang} usando {provider}",
   "status.uncached_media_warning": "Vista previa no disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
-  "status.unpin": "Dejar de fijar",
+  "status.unpin": "No destacar en el perfil",
   "subscribed_languages.lead": "Solo las publicaciones en los idiomas seleccionados aparecerán en tu inicio y enlistará las líneas de tiempo después del cambio. Selecciona ninguno para recibir publicaciones en todos los idiomas.",
   "subscribed_languages.save": "Guardar cambios",
   "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",

app/javascript/mastodon/locales/es.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en el perfil",
   "account.featured": "Destacado",
+  "account.featured.accounts": "Perfiles",
   "account.featured.hashtags": "Etiquetas",
   "account.featured.posts": "Publicaciones",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
-  "column.pins": "Publicaciones fijadas",
+  "column.pins": "Publicaciones destacadas",
   "column.public": "Cronología federada",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Ocultar configuración",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}} hoy",
+  "hashtag.feature": "Destacar en el perfil",
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.mute": "Silenciar #{hashtag}",
+  "hashtag.unfeature": "No destacar en el perfil",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
   "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Abrir tu perfil",
   "keyboard_shortcuts.notifications": "Abrir columna de notificaciones",
   "keyboard_shortcuts.open_media": "Abrir multimedia",
-  "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones destacadas",
+  "keyboard_shortcuts.pinned": "Abrir lista de publicaciones destacadas",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
   "keyboard_shortcuts.reply": "Responder a una publicación",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Usuarios silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicaciones, cuentas y otras páginas específicas se abren por defecto en la interfaz web clásica.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Publicaciones fijadas",
+  "navigation_bar.pins": "Publicaciones destacadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Cronología federada",
   "navigation_bar.search": "Buscar",
@@ -857,8 +860,7 @@
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir publicación",
-  "status.pin": "Fijar",
-  "status.pinned": "Publicación fijada",
+  "status.pin": "Destacar en el perfil",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar a la audiencia original",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Traducido de {lang} usando {provider}",
   "status.uncached_media_warning": "Vista previa no disponible",
   "status.unmute_conversation": "Dejar de silenciar conversación",
-  "status.unpin": "Dejar de fijar",
+  "status.unpin": "No destacar en el perfil",
   "subscribed_languages.lead": "Sólo los mensajes en los idiomas seleccionados aparecerán en su inicio y otras líneas de tiempo después del cambio. Seleccione ninguno para recibir mensajes en todos los idiomas.",
   "subscribed_languages.save": "Guardar cambios",
   "subscribed_languages.target": "Cambiar idiomas suscritos para {target}",

app/javascript/mastodon/locales/et.json

@@ -157,7 +157,6 @@
   "column.lists": "Loetelud",
   "column.mutes": "Vaigistatud kasutajad",
   "column.notifications": "Teated",
-  "column.pins": "Kinnitatud postitused",
   "column.public": "Föderatiivne ajajoon",
   "column_back_button.label": "Tagasi",
   "column_header.hide_settings": "Peida sätted",
@@ -457,7 +456,6 @@
   "keyboard_shortcuts.my_profile": "Ava oma profiil",
   "keyboard_shortcuts.notifications": "Ava teadete veerg",
   "keyboard_shortcuts.open_media": "Ava meedia",
-  "keyboard_shortcuts.pinned": "Ava kinnitatud postituste loetelu",
   "keyboard_shortcuts.profile": "Ava autori profiil",
   "keyboard_shortcuts.reply": "Vasta postitusele",
   "keyboard_shortcuts.requests": "Ava jälgimistaotluste loetelu",
@@ -541,7 +539,6 @@
   "navigation_bar.mutes": "Vaigistatud kasutajad",
   "navigation_bar.opened_in_classic_interface": "Postitused, kontod ja teised spetsiaalsed lehed avatakse vaikimisi klassikalises veebiliideses.",
   "navigation_bar.personal": "Isiklik",
-  "navigation_bar.pins": "Kinnitatud postitused",
   "navigation_bar.preferences": "Eelistused",
   "navigation_bar.public_timeline": "Föderatiivne ajajoon",
   "navigation_bar.search": "Otsing",
@@ -832,8 +829,6 @@
   "status.mute": "Vaigista @{name}",
   "status.mute_conversation": "Vaigista vestlus",
   "status.open": "Laienda postitus",
-  "status.pin": "Kinnita profiilile",
-  "status.pinned": "Kinnitatud postitus",
   "status.read_more": "Loe veel",
   "status.reblog": "Jaga",
   "status.reblog_private": "Jaga algse nähtavusega",
@@ -857,7 +852,6 @@
   "status.translated_from_with": "Tõlgitud {lang} keelest kasutades teenust {provider}",
   "status.uncached_media_warning": "Eelvaade pole saadaval",
   "status.unmute_conversation": "Ära vaigista vestlust",
-  "status.unpin": "Eemalda profiilile kinnitus",
   "subscribed_languages.lead": "Pärast muudatust näed koduvaates ja loetelude ajajoontel postitusi valitud keeltes. Ära vali midagi, kui tahad näha postitusi kõikides keeltes.",
   "subscribed_languages.save": "Salvesta muudatused",
   "subscribed_languages.target": "Muuda tellitud keeli {target} jaoks",

app/javascript/mastodon/locales/eu.json

@@ -147,7 +147,6 @@
   "column.lists": "Zerrendak",
   "column.mutes": "Mutututako erabiltzaileak",
   "column.notifications": "Jakinarazpenak",
-  "column.pins": "Finkatutako bidalketak",
   "column.public": "Federatutako denbora-lerroa",
   "column_back_button.label": "Atzera",
   "column_header.hide_settings": "Ezkutatu ezarpenak",
@@ -432,7 +431,6 @@
   "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
   "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
   "keyboard_shortcuts.open_media": "Ireki edukia",
-  "keyboard_shortcuts.pinned": "Ireki finkatutako bidalketen zerrenda",
   "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "Erantzun bidalketari",
   "keyboard_shortcuts.requests": "Jarraitzeko eskaeren zerrenda irekia",
@@ -499,7 +497,6 @@
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.opened_in_classic_interface": "Argitalpenak, kontuak eta beste orri jakin batzuk lehenespenez irekitzen dira web-interfaze klasikoan.",
   "navigation_bar.personal": "Pertsonala",
-  "navigation_bar.pins": "Finkatutako bidalketak",
   "navigation_bar.preferences": "Hobespenak",
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.search": "Bilatu",
@@ -781,8 +778,6 @@
   "status.mute": "Mututu @{name}",
   "status.mute_conversation": "Mututu elkarrizketa",
   "status.open": "Hedatu bidalketa hau",
-  "status.pin": "Finkatu profilean",
-  "status.pinned": "Finkatutako bidalketa",
   "status.read_more": "Irakurri gehiago",
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
@@ -806,7 +801,6 @@
   "status.translated_from_with": "Itzuli {lang}(e)tik {provider} erabiliz",
   "status.uncached_media_warning": "Aurrebista ez dago erabilgarri",
   "status.unmute_conversation": "Desmututu elkarrizketa",
-  "status.unpin": "Desfinkatu profiletik",
   "subscribed_languages.lead": "Hautatutako hizkuntzetako bidalketak soilik agertuko dira zure denbora-lerroetan aldaketaren ondoren. Ez baduzu bat ere aukeratzen hizkuntza guztietako bidalketak jasoko dituzu.",
   "subscribed_languages.save": "Gorde aldaketak",
   "subscribed_languages.target": "Aldatu {target}(e)n harpidetutako hizkuntzak",

app/javascript/mastodon/locales/fa.json

@@ -168,7 +168,6 @@
   "column.lists": "سیاهه‌ها",
   "column.mutes": "کاربران خموش",
   "column.notifications": "آگاهی‌ها",
-  "column.pins": "فرسته‌های سنجاق شده",
   "column.public": "خط زمانی همگانی",
   "column_back_button.label": "بازگشت",
   "column_header.hide_settings": "نهفتن تنظیمات",
@@ -477,7 +476,6 @@
   "keyboard_shortcuts.my_profile": "گشودن نمایه‌تان",
   "keyboard_shortcuts.notifications": "گشودن ستون آگاهی‌ها",
   "keyboard_shortcuts.open_media": "گشودن رسانه",
-  "keyboard_shortcuts.pinned": "گشودن سیاههٔ فرسته‌های سنجاق شده",
   "keyboard_shortcuts.profile": "گشودن نمایهٔ نویسنده",
   "keyboard_shortcuts.reply": "پاسخ به فرسته",
   "keyboard_shortcuts.requests": "گشودن سیاههٔ درخواست‌های پی‌گیری",
@@ -561,7 +559,6 @@
   "navigation_bar.mutes": "کاربران خموشانده",
   "navigation_bar.opened_in_classic_interface": "فرسته‌ها، حساب‌ها و دیگر صفحه‌های خاص به طور پیش‌گزیده در میانای وب کلاسیک گشوده می‌شوند.",
   "navigation_bar.personal": "شخصی",
-  "navigation_bar.pins": "فرسته‌های سنجاق شده",
   "navigation_bar.preferences": "ترجیحات",
   "navigation_bar.public_timeline": "خط زمانی همگانی",
   "navigation_bar.search": "جست‌وجو",
@@ -857,8 +854,6 @@
   "status.mute": "خموشاندن ‎@{name}",
   "status.mute_conversation": "خموشاندن گفت‌وگو",
   "status.open": "گسترش این فرسته",
-  "status.pin": "سنجاق به نمایه",
-  "status.pinned": "فرستهٔ سنجاق شده",
   "status.read_more": "بیشتر بخوانید",
   "status.reblog": "تقویت",
   "status.reblog_private": "تقویت برای مخاطبان نخستین",
@@ -883,7 +878,6 @@
   "status.translated_from_with": "ترجمه از {lang} با {provider}",
   "status.uncached_media_warning": "پیش‌نمایش موجود نیست",
   "status.unmute_conversation": "رفع خموشی گفت‌وگو",
-  "status.unpin": "برداشتن سنجاق از نمایه",
   "subscribed_languages.lead": "پس از تغییر، تنها فرسته‌های به زبان‌های گزیده روی خانه و خط‌زمانی‌های سیاهه ظاهر خواهند شد. برای دریافت فرسته‌ها به تمامی زبان‌ها، هیچ‌کدام را برنگزینید.",
   "subscribed_languages.save": "ذخیرهٔ تغییرات",
   "subscribed_languages.target": "تغییر زبان‌های مشترک شده برای {target}",

app/javascript/mastodon/locales/fi.json

@@ -27,7 +27,9 @@
   "account.domain_blocking": "Verkkotunnus estetty",
   "account.edit_profile": "Muokkaa profiilia",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
-  "account.endorse": "Suosittele profiilissasi",
+  "account.endorse": "Suosittele profiilissa",
+  "account.featured": "Suositellut",
+  "account.featured.accounts": "Profiilit",
   "account.featured.hashtags": "Aihetunnisteet",
   "account.featured.posts": "Julkaisut",
   "account.featured_tags.last_status_at": "Viimeisin julkaisu {date}",
@@ -73,7 +75,7 @@
   "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
   "account.unblock_domain_short": "Kumoa esto",
   "account.unblock_short": "Kumoa esto",
-  "account.unendorse": "Kumoa suosittelu profiilissasi",
+  "account.unendorse": "Kumoa suosittelu profiilissa",
   "account.unfollow": "Älä seuraa",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications_short": "Poista ilmoitusten mykistys",
@@ -167,7 +169,7 @@
   "column.lists": "Listat",
   "column.mutes": "Mykistetyt käyttäjät",
   "column.notifications": "Ilmoitukset",
-  "column.pins": "Kiinnitetyt julkaisut",
+  "column.pins": "Suositellut julkaisut",
   "column.public": "Yleinen aikajana",
   "column_back_button.label": "Takaisin",
   "column_header.hide_settings": "Piilota asetukset",
@@ -303,6 +305,9 @@
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
+  "empty_column.account_featured.me": "Et suosittele vielä mitään. Tiesitkö, että voit suositella profiilissasi julkaisujasi, eniten käyttämiäsi aihetunnisteita ja jopa ystäviesi tilejä?",
+  "empty_column.account_featured.other": "{acct} ei suosittele vielä mitään. Tiesitkö, että voit suositella profiilissasi julkaisujasi, eniten käyttämiäsi aihetunnisteita ja jopa ystäviesi tilejä?",
+  "empty_column.account_featured_other.unknown": "Tämä tili ei suosittele vielä mitään.",
   "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",
   "empty_column.account_timeline": "Ei viestejä täällä.",
@@ -401,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} osallistuja} other {{counter} osallistujaa}}",
   "hashtag.counter_by_uses": "{count, plural, one{{counter} julkaisu} other {{counter} julkaisua}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}} tänään",
+  "hashtag.feature": "Suosittele profiilissa",
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.mute": "Mykistä #{hashtag}",
+  "hashtag.unfeature": "Kumoa suosittelu profiilissa",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
   "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",
@@ -473,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Avaa profiilisi",
   "keyboard_shortcuts.notifications": "Avaa ilmoitussarake",
   "keyboard_shortcuts.open_media": "Avaa media",
-  "keyboard_shortcuts.pinned": "Avaa kiinnitettyjen julkaisujen luettelo",
+  "keyboard_shortcuts.pinned": "Avaa suositeltujen julkaisujen luettelo",
   "keyboard_shortcuts.profile": "Avaa tekijän profiili",
   "keyboard_shortcuts.reply": "Vastaa julkaisuun",
   "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
@@ -557,7 +564,7 @@
   "navigation_bar.mutes": "Mykistetyt käyttäjät",
   "navigation_bar.opened_in_classic_interface": "Julkaisut, profiilit ja tietyt muut sivut avautuvat oletuksena perinteiseen selainkäyttöliittymään.",
   "navigation_bar.personal": "Henkilökohtaiset",
-  "navigation_bar.pins": "Kiinnitetyt julkaisut",
+  "navigation_bar.pins": "Suositellut julkaisut",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.public_timeline": "Yleinen aikajana",
   "navigation_bar.search": "Haku",
@@ -853,8 +860,7 @@
   "status.mute": "Mykistä @{name}",
   "status.mute_conversation": "Mykistä keskustelu",
   "status.open": "Laajenna julkaisu",
-  "status.pin": "Kiinnitä profiiliin",
-  "status.pinned": "Kiinnitetty julkaisu",
+  "status.pin": "Suosittele profiilissa",
   "status.read_more": "Näytä enemmän",
   "status.reblog": "Tehosta",
   "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
@@ -879,7 +885,7 @@
   "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
   "status.uncached_media_warning": "Esikatselu ei ole käytettävissä",
   "status.unmute_conversation": "Kumoa keskustelun mykistys",
-  "status.unpin": "Irrota profiilista",
+  "status.unpin": "Kumoa suosittelu profiilissa",
   "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
   "subscribed_languages.save": "Tallenna muutokset",
   "subscribed_languages.target": "Vaihda tilattuja kieliä käyttäjältä {target}",

app/javascript/mastodon/locales/fil.json

@@ -98,7 +98,6 @@
   "column.lists": "Mga listahan",
   "column.mutes": "Mga pinatahimik na tagagamit",
   "column.notifications": "Mga abiso",
-  "column.pins": "Mga nakapaskil na post",
   "column.public": "Pinagsamang timeline",
   "column_back_button.label": "Bumalik",
   "column_header.hide_settings": "I-tago ang mga setting",

app/javascript/mastodon/locales/fo.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Boða mær frá, tá @{name} skrivar",
   "account.endorse": "Víst á vangamyndini",
   "account.featured": "Tikin fram",
+  "account.featured.accounts": "Vangar",
   "account.featured.hashtags": "Frámerki",
   "account.featured.posts": "Postar",
   "account.featured_tags.last_status_at": "Seinasta strongur skrivaður {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listar",
   "column.mutes": "Sløktir brúkarar",
   "column.notifications": "Fráboðanir",
-  "column.pins": "Festir postar",
+  "column.pins": "Postar, ið eru tiknir fram",
   "column.public": "Felags tíðarlinja",
   "column_back_button.label": "Aftur",
   "column_header.hide_settings": "Fjal stillingar",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} luttakari} other {{counter} luttakarar}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} postur} other {{counter} postar}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postur} other {{counter} postar}} í dag",
+  "hashtag.feature": "Vís á vanga",
   "hashtag.follow": "Fylg frámerki",
   "hashtag.mute": "Doyv @#{hashtag}",
+  "hashtag.unfeature": "Vís ikki á vanga",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
   "hints.profiles.followers_may_be_missing": "Fylgjarar hjá hesum vanganum kunnu mangla.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Lat vanga tín upp",
   "keyboard_shortcuts.notifications": "Lat fráboðanarteig upp",
   "keyboard_shortcuts.open_media": "Lat miðlar upp",
-  "keyboard_shortcuts.pinned": "Lat lista yvir festar postar upp",
+  "keyboard_shortcuts.pinned": "Lat listan við postum, ið eru tiknir fram, upp",
   "keyboard_shortcuts.profile": "Lat vangan hjá høvundinum upp",
   "keyboard_shortcuts.reply": "Svara posti",
   "keyboard_shortcuts.requests": "Lat lista við fylgjaraumbønum upp",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Doyvdir brúkarar",
   "navigation_bar.opened_in_classic_interface": "Postar, kontur og aðrar serstakar síður verða - um ikki annað er ásett - latnar upp í klassiska vev-markamótinum.",
   "navigation_bar.personal": "Persónligt",
-  "navigation_bar.pins": "Festir postar",
+  "navigation_bar.pins": "Postar, ið eru tiknir fram",
   "navigation_bar.preferences": "Stillingar",
   "navigation_bar.public_timeline": "Felags tíðarlinja",
   "navigation_bar.search": "Leita",
@@ -857,8 +860,7 @@
   "status.mute": "Doyv @{name}",
   "status.mute_conversation": "Doyv samrøðu",
   "status.open": "Víðka henda postin",
-  "status.pin": "Ger fastan í vangan",
-  "status.pinned": "Festur postur",
+  "status.pin": "Vís á vanga",
   "status.read_more": "Les meira",
   "status.reblog": "Stimbra",
   "status.reblog_private": "Stimbra við upprunasýni",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Umsett frá {lang} við {provider}",
   "status.uncached_media_warning": "Undanvísing ikki tøk",
   "status.unmute_conversation": "Strika doyving av samrøðu",
-  "status.unpin": "Loys frá vanga",
+  "status.unpin": "Vís ikki á vanga",
   "subscribed_languages.lead": "Eftir broytingina fara einans postar á valdum málum at síggjast á tíni heimarás og á tínum listatíðarlinjum. Vel ongi fyri at fáa postar á øllum málum.",
   "subscribed_languages.save": "Goym broytingar",
   "subscribed_languages.target": "Broyt haldaramál fyri {target}",

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

@@ -161,7 +161,6 @@
   "column.lists": "Listes",
   "column.mutes": "Comptes masqués",
   "column.notifications": "Notifications",
-  "column.pins": "Publications épinglés",
   "column.public": "Fil global",
   "column_back_button.label": "Retour",
   "column_header.hide_settings": "Cacher les paramètres",
@@ -461,7 +460,6 @@
   "keyboard_shortcuts.my_profile": "Ouvrir votre profil",
   "keyboard_shortcuts.notifications": "Ouvrir la colonne de notifications",
   "keyboard_shortcuts.open_media": "Ouvrir média",
-  "keyboard_shortcuts.pinned": "Ouvrir la liste de publications épinglés",
   "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
   "keyboard_shortcuts.reply": "Répondre au message",
   "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
@@ -545,7 +543,6 @@
   "navigation_bar.mutes": "Utilisateurs masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.personal": "Personnel",
-  "navigation_bar.pins": "Publications épinglés",
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.public_timeline": "Fil global",
   "navigation_bar.search": "Rechercher",
@@ -841,8 +838,6 @@
   "status.mute": "Masquer @{name}",
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Afficher la publication entière",
-  "status.pin": "Épingler sur profil",
-  "status.pinned": "Message épinglé",
   "status.read_more": "En savoir plus",
   "status.reblog": "Booster",
   "status.reblog_private": "Booster avec visibilité originale",
@@ -867,7 +862,6 @@
   "status.translated_from_with": "Traduit de {lang} avec {provider}",
   "status.uncached_media_warning": "Aperçu non disponible",
   "status.unmute_conversation": "Ne plus masquer cette conversation",
-  "status.unpin": "Désépingler du profil",
   "subscribed_languages.lead": "Seules des publications dans les langues sélectionnées apparaîtront sur vos fil d'accueil et de liste(s) après le changement. N'en sélectionnez aucune pour recevoir des publications dans toutes les langues.",
   "subscribed_languages.save": "Enregistrer les modifications",
   "subscribed_languages.target": "Changer les langues abonnées pour {target}",

app/javascript/mastodon/locales/fr.json

@@ -161,7 +161,6 @@
   "column.lists": "Listes",
   "column.mutes": "Comptes masqués",
   "column.notifications": "Notifications",
-  "column.pins": "Messages épinglés",
   "column.public": "Fil fédéré",
   "column_back_button.label": "Retour",
   "column_header.hide_settings": "Cacher les paramètres",
@@ -461,7 +460,6 @@
   "keyboard_shortcuts.my_profile": "Ouvrir votre profil",
   "keyboard_shortcuts.notifications": "Ouvrir la colonne de notifications",
   "keyboard_shortcuts.open_media": "Ouvrir le média",
-  "keyboard_shortcuts.pinned": "Ouvrir la liste des messages épinglés",
   "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
   "keyboard_shortcuts.reply": "Répondre au message",
   "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
@@ -545,7 +543,6 @@
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.personal": "Personnel",
-  "navigation_bar.pins": "Messages épinglés",
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.public_timeline": "Fil fédéré",
   "navigation_bar.search": "Rechercher",
@@ -841,8 +838,6 @@
   "status.mute": "Masquer @{name}",
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Afficher le message entier",
-  "status.pin": "Épingler sur le profil",
-  "status.pinned": "Message épinglé",
   "status.read_more": "En savoir plus",
   "status.reblog": "Partager",
   "status.reblog_private": "Partager à l’audience originale",
@@ -867,7 +862,6 @@
   "status.translated_from_with": "Traduit de {lang} en utilisant {provider}",
   "status.uncached_media_warning": "Prévisualisation non disponible",
   "status.unmute_conversation": "Ne plus masquer la conversation",
-  "status.unpin": "Retirer du profil",
   "subscribed_languages.lead": "Seuls les messages dans les langues sélectionnées apparaîtront sur votre fil principal et vos listes de fils après le changement. Sélectionnez aucune pour recevoir les messages dans toutes les langues.",
   "subscribed_languages.save": "Enregistrer les modifications",
   "subscribed_languages.target": "Changer les langues abonnées pour {target}",

app/javascript/mastodon/locales/fy.json

@@ -168,7 +168,6 @@
   "column.lists": "Listen",
   "column.mutes": "Negearre brûkers",
   "column.notifications": "Meldingen",
-  "column.pins": "Fêstsette berjochten",
   "column.public": "Globale tiidline",
   "column_back_button.label": "Tebek",
   "column_header.hide_settings": "Ynstellingen ferstopje",
@@ -477,7 +476,6 @@
   "keyboard_shortcuts.my_profile": "Jo profyl iepenje",
   "keyboard_shortcuts.notifications": "Meldingen toane",
   "keyboard_shortcuts.open_media": "Media iepenje",
-  "keyboard_shortcuts.pinned": "Fêstsette berjochten toane",
   "keyboard_shortcuts.profile": "Skriuwersprofyl iepenje",
   "keyboard_shortcuts.reply": "Berjocht beäntwurdzje",
   "keyboard_shortcuts.requests": "Folchfersiken toane",
@@ -561,7 +559,6 @@
   "navigation_bar.mutes": "Negearre brûkers",
   "navigation_bar.opened_in_classic_interface": "Berjochten, accounts en oare spesifike siden, wurde standert iepene yn de klassike webinterface.",
   "navigation_bar.personal": "Persoanlik",
-  "navigation_bar.pins": "Fêstsette berjochten",
   "navigation_bar.preferences": "Ynstellingen",
   "navigation_bar.public_timeline": "Globale tiidline",
   "navigation_bar.search": "Sykje",
@@ -857,8 +854,6 @@
   "status.mute": "@{name} negearje",
   "status.mute_conversation": "Petear negearje",
   "status.open": "Dit berjocht útklappe",
-  "status.pin": "Op profylside fêstsette",
-  "status.pinned": "Fêstset berjocht",
   "status.read_more": "Mear ynfo",
   "status.reblog": "Booste",
   "status.reblog_private": "Boost nei oarspronklike ûntfangers",
@@ -883,7 +878,6 @@
   "status.translated_from_with": "Fan {lang} út oersetten mei {provider}",
   "status.uncached_media_warning": "Foarfertoaning net beskikber",
   "status.unmute_conversation": "Petear net mear negearje",
-  "status.unpin": "Fan profylside losmeitsje",
   "subscribed_languages.lead": "Nei de wiziging wurde allinnich berjochten fan selektearre talen op jo starttiidline en yn listen werjaan.",
   "subscribed_languages.save": "Wizigingen bewarje",
   "subscribed_languages.target": "Toande talen foar {target} wizigje",

app/javascript/mastodon/locales/ga.json

@@ -19,13 +19,18 @@
   "account.block_domain": "Bac ainm fearainn {domain}",
   "account.block_short": "Bloc",
   "account.blocked": "Bactha",
+  "account.blocking": "Ag Blocáil",
   "account.cancel_follow_request": "Éirigh as iarratas leanta",
   "account.copy": "Cóipeáil nasc chuig an bpróifíl",
   "account.direct": "Luaigh @{name} go príobháideach",
   "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
+  "account.domain_blocking": "Fearann a bhlocáil",
   "account.edit_profile": "Cuir an phróifíl in eagar",
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
+  "account.featured": "Faoi thrácht",
+  "account.featured.hashtags": "Haischlibeanna",
+  "account.featured.posts": "Poist",
   "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
   "account.featured_tags.last_status_never": "Gan aon phoist",
   "account.follow": "Lean",
@@ -36,6 +41,7 @@
   "account.following": "Ag leanúint",
   "account.following_counter": "{count, plural, one {{counter} ag leanúint} other {{counter} ag leanúint}}",
   "account.follows.empty": "Ní leanann an t-úsáideoir seo aon duine go fóill.",
+  "account.follows_you": "Leanann tú",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
   "account.in_memoriam": "Cuimhneachán.",
@@ -50,13 +56,17 @@
   "account.mute_notifications_short": "Balbhaigh fógraí",
   "account.mute_short": "Balbhaigh",
   "account.muted": "Balbhaithe",
+  "account.muting": "Ag balbhaigh",
+  "account.mutual": "Leanann sibh a chéile",
   "account.no_bio": "Níor tugadh tuairisc.",
   "account.open_original_page": "Oscail an leathanach bunaidh",
   "account.posts": "Postálacha",
   "account.posts_with_replies": "Postálacha agus freagraí",
+  "account.remove_from_followers": "Bain {name} de na leantóirí",
   "account.report": "Tuairiscigh @{name}",
   "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
   "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint",
+  "account.requests_to_follow_you": "Iarratais chun tú a leanúint",
   "account.share": "Roinn próifíl @{name}",
   "account.show_reblogs": "Taispeáin moltaí ó @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} poist}}",
@@ -158,7 +168,7 @@
   "column.lists": "Liostaí",
   "column.mutes": "Úsáideoirí balbhaithe",
   "column.notifications": "Fógraí",
-  "column.pins": "Postálacha pionnáilte",
+  "column.pins": "Poist le feiceáil",
   "column.public": "Amlíne cónaidhmithe",
   "column_back_button.label": "Ar ais",
   "column_header.hide_settings": "Folaigh socruithe",
@@ -224,6 +234,9 @@
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an postáil seo a scriosadh agus é a athdhréachtú? Caillfear ceanáin agus treisithe, agus dílleachtaí freagraí ar an mbunphostála.",
   "confirmations.redraft.title": "Scrios & athdhréachtú postáil?",
+  "confirmations.remove_from_followers.confirm": "Bain leantóir",
+  "confirmations.remove_from_followers.message": "Scoirfidh {name} de bheith ag leanúint leat. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
+  "confirmations.remove_from_followers.title": "Bain an leantóir?",
   "confirmations.reply.confirm": "Freagair",
   "confirmations.reply.message": "Scriosfaidh freagra láithreach an teachtaireacht atá a chumadh anois agat. An bhfuil tú cinnte gur mhaith leat leanúint leat?",
   "confirmations.reply.title": "Forscríobh postáil?",
@@ -291,6 +304,9 @@
   "emoji_button.search_results": "Torthaí cuardaigh",
   "emoji_button.symbols": "Comharthaí",
   "emoji_button.travel": "Taisteal ⁊ Áiteanna",
+  "empty_column.account_featured.me": "Níl aon rud curtha i láthair agat go fóill. An raibh a fhios agat gur féidir leat do phoist, na hashtags is mó a úsáideann tú, agus fiú cuntais do chairde a chur i láthair ar do phróifíl?",
+  "empty_column.account_featured.other": "Níl aon rud feicthe ag {acct} go fóill. An raibh a fhios agat gur féidir leat do phoist, na haischlibeanna is mó a úsáideann tú, agus fiú cuntais do chairde a chur ar do phróifíl?",
+  "empty_column.account_featured_other.unknown": "Níl aon rud le feiceáil sa chuntas seo go fóill.",
   "empty_column.account_hides_collections": "Roghnaigh an t-úsáideoir seo gan an fhaisnéis seo a chur ar fáil",
   "empty_column.account_suspended": "Cuntas ar fionraí",
   "empty_column.account_timeline": "Níl postálacha ar bith anseo!",
@@ -375,6 +391,8 @@
   "generic.saved": "Sábháilte",
   "getting_started.heading": "Ag tosú amach",
   "hashtag.admin_moderation": "Oscail comhéadan modhnóireachta le haghaidh #{name}",
+  "hashtag.browse": "Brabhsáil poist i #{hashtag}",
+  "hashtag.browse_from_account": "Brabhsáil poist ó @{name} i #{hashtag}",
   "hashtag.column_header.tag_mode.all": "agus {additional}",
   "hashtag.column_header.tag_mode.any": "nó {additional}",
   "hashtag.column_header.tag_mode.none": "gan {additional}",
@@ -388,6 +406,7 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} two {{counter} post} few {{counter} post} many {{counter} post} other {{counter} poist}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post inniu} other {{counter} poist inniu}} inniu",
   "hashtag.follow": "Lean haischlib",
+  "hashtag.mute": "Balbhaigh #{hashtag}",
   "hashtag.unfollow": "Ná lean haischlib",
   "hashtags.and_other": "agus {count, plural, one {} two {# níos} few {# níos} many {# níos} other {# níos}}",
   "hints.profiles.followers_may_be_missing": "Seans go bhfuil leantóirí don phróifíl seo in easnamh.",
@@ -458,7 +477,7 @@
   "keyboard_shortcuts.my_profile": "Oscail do phróifíl",
   "keyboard_shortcuts.notifications": "Oscail colún fógraí",
   "keyboard_shortcuts.open_media": "Oscail meáin",
-  "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
+  "keyboard_shortcuts.pinned": "Oscail liosta na bpostálacha le feiceáil",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
   "keyboard_shortcuts.reply": "Freagair ar phostáil",
   "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
@@ -542,7 +561,7 @@
   "navigation_bar.mutes": "Úsáideoirí balbhaithe",
   "navigation_bar.opened_in_classic_interface": "Osclaítear poist, cuntais agus leathanaigh shonracha eile de réir réamhshocraithe sa chomhéadan gréasáin clasaiceach.",
   "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Postálacha pionnáilte",
+  "navigation_bar.pins": "Poist le feiceáil",
   "navigation_bar.preferences": "Sainroghanna pearsanta",
   "navigation_bar.public_timeline": "Amlíne cónaidhmithe",
   "navigation_bar.search": "Cuardaigh",
@@ -838,8 +857,7 @@
   "status.mute": "Balbhaigh @{name}",
   "status.mute_conversation": "Balbhaigh comhrá",
   "status.open": "Leathnaigh an post seo",
-  "status.pin": "Pionnáil ar do phróifíl",
-  "status.pinned": "Postáil pionnáilte",
+  "status.pin": "Gné ar phróifíl",
   "status.read_more": "Léan a thuilleadh",
   "status.reblog": "Treisiú",
   "status.reblog_private": "Mol le léargas bunúsach",
@@ -864,7 +882,7 @@
   "status.translated_from_with": "D'Aistrigh ón {lang} ag úsáid {provider}",
   "status.uncached_media_warning": "Níl an réamhamharc ar fáil",
   "status.unmute_conversation": "Díbhalbhaigh comhrá",
-  "status.unpin": "Díphionnáil de do phróifíl",
+  "status.unpin": "Ná cuir le feiceáil ar phróifíl",
   "subscribed_languages.lead": "Ní bheidh ach postálacha i dteangacha roghnaithe le feiceáil ar do bhaile agus liostaí amlínte tar éis an athraithe. Roghnaigh ceann ar bith chun postálacha a fháil i ngach teanga.",
   "subscribed_languages.save": "Sábháil athruithe",
   "subscribed_languages.target": "Athraigh teangacha suibscríofa le haghaidh {target}",

app/javascript/mastodon/locales/gd.json

@@ -145,7 +145,6 @@
   "column.lists": "Liostaichean",
   "column.mutes": "Cleachdaichean mùchte",
   "column.notifications": "Brathan",
-  "column.pins": "Postaichean prìnichte",
   "column.public": "Loidhne-ama cho-naisgte",
   "column_back_button.label": "Air ais",
   "column_header.hide_settings": "Falaich na roghainnean",
@@ -421,7 +420,6 @@
   "keyboard_shortcuts.my_profile": "Fosgail a’ phròifil agad",
   "keyboard_shortcuts.notifications": "Fosgail colbh nam brathan",
   "keyboard_shortcuts.open_media": "Fosgail meadhan",
-  "keyboard_shortcuts.pinned": "Fosgail liosta nam postaichean prìnichte",
   "keyboard_shortcuts.profile": "Fosgail pròifil an ùghdair",
   "keyboard_shortcuts.reply": "Freagair do phost",
   "keyboard_shortcuts.requests": "Fosgail liosta nan iarrtasan leantainn",
@@ -483,7 +481,6 @@
   "navigation_bar.mutes": "Cleachdaichean mùchte",
   "navigation_bar.opened_in_classic_interface": "Thèid postaichean, cunntasan ’s duilleagan sònraichte eile fhosgladh san eadar-aghaidh-lìn chlasaigeach a ghnàth.",
   "navigation_bar.personal": "Pearsanta",
-  "navigation_bar.pins": "Postaichean prìnichte",
   "navigation_bar.preferences": "Roghainnean",
   "navigation_bar.public_timeline": "Loidhne-ama cho-naisgte",
   "navigation_bar.search": "Lorg",
@@ -767,8 +764,6 @@
   "status.mute": "Mùch @{name}",
   "status.mute_conversation": "Mùch an còmhradh",
   "status.open": "Leudaich am post seo",
-  "status.pin": "Prìnich ris a’ phròifil",
-  "status.pinned": "Post prìnichte",
   "status.read_more": "Leugh an còrr",
   "status.reblog": "Brosnaich",
   "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
@@ -792,7 +787,6 @@
   "status.translated_from_with": "Air eadar-theangachadh o {lang} le {provider}",
   "status.uncached_media_warning": "Chan eil ro-shealladh ri fhaighinn",
   "status.unmute_conversation": "Dì-mhùch an còmhradh",
-  "status.unpin": "Dì-phrìnich on phròifil",
   "subscribed_languages.lead": "Cha nochd ach na postaichean sna cànanan a thagh thu air loidhnichean-ama na dachaigh ’s nan liostaichean às dèidh an atharrachaidh seo. Na tagh gin ma tha thu airson na postaichean uile fhaighinn ge b’ e dè an cànan.",
   "subscribed_languages.save": "Sàbhail na h-atharraichean",
   "subscribed_languages.target": "Atharraich fo-sgrìobhadh nan cànan airson {target}",

app/javascript/mastodon/locales/gl.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
   "account.featured": "Destacado",
+  "account.featured.accounts": "Perfís",
   "account.featured.hashtags": "Cancelos",
   "account.featured.posts": "Publicacións",
   "account.featured_tags.last_status_at": "Última publicación o {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listaxes",
   "column.mutes": "Usuarias acaladas",
   "column.notifications": "Notificacións",
-  "column.pins": "Publicacións fixadas",
+  "column.pins": "Publicacións destacadas",
   "column.public": "Cronoloxía federada",
   "column_back_button.label": "Volver",
   "column_header.hide_settings": "Agochar axustes",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicacións}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicación} other {{counter} publicacións}} hoxe",
+  "hashtag.feature": "Destacar no perfil",
   "hashtag.follow": "Seguir cancelo",
   "hashtag.mute": "Acalar a #{hashtag}",
+  "hashtag.unfeature": "Non destacar no perfil",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
   "hints.profiles.followers_may_be_missing": "Poderían faltar seguidoras deste perfil.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Para abrir o teu perfil",
   "keyboard_shortcuts.notifications": "Para abrir a columna das notificacións",
   "keyboard_shortcuts.open_media": "Para abrir o contido multimedia",
-  "keyboard_shortcuts.pinned": "Para abrir a listaxe das publicacións fixadas",
+  "keyboard_shortcuts.pinned": "Abrir lista das publicacións destacadas",
   "keyboard_shortcuts.profile": "Para abrir o perfil da autora",
   "keyboard_shortcuts.reply": "Para responder",
   "keyboard_shortcuts.requests": "Para abrir a listaxe das peticións de seguimento",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Usuarias silenciadas",
   "navigation_bar.opened_in_classic_interface": "Publicacións, contas e outras páxinas dedicadas ábrense por defecto na interface web clásica.",
   "navigation_bar.personal": "Persoal",
-  "navigation_bar.pins": "Publicacións fixadas",
+  "navigation_bar.pins": "Publicacións destacadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Cronoloxía federada",
   "navigation_bar.search": "Buscar",
@@ -857,8 +860,7 @@
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Estender esta publicación",
-  "status.pin": "Fixar no perfil",
-  "status.pinned": "Publicación fixada",
+  "status.pin": "Destacar no perfil",
   "status.read_more": "Ler máis",
   "status.reblog": "Promover",
   "status.reblog_private": "Compartir coa audiencia orixinal",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Traducido do {lang} usando {provider}",
   "status.uncached_media_warning": "A vista previa non está dispoñíble",
   "status.unmute_conversation": "Deixar de silenciar conversa",
-  "status.unpin": "Non fixar no perfil",
+  "status.unpin": "Non destacar no perfil",
   "subscribed_languages.lead": "Ao facer cambios só as publicacións nos idiomas seleccionados aparecerán nas túas cronoloxías. Non elixas ningún para poder ver publicacións en tódolos idiomas.",
   "subscribed_languages.save": "Gardar cambios",
   "subscribed_languages.target": "Cambiar a subscrición a idiomas para {target}",

app/javascript/mastodon/locales/he.json

@@ -18,7 +18,7 @@
   "account.block": "חסמי את @{name}",
   "account.block_domain": "חסמו את קהילת {domain}",
   "account.block_short": "לחסום",
-  "account.blocked": "לחסום",
+  "account.blocked": "חסום",
   "account.blocking": "רשימת החשבונות החסומים",
   "account.cancel_follow_request": "משיכת בקשת מעקב",
   "account.copy": "להעתיק קישור לפרופיל",
@@ -29,6 +29,7 @@
   "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
   "account.endorse": "קדם את החשבון בפרופיל",
   "account.featured": "מומלץ",
+  "account.featured.accounts": "פרופילים",
   "account.featured.hashtags": "תגיות",
   "account.featured.posts": "הודעות",
   "account.featured_tags.last_status_at": "חצרוץ אחרון בתאריך {date}",
@@ -168,7 +169,7 @@
   "column.lists": "רשימות",
   "column.mutes": "משתמשים בהשתקה",
   "column.notifications": "התראות",
-  "column.pins": "חיצרוצים נעוצים",
+  "column.pins": "הודעות מובלטות",
   "column.public": "פיד כללי (כל השרתים)",
   "column_back_button.label": "בחזרה",
   "column_header.hide_settings": "הסתרת הגדרות",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{counter} משתתפיםות}}",
   "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}} היום",
+  "hashtag.feature": "מובלט בפרופיל",
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.mute": "להשתיק את #{hashtag}",
+  "hashtag.unfeature": "לא להבליט בפרופיל",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
   "hints.profiles.followers_may_be_missing": "יתכן כי עוקבים של פרופיל זה חסרים.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "פתיחת הפרופיל שלך",
   "keyboard_shortcuts.notifications": "פתיחת טור התראות",
   "keyboard_shortcuts.open_media": "פתיחת מדיה",
-  "keyboard_shortcuts.pinned": "פתיחת הודעה נעוצות",
+  "keyboard_shortcuts.pinned": "פתיחת רשימת הודעות מובלטות",
   "keyboard_shortcuts.profile": "פתח את פרופיל המשתמש",
   "keyboard_shortcuts.reply": "תגובה להודעה",
   "keyboard_shortcuts.requests": "פתיחת רשימת בקשות מעקב",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "משתמשים בהשתקה",
   "navigation_bar.opened_in_classic_interface": "הודעות, חשבונות ושאר עמודי רשת יפתחו כברירת מחדל בדפדפן רשת קלאסי.",
   "navigation_bar.personal": "אישי",
-  "navigation_bar.pins": "הודעות נעוצות",
+  "navigation_bar.pins": "הודעות מובלטות",
   "navigation_bar.preferences": "העדפות",
   "navigation_bar.public_timeline": "פיד כללי (כל השרתים)",
   "navigation_bar.search": "חיפוש",
@@ -857,8 +860,7 @@
   "status.mute": "להשתיק את @{name}",
   "status.mute_conversation": "השתקת שיחה",
   "status.open": "הרחבת הודעה זו",
-  "status.pin": "הצמדה לפרופיל שלי",
-  "status.pinned": "חצרוץ נעוץ",
+  "status.pin": "מובלט בפרופיל",
   "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
   "status.reblog_private": "להדהד ברמת הנראות המקורית",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "לתרגם משפה {lang} באמצעות {provider}",
   "status.uncached_media_warning": "תצוגה מקדימה אינה זמינה",
   "status.unmute_conversation": "הסרת השתקת שיחה",
-  "status.unpin": "לשחרר מקיבוע באודות",
+  "status.unpin": "לא להבליט בפרופיל",
   "subscribed_languages.lead": "רק חצרוצים בשפות הנבחרות יופיעו בפיד הבית וברשימות שלך אחרי השינוי. נקו את כל הבחירות כדי לראות את כל השפות.",
   "subscribed_languages.save": "שמירת שינויים",
   "subscribed_languages.target": "שינוי רישום שפה עבור {target}",

app/javascript/mastodon/locales/hi.json

@@ -120,7 +120,6 @@
   "column.lists": "सूचियाँ",
   "column.mutes": "म्यूट किये हुए यूजर",
   "column.notifications": "नोटिफिकेशन्स",
-  "column.pins": "पिनड टूट्स",
   "column.public": "फ़ेडरेटेड टाइम्लाइन",
   "column_back_button.label": "पीछे जाए",
   "column_header.hide_settings": "सेटिंग्स छुपाए",
@@ -320,7 +319,6 @@
   "keyboard_shortcuts.my_profile": "आपकी प्रोफाइल खोलने के लिए",
   "keyboard_shortcuts.notifications": "नोटिफिकेशन कॉलम खोलने के लिए",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "पिनड टूट्स की लिस्ट खोलने के लिए",
   "keyboard_shortcuts.profile": "लेखक की प्रोफाइल खोलने के लिए",
   "keyboard_shortcuts.reply": "जवाब के लिए",
   "keyboard_shortcuts.requests": "फॉलो रिक्वेस्ट लिस्ट खोलने के लिए",
@@ -360,7 +358,6 @@
   "navigation_bar.logout": "बाहर जाए",
   "navigation_bar.mutes": "शांत किए गए सभ्य",
   "navigation_bar.personal": "निजी",
-  "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "पसंदे",
   "navigation_bar.search": "ढूंढें",
   "navigation_bar.security": "सुरक्षा",
@@ -462,8 +459,6 @@
   "status.mute": "@{name} म्यूट करें",
   "status.mute_conversation": "इस वार्तालाप को म्यूट करें",
   "status.open": "Expand this status",
-  "status.pin": "प्रोफ़ाइल पर पिन करें",
-  "status.pinned": "Pinned toot",
   "status.read_more": "और पढ़ें",
   "status.reblog": "बूस्ट",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",

app/javascript/mastodon/locales/hr.json

@@ -106,7 +106,6 @@
   "column.lists": "Liste",
   "column.mutes": "Utišani korisnici",
   "column.notifications": "Obavijesti",
-  "column.pins": "Prikvačeni tootovi",
   "column.public": "Federalna vremenska crta",
   "column_back_button.label": "Natrag",
   "column_header.hide_settings": "Sakrij postavke",
@@ -271,7 +270,6 @@
   "keyboard_shortcuts.my_profile": "za otvaranje Vašeg profila",
   "keyboard_shortcuts.notifications": "za otvaranje stupca s obavijestima",
   "keyboard_shortcuts.open_media": "za otvaranje medijskog sadržaja",
-  "keyboard_shortcuts.pinned": "za otvaranje liste prikvačenih tootova",
   "keyboard_shortcuts.profile": "za otvaranje autorovog profila",
   "keyboard_shortcuts.reply": "za odgovaranje",
   "keyboard_shortcuts.requests": "za otvaranje liste zahtjeva za praćenje",
@@ -309,7 +307,6 @@
   "navigation_bar.logout": "Odjavi se",
   "navigation_bar.mutes": "Utišani korisnici",
   "navigation_bar.personal": "Osobno",
-  "navigation_bar.pins": "Prikvačeni tootovi",
   "navigation_bar.preferences": "Postavke",
   "navigation_bar.public_timeline": "Federalna vremenska crta",
   "navigation_bar.search": "Traži",
@@ -432,8 +429,6 @@
   "status.mute": "Utišaj @{name}",
   "status.mute_conversation": "Utišaj razgovor",
   "status.open": "Proširi ovaj toot",
-  "status.pin": "Prikvači na profil",
-  "status.pinned": "Pinned toot",
   "status.read_more": "Pročitajte više",
   "status.reblog": "Boostaj",
   "status.reblog_private": "Boostaj s izvornom vidljivošću",
@@ -453,7 +448,6 @@
   "status.translated_from_with": "Prevedno s {lang} koristeći {provider}",
   "status.uncached_media_warning": "Pregled nije dostupan",
   "status.unmute_conversation": "Poništi utišavanje razgovora",
-  "status.unpin": "Otkvači s profila",
   "subscribed_languages.save": "Spremi promjene",
   "tabs_bar.home": "Početna",
   "tabs_bar.notifications": "Obavijesti",

app/javascript/mastodon/locales/hu.json

@@ -168,7 +168,7 @@
   "column.lists": "Listák",
   "column.mutes": "Némított felhasználók",
   "column.notifications": "Értesítések",
-  "column.pins": "Kitűzött bejegyzések",
+  "column.pins": "Kiemelt bejegyzések",
   "column.public": "Föderációs idővonal",
   "column_back_button.label": "Vissza",
   "column_header.hide_settings": "Beállítások elrejtése",
@@ -477,7 +477,7 @@
   "keyboard_shortcuts.my_profile": "Saját profil megnyitása",
   "keyboard_shortcuts.notifications": "Értesítések oszlop megnyitása",
   "keyboard_shortcuts.open_media": "Média megnyitása",
-  "keyboard_shortcuts.pinned": "Kitűzött bejegyzések listájának megnyitása",
+  "keyboard_shortcuts.pinned": "Kiemelt bejegyzések listájának megnyitása",
   "keyboard_shortcuts.profile": "Szerző profiljának megnyitása",
   "keyboard_shortcuts.reply": "Válasz bejegyzésre",
   "keyboard_shortcuts.requests": "Követési kérések listájának megnyitása",
@@ -561,7 +561,6 @@
   "navigation_bar.mutes": "Némított felhasználók",
   "navigation_bar.opened_in_classic_interface": "A bejegyzések, fiókok és más speciális oldalak alapértelmezés szerint a klasszikus webes felületen nyílnak meg.",
   "navigation_bar.personal": "Személyes",
-  "navigation_bar.pins": "Kitűzött bejegyzések",
   "navigation_bar.preferences": "Beállítások",
   "navigation_bar.public_timeline": "Föderációs idővonal",
   "navigation_bar.search": "Keresés",
@@ -857,8 +856,6 @@
   "status.mute": "@{name} némítása",
   "status.mute_conversation": "Beszélgetés némítása",
   "status.open": "Bejegyzés kibontása",
-  "status.pin": "Kitűzés a profilodra",
-  "status.pinned": "Kitűzött bejegyzés",
   "status.read_more": "Bővebben",
   "status.reblog": "Megtolás",
   "status.reblog_private": "Megtolás az eredeti közönségnek",
@@ -883,7 +880,6 @@
   "status.translated_from_with": "{lang} nyelvről fordítva {provider} szolgáltatással",
   "status.uncached_media_warning": "Előnézet nem érhető el",
   "status.unmute_conversation": "Beszélgetés némításának feloldása",
-  "status.unpin": "Kitűzés eltávolítása a profilodról",
   "subscribed_languages.lead": "A változtatás után csak a kiválasztott nyelvű bejegyzések fognak megjelenni a kezdőlapon és az idővonalakon. Ha egy sincs kiválasztva, akkor minden nyelven megjelennek a bejegyzések.",
   "subscribed_languages.save": "Változások mentése",
   "subscribed_languages.target": "Feliratkozott nyelvek módosítása {target} esetében",

app/javascript/mastodon/locales/hy.json

@@ -87,7 +87,6 @@
   "column.lists": "Ցանկեր",
   "column.mutes": "Լռեցրած օգտատէրեր",
   "column.notifications": "Ծանուցումներ",
-  "column.pins": "Ամրացուած գրառում",
   "column.public": "Դաշնային հոսք",
   "column_back_button.label": "Ետ",
   "column_header.hide_settings": "Թաքցնել կարգաւորումները",
@@ -251,7 +250,6 @@
   "keyboard_shortcuts.my_profile": "սեփական էջին անցնելու համար",
   "keyboard_shortcuts.notifications": "ծանուցումների սիւնակը բացելու համար",
   "keyboard_shortcuts.open_media": "ցուցադրել մեդիան",
-  "keyboard_shortcuts.pinned": "Բացել ամրացուած գրառումների ցանկը",
   "keyboard_shortcuts.profile": "հեղինակի անձնական էջը բացելու համար",
   "keyboard_shortcuts.reply": "պատասխանելու համար",
   "keyboard_shortcuts.requests": "հետեւելու հայցերի ցանկը դիտելու համար",
@@ -290,7 +288,6 @@
   "navigation_bar.logout": "Դուրս գալ",
   "navigation_bar.mutes": "Լռեցրած օգտատէրեր",
   "navigation_bar.personal": "Անձնական",
-  "navigation_bar.pins": "Ամրացուած գրառումներ",
   "navigation_bar.preferences": "Նախապատուութիւններ",
   "navigation_bar.public_timeline": "Դաշնային հոսք",
   "navigation_bar.search": "Որոնել",
@@ -423,8 +420,6 @@
   "status.mute": "Լռեցնել @{name}֊ին",
   "status.mute_conversation": "Լռեցնել խօսակցութիւնը",
   "status.open": "Ընդարձակել այս գրառումը",
-  "status.pin": "Ամրացնել անձնական էջում",
-  "status.pinned": "Ամրացուած գրառում",
   "status.read_more": "Կարդալ աւելին",
   "status.reblog": "Տարածել",
   "status.reblog_private": "Տարածել սեփական լսարանին",
@@ -444,7 +439,6 @@
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Թարգմանել",
   "status.unmute_conversation": "Ապալռեցնել խօսակցութիւնը",
-  "status.unpin": "Հանել անձնական էջից",
   "subscribed_languages.save": "Պահպանել փոփոխութիւնները",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.notifications": "Ծանուցումներ",

app/javascript/mastodon/locales/ia.json

@@ -19,13 +19,19 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
+  "account.blocking": "Blocate",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
   "account.disable_notifications": "Non plus notificar me quando @{name} publica",
+  "account.domain_blocking": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
   "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
+  "account.featured": "In evidentia",
+  "account.featured.accounts": "Profilos",
+  "account.featured.hashtags": "Hashtags",
+  "account.featured.posts": "Messages",
   "account.featured_tags.last_status_at": "Ultime message publicate le {date}",
   "account.featured_tags.last_status_never": "Necun message",
   "account.follow": "Sequer",
@@ -36,6 +42,7 @@
   "account.following": "Sequente",
   "account.following_counter": "{count, plural, one {{counter} sequite} other {{counter} sequites}}",
   "account.follows.empty": "Iste usator non seque ancora alcuno.",
+  "account.follows_you": "Te seque",
   "account.go_to_profile": "Vader al profilo",
   "account.hide_reblogs": "Celar impulsos de @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -50,18 +57,23 @@
   "account.mute_notifications_short": "Silentiar le notificationes",
   "account.mute_short": "Silentiar",
   "account.muted": "Silentiate",
+  "account.muting": "Silentiate",
+  "account.mutual": "Sequimento mutue",
   "account.no_bio": "Nulle description fornite.",
   "account.open_original_page": "Aperir le pagina original",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages e responsas",
+  "account.remove_from_followers": "Remover {name} del sequitores",
   "account.report": "Reportar @{name}",
   "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
+  "account.requests_to_follow_you": "Requestas de sequer te",
   "account.share": "Compartir profilo de @{name}",
   "account.show_reblogs": "Monstrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Disblocar @{name}",
   "account.unblock_domain": "Disblocar dominio {domain}",
+  "account.unblock_domain_short": "Disblocar",
   "account.unblock_short": "Disblocar",
   "account.unendorse": "Non evidentiar sur le profilo",
   "account.unfollow": "Non plus sequer",
@@ -157,7 +169,7 @@
   "column.lists": "Listas",
   "column.mutes": "Usatores silentiate",
   "column.notifications": "Notificationes",
-  "column.pins": "Messages fixate",
+  "column.pins": "Messages in evidentia",
   "column.public": "Chronologia federate",
   "column_back_button.label": "Retro",
   "column_header.hide_settings": "Celar le parametros",
@@ -223,6 +235,9 @@
   "confirmations.redraft.confirm": "Deler e rescriber",
   "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
   "confirmations.redraft.title": "Deler e rescriber le message?",
+  "confirmations.remove_from_followers.confirm": "Remover sequitor",
+  "confirmations.remove_from_followers.message": "{name} non plus te sequera. Es tu secur de voler continuar?",
+  "confirmations.remove_from_followers.title": "Remover sequitor?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Si tu responde ora, le message in curso de composition essera perdite. Es tu secur de voler continuar?",
   "confirmations.reply.title": "Superscriber le message?",
@@ -290,6 +305,9 @@
   "emoji_button.search_results": "Resultatos de recerca",
   "emoji_button.symbols": "Symbolos",
   "emoji_button.travel": "Viages e locos",
+  "empty_column.account_featured.me": "Tu non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia tu messages, le hashtags que tu usa le plus, e mesmo le contos de tu amicos sur tu profilo?",
+  "empty_column.account_featured.other": "{acct} non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia tu messages, le hashtags que tu usa le plus, e mesmo le contos de tu amicos sur tu profilo?",
+  "empty_column.account_featured_other.unknown": "Iste conto non ha ancora mittite alcun cosa in evidentia.",
   "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
   "empty_column.account_timeline": "Nulle messages hic!",
@@ -457,7 +475,6 @@
   "keyboard_shortcuts.my_profile": "Aperir tu profilo",
   "keyboard_shortcuts.notifications": "Aperir columna de notificationes",
   "keyboard_shortcuts.open_media": "Aperir multimedia",
-  "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.requests": "Aperir le lista de requestas de sequimento",
@@ -541,7 +558,6 @@
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Messages fixate",
   "navigation_bar.preferences": "Preferentias",
   "navigation_bar.public_timeline": "Chronologia federate",
   "navigation_bar.search": "Cercar",
@@ -837,8 +853,6 @@
   "status.mute": "Silentiar @{name}",
   "status.mute_conversation": "Silentiar conversation",
   "status.open": "Expander iste message",
-  "status.pin": "Fixar sur profilo",
-  "status.pinned": "Message fixate",
   "status.read_more": "Leger plus",
   "status.reblog": "Impulsar",
   "status.reblog_private": "Impulsar con visibilitate original",
@@ -863,7 +877,6 @@
   "status.translated_from_with": "Traducite de {lang} usante {provider}",
   "status.uncached_media_warning": "Previsualisation non disponibile",
   "status.unmute_conversation": "Non plus silentiar conversation",
-  "status.unpin": "Disfixar del profilo",
   "subscribed_languages.lead": "Solmente le messages in le linguas seligite apparera in tu chronologias de initio e de listas post le cambiamento. Selige necun pro reciper messages in tote le linguas.",
   "subscribed_languages.save": "Salvar le cambiamentos",
   "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",

app/javascript/mastodon/locales/id.json

@@ -131,7 +131,6 @@
   "column.lists": "List",
   "column.mutes": "Pengguna yang dibisukan",
   "column.notifications": "Notifikasi",
-  "column.pins": "Kiriman tersemat",
   "column.public": "Linimasa gabungan",
   "column_back_button.label": "Kembali",
   "column_header.hide_settings": "Sembunyikan pengaturan",
@@ -365,7 +364,6 @@
   "keyboard_shortcuts.my_profile": "Buka profil Anda",
   "keyboard_shortcuts.notifications": "buka kolom notifikasi",
   "keyboard_shortcuts.open_media": "membuka media",
-  "keyboard_shortcuts.pinned": "buka daftar toot tersemat",
   "keyboard_shortcuts.profile": "buka profil pencipta",
   "keyboard_shortcuts.reply": "balas",
   "keyboard_shortcuts.requests": "buka daftar permintaan ikuti",
@@ -409,7 +407,6 @@
   "navigation_bar.logout": "Keluar",
   "navigation_bar.mutes": "Pengguna dibisukan",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Toot tersemat",
   "navigation_bar.preferences": "Pengaturan",
   "navigation_bar.public_timeline": "Linimasa gabungan",
   "navigation_bar.search": "Cari",
@@ -559,8 +556,6 @@
   "status.mute": "Bisukan @{name}",
   "status.mute_conversation": "Bisukan percakapan",
   "status.open": "Tampilkan kiriman ini",
-  "status.pin": "Sematkan di profil",
-  "status.pinned": "Kiriman tersemat",
   "status.read_more": "Baca lebih banyak",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost dengan visibilitas asli",
@@ -581,7 +576,6 @@
   "status.translate": "Terjemahkan",
   "status.translated_from_with": "Diterjemahkan dari {lang} menggunakan {provider}",
   "status.unmute_conversation": "Bunyikan percakapan",
-  "status.unpin": "Hapus sematan dari profil",
   "subscribed_languages.lead": "Hanya kiriman dalam bahasa yang dipilih akan muncul di linimasa beranda dan daftar setelah perubahan. Pilih tidak ada untuk menerima kiriman dalam semua bahasa.",
   "subscribed_languages.save": "Simpan perubahan",
   "subscribed_languages.target": "Ubah langganan bahasa untuk {target}",

app/javascript/mastodon/locales/ie.json

@@ -120,7 +120,6 @@
   "column.lists": "Listes",
   "column.mutes": "Silentiat usatores",
   "column.notifications": "Notificationes",
-  "column.pins": "Pinglat postas",
   "column.public": "Federat témpor-linea",
   "column_back_button.label": "Retornar",
   "column_header.hide_settings": "Celar parametres",
@@ -361,7 +360,6 @@
   "keyboard_shortcuts.my_profile": "Aperter tui profil",
   "keyboard_shortcuts.notifications": "Aperter li columne de notificationes",
   "keyboard_shortcuts.open_media": "Aperter medie",
-  "keyboard_shortcuts.pinned": "Aperter li liste de pinglat postas",
   "keyboard_shortcuts.profile": "Aperter profil del autor",
   "keyboard_shortcuts.reply": "Responder al posta",
   "keyboard_shortcuts.requests": "Aperter liste de seque-petitiones",
@@ -416,7 +414,6 @@
   "navigation_bar.mutes": "Silentiat usatores",
   "navigation_bar.opened_in_classic_interface": "Postas, contos e altri specific págines es customalmen apertet in li classic web-interfacie.",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinglat postas",
   "navigation_bar.preferences": "Preferenties",
   "navigation_bar.public_timeline": "Federat témpor-linea",
   "navigation_bar.search": "Sercha",
@@ -647,8 +644,6 @@
   "status.mute": "Silentiar @{name}",
   "status.mute_conversation": "Silentiar conversation",
   "status.open": "Expander ti-ci posta",
-  "status.pin": "Pinglar sur profil",
-  "status.pinned": "Pinglat posta",
   "status.read_more": "Leer plu",
   "status.reblog": "Boostar",
   "status.reblog_private": "Boostar con li original visibilitá",
@@ -671,7 +666,6 @@
   "status.translated_from_with": "Traductet de {lang} per {provider}",
   "status.uncached_media_warning": "Previse ne disponibil",
   "status.unmute_conversation": "Dessilentiar conversation",
-  "status.unpin": "Despinglar de profil",
   "subscribed_languages.lead": "Solmen postas in selectet lingues va aparir in tui hemal e listal témpor-lineas pos li change. Selecte null por reciver postas in omni lingues.",
   "subscribed_languages.save": "Conservar changes",
   "subscribed_languages.target": "Changear abonnat lingues por {target}",

app/javascript/mastodon/locales/ig.json

@@ -25,7 +25,6 @@
   "column.home": "Be",
   "column.lists": "Ndepụta",
   "column.notifications": "Nziọkwà",
-  "column.pins": "Pinned post",
   "column_header.pin": "Gbado na profaịlụ gị",
   "column_header.show_settings": "Gosi mwube",
   "column_subheading.settings": "Mwube",
@@ -93,7 +92,6 @@
   "keyboard_shortcuts.my_profile": "Mepe profaịlụ gị",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned posts list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",

app/javascript/mastodon/locales/io.json

@@ -157,7 +157,6 @@
   "column.lists": "Listi",
   "column.mutes": "Celita uzeri",
   "column.notifications": "Savigi",
-  "column.pins": "Adpinglita afishi",
   "column.public": "Federata tempolineo",
   "column_back_button.label": "Retro",
   "column_header.hide_settings": "Celez ajusti",
@@ -457,7 +456,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "Desklozar audvidaji",
-  "keyboard_shortcuts.pinned": "Desklozar listo di adpinglita afishi",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",
@@ -541,7 +539,6 @@
   "navigation_bar.mutes": "Celita uzeri",
   "navigation_bar.opened_in_classic_interface": "Posti, konti e altra pagini specifika apertesas en la retovidilo klasika.",
   "navigation_bar.personal": "Personala",
-  "navigation_bar.pins": "Adpinglita afishi",
   "navigation_bar.preferences": "Preferi",
   "navigation_bar.public_timeline": "Federata tempolineo",
   "navigation_bar.search": "Serchez",
@@ -837,8 +834,6 @@
   "status.mute": "Silencigez @{name}",
   "status.mute_conversation": "Silencigez konverso",
   "status.open": "Detaligar ca mesajo",
-  "status.pin": "Pinglagez che profilo",
-  "status.pinned": "Adpinglita afisho",
   "status.read_more": "Lektez plu",
   "status.reblog": "Repetez",
   "status.reblog_private": "Repetez kun originala videbleso",
@@ -863,7 +858,6 @@
   "status.translated_from_with": "Tradukita de {lang} per {provider}",
   "status.uncached_media_warning": "Previdajo nedisponebla",
   "status.unmute_conversation": "Desilencigez konverso",
-  "status.unpin": "Depinglagez de profilo",
   "subscribed_languages.lead": "Nur posti en selektita lingui aparos en vua hemo e listotempolineo pos chanjo. Selektez nulo por ganar posti en omna lingui.",
   "subscribed_languages.save": "Sparez chanji",
   "subscribed_languages.target": "Chanjez abonita lingui por {target}",

app/javascript/mastodon/locales/is.json

@@ -29,6 +29,7 @@
   "account.enable_notifications": "Láta mig vita þegar @{name} sendir inn",
   "account.endorse": "Birta á notandasniði",
   "account.featured": "Með aukið vægi",
+  "account.featured.accounts": "Notendasnið",
   "account.featured.hashtags": "Myllumerki",
   "account.featured.posts": "Færslur",
   "account.featured_tags.last_status_at": "Síðasta færsla þann {date}",
@@ -168,7 +169,7 @@
   "column.lists": "Listar",
   "column.mutes": "Þaggaðir notendur",
   "column.notifications": "Tilkynningar",
-  "column.pins": "Festar færslur",
+  "column.pins": "Færslur með aukið vægi",
   "column.public": "Sameiginleg tímalína",
   "column_back_button.label": "Til baka",
   "column_header.hide_settings": "Fela stillingar",
@@ -405,8 +406,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} þátttakandi} other {{counter} þátttakendur}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} færsla} other {{counter} færslur}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} færsla} other {{counter} færslur}} í dag",
+  "hashtag.feature": "Birta á notandasniði",
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.mute": "Þagga #{hashtag}",
+  "hashtag.unfeature": "Ekki birta á notandasniði",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
   "hints.profiles.followers_may_be_missing": "Fylgjendur frá þessum notanda gæti vantað.",
@@ -477,7 +480,7 @@
   "keyboard_shortcuts.my_profile": "Opna notandasniðið þitt",
   "keyboard_shortcuts.notifications": "Opna tilkynningadálk",
   "keyboard_shortcuts.open_media": "Opna margmiðlunargögn",
-  "keyboard_shortcuts.pinned": "Opna lista yfir festar færslur",
+  "keyboard_shortcuts.pinned": "Opna lista með færslum með aukið vægi",
   "keyboard_shortcuts.profile": "Opna notandasnið höfundar",
   "keyboard_shortcuts.reply": "Svara færslu",
   "keyboard_shortcuts.requests": "Opna lista yfir fylgjendabeiðnir",
@@ -561,7 +564,7 @@
   "navigation_bar.mutes": "Þaggaðir notendur",
   "navigation_bar.opened_in_classic_interface": "Færslur, notendaaðgangar og aðrar sérhæfðar síður eru sjálfgefið opnaðar í klassíska vefviðmótinu.",
   "navigation_bar.personal": "Einka",
-  "navigation_bar.pins": "Festar færslur",
+  "navigation_bar.pins": "Færslur með aukið vægi",
   "navigation_bar.preferences": "Kjörstillingar",
   "navigation_bar.public_timeline": "Sameiginleg tímalína",
   "navigation_bar.search": "Leita",
@@ -857,8 +860,7 @@
   "status.mute": "Þagga niður í @{name}",
   "status.mute_conversation": "Þagga niður í samtali",
   "status.open": "Opna þessa færslu",
-  "status.pin": "Festa á notandasnið",
-  "status.pinned": "Fest færsla",
+  "status.pin": "Birta á notandasniði",
   "status.read_more": "Lesa meira",
   "status.reblog": "Endurbirting",
   "status.reblog_private": "Endurbirta til upphaflegra lesenda",
@@ -883,7 +885,7 @@
   "status.translated_from_with": "Þýtt úr {lang} með {provider}",
   "status.uncached_media_warning": "Forskoðun ekki tiltæk",
   "status.unmute_conversation": "Hætta að þagga niður í samtali",
-  "status.unpin": "Losa af notandasniði",
+  "status.unpin": "Ekki birta á notandasniði",
   "subscribed_languages.lead": "Einungis færslur á völdum tungumálum munu birtast á upphafssíðu og tímalínum þínum eftir þessa breytingu. Veldu ekkert til að sjá færslur á öllum tungumálum.",
   "subscribed_languages.save": "Vista breytingar",
   "subscribed_languages.target": "Breyta tungumálum í áskrift fyrir {target}",

app/javascript/mastodon/locales/it.json

@@ -168,7 +168,6 @@
   "column.lists": "Liste",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
-  "column.pins": "Post fissati",
   "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
@@ -477,7 +476,6 @@
   "keyboard_shortcuts.my_profile": "Apre il tuo profilo",
   "keyboard_shortcuts.notifications": "Apre la colonna delle notifiche",
   "keyboard_shortcuts.open_media": "Apre i multimedia",
-  "keyboard_shortcuts.pinned": "Apre l'elenco dei post fissati",
   "keyboard_shortcuts.profile": "Apre il profilo dell'autore",
   "keyboard_shortcuts.reply": "Risponde al post",
   "keyboard_shortcuts.requests": "Apre l'elenco delle richieste di seguirti",
@@ -561,7 +559,6 @@
   "navigation_bar.mutes": "Utenti silenziati",
   "navigation_bar.opened_in_classic_interface": "Post, account e altre pagine specifiche sono aperti per impostazione predefinita nella classica interfaccia web.",
   "navigation_bar.personal": "Personale",
-  "navigation_bar.pins": "Post fissati",
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.public_timeline": "Cronologia federata",
   "navigation_bar.search": "Cerca",
@@ -857,8 +854,6 @@
   "status.mute": "Silenzia @{name}",
   "status.mute_conversation": "Silenzia conversazione",
   "status.open": "Espandi questo post",
-  "status.pin": "Fissa in cima sul profilo",
-  "status.pinned": "Post fissato",
   "status.read_more": "Leggi di più",
   "status.reblog": "Reblog",
   "status.reblog_private": "Reblog con visibilità originale",
@@ -883,7 +878,6 @@
   "status.translated_from_with": "Tradotto da {lang} utilizzando {provider}",
   "status.uncached_media_warning": "Anteprima non disponibile",
   "status.unmute_conversation": "Annulla silenziamento conversazione",
-  "status.unpin": "Non fissare sul profilo",
   "subscribed_languages.lead": "Solo i post nelle lingue selezionate appariranno sulla tua home e nelle cronologie dopo la modifica. Seleziona nessuno per ricevere i post in tutte le lingue.",
   "subscribed_languages.save": "Salva le modifiche",
   "subscribed_languages.target": "Modifica le lingue in cui sei iscritto per {target}",

app/javascript/mastodon/locales/ja.json

@@ -272,7 +272,6 @@
   "column.local": "ローカル",
   "column.mutes": "ミュートしたユーザー",
   "column.notifications": "通知",
-  "column.pins": "固定された投稿",
   "column.public": "連合タイムライン",
   "column.reaction_deck": "絵文字デッキ",
   "column_back_button.label": "戻る",
@@ -604,7 +603,6 @@
   "keyboard_shortcuts.my_profile": "自分のプロフィールを開く",
   "keyboard_shortcuts.notifications": "通知カラムを開く",
   "keyboard_shortcuts.open_media": "メディアを開く",
-  "keyboard_shortcuts.pinned": "固定した投稿のリストを開く",
   "keyboard_shortcuts.profile": "プロフィールを開く",
   "keyboard_shortcuts.reply": "返信",
   "keyboard_shortcuts.requests": "フォローリクエストのリストを開く",
@@ -698,7 +696,6 @@
   "navigation_bar.mutes": "ミュートしたユーザー",
   "navigation_bar.opened_in_classic_interface": "投稿やプロフィールを直接開いた場合は一時的に標準UIで表示されます。",
   "navigation_bar.personal": "個人用",
-  "navigation_bar.pins": "固定した投稿",
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.reaction_deck": "絵文字デッキ",
@@ -1047,8 +1044,6 @@
   "status.mute": "@{name}さんをミュート",
   "status.mute_conversation": "会話をミュート",
   "status.open": "詳細を表示",
-  "status.pin": "プロフィールに固定表示",
-  "status.pinned": "固定された投稿",
   "status.quote": "リンク",
   "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
@@ -1077,7 +1072,6 @@
   "status.translated_from_with": "{provider}を使って{lang}から翻訳",
   "status.uncached_media_warning": "プレビューは使用できません",
   "status.unmute_conversation": "会話のミュートを解除",
-  "status.unpin": "プロフィールへの固定を解除",
   "subscribed_languages.lead": "選択した言語の投稿だけがホームとリストのタイムラインに表示されます。全ての言語の投稿を受け取る場合は全てのチェックを外して下さい。",
   "subscribed_languages.save": "変更を保存",
   "subscribed_languages.target": "{target}さんの購読言語を変更します",

app/javascript/mastodon/locales/ka.json

@@ -45,7 +45,6 @@
   "column.lists": "სიები",
   "column.mutes": "გაჩუმებული მომხმარებლები",
   "column.notifications": "შეტყობინებები",
-  "column.pins": "აპინული ტუტები",
   "column.public": "ფედერალური თაიმლაინი",
   "column_back_button.label": "უკან",
   "column_header.hide_settings": "პარამეტრების დამალვა",
@@ -126,7 +125,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "ავტორის პროფილის გასახსნელად",
   "keyboard_shortcuts.reply": "პასუხისთვის",
   "keyboard_shortcuts.requests": "to open follow requests list",
@@ -154,7 +152,6 @@
   "navigation_bar.logout": "გასვლა",
   "navigation_bar.mutes": "გაჩუმებული მომხმარებლები",
   "navigation_bar.personal": "პირადი",
-  "navigation_bar.pins": "აპინული ტუტები",
   "navigation_bar.preferences": "პრეფერენსიები",
   "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
   "navigation_bar.security": "უსაფრთხოება",
@@ -204,8 +201,6 @@
   "status.mute": "გააჩუმე @{name}",
   "status.mute_conversation": "გააჩუმე საუბარი",
   "status.open": "ამ სტატუსის გაფართოება",
-  "status.pin": "აპინე პროფილზე",
-  "status.pinned": "აპინული ტუტი",
   "status.reblog": "ბუსტი",
   "status.reblog_private": "დაიბუსტოს საწყის აუდიტორიაზე",
   "status.reblogged_by": "{name} დაიბუსტა",
@@ -220,7 +215,6 @@
   "status.show_more_all": "აჩვენე მეტი ყველაზე",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "საუბარზე გაჩუმების მოშორება",
-  "status.unpin": "პროფილიდან პინის მოშორება",
   "tabs_bar.home": "საწყისი",
   "tabs_bar.notifications": "შეტყობინებები",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",

app/javascript/mastodon/locales/kab.json

@@ -119,7 +119,6 @@
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
   "column.notifications": "Ilɣa",
-  "column.pins": "Tisuffaɣ yettwasenṭḍen",
   "column.public": "Tasuddemt tamatut",
   "column_back_button.label": "Tuɣalin",
   "column_header.hide_settings": "Ffer iɣewwaṛen",
@@ -340,7 +339,6 @@
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaɣnu-ik",
   "keyboard_shortcuts.notifications": "Ad d-yeldi ajgu n yilɣa",
   "keyboard_shortcuts.open_media": "i tiɣwalin yeldin",
-  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tjewwiqin yettwasentḍen",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaɣnu n umeskar",
   "keyboard_shortcuts.reply": "i tririt",
   "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
@@ -410,7 +408,6 @@
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
   "navigation_bar.personal": "Udmawan",
-  "navigation_bar.pins": "Tisuffaɣ yettwasenṭḍen",
   "navigation_bar.preferences": "Imenyafen",
   "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
   "navigation_bar.search": "Nadi",
@@ -620,8 +617,6 @@
   "status.mute": "Sussem @{name}",
   "status.mute_conversation": "Sgugem adiwenni",
   "status.open": "Semɣeṛ tasuffeɣt-ayi",
-  "status.pin": "Senteḍ-itt deg umaɣnu",
-  "status.pinned": "Tisuffaɣ yettwasentḍen",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
   "status.reblogged_by": "Yebḍa-tt {name}",
@@ -644,7 +639,6 @@
   "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
   "status.uncached_media_warning": "Ulac taskant",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
-  "status.unpin": "Kkes asenteḍ seg umaɣnu",
   "subscribed_languages.save": "Sekles ibeddilen",
   "tabs_bar.home": "Agejdan",
   "tabs_bar.notifications": "Ilɣa",

app/javascript/mastodon/locales/kk.json

@@ -71,7 +71,6 @@
   "column.lists": "Тізімдер",
   "column.mutes": "Үнсіз қолданушылар",
   "column.notifications": "Ескертпелер",
-  "column.pins": "Жабыстырылған жазбалар",
   "column.public": "Жаһандық желі",
   "column_back_button.label": "Артқа",
   "column_header.hide_settings": "Баптауларды жасыр",
@@ -191,7 +190,6 @@
   "keyboard_shortcuts.my_profile": "профиліңізді ашу",
   "keyboard_shortcuts.notifications": "ескертпелер бағанын ашу",
   "keyboard_shortcuts.open_media": "медианы ашу үшін",
-  "keyboard_shortcuts.pinned": "жабыстырылған жазбаларды көру",
   "keyboard_shortcuts.profile": "автор профилін қарау",
   "keyboard_shortcuts.reply": "жауап жазу",
   "keyboard_shortcuts.requests": "жазылу сұранымдарын қарау",
@@ -222,7 +220,6 @@
   "navigation_bar.logout": "Шығу",
   "navigation_bar.mutes": "Үнсіз қолданушылар",
   "navigation_bar.personal": "Жеке",
-  "navigation_bar.pins": "Жабыстырылғандар",
   "navigation_bar.preferences": "Басымдықтар",
   "navigation_bar.public_timeline": "Жаһандық желі",
   "navigation_bar.security": "Қауіпсіздік",
@@ -294,8 +291,6 @@
   "status.mute": "Үнсіз @{name}",
   "status.mute_conversation": "Пікірталасты үнсіз қылу",
   "status.open": "Жазбаны ашу",
-  "status.pin": "Профильде жабыстыру",
-  "status.pinned": "Жабыстырылған жазба",
   "status.read_more": "Әрі қарай",
   "status.reblog": "Бөлісу",
   "status.reblog_private": "Негізгі аудиторияға бөлісу",
@@ -312,7 +307,6 @@
   "status.show_more_all": "Бәрін толығымен",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Пікірталасты үнсіз қылмау",
-  "status.unpin": "Профильден алып тастау",
   "tabs_bar.home": "Басты бет",
   "tabs_bar.notifications": "Ескертпелер",
   "time_remaining.days": "{number, plural, one {# күн} other {# күн}}",

app/javascript/mastodon/locales/kn.json

@@ -19,7 +19,6 @@
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
   "bundle_column_error.retry": "ಮರಳಿ ಪ್ರಯತ್ನಿಸಿ",
   "column.domain_blocks": "Hidden domains",
-  "column.pins": "Pinned toot",
   "community.column_settings.media_only": "Media only",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
@@ -53,7 +52,6 @@
   "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "to reply",
   "keyboard_shortcuts.requests": "to open follow requests list",
@@ -67,7 +65,6 @@
   "keyboard_shortcuts.up": "to move up in the list",
   "navigation_bar.compose": "Compose new toot",
   "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.pins": "Pinned toots",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
   "notifications.column_settings.status": "New toots:",
@@ -82,7 +79,6 @@
   "status.copy": "Copy link to status",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Expand this status",
-  "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",

app/javascript/mastodon/locales/ko.json

@@ -168,7 +168,7 @@
   "column.lists": "리스트",
   "column.mutes": "뮤트한 사용자",
   "column.notifications": "알림",
-  "column.pins": "고정된 게시물",
+  "column.pins": "추천 게시물",
   "column.public": "연합 타임라인",
   "column_back_button.label": "돌아가기",
   "column_header.hide_settings": "설정 숨기기",
@@ -227,9 +227,9 @@
   "confirmations.logout.message": "정말로 로그아웃 하시겠습니까?",
   "confirmations.logout.title": "로그아웃 할까요?",
   "confirmations.missing_alt_text.confirm": "대체 텍스트 추가",
-  "confirmations.missing_alt_text.message": "대체 텍스트가 없는 미디어를 포함하고 있습니다. 설명을 추가하면 더 많은 사람들이 내 콘텐츠에 접근할 수 있습니다.",
+  "confirmations.missing_alt_text.message": "대체 텍스트가 없는 미디어를 포함하고 있습니다. 설명을 추가하면 더 많은 사람들이 내 콘텐츠에 접근할 수 있습니다. ",
   "confirmations.missing_alt_text.secondary": "그냥 게시하기",
-  "confirmations.missing_alt_text.title": "대체 텍스트를 추가할까요?",
+  "confirmations.missing_alt_text.title": "대체 텍스트를 추가할까요? ",
   "confirmations.mute.confirm": "뮤트",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
@@ -436,7 +436,7 @@
   "ignore_notifications_modal.not_following_title": "내가 팔로우하지 않는 사람들의 알림을 무시할까요?",
   "ignore_notifications_modal.private_mentions_title": "요청하지 않은 개인 멘션 알림을 무시할까요?",
   "info_button.label": "도움말",
-  "info_button.what_is_alt_text": "<h1>대체 텍스트가 무었인가요?</h1> <p>대체 텍스트는 저시력자, 낮은 인터넷 대역폭 사용자, 더 자세한 문맥을 위해 이미지에 대한 설명을 제공하는 것입니다.</p> <p>깔끔하고 간결하고 객관적인 대체 텍스트를 작성해 모두가 이해하기 쉽게 만들고 접근성이 높아질 수 있습니다.</p><ul><li>중요한 요소에 중점을 두세요</li> <li>이미지 안의 글자를 요약하세요</li> <li>정형화된 문장 구조를 사용하세요</li> <li>중복된 정보를 피하세요</li> <li>복잡한 시각자료(도표나 지도 같은)에선 추세와 주요 결과에 중점을 두세요</li> </ul>",
+  "info_button.what_is_alt_text": "<h1>대체 텍스트가 무엇인가요?</h1> <p>대체 텍스트는 저시력자, 낮은 인터넷 대역폭 사용자, 더 자세한 문맥을 위해 이미지에 대한 설명을 제공하는 것입니다.</p> <p>깔끔하고 간결하고 객관적인 대체 텍스트를 작성해 모두가 이해하기 쉽게 만들고 접근성이 높아질 수 있습니다.</p><ul><li>중요한 요소에 중점을 두세요</li> <li>이미지 안의 글자를 요약하세요</li> <li>정형화된 문장 구조를 사용하세요</li> <li>중복된 정보를 피하세요</li> <li>복잡한 시각자료(도표나 지도 같은)에선 추세와 주요 결과에 중점을 두세요</li> </ul>",
   "interaction_modal.action.favourite": "계속하려면 내 계정으로 즐겨찾기해야 합니다.",
   "interaction_modal.action.follow": "계속하려면 내 계정으로 팔로우해야 합니다.",
   "interaction_modal.action.reblog": "계속하려면 내 계정으로 리블로그해야 합니다.",
@@ -477,7 +477,7 @@
   "keyboard_shortcuts.my_profile": "내 프로필 열기",
   "keyboard_shortcuts.notifications": "알림 컬럼 열기",
   "keyboard_shortcuts.open_media": "미디어 열기",
-  "keyboard_shortcuts.pinned": "고정 게시물 리스트 열기",
+  "keyboard_shortcuts.pinned": "추천 게시물 목록 열기",
   "keyboard_shortcuts.profile": "작성자의 프로필 열기",
   "keyboard_shortcuts.reply": "게시물에 답장",
   "keyboard_shortcuts.requests": "팔로우 요청 리스트 열기",
@@ -561,7 +561,7 @@
   "navigation_bar.mutes": "뮤트한 사용자",
   "navigation_bar.opened_in_classic_interface": "게시물, 계정, 기타 특정 페이지들은 기본적으로 기존 웹 인터페이스로 열리게 됩니다.",
   "navigation_bar.personal": "개인용",
-  "navigation_bar.pins": "고정된 게시물",
+  "navigation_bar.pins": "추천 게시물",
   "navigation_bar.preferences": "환경설정",
   "navigation_bar.public_timeline": "연합 타임라인",
   "navigation_bar.search": "검색",
@@ -756,12 +756,12 @@
   "report.comment.title": "우리가 더 알아야 할 내용이 있나요?",
   "report.forward": "{target}에 전달",
   "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
-  "report.mute": "침묵",
+  "report.mute": "뮤트",
   "report.mute_explanation": "당신은 해당 계정의 게시물을 보지 않게 됩니다. 해당 계정은 여전히 당신을 팔로우 하거나 당신의 게시물을 볼 수 있으며 해당 계정은 자신이 뮤트 되었는지 알지 못합니다.",
   "report.next": "다음",
-  "report.placeholder": "코멘트",
+  "report.placeholder": "추가 정보 입력",
   "report.reasons.dislike": "마음에 안 듭니다",
-  "report.reasons.dislike_description": "내가 보기 싫은 종류에 속합니다",
+  "report.reasons.dislike_description": "원치 않는 게시물입니다",
   "report.reasons.legal": "불법입니다",
   "report.reasons.legal_description": "내 서버가 속한 국가의 법률을 위반한다고 생각합니다",
   "report.reasons.other": "기타",
@@ -846,19 +846,18 @@
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
-  "status.history.created": "{name} 님이 {date}에 처음 게시함",
+  "status.history.created": "{name} 님이 {date}에 게시함",
   "status.history.edited": "{name} 님이 {date}에 수정함",
-  "status.load_more": "더 보기",
+  "status.load_more": "더보기",
   "status.media.open": "클릭하여 열기",
   "status.media.show": "클릭하여 보기",
   "status.media_hidden": "미디어 숨겨짐",
   "status.mention": "@{name} 님에게 멘션",
   "status.more": "자세히",
   "status.mute": "@{name} 뮤트",
-  "status.mute_conversation": "이 대화를 뮤트",
+  "status.mute_conversation": "대화 뮤트",
   "status.open": "상세 정보 표시",
   "status.pin": "고정",
-  "status.pinned": "고정된 게시물",
   "status.read_more": "더 보기",
   "status.reblog": "부스트",
   "status.reblog_private": "원래의 수신자들에게 부스트",
@@ -883,7 +882,7 @@
   "status.translated_from_with": "{provider}에 의해 {lang}에서 번역됨",
   "status.uncached_media_warning": "미리보기를 사용할 수 없습니다",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
-  "status.unpin": "고정 해제",
+  "status.unpin": "고정 취소",
   "subscribed_languages.lead": "변경 후에는 선택한 언어들로 작성된 게시물들만 홈 타임라인과 리스트 타임라인에 나타나게 됩니다. 아무 것도 선택하지 않으면 모든 언어로 작성된 게시물을 받아봅니다.",
   "subscribed_languages.save": "변경사항 저장",
   "subscribed_languages.target": "{target}에 대한 구독 언어 변경",
@@ -900,9 +899,9 @@
   "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행 중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}B",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count}십억",
+  "units.short.million": "{count}백만",
+  "units.short.thousand": "{count}천",
   "upload_area.title": "드래그 & 드롭으로 업로드",
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
@@ -915,7 +914,7 @@
   "upload_form.edit": "수정",
   "upload_progress.label": "업로드 중...",
   "upload_progress.processing": "처리 중...",
-  "username.taken": "이미 쓰인 사용자명입니다. 다른 것으로 시도해보세요",
+  "username.taken": "이미 사용중인 사용자명입니다. 다시 시도해보세요",
   "video.close": "동영상 닫기",
   "video.download": "파일 다운로드",
   "video.exit_fullscreen": "전체화면 나가기",

app/javascript/mastodon/locales/ku.json

@@ -37,6 +37,7 @@
   "account.following": "Dişopîne",
   "account.following_counter": "{count, plural, one {{counter} dişopîne} other {{counter} dişopîne}}",
   "account.follows.empty": "Ev bikarhêner hin kesekî heya niha neşopandiye.",
+  "account.follows_you": "Te dişopîne",
   "account.go_to_profile": "Biçe bo profîlê",
   "account.hide_reblogs": "Bilindkirinên ji @{name} veşêre",
   "account.in_memoriam": "Di bîranînê de.",
@@ -125,7 +126,6 @@
   "column.lists": "Lîste",
   "column.mutes": "Bikarhênerên bêdengkirî",
   "column.notifications": "Agahdarî",
-  "column.pins": "Şandiya derzîkirî",
   "column.public": "Demnameya giştî",
   "column_back_button.label": "Vegere",
   "column_header.hide_settings": "Sazkariyan veşêre",
@@ -311,7 +311,6 @@
   "keyboard_shortcuts.my_profile": "Profîla xwe veke",
   "keyboard_shortcuts.notifications": "Stûnê agahdariyan veke",
   "keyboard_shortcuts.open_media": "Medya veke",
-  "keyboard_shortcuts.pinned": "Şandiyên derzîkirî veke",
   "keyboard_shortcuts.profile": "Profîla nivîskaran veke",
   "keyboard_shortcuts.reply": "Bersivê bide şandiyê",
   "keyboard_shortcuts.requests": "Lîsteya daxwazên şopandinê veke",
@@ -353,7 +352,6 @@
   "navigation_bar.logout": "Derkeve",
   "navigation_bar.mutes": "Bikarhênerên bêdengkirî",
   "navigation_bar.personal": "Kesanî",
-  "navigation_bar.pins": "Şandiya derzîkirî",
   "navigation_bar.preferences": "Sazkarî",
   "navigation_bar.public_timeline": "Demnameya giştî",
   "navigation_bar.search": "Bigere",
@@ -517,8 +515,6 @@
   "status.mute": "@{name} bêdeng bike",
   "status.mute_conversation": "Axaftinê bêdeng bike",
   "status.open": "Vê şandiyê berferh bike",
-  "status.pin": "Li ser profîlê derzî bike",
-  "status.pinned": "Şandiya derzîkirî",
   "status.read_more": "Bêtir bixwîne",
   "status.reblog": "Bilind bike",
   "status.reblog_private": "Bi dîtina resen bilind bike",
@@ -539,7 +535,6 @@
   "status.translate": "Wergerîne",
   "status.translated_from_with": "Ji {lang} hate wergerandin bi riya {provider}",
   "status.unmute_conversation": "Axaftinê bêdeng neke",
-  "status.unpin": "Şandiya derzîkirî ji profîlê rake",
   "subscribed_languages.lead": "Tenê şandiyên bi zimanên hilbijartî wê di rojev û demnameya te de wê xuya bibe û piştî guhertinê. Ji bo wergirtina şandiyan di hemû zimanan de ne yek hilbijêre.",
   "subscribed_languages.save": "Guhertinan tomar bike",
   "subscribed_languages.target": "Zimanên beşdarbûyî biguherîne ji bo {target}",

app/javascript/mastodon/locales/kw.json

@@ -53,7 +53,6 @@
   "column.lists": "Rolyow",
   "column.mutes": "Devnydhyoryon tawhes",
   "column.notifications": "Gwarnyansow",
-  "column.pins": "Postow fastys",
   "column.public": "Amserlin geffrysys",
   "column_back_button.label": "War-gamm",
   "column_header.hide_settings": "Kudha dewisyow",
@@ -177,7 +176,6 @@
   "keyboard_shortcuts.my_profile": "Ygeri agas profil",
   "keyboard_shortcuts.notifications": "Ygeri koloven gwarnyansow",
   "keyboard_shortcuts.open_media": "Ygeri myski",
-  "keyboard_shortcuts.pinned": "Ygeri rol a bostow fastys",
   "keyboard_shortcuts.profile": "Ygeri profil an awtour",
   "keyboard_shortcuts.reply": "Gorthebi orth post",
   "keyboard_shortcuts.requests": "Ygeri rol govynnow holya",
@@ -211,7 +209,6 @@
   "navigation_bar.logout": "Digelmi",
   "navigation_bar.mutes": "Devnydhyoryon tawhes",
   "navigation_bar.personal": "Menebel",
-  "navigation_bar.pins": "Postow fastys",
   "navigation_bar.preferences": "Erviransow",
   "navigation_bar.public_timeline": "Amserlin geffrysys",
   "navigation_bar.security": "Diogeledh",
@@ -294,8 +291,6 @@
   "status.mute": "Tawhe @{name}",
   "status.mute_conversation": "Tawhe kesklapp",
   "status.open": "Efani'n post ma",
-  "status.pin": "Fastya yn profil",
-  "status.pinned": "Postow fastys",
   "status.read_more": "Redya moy",
   "status.reblog": "Kenertha",
   "status.reblog_private": "Kenertha gans gweladewder derowel",
@@ -312,7 +307,6 @@
   "status.show_more_all": "Diskwedhes moy rag puptra",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Antawhe kesklapp",
-  "status.unpin": "Anfastya a brofil",
   "tabs_bar.home": "Tre",
   "tabs_bar.notifications": "Gwarnyansow",
   "time_remaining.days": "{number, plural, one {# jydh} other {# a jydhyow}} gesys",

app/javascript/mastodon/locales/la.json

@@ -45,7 +45,6 @@
   "column.bookmarks": "Signa paginales",
   "column.home": "Domi",
   "column.lists": "Catalogi",
-  "column.pins": "Pinned post",
   "community.column_settings.media_only": "Media only",
   "compose.language.change": "Mutare linguam",
   "compose.language.search": "Quaerere linguas...",
@@ -126,7 +125,6 @@
   "keyboard_shortcuts.my_profile": "Aperī prōfilum tuum",
   "keyboard_shortcuts.notifications": "Aperī columnam nūntiātiōnum",
   "keyboard_shortcuts.open_media": "Aperi media",
-  "keyboard_shortcuts.pinned": "Aperī indicem nūntiōrum affixōrum",
   "keyboard_shortcuts.profile": "Aperi auctoris profile",
   "keyboard_shortcuts.reply": "Respondere ad contributum",
   "keyboard_shortcuts.requests": "Aperī indicem petītiōnum sequendī",