Change error icon to avoid close confusion

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: 'bdxtown'
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/gh-pages.yml

@@ -1,20 +0,0 @@
-name: Github Pages
-on:
-  push:
-    branches: [ "gh-pages" ]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Find and Replace
-        uses: jacobtomlinson/gha-find-replace@v3
-        with:
-          find: "/packs/"
-          replace: "/Mangane/packs/"
-          regex: false
-      - name: Push changes
-        uses: ad-m/github-push-action@v0.6.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}

.github/workflows/webpack.yml

@@ -32,16 +32,12 @@ jobs:
 
     - name: Build
       run: |
-        # Build one time for release
         export NODE_ENV=production
         yarn
         yarn build
         mv static dist
         zip -r static.zip dist
-        # Build one time for showcase
-        export NODE_ENV=development
-        export FE_SUBDIRECTORY=Mangane
-        yarn build
+        
 
     - name: Create Draft Release
       id: create_release
@@ -68,8 +64,3 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         release_id: ${{ steps.create_release.outputs.id }}
-
-    - name: Deploy 🚀
-      uses: JamesIves/github-pages-deploy-action@v4
-      with:
-        folder: static/Mangane

.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

CHANGELOG.md

@@ -4,123 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
-
-### Added
-- Compatibility: rudimentary support for Takahē.
-- UI: added backdrop blur behind modals.
-- Admin: let admins configure media preview for attachment thumbnails.
-- Login: accept `?server` param in external login, eg `fe.soapbox.pub/login/external?server=gleasonator.com`.
-- Backups: restored Pleroma backups functionality.
-- Export: restored "Export data" to CSV.
-
-### Changed
-- Posts: letterbox images to 19:6 again.
-- Status Info: moved context (repost, pinned) to improve UX.
-- Posts: remove file icon from empty link previews.
-- Settings: moved "Import data" under settings.
-
-### Fixed
-- Layout: use accent color for "floating action button" (mobile compose button).
-- ServiceWorker: don't serve favicon, robots.txt, and others from ServiceWorker.
-- Datepicker: correctly default to the current year.
-- Scheduled posts: fix page crashing on deleting a scheduled post.
-- Events: don't crash when searching for a location.
-- Search: fixes an abort error when using the navbar search component.
-- Posts: fix monospace font in Markdown code blocks.
-- Modals: fix action buttons overflow
-- Editing: don't insert edited posts to the top of the feed.
-- Modals: close modal when navigating to a different page.
-- Modals: fix "View context" button in media modal.
-- Posts: let unauthenticated users to translate posts if allowed by backend.
-- Chats: fix jumpy scrollbar.
-
-## [3.0.0] - 2022-12-25
-
-### Added
-- Editing: ability to edit posts and view edit history (on Rebased, Pleroma, and Mastodon).
-- Events: ability to create, view, and comment on Events (on Rebased).
-- Onboarding: display an introduction wizard to newly registered accounts.
-- Posts: translate foreign language posts into your native language (on Rebased, Mastodon; if configured by the admin).
-- Posts: ability to view quotes of a post (on Rebased).
-- Posts: hover the "replying to" line to see a preview card of the parent post.
-- Chats: ability to leave a chat (on Rebased, Truth Social).
-- Chats: ability to disable chats for yourself.
-- Layout: added right-to-left support for Arabic, Hebrew, Persian, and Central Kurdish languages.
-- Composer: support custom emoji categories.
-- Search: ability to search posts from a specific account (on Pleroma, Rebased).
-- Theme: auto-detect system theme by default.
-- Profile: remove a specific user from your followers (on Rebased, Mastodon).
-- Suggestions: ability to view all suggested profiles.
-- Feeds: display suggested accounts in Home feed (optional by admin).
-- Compatibility: added compatibility with Truth Social, Fedibird, Pixelfed, Akkoma, and Glitch.
-- Developers: added Test feed, Service Worker debugger, and Network Error preview.
-- Reports: display server rules in reports. Let users select rule violations when submitting a report.
-- Admin: added Theme Editor, a GUI for customizing the color scheme.
-- Admin: custom badges. Admins can add non-federating badges to any user's profile (on Rebased, Pleroma).
-- Admin: consolidated user dropdown actions (verify/suggest/etc) into a unified "Moderate User" modal.
-- i18n: updated translations for Italian, Polish, Arabic, Hebrew, and German.
-- Toast: added the ability to dismiss toast notifications.
-
-### Changed
-- UI: the whole UI has been overhauled both inside and out. 97% of the codebase has been rewritten to TypeScript, and a new component library has been introduced with Tailwind CSS.
-- Chats: redesigned chats. Includes an improved desktop UI, unified chat widget, expanding textarea, and autosuggestions.
-- Lists: ability to edit and delete a list.
-- Settings: unified settings under one path with separate sections.
-- Posts: changed the thumbs-up icon to a heart.
-- Posts: move instance favicon beside username instead of post timestamp.
-- Posts: changed the behavior of content warnings. CWs and sensitive media are unified into one design.
-- Posts: redesigned interaction counters to use text instead of icons.
-- Posts: letterbox images taller than 1:1.
-- Profile: overhauled user profiles to be consistent with the rest of the UI.
-- Composer: move emoji button alongside other composer buttons, add numerical counter.
-- Birthdays: move today's birthdays out of notifications into right sidebar.
-- Performance: improve scrolling/navigation between feeds by using a virtual window library.
-- Admin: reorganize UI into 3-column layout.
-- Admin: include external link to frontend repo for the running commit.
-- Toast: redesigned toast notifications.
-
-### Removed
-- Theme: Halloween theme.
-- Settings: advanced notification settings.
-- Settings: dyslexic mode.
-- Settings: demetricator.
-- Profile: ability to set and view private notes on an account.
-- Feeds: per-feed filters for replies, media, etc.
-- Backup and export functionality (for now).
-- Posts: hide non-emoji images embedded in post content.
-
-### Security
-- Glitch Social: fixed XSS vulnerability on Glitch Social where custom emojis could be exploited to embed a script tag.
-
-## [2.0.0] - 2022-05-01
-### Added
-- Quote Posting: repost with comment on Fedibird and Rebased.
-- Profile: ability to feature other users on your profile (on Rebased, Mastodon).
-- Profile: ability to add location to the user's profile (on Rebased, Truth Social).
-- Birthdays: ability to add a birthday to your profile (on Rebased, Pleroma).
-- Birthdays: support for age-gated registration if configured by the admin (on Rebased, Pleroma).
-- Birthdays: display today's birthdays in notifications.
-- Notifications: added unread badge to favicon when user has notifications.
-- Notifications: display full attachments in notifications instead of links.
-- Search: added a dedicated search page with prefilled suggestions.
-- Compatibility: improved support for Mastodon, added support for Mitra.
-- Ethereum: Metamask sign-in with Mitra.
-- i18n: added Shavian alphabet (`en-Shaw`) transliteration.
-- i18n: added Icelandic translation.
-
-### Changed
-- Feeds: added gaps between posts in feeds.
-- Feeds: automatically load new posts when scrolled to the top of the feed.
-- Layout: improved design of top navigation bar.
-- Layout: add left sidebar navigation.
-- Icons: replaced Fork Awesome icons with Tabler icons.
-- Posts: moved mentions out of the post content into an area above the post for replies (on Pleroma and Rebased - Mastodon falls back to the old behavior).
-- Composer: use graphical ring counter for character count.
-
-### Fixed
-- Multi-Account: fix switching between profiles on different servers with the same local username.
-
 ## [1.3.0] - 2021-07-02
 ### Changed
 - Layout: show right sidebar on all pages.

COFE_OF_CONDUCT.md

@@ -0,0 +1,49 @@
+```
+                                    o$$$$$$oo
+                                 o$"        "$oo
+                                 $   o""""$o  "$o
+                                "$  o  "o  "o   $
+                                "$   $o $   $   o$
+                                 "$       o$"$  o$
+                                  "$ooooo$$  $  o$
+                        o$ """ $     " $$$   "  $
+                      o$        $o    $$"   "   "
+                     $$  $ " $   $$$o"$    o  o$"
+                     $"  o "" $   $" "   o"  $$
+                     $o  " "  $  o$"   o"  o$"
+                      "$o    $$  $   o"  o$$"
+                       ""o$o"$"  $oo"  o$"
+                        o$$ $   $$$  o$$
+                        o" o oo""  "" "$o
+                       o$o" ""          $
+                      $" " o"   " " "   "o
+                     $$ "  "  o$ o$o "   $
+                    o$ $  $  o$$ "  "   ""
+                    o  $ $"  " "o      o$
+                    $ o         $o$oo$""
+                   $o $   o  o  o"$$
+                   $o  o  $  $    "$o
+                   $o  $   o  $  $ "o
+                    $  $   "o  $  "o"$o
+                    $   "   o   $   o $$
+            $o$o$o$o$$o$$$o$$o$o$$o$$o$$$o$o$o$o$o$o$o$o$o$ooo
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$   " $$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$      "$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$       $$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$     o$$$$"
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ooooo$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"""""
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+            $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+"$o$o$o$o$o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+  "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"
+    "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"""
+       """""""""""""""""""""""""""""""""""""""""""""""""""""
+```

app/soapbox/actions/filters.ts

@@ -1,14 +1,11 @@
 import { defineMessages } from 'react-intl';
 
 import snackbar from 'soapbox/actions/snackbar';
-import { getFilters } from 'soapbox/selectors';
 import { isLoggedIn } from 'soapbox/utils/auth';
 import { getFeatures } from 'soapbox/utils/features';
 
 import api from '../api';
 
-import { STATUS_APPLY_FILTERS } from './statuses';
-
 import type { AppDispatch, RootState } from 'soapbox/store';
 
 const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
@@ -29,7 +26,7 @@ const messages = defineMessages({
 });
 
 const fetchFilters = () =>
-  async(dispatch: AppDispatch, getState: () => RootState) => {
+  (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
     const state = getState();
@@ -43,26 +40,19 @@ const fetchFilters = () =>
       skipLoading: true,
     });
 
-    try {
-      const { data } = await api(getState).get('/api/v1/filters');
-      await dispatch({
+    api(getState)
+      .get('/api/v1/filters')
+      .then(({ data }) => dispatch({
         type: FILTERS_FETCH_SUCCESS,
         filters: data,
         skipLoading: true,
-      });
-      const filters = getFilters(getState(), null);
-      dispatch({
-        type: STATUS_APPLY_FILTERS,
-        filters,
-      });
-    } catch (err) {
-      dispatch({
+      }))
+      .catch(err => dispatch({
         type: FILTERS_FETCH_FAIL,
         err,
         skipLoading: true,
         skipAlert: true,
-      });
-    }
+      }));
   };
 
 const createFilter = (phrase: string, expires_at: string, context: Array<string>, whole_word: boolean, irreversible: boolean) =>

app/soapbox/actions/importer/index.ts

@@ -1,5 +1,3 @@
-import { getFilters } from 'soapbox/selectors';
-
 import { getSettings } from '../settings';
 
 import type { AppDispatch, RootState } from 'soapbox/store';
@@ -23,16 +21,14 @@ export function importAccounts(accounts: APIEntity[]) {
 export function importStatus(status: APIEntity, idempotencyKey?: string) {
   return (dispatch: AppDispatch, getState: () => RootState) => {
     const expandSpoilers = getSettings(getState()).get('expandSpoilers');
-    const filters = getFilters(getState(), null);
-    return dispatch({ type: STATUS_IMPORT, status, idempotencyKey, expandSpoilers, filters });
+    return dispatch({ type: STATUS_IMPORT, status, idempotencyKey, expandSpoilers });
   };
 }
 
 export function importStatuses(statuses: APIEntity[]) {
   return (dispatch: AppDispatch, getState: () => RootState) => {
     const expandSpoilers = getSettings(getState()).get('expandSpoilers');
-    const filters = getFilters(getState(), null);
-    return dispatch({ type: STATUSES_IMPORT, statuses, expandSpoilers, filters });
+    return dispatch({ type: STATUSES_IMPORT, statuses, expandSpoilers });
   };
 }
 

app/soapbox/actions/notifications.ts

@@ -107,11 +107,9 @@ const updateNotificationsQueue = (notification: APIEntity, intlMessages: Record<
       filtered = regex && regex.test(searchIndex);
     }
 
-    if (filtered) return;
-
     // Desktop notifications
     try {
-      if (showAlert) {
+      if (showAlert && !filtered) {
         const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
         const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : unescapeHTML(notification.status ? notification.status.content : '');
 
@@ -130,7 +128,7 @@ const updateNotificationsQueue = (notification: APIEntity, intlMessages: Record<
       console.warn(e);
     }
 
-    if (playSound) {
+    if (playSound && !filtered) {
       dispatch({
         type: NOTIFICATIONS_UPDATE_NOOP,
         meta: { sound: 'boop' },

app/soapbox/actions/statuses.ts

@@ -47,8 +47,6 @@ const STATUS_TRANSLATE_FAIL = 'STATUS_TRANSLATE_FAIL';
 const STATUS_REVEAL = 'STATUS_REVEAL';
 const STATUS_HIDE   = 'STATUS_HIDE';
 
-const STATUS_APPLY_FILTERS = 'STATUS_APPLY_FILTERS';
-
 const statusExists = (getState: () => RootState, statusId: string) => {
   return (getState().statuses.get(statusId) || null) !== null;
 };
@@ -355,7 +353,6 @@ export {
   STATUS_TRANSLATE_REQUEST,
   STATUS_TRANSLATE_SUCCESS,
   STATUS_TRANSLATE_FAIL,
-  STATUS_APPLY_FILTERS,
   createStatus,
   editStatus,
   fetchStatus,

app/soapbox/actions/tags.ts

@@ -1,119 +0,0 @@
-import { isLoggedIn } from 'soapbox/utils/auth';
-import { getFeatures } from 'soapbox/utils/features';
-
-import api, { getNextLink } from '../api';
-
-import type { AppDispatch, RootState } from 'soapbox/store';
-
-const TAG_FETCH_REQUEST = 'TAG_FETCH_REQUEST';
-const TAG_FETCH_SUCCESS = 'TAG_FETCH_SUCCESS';
-const TAG_FETCH_FAIL = 'TAG_FETCH_FAIL';
-
-const TAG_FOLLOW_REQUEST = 'TAG_FOLLOW_REQUEST';
-const TAG_FOLLOW_SUCCESS = 'TAG_FOLLOW_SUCCESS';
-const TAG_FOLLOW_FAIL = 'TAG_FOLLOW_FAIL';
-
-const TAG_UNFOLLOW_REQUEST = 'TAG_UNFOLLOW_REQUEST';
-const TAG_UNFOLLOW_SUCCESS = 'TAG_UNFOLLOW_SUCCESS';
-const TAG_UNFOLLOW_FAIL = 'TAG_UNFOLLOW_FAIL';
-
-const fetchTags = () => async(dispatch: AppDispatch, getState: () => RootState) => {
-  if (!isLoggedIn(getState)) return;
-
-  const state = getState();
-  const instance = state.instance;
-  const features = getFeatures(instance);
-
-  if (!features.followTags) return;
-
-  dispatch({ type: TAG_FETCH_REQUEST, skipLoading: true });
-
-  try {
-    let next = null;
-    let tags = [];
-    do {
-      const response = await api(getState).get(next || '/api/v1/followed_tags');
-      tags = [...tags, ...response.data];
-      next = getNextLink(response);
-    } while (next);
-    dispatch({
-      type: TAG_FETCH_SUCCESS,
-      tags,
-      skipLoading: true,
-    });
-  } catch (err) {
-    dispatch({
-      type: TAG_FETCH_FAIL,
-      err,
-      skipLoading: true,
-      skipAlert: true,
-    });
-  }
-};
-
-const followTag = (tagId: string) => async(dispatch: AppDispatch, getState: () => RootState) => {
-  if (!isLoggedIn(getState)) return;
-
-  const state = getState();
-  const features = getFeatures(state.instance);
-
-  if (!features.followTags) return;
-
-  dispatch({ type: TAG_FOLLOW_REQUEST });
-
-  try {
-    const { data } = await api(getState).post(`/api/v1/tags/${tagId}/follow`);
-    dispatch({
-      type: TAG_FOLLOW_SUCCESS,
-      tag: data,
-    });
-
-  } catch (err) {
-    dispatch({
-      type: TAG_FOLLOW_FAIL,
-      err,
-    });
-  }
-};
-
-const unfollowTag = (tagId: string) => async(dispatch: AppDispatch, getState: () => RootState) => {
-  if (!isLoggedIn(getState)) return;
-
-  const state = getState();
-  const features = getFeatures(state.instance);
-
-  if (!features.followTags) return;
-
-  dispatch({ type: TAG_UNFOLLOW_REQUEST });
-
-  try {
-    const { data } = await api(getState).post(`/api/v1/tags/${tagId}/unfollow`);
-    dispatch({
-      type: TAG_UNFOLLOW_SUCCESS,
-      tag: data,
-    });
-
-  } catch (err) {
-    dispatch({
-      type: TAG_UNFOLLOW_FAIL,
-      err,
-    });
-  }
-};
-
-export {
-  fetchTags,
-  TAG_FETCH_FAIL,
-  TAG_FETCH_REQUEST,
-  TAG_FETCH_SUCCESS,
-
-  followTag,
-  TAG_FOLLOW_FAIL,
-  TAG_FOLLOW_REQUEST,
-  TAG_FOLLOW_SUCCESS,
-
-  unfollowTag,
-  TAG_UNFOLLOW_FAIL,
-  TAG_UNFOLLOW_REQUEST,
-  TAG_UNFOLLOW_SUCCESS,
-};

app/soapbox/actions/timelines.ts

@@ -245,7 +245,6 @@ const expandTimelineSuccess = (timeline: string, statuses: APIEntity[], next: st
   partial,
   isLoadingRecent,
   skipLoading: !isLoadingMore,
-  isLoadingMore,
 });
 
 const expandTimelineFail = (timeline: string, error: AxiosError, isLoadingMore: boolean) => ({

app/soapbox/components/account.tsx

@@ -164,9 +164,9 @@ const Account = ({
   const LinkEl: any = withLinkToProfile ? Link : 'div';
 
   return (
-    <div data-testid='account' className='shrink-0 group block w-full' ref={overflowRef}>
+    <div data-testid='account' className='flex-shrink-0 group block w-full' ref={overflowRef}>
       <HStack alignItems={actionAlignment} justifyContent='between'>
-        <HStack className='grow min-w-0' alignItems={withAccountNote ? 'top' : 'center'} space={3}>
+        <HStack alignItems={withAccountNote ? 'top' : 'center'} space={3}>
           <ProfilePopper
             condition={showProfileHoverCard}
             wrapper={(children) => <HoverRefWrapper className='relative' accountId={account.id} inline>{children}</HoverRefWrapper>}
@@ -186,7 +186,7 @@ const Account = ({
             </LinkEl>
           </ProfilePopper>
 
-          <div className='grow min-w-0'>
+          <div className='flex-grow'>
             <ProfilePopper
               condition={showProfileHoverCard}
               wrapper={(children) => <HoverRefWrapper accountId={account.id} inline>{children}</HoverRefWrapper>}
@@ -210,7 +210,7 @@ const Account = ({
             </ProfilePopper>
 
             <Stack space={withAccountNote ? 1 : 0}>
-              <HStack className='grow' alignItems='center' space={1} style={style}>
+              <HStack alignItems='center' space={1} style={style}>
                 <Text theme='muted' size='sm' truncate>@{username}</Text>
 
                 {account.favicon && (

app/soapbox/components/announcements/announcement-content.tsx

@@ -30,7 +30,7 @@ const AnnouncementContent: React.FC<IAnnouncementContent> = ({ announcement }) =
     if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       e.stopPropagation();
-      history.push(`/tag/${hashtag}`);
+      history.push(`/tags/${hashtag}`);
     }
   };
 

app/soapbox/components/domain.tsx

@@ -4,10 +4,10 @@ import { useDispatch } from 'react-redux';
 
 import { unblockDomain } from 'soapbox/actions/domain_blocks';
 
-import Icon from './icon';
-import { Button } from './ui';
+import IconButton from './icon_button';
 
 const messages = defineMessages({
+  blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
 });
 
@@ -19,27 +19,29 @@ const Domain: React.FC<IDomain> = ({ domain }) => {
   const dispatch = useDispatch();
   const intl = useIntl();
 
+  // const onBlockDomain = () => {
+  //   dispatch(openModal('CONFIRM', {
+  //     icon: require('@tabler/icons/ban.svg'),
+  //     heading: <FormattedMessage id='confirmations.domain_block.heading' defaultMessage='Block {domain}' values={{ domain }} />,
+  //     message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.' values={{ domain: <strong>{domain}</strong> }} />,
+  //     confirm: intl.formatMessage(messages.blockDomainConfirm),
+  //     onConfirm: () => dispatch(blockDomain(domain)),
+  //   }));
+  // }
+
   const handleDomainUnblock = () => {
     dispatch(unblockDomain(domain));
   };
 
   return (
     <div className='domain'>
-      <div className='domain__wrapper flex justify-between items-center'>
-        <div className='flex gap-1 items-center'>
-          <Icon src={require('@tabler/icons/world.svg')} />
-          <strong className='text-gray-700 dark:text-white'>{domain}</strong>
-        </div>
+      <div className='domain__wrapper'>
+        <span className='domain__domain-name'>
+          <strong>{domain}</strong>
+        </span>
 
         <div className='domain__buttons'>
-          <Button theme='ghost' onClick={handleDomainUnblock}>
-            <div className='flex gap-1 items-center'>
-              <Icon src={require('@tabler/icons/lock-open.svg')} />
-              <span>
-                { intl.formatMessage(messages.unblockDomain) }
-              </span>
-            </div>
-          </Button>
+          <IconButton active src={require('@tabler/icons/lock-open.svg')} title={intl.formatMessage(messages.unblockDomain, { domain })} onClick={handleDomainUnblock} />
         </div>
       </div>
     </div>

app/soapbox/components/hashtag.tsx

@@ -23,7 +23,7 @@ const Hashtag: React.FC<IHashtag> = ({ hashtag }) => {
   return (
     <HStack alignItems='center' justifyContent='between' data-testid='hashtag'>
       <Stack>
-        <Permalink href={hashtag.url} to={`/tag/${hashtag.name}`} className='hover:underline'>
+        <Permalink href={hashtag.url} to={`/tags/${hashtag.name}`} className='hover:underline'>
           <Text tag='span' size='sm' weight='semibold'>#{hashtag.name}</Text>
         </Permalink>
 

app/soapbox/components/media_gallery.js

@@ -598,7 +598,7 @@ class MediaGallery extends React.PureComponent {
     return (
       <div className={classNames('media-gallery', { 'media-gallery--compact': compact })} style={sizeData.get('style')} ref={this.handleRef}>
         <div className={classNames('spoiler-button', { 'spoiler-button--minified': visible || compact })}>
-          {(
+          {sensitive && (
             (visible || compact) ? (
               <Button
                 text={intl.formatMessage(messages.toggle_visible)}
@@ -612,14 +612,11 @@ class MediaGallery extends React.PureComponent {
                 <div className='p-4 rounded-xl shadow-xl backdrop-blur-sm bg-white/75 dark:bg-slate-800/75 text-center inline-block space-y-4 max-w-[280px]'>
                   <div className='space-y-1'>
                     <Text weight='semibold'>{warning}</Text>
-                    {
-                      sensitive && (
-                        <Text size='sm'>
-                          <FormattedMessage id='status.sensitive_warning.subtitle' defaultMessage='This content may not be suitable for all audiences.' />
-                        </Text>
-                      )
-                    }
+                    <Text size='sm'>
+                      <FormattedMessage id='status.sensitive_warning.subtitle' defaultMessage='This content may not be suitable for all audiences.' />
+                    </Text>
                   </div>
+
                   <Button type='button' theme='primary' size='sm' icon={require('@tabler/icons/eye.svg')}>
                     <FormattedMessage id='status.sensitive_warning.action' defaultMessage='Show content' />
                   </Button>

app/soapbox/components/polls/poll-footer.tsx

@@ -51,35 +51,35 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
         {poll.pleroma.get('non_anonymous') && (
           <>
             <Tooltip text={intl.formatMessage(messages.nonAnonymous)}>
-              <Text tag='span' theme='muted' weight='medium'>
+              <Text theme='muted' weight='medium'>
                 <FormattedMessage id='poll.non_anonymous' defaultMessage='Public poll' />
               </Text>
             </Tooltip>
 
-            <Text tag='span' theme='muted'>&middot;</Text>
+            <Text theme='muted'>&middot;</Text>
           </>
         )}
 
         {showResults && (
           <>
             <button className='text-gray-600 underline' onClick={handleRefresh} data-testid='poll-refresh'>
-              <Text tag='span' theme='muted' weight='medium'>
+              <Text theme='muted' weight='medium'>
                 <FormattedMessage id='poll.refresh' defaultMessage='Refresh' />
               </Text>
             </button>
 
-            <Text tag='span' theme='muted'>&middot;</Text>
+            <Text theme='muted'>&middot;</Text>
           </>
         )}
 
-        <Text tag='span' theme='muted' weight='medium'>
+        <Text theme='muted' weight='medium'>
           {votesCount}
         </Text>
 
         {poll.expires_at && (
           <>
-            <Text tag='span' theme='muted'>&middot;</Text>
-            <Text tag='span' weight='medium' theme='muted' data-testid='poll-expiration'>{timeRemaining}</Text>
+            <Text theme='muted'>&middot;</Text>
+            <Text weight='medium' theme='muted' data-testid='poll-expiration'>{timeRemaining}</Text>
           </>
         )}
       </HStack>

app/soapbox/components/scroll-top-button.tsx

@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import throttle from 'lodash/throttle';
 import React, { useState, useEffect, useCallback } from 'react';
 import { useIntl, MessageDescriptor } from 'react-intl';
@@ -30,38 +31,38 @@ const ScrollTopButton: React.FC<IScrollTopButton> = ({
   const intl = useIntl();
   const settings = useSettings();
 
-  const timer = React.useRef(null);
   const [scrolled, setScrolled] = useState<boolean>(false);
   const autoload = settings.get('autoloadTimelines') === true;
 
-  const getScrollTop = React.useCallback((): number => {
-    return (document.scrollingElement || document.documentElement).scrollTop;
-  }, []);
+  const visible = count > 0 && scrolled;
 
-  const maybeUnload = React.useCallback(() => {
-    // we need to add a timer since there is a delay between content render and
-    // scroll top calculation. Without it, new content is always loaded because
-    // scrollTop is 0 at first.
-    if (timer.current) clearTimeout(timer.current);
-    timer.current = setTimeout(() => {
-      if (count > 0 && autoload && getScrollTop() <= autoloadThreshold) {
-        onClick();
-      }
-      timer.current = null;
-    }, 250);
-  }, [autoload, autoloadThreshold, onClick, count]);
+  const classes = classNames('left-1/2 -translate-x-1/2 fixed top-20 z-50', {
+    'hidden': !visible,
+  });
+
+  const getScrollTop = (): number => {
+    return (document.scrollingElement || document.documentElement).scrollTop;
+  };
+
+  const maybeUnload = () => {
+    if (autoload && getScrollTop() <= autoloadThreshold) {
+      onClick();
+    }
+  };
 
   const handleScroll = useCallback(throttle(() => {
+    maybeUnload();
+
     if (getScrollTop() > threshold) {
       setScrolled(true);
     } else {
       setScrolled(false);
     }
-  }, 150, { trailing: true }), [threshold]);
+  }, 150, { trailing: true }), [autoload, threshold, autoloadThreshold, onClick]);
 
-  const scrollUp = React.useCallback(() => {
+  const scrollUp = () => {
     window.scrollTo({ top: 0 });
-  }, []);
+  };
 
   const handleClick: React.MouseEventHandler = () => {
     setTimeout(scrollUp, 10);
@@ -78,23 +79,19 @@ const ScrollTopButton: React.FC<IScrollTopButton> = ({
 
   useEffect(() => {
     maybeUnload();
-  }, [maybeUnload]);
-
-  const visible = React.useMemo(() => count > 0 && scrolled, [count, scrolled]) ;
-
-  if (!visible) return null;
+  }, [count]);
 
   return (
-    <div className='left-1/2 -translate-x-1/2 fixed top-20 z-50'>
-      <button
-        className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer whitespace-nowrap' 
-        onClick={handleClick}
-      >
+    <div className={classes}>
+      <a className='flex items-center bg-primary-600 hover:bg-primary-700 hover:scale-105 active:scale-100 transition-transform text-white rounded-full px-4 py-2 space-x-1.5 cursor-pointer whitespace-nowrap' onClick={handleClick}>
         <Icon src={require('@tabler/icons/arrow-bar-to-up.svg')} />
-        <Text theme='inherit' size='sm'>
-          {intl.formatMessage(message, { count })}
-        </Text>
-      </button>
+
+        {(count > 0) && (
+          <Text theme='inherit' size='sm'>
+            {intl.formatMessage(message, { count })}
+          </Text>
+        )}
+      </a>
     </div>
   );
 };

app/soapbox/components/sidebar-navigation.tsx

@@ -22,7 +22,6 @@ const messages = defineMessages({
   settings: { id: 'tabs_bar.settings', defaultMessage: 'Settings' },
   direct: { id: 'column.direct', defaultMessage: 'Direct messages' },
   directory: { id: 'navigation_bar.profile_directory', defaultMessage: 'Profile directory' },
-  tags: { id: 'navigation_bar.tags', defaultMessage: 'Hashtags' },
 });
 
 /** Desktop sidebar with links to different views in the app. */
@@ -80,14 +79,6 @@ const SidebarNavigation = () => {
         });
       }
 
-      if (features.followTags) {
-        menu.push({
-          to: '/followed_hashtags',
-          text: intl.formatMessage(messages.tags),
-          icon: require('@tabler/icons/hash.svg'),
-        });
-      }
-
       if (features.profileDirectory) {
         menu.push({
           to: '/directory',

app/soapbox/components/sidebar_menu.tsx

@@ -38,7 +38,6 @@ const messages = defineMessages({
   direct: { id: 'column.direct', defaultMessage: 'Direct messages' },
   directory: { id: 'navigation_bar.profile_directory', defaultMessage: 'Profile directory' },
   dashboard: { id: 'tabs_bar.dashboard', defaultMessage: 'Dashboard' },
-  tags: { id: 'navigation_bar.tags', defaultMessage: 'Hashtags' },
 });
 
 interface ISidebarLink {
@@ -244,15 +243,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
                   />
                 )}
 
-                {features.followTags && (
-                  <SidebarLink
-                    to='/followed_hashtags'
-                    icon={require('@tabler/icons/hash.svg')}
-                    text={intl.formatMessage(messages.tags)}
-                    onClick={onClose}
-                  />
-                )}
-
                 {features.profileDirectory && (
                   <SidebarLink
                     to='/directory'

app/soapbox/components/status.tsx

@@ -204,6 +204,21 @@ const Status: React.FC<IStatus> = (props) => {
     );
   }
 
+  if (status.filtered || actualStatus.filtered) {
+    const minHandlers = muted ? undefined : {
+      moveUp: handleHotkeyMoveUp,
+      moveDown: handleHotkeyMoveDown,
+    };
+
+    return (
+      <HotKeys handlers={minHandlers}>
+        <div className={classNames('status__wrapper', 'status__wrapper--filtered', { focusable })} tabIndex={focusable ? 0 : undefined} ref={node}>
+          <FormattedMessage id='status.filtered' defaultMessage='Filtered' />
+        </div>
+      </HotKeys>
+    );
+  }
+
   let quote;
 
   if (actualStatus.quote) {
@@ -272,14 +287,14 @@ const Status: React.FC<IStatus> = (props) => {
           data-id={status.id}
         >
 
-          <div className={classNames('flex items-center', { 'mb-3': status.reblog && typeof status.reblog === 'object' })}>
-            <div className='grow min-w-0'>
+          <div className='flex mb-3'>
+            <div className='grow'>
               {
                 status.reblog && typeof status.reblog === 'object' && (
                   <NavLink
                     to={`/@${status.getIn(['account', 'acct'])}`}
                     onClick={(event) => event.stopPropagation()}
-                    className='flex items-center text-gray-700 dark:text-gray-600 text-xs font-medium space-x-1 hover:underline'
+                    className='flex items-center mb-3 text-gray-700 dark:text-gray-600 text-xs font-medium space-x-1 hover:underline'
                   >
                     <Icon src={require('@tabler/icons/repeat.svg')} className='text-green-600' />
 
@@ -297,21 +312,21 @@ const Status: React.FC<IStatus> = (props) => {
                   </NavLink>
                 )
               }
+              <AccountContainer
+                key={String(actualStatus.getIn(['account', 'id']))}
+                id={String(actualStatus.getIn(['account', 'id']))}
+                timestamp={actualStatus.created_at}
+                timestampUrl={statusUrl}
+                hideActions
+                showEdit={!!actualStatus.edited_at}
+                showProfileHoverCard={hoverable}
+                withLinkToProfile={hoverable}
+              />
             </div>
+
             <Icon aria-hidden src={privacyIcon} className='h-5 w-5 shrink-0 text-gray-400 dark:text-gray-600' />
           </div>
-          <div className='mb-3'>
-            <AccountContainer
-              key={String(actualStatus.getIn(['account', 'id']))}
-              id={String(actualStatus.getIn(['account', 'id']))}
-              timestamp={actualStatus.created_at}
-              timestampUrl={statusUrl}
-              hideActions
-              showEdit={!!actualStatus.edited_at}
-              showProfileHoverCard={hoverable}
-              withLinkToProfile={hoverable}
-            />
-          </div>
+
 
           <div className='status__content-wrapper'>
             {!group && actualStatus.group && (
@@ -333,21 +348,15 @@ const Status: React.FC<IStatus> = (props) => {
               collapsable
             />
 
-            {
-              !actualStatus.hidden && (
-                <>
-                  <StatusMedia
-                    status={actualStatus}
-                    muted={muted}
-                    onClick={handleClick}
-                    showMedia={showMedia}
-                    onToggleVisibility={handleToggleMediaVisibility}
-                  />
-                  { quote  }
-                </>
+            <StatusMedia
+              status={actualStatus}
+              muted={muted}
+              onClick={handleClick}
+              showMedia={showMedia}
+              onToggleVisibility={handleToggleMediaVisibility}
+            />
 
-              )
-            }
+            {!actualStatus.hidden && quote}
 
             {!hideActionBar && (
               <div className='pt-4'>

app/soapbox/components/status_content.tsx

@@ -11,7 +11,6 @@ import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich_content';
 import { isRtl } from '../rtl';
 
 import Poll from './polls/poll';
-import { Button, Text } from './ui';
 
 import type { Status, Mention } from 'soapbox/types/entities';
 
@@ -29,11 +28,10 @@ interface IReadMoreButton {
 
 /** Button to expand a truncated status (due to too much content) */
 const ReadMoreButton: React.FC<IReadMoreButton> = ({ onClick }) => (
-  <Button onClick={onClick} theme='link' size='sm' classNames='-mx-3'>
+  <button className='status__content__read-more-button' onClick={onClick}>
     <FormattedMessage id='status.read_more' defaultMessage='Read more' />
     <Icon className='inline-block h-5 w-5' src={require('@tabler/icons/chevron-right.svg')} fixedWidth />
-  </Button>
-
+  </button>
 );
 
 interface ISpoilerButton {
@@ -44,9 +42,18 @@ interface ISpoilerButton {
 
 /** Button to expand status text behind a content warning */
 const SpoilerButton: React.FC<ISpoilerButton> = ({ onClick, hidden, tabIndex }) => (
-  <Button
-    theme='ghost'
-    size='sm'
+  <button
+    tabIndex={tabIndex}
+    className={classNames(
+      'inline-block rounded-md px-1.5 py-0.5 ml-[0.5em]',
+      'text-black dark:text-white',
+      'font-bold text-[11px] uppercase',
+      'bg-primary-100 dark:bg-primary-900',
+      'hover:bg-primary-300 dark:hover:bg-primary-600',
+      'focus:bg-primary-200 dark:focus:bg-primary-600',
+      'hover:no-underline',
+      'duration-100',
+    )}
     onClick={onClick}
   >
     {hidden ? (
@@ -54,68 +61,9 @@ const SpoilerButton: React.FC<ISpoilerButton> = ({ onClick, hidden, tabIndex })
     ) : (
       <FormattedMessage id='status.show_less' defaultMessage='Show less' />
     )}
-  </Button>
+  </button>
 );
 
-interface ISpoiler {
-  hidden: boolean,
-  status: Status,
-  onClick: (event: React.MouseEvent<Element, MouseEvent>) => void,
-}
-
-const Spoiler: React.FC<ISpoiler> = ({ hidden, onClick, status }) => {
-  return (
-    <div className='flex items-center justify-between bg-gray-100 dark:bg-slate-700 p-2 rounded mt-1'>
-      {
-        status.spoiler_text.length > 0 ? (
-          <span>
-            <Text tag='span' weight='medium'>
-              <FormattedMessage
-                id='status.cw'
-                defaultMessage='Warning:'
-              />
-            </Text>
-                &nbsp;
-            <span dangerouslySetInnerHTML={{ __html: status.spoilerHtml }} lang={status.language || undefined} />
-          </span>
-        ) : (
-          <span>
-            <Text tag='span'>
-              <FormattedMessage
-                id='status.filtered'
-                defaultMessage='Filtered'
-              />
-            </Text>
-            <br />
-            <Text size='xs' theme='muted' tag='span'>
-              <FormattedMessage
-                id='status.filtered-hint'
-                defaultMessage='Status was hidden by filter settings'
-              />
-            </Text>
-          </span>
-        )
-      }
-      <div className='flex gap-3 items-center'>
-        {
-          status.media_attachments?.count() > 0 && (
-            <div aria-hidden className='flex gap-1 items-center'>
-              <Icon className='inline-block' src={require('@tabler/icons/paperclip.svg')} />
-              <Text tag='span' size='xs' theme='muted'>{ status.media_attachments.count() }</Text>
-            </div>
-          )
-        }
-
-        <SpoilerButton
-          tabIndex={0}
-          onClick={onClick}
-          hidden={hidden}
-        />
-      </div>
-    </div>
-  );
-};
-
 interface IStatusContent {
   status: Status,
   expanded?: boolean,
@@ -151,7 +99,7 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
     if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       e.stopPropagation();
-      history.push(`/tag/${hashtag}`);
+      history.push(`/tags/${hashtag}`);
     }
   };
 
@@ -266,6 +214,7 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
   const isHidden = onExpandedToggle ? !expanded : hidden;
 
   const content = { __html: parsedHtml };
+  const spoilerContent = { __html: status.spoilerHtml };
   const directionStyle: React.CSSProperties = { direction: 'ltr' };
   const className = classNames('status__content', {
     'status__content--with-action': onClick,
@@ -278,50 +227,80 @@ const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onE
     directionStyle.direction = 'rtl';
   }
 
-  return (
-    <>
-      <div className={`${className} flex flex-col gap-2`} ref={node} tabIndex={0} style={directionStyle} onMouseDown={handleMouseDown} onMouseUp={handleMouseUp}>
-        {
-          // post has a spoiler or was filtered
-          (status.spoiler_text.length > 0 || status.filtered) && (
-            <Spoiler
-              status={status}
-              hidden={isHidden}
-              onClick={handleSpoilerClick}
-            />
-          )
-        }
-        {
-          // actual content
-          !isHidden && (
-            <>
-              <div
-                tabIndex={!isHidden ? 0 : undefined}
-                className={classNames('min-h-0 overflow-hidden text-ellipsis status__content__text status__content__text--visible')}
-                style={directionStyle}
-                dangerouslySetInnerHTML={content}
-                lang={status.language || undefined}
-              />
-              {
-              // post folded because too long
-                collapsed && onClick && (
-                  <div>
-                    <ReadMoreButton onClick={onClick} key='read-more' />
-                  </div>
-                )
-              }
-              {
-              // post has a poll
-                !collapsed && status.poll && typeof status.poll === 'string' && (
-                  <Poll id={status.poll} key='poll' status={status.url} />
-                )
-              }
-            </>
-          )
-        }
+  if (status.spoiler_text.length > 0) {
+    return (
+      <div className={className} ref={node} tabIndex={0} style={directionStyle} onMouseDown={handleMouseDown} onMouseUp={handleMouseUp}>
+        <p style={{ marginBottom: isHidden && status.mentions.isEmpty() ? 0 : undefined }}>
+          <span dangerouslySetInnerHTML={spoilerContent} lang={status.language || undefined} />
+
+          <SpoilerButton
+            tabIndex={0}
+            onClick={handleSpoilerClick}
+            hidden={isHidden}
+          />
+        </p>
+
+        <div
+          tabIndex={!isHidden ? 0 : undefined}
+          className={classNames('status__content__text', {
+            'status__content__text--visible': !isHidden,
+          })}
+          style={directionStyle}
+          dangerouslySetInnerHTML={content}
+          lang={status.language || undefined}
+        />
+
+        {!isHidden && status.poll && typeof status.poll === 'string' && (
+          <Poll id={status.poll} status={status.url} />
+        )}
       </div>
-    </>
-  );
+    );
+  } else if (onClick) {
+    const output = [
+      <div
+        ref={node}
+        tabIndex={0}
+        key='content'
+        className={className}
+        style={directionStyle}
+        dangerouslySetInnerHTML={content}
+        lang={status.language || undefined}
+        onMouseDown={handleMouseDown}
+        onMouseUp={handleMouseUp}
+      />,
+    ];
+
+    if (collapsed) {
+      output.push(<ReadMoreButton onClick={onClick} key='read-more' />);
+    }
+
+    const hasPoll = status.poll && typeof status.poll === 'string';
+    if (hasPoll) {
+      output.push(<Poll id={status.poll} key='poll' status={status.url} />);
+    }
+
+    return <div className={classNames({ 'rounded-md p-4': hasPoll })}>{output}</div>;
+  } else {
+    const output = [
+      <div
+        ref={node}
+        tabIndex={0}
+        key='content'
+        className={classNames('status__content', {
+          'status__content--big': onlyEmoji,
+        })}
+        style={directionStyle}
+        dangerouslySetInnerHTML={content}
+        lang={status.language || undefined}
+      />,
+    ];
+
+    if (status.poll && typeof status.poll === 'string') {
+      output.push(<Poll id={status.poll} key='poll' status={status.url} />);
+    }
+
+    return <>{output}</>;
+  }
 };
 
 export default React.memo(StatusContent);

app/soapbox/components/ui/button/button.tsx

@@ -12,6 +12,7 @@ interface IButton {
   block?: boolean,
   /** Elements inside the <button> */
   children?: React.ReactNode,
+  /** @deprecated unused */
   classNames?: string,
   /** Prevent the button from being clicked. */
   disabled?: boolean,
@@ -21,6 +22,7 @@ interface IButton {
   onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void,
   /** A predefined button size. */
   size?: ButtonSizes,
+  /** @deprecated unused */
   style?: React.CSSProperties,
   /** Text inside the button. Takes precedence over `children`. */
   text?: React.ReactNode,
@@ -35,7 +37,6 @@ interface IButton {
 /** Customizable button element with various themes. */
 const Button = React.forwardRef<HTMLButtonElement, IButton>((props, ref): JSX.Element => {
   const {
-    classNames,
     block = false,
     children,
     disabled = false,
@@ -46,7 +47,6 @@ const Button = React.forwardRef<HTMLButtonElement, IButton>((props, ref): JSX.El
     theme = 'accent',
     to,
     type = 'button',
-    style,
   } = props;
 
   const themeClass = useButtonStyles({
@@ -72,13 +72,12 @@ const Button = React.forwardRef<HTMLButtonElement, IButton>((props, ref): JSX.El
 
   const renderButton = () => (
     <button
-      className={`${themeClass} ${classNames}`}
+      className={themeClass}
       disabled={disabled}
       onClick={handleClick}
       ref={ref}
       type={type}
       data-testid='button'
-      style={style}
     >
       {renderIcon()}
       {text || children}

app/soapbox/components/ui/card/card.tsx

@@ -85,7 +85,7 @@ interface ICardTitle {
 
 /** A card's title. */
 const CardTitle: React.FC<ICardTitle> = ({ title }): JSX.Element => (
-  <Text className='grow' size='xl' weight='bold' tag='h1' data-testid='card-title' truncate>{title}</Text>
+  <Text size='xl' weight='bold' tag='h1' data-testid='card-title' truncate>{title}</Text>
 );
 
 /** A card's body. */

app/soapbox/components/ui/icon-button/icon-button.tsx

@@ -10,7 +10,7 @@ interface IIconButton extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   /** URL to the svg icon. */
   src: string,
   /** Text to display next ot the button. */
-  text?: React.ReactNode,
+  text?: string,
   /** Don't render a background behind the icon. */
   transparent?: boolean,
   /** Predefined styles to display for the button. */

app/soapbox/features/backups/index.tsx

@@ -1,9 +1,9 @@
+import classNames from 'classnames';
 import React, { useEffect, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { fetchBackups, createBackup } from 'soapbox/actions/backups';
 import ScrollableList from 'soapbox/components/scrollable_list';
-import { Button, FormActions, Text, Spinner } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
 import Column from '../ui/components/better_column';
@@ -24,14 +24,22 @@ const Backups = () => {
 
   const [isLoading, setIsLoading] = useState(true);
 
-  const handleCreateBackup: React.MouseEventHandler = e => {
+  const handleCreateBackup: React.MouseEventHandler<HTMLAnchorElement> = e => {
     dispatch(createBackup());
     e.preventDefault();
   };
 
+  const makeColumnMenu = () => {
+    return [{
+      text: intl.formatMessage(messages.create),
+      action: handleCreateBackup,
+      icon: require('@tabler/icons/plus.svg'),
+    }];
+  };
+
   useEffect(() => {
     dispatch(fetchBackups()).then(() => {
-      setIsLoading(false);
+      setIsLoading(true);
     }).catch(() => {});
   }, []);
 
@@ -39,47 +47,30 @@ const Backups = () => {
 
   const emptyMessageAction = (
     <a href='#' onClick={handleCreateBackup}>
-      <Text tag='span' theme='primary' size='sm' className='hover:underline'>
-        {intl.formatMessage(messages.emptyMessageAction)}
-      </Text>
+      {intl.formatMessage(messages.emptyMessageAction)}
     </a>
   );
 
   return (
-    <Column label={intl.formatMessage(messages.heading)}>
+    <Column icon='cloud-download' label={intl.formatMessage(messages.heading)} menu={makeColumnMenu()}>
       <ScrollableList
         isLoading={isLoading}
         showLoading={showLoading}
         scrollKey='backups'
         emptyMessage={intl.formatMessage(messages.emptyMessage, { action: emptyMessageAction })}
       >
-        {backups.map((backup) => {
-          const insertedAt = new Date(backup.inserted_at).toLocaleDateString(undefined, { year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' });
-          return (
-            <div
-              className='p-2 mb-3 rounded bg-gray-100 dark:bg-slate-900 flex justify-between items-center'
-              key={backup.id}
-            >
-              <div>
-                {backup.processed
-                  ? <a href={backup.url} target='_blank'>{insertedAt}</a>
-                  : <Text theme='subtle'>{insertedAt}&nbsp;-&nbsp;{intl.formatMessage(messages.pending)}</Text>
-                }
-              </div>
-              {
-                !backup.processed && <Spinner withText={false} size={15} />
-              }
-            </div>
-          );
-        })}
+        {backups.map((backup) => (
+          <div
+            className={classNames('backup', { 'backup--pending': !backup.processed })}
+            key={backup.id}
+          >
+            {backup.processed
+              ? <a href={backup.url} target='_blank'>{backup.inserted_at}</a>
+              : <div>{intl.formatMessage(messages.pending)}: {backup.inserted_at}</div>
+            }
+          </div>
+        ))}
       </ScrollableList>
-      <div className='mt-4'>
-        <FormActions>
-          <Button theme='primary' disabled={isLoading} onClick={handleCreateBackup}>
-            {intl.formatMessage(messages.create)}
-          </Button>
-        </FormActions>
-      </div>
     </Column>
   );
 };

app/soapbox/features/blocks/index.tsx

@@ -23,12 +23,19 @@ const Blocks: React.FC = () => {
 
   const accountIds = useAppSelector((state) => state.user_lists.blocks.items);
   const hasMore = useAppSelector((state) => !!state.user_lists.blocks.next);
-  const loading = useAppSelector((state) => state.user_lists.blocks.isLoading);
 
   React.useEffect(() => {
     dispatch(fetchBlocks());
   }, []);
 
+  if (!accountIds) {
+    return (
+      <Column>
+        <Spinner />
+      </Column>
+    );
+  }
+
   const emptyMessage = <FormattedMessage id='empty_column.blocks' defaultMessage="You haven't blocked any users yet." />;
 
   return (
@@ -38,16 +45,12 @@ const Blocks: React.FC = () => {
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
-        itemClassName='flex flex-col gap-3 pb-4'
+        itemClassName='pb-4'
       >
         {accountIds.map((id) =>
           <AccountContainer key={id} id={id} actionType='blocking' />,
         )}
-        {
-          loading && <Spinner />
-        }
       </ScrollableList>
-
     </Column>
   );
 };

app/soapbox/features/domain_blocks/index.tsx

@@ -26,13 +26,19 @@ const DomainBlocks: React.FC = () => {
 
   const domains = useAppSelector((state) => state.domain_lists.blocks.items);
   const hasMore = useAppSelector((state) => !!state.domain_lists.blocks.next);
-  const loading = useAppSelector((state) => state.domain_lists.blocks.isLoading);
-
 
   React.useEffect(() => {
     dispatch(fetchDomainBlocks());
   }, []);
 
+  if (!domains) {
+    return (
+      <Column>
+        <Spinner />
+      </Column>
+    );
+  }
+
   const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
 
   return (
@@ -42,16 +48,10 @@ const DomainBlocks: React.FC = () => {
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
-        itemClassName='flex flex-col gap-3'
       >
-        {domains.map((domain) => (
-          <div className='rounded p-1 bg-gray-100 dark:bg-slate-900'>
-            <Domain key={domain} domain={domain} />
-          </div>
-        ))}
-        {
-          loading && <Spinner />
-        }
+        {domains.map((domain) =>
+          <Domain key={domain} domain={domain} />,
+        )}
       </ScrollableList>
     </Column>
   );

app/soapbox/features/filters/index.tsx

@@ -4,13 +4,13 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { fetchFilters, createFilter, deleteFilter } from 'soapbox/actions/filters';
 import snackbar from 'soapbox/actions/snackbar';
 import Icon from 'soapbox/components/icon';
-import { Button, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input } from 'soapbox/components/ui';
+import ScrollableList from 'soapbox/components/scrollable_list';
+import { Button, CardHeader, CardTitle, Column, Form, FormActions, FormGroup, Input, Text } from 'soapbox/components/ui';
 import {
   FieldsGroup,
   Checkbox,
 } from 'soapbox/features/forms';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
-import { Filter } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   heading: { id: 'column.filters', defaultMessage: 'Muted words' },
@@ -20,9 +20,8 @@ const messages = defineMessages({
   expires_hint: { id: 'column.filters.expires_hint', defaultMessage: 'Expiration dates are not currently supported' },
   home_timeline: { id: 'column.filters.home_timeline', defaultMessage: 'Home timeline' },
   public_timeline: { id: 'column.filters.public_timeline', defaultMessage: 'Public timeline' },
-  notifications: { id: 'column.filters.notifications', defaultMessage: 'Also apply for notifications' },
+  notifications: { id: 'column.filters.notifications', defaultMessage: 'Notifications' },
   conversations: { id: 'column.filters.conversations', defaultMessage: 'Conversations' },
-  drop_notifications: { id: 'column.filters.drop_notifications', defaultMessage: 'Will also hide status in notifications' },
   drop_header: { id: 'column.filters.drop_header', defaultMessage: 'Drop instead of hide' },
   drop_hint: { id: 'column.filters.drop_hint', defaultMessage: 'Filtered posts will disappear irreversibly, even if filter is later removed' },
   whole_word_header: { id: 'column.filters.whole_word_header', defaultMessage: 'Whole word' },
@@ -34,6 +33,15 @@ const messages = defineMessages({
   delete: { id: 'column.filters.delete', defaultMessage: 'Delete' },
 });
 
+// const expirations = {
+//   null: 'Never',
+//   // 3600: '30 minutes',
+//   // 21600: '1 hour',
+//   // 43200: '12 hours',
+//   // 86400 : '1 day',
+//   // 604800: '1 week',
+// };
+
 const Filters = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -42,20 +50,43 @@ const Filters = () => {
 
   const [phrase, setPhrase] = useState('');
   const [expiresAt] = useState('');
+  const [homeTimeline, setHomeTimeline] = useState(true);
+  const [publicTimeline, setPublicTimeline] = useState(false);
+  const [notifications, setNotifications] = useState(false);
+  const [conversations, setConversations] = useState(false);
   const [irreversible, setIrreversible] = useState(false);
   const [wholeWord, setWholeWord] = useState(true);
 
+  // const handleSelectChange = e => {
+  //   this.setState({ [e.target.name]: e.target.value });
+  // };
+
   const handleAddNew: React.FormEventHandler = e => {
     e.preventDefault();
-    dispatch(createFilter(phrase, expiresAt, [], wholeWord, irreversible)).then(() => {
+    const context: Array<string> = [];
+
+    if (homeTimeline) {
+      context.push('home');
+    }
+    if (publicTimeline) {
+      context.push('public');
+    }
+    if (notifications) {
+      context.push('notifications');
+    }
+    if (conversations) {
+      context.push('thread');
+    }
+
+    dispatch(createFilter(phrase, expiresAt, context, wholeWord, irreversible)).then(() => {
       return dispatch(fetchFilters());
     }).catch(error => {
       dispatch(snackbar.error(intl.formatMessage(messages.create_error)));
     });
   };
 
-  const handleFilterDelete = (filter: Filter) => {
-    dispatch(deleteFilter(filter.id)).then(() => {
+  const handleFilterDelete: React.MouseEventHandler<HTMLDivElement> = e => {
+    dispatch(deleteFilter(e.currentTarget.dataset.value!)).then(() => {
       return dispatch(fetchFilters());
     }).catch(() => {
       dispatch(snackbar.error(intl.formatMessage(messages.delete_error)));
@@ -82,23 +113,65 @@ const Filters = () => {
             onChange={({ target }) => setPhrase(target.value)}
           />
         </FormGroup>
+        {/* <FormGroup labelText={intl.formatMessage(messages.expires)} hintText={intl.formatMessage(messages.expires_hint)}>
+          <SelectDropdown
+            items={expirations}
+            defaultValue={expirations.never}
+            onChange={this.handleSelectChange}
+          />
+        </FormGroup> */}
+
         <FieldsGroup>
-          <div className='flex flex-col gap-2'>
+          <Text tag='label'>
+            <FormattedMessage id='filters.context_header' defaultMessage='Filter contexts' />
+          </Text>
+          <Text theme='muted' size='xs'>
+            <FormattedMessage id='filters.context_hint' defaultMessage='One or multiple contexts where the filter should apply' />
+          </Text>
+          <div className='two-col'>
             <Checkbox
-              label={intl.formatMessage(messages.drop_header)}
-              hint={intl.formatMessage(messages.drop_hint)}
-              name='irreversible'
-              checked={irreversible}
-              onChange={({ target }) => setIrreversible(target.checked)}
+              label={intl.formatMessage(messages.home_timeline)}
+              name='home_timeline'
+              checked={homeTimeline}
+              onChange={({ target }) => setHomeTimeline(target.checked)}
             />
             <Checkbox
-              label={intl.formatMessage(messages.whole_word_header)}
-              hint={intl.formatMessage(messages.whole_word_hint)}
-              name='whole_word'
-              checked={wholeWord}
-              onChange={({ target }) => setWholeWord(target.checked)}
+              label={intl.formatMessage(messages.public_timeline)}
+              name='public_timeline'
+              checked={publicTimeline}
+              onChange={({ target }) => setPublicTimeline(target.checked)}
+            />
+            <Checkbox
+              label={intl.formatMessage(messages.notifications)}
+              name='notifications'
+              checked={notifications}
+              onChange={({ target }) => setNotifications(target.checked)}
+            />
+            <Checkbox
+              label={intl.formatMessage(messages.conversations)}
+              name='conversations'
+              checked={conversations}
+              onChange={({ target }) => setConversations(target.checked)}
             />
           </div>
+
+        </FieldsGroup>
+
+        <FieldsGroup>
+          <Checkbox
+            label={intl.formatMessage(messages.drop_header)}
+            hint={intl.formatMessage(messages.drop_hint)}
+            name='irreversible'
+            checked={irreversible}
+            onChange={({ target }) => setIrreversible(target.checked)}
+          />
+          <Checkbox
+            label={intl.formatMessage(messages.whole_word_header)}
+            hint={intl.formatMessage(messages.whole_word_hint)}
+            name='whole_word'
+            checked={wholeWord}
+            onChange={({ target }) => setWholeWord(target.checked)}
+          />
         </FieldsGroup>
 
         <FormActions>
@@ -110,19 +183,27 @@ const Filters = () => {
         <CardTitle title={intl.formatMessage(messages.subheading_filters)} />
       </CardHeader>
 
-      <div>
-        {
-          filters.size === 0 && <div>{ emptyMessage }</div>
-        }
+      <ScrollableList
+        scrollKey='filters'
+        emptyMessage={emptyMessage}
+      >
         {filters.map((filter, i) => (
-          <div key={i} className='filter__container rounded bg-gray-100 dark:bg-slate-900 p-2 my-3'>
-            <div className=''>
-              <div className='mb-1'>
-                <span className='pr-1 text-gray-600 dark:text-gray-400'><FormattedMessage id='filters.filters_list_phrase_label' defaultMessage='Keyword or phrase:' /></span>
+          <div key={i} className='filter__container'>
+            <div className='filter__details'>
+              <div className='filter__phrase'>
+                <span className='filter__list-label'><FormattedMessage id='filters.filters_list_phrase_label' defaultMessage='Keyword or phrase:' /></span>
                 <span className='filter__list-value'>{filter.phrase}</span>
               </div>
-              <div className=''>
-                <span className='pr-1 text-gray-600 dark:text-gray-400'><FormattedMessage id='filters.filters_list_details_label' defaultMessage='Filter settings:' /></span>
+              <div className='filter__contexts'>
+                <span className='filter__list-label'><FormattedMessage id='filters.filters_list_context_label' defaultMessage='Filter contexts:' /></span>
+                <span className='filter__list-value'>
+                  {filter.context.map((context, i) => (
+                    <span key={i} className='context'>{context}</span>
+                  ))}
+                </span>
+              </div>
+              <div className='filter__details'>
+                <span className='filter__list-label'><FormattedMessage id='filters.filters_list_details_label' defaultMessage='Filter settings:' /></span>
                 <span className='filter__list-value'>
                   {filter.irreversible ?
                     <span><FormattedMessage id='filters.filters_list_drop' defaultMessage='Drop' /></span> :
@@ -134,18 +215,13 @@ const Filters = () => {
                 </span>
               </div>
             </div>
-            <div>
-              <Button  theme='ghost' onClick={() => handleFilterDelete(filter)} aria-label={intl.formatMessage(messages.delete)}>
-                <div className='flex items-end gap-1'>
-                  <FormattedMessage id='filters.filters_list_delete' defaultMessage='Delete' />
-                  <Icon src={require('@tabler/icons/x.svg')} />
-                </div>
-              </Button>
+            <div className='filter__delete' role='button' tabIndex={0} onClick={handleFilterDelete} data-value={filter.id} aria-label={intl.formatMessage(messages.delete)}>
+              <Icon className='filter__delete-icon' src={require('@tabler/icons/x.svg')} />
+              <span className='filter__delete-label'><FormattedMessage id='filters.filters_list_delete' defaultMessage='Delete' /></span>
             </div>
-
           </div>
         ))}
-      </div>
+      </ScrollableList>
     </Column>
   );
 };

app/soapbox/features/follow_requests/index.tsx

@@ -26,18 +26,24 @@ const FollowRequests: React.FC = () => {
 
   const accountIds = useAppSelector((state) => state.user_lists.follow_requests.items);
   const hasMore = useAppSelector((state) => !!state.user_lists.follow_requests.next);
-  const loading = useAppSelector((state) => state.user_lists.mutes.isLoading);
 
   React.useEffect(() => {
     dispatch(fetchFollowRequests());
   }, []);
 
+  if (!accountIds) {
+    return (
+      <Column>
+        <Spinner />
+      </Column>
+    );
+  }
+
   const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
 
   return (
     <Column icon='user-plus' label={intl.formatMessage(messages.heading)}>
       <ScrollableList
-        className='flex flex-col gap-3'
         scrollKey='follow_requests'
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
@@ -46,9 +52,6 @@ const FollowRequests: React.FC = () => {
         {accountIds.map(id =>
           <AccountAuthorize key={id} id={id} />,
         )}
-        {
-          loading && <Spinner />
-        }
       </ScrollableList>
     </Column>
   );

app/soapbox/features/followed_tags/index.tsx

@@ -1,102 +0,0 @@
-import React from 'react';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
-
-import { fetchTags, followTag, unfollowTag } from 'soapbox/actions/tags';
-import Icon from 'soapbox/components/icon';
-import ScrollableList from 'soapbox/components/scrollable_list';
-import { Button, Column, IconButton, Spinner, Text } from 'soapbox/components/ui';
-import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
-
-const messages = defineMessages({
-  heading: { id: 'column.tags', defaultMessage: 'Followed hashtags' },
-});
-
-interface IFollowButton {
-    id: string,
-  }
-
-const FollowButton: React.FC<IFollowButton> = ({ id }) => {
-  const { isFollow } = useAppSelector(state => ({ isFollow: state.tags.list.find((t) => t.name === id) }));
-  const dispatch = useAppDispatch();
-
-  const onClick = React.useCallback(() => {
-    const action = isFollow ? unfollowTag : followTag;
-    dispatch(action(id));
-  }, [isFollow, id]);
-
-  const text = React.useMemo(() => {
-    return isFollow ? (
-      <FormattedMessage id='hashtag_timeline.unfollow' defaultMessage='Unfollow' />
-
-    ) : (
-      <FormattedMessage id='hashtag_timeline.follow' defaultMessage='Follow' />
-    );
-  }, [isFollow]);
-
-
-  return (
-    <IconButton className='mx-3' style={{ background: 'transparent' }} onClick={onClick} src={isFollow ? require('@tabler/icons/minus.svg') : require('@tabler/icons/plus.svg')} text={text} />
-  );
-};
-
-const FollowedHashtags = () => {
-  const intl = useIntl();
-  const [tags, setTags] = React.useState(null);
-  const dispatch = useAppDispatch();
-
-  const { tags: serverTags, loading } = useAppSelector((state) => ({ tags: state.tags.list, loading: state.tags.loading }));
-
-  // we want to keep our own list to allow user to refollow instantly if unfollow was a mistake
-  React.useEffect(() => {
-    if (loading || tags) return;
-    setTags(serverTags);
-  }, [serverTags, tags, loading]);
-
-  React.useEffect(() => {
-    dispatch(fetchTags());
-  }, [dispatch]);
-
-
-  return (
-    <Column label={intl.formatMessage(messages.heading)}>
-      {
-        !tags ? (
-          <Spinner />
-        ) : (
-          <ScrollableList
-            className='flex flex-col gap-2'
-            scrollKey='followed_hashtags'
-            emptyMessage={<FormattedMessage id='column.tags.empty' defaultMessage="You don't follow any hashtag yet." />}
-          >
-            {
-              tags?.map((tag) => (
-                <div className='p-1 bg-gray-100 dark:bg-slate-900 rounded flex flex-wrap justify-between items-center'>
-                  <div className='flex items-center grow'>
-                    <Icon src={require('@tabler/icons/hash.svg')} />
-                    <Text tag='span' weight='semibold'>
-                      { tag.name }
-                    </Text>
-                  </div>
-                  <div className='flex items-center gap-3 grow shrink justify-end'>
-                    <FollowButton id={tag.name} />
-                    <span className='dark:text-slate-800 text-gray-300' >|</span>
-                    <Button theme='link' to={`/tag/${tag.name}`}>
-                      <div className='flex items-center'>
-                        <FormattedMessage id='column.tags.see' defaultMessage='See' />
-                        &nbsp;
-                        <Icon src={require('@tabler/icons/arrow-right.svg')} />
-                      </div>
-                    </Button>
-                  </div>
-                </div>
-              ))
-            }
-          </ScrollableList>
-        )
-      }
-
-    </Column>
-  );
-};
-
-export default FollowedHashtags;

app/soapbox/features/hashtag_timeline/index.js

@@ -0,0 +1,130 @@
+import isEqual from 'lodash/isEqual';
+import PropTypes from 'prop-types';
+import React from 'react';
+import { FormattedMessage } from 'react-intl';
+import { connect } from 'react-redux';
+
+import { connectHashtagStream } from '../../actions/streaming';
+import { expandHashtagTimeline, clearTimeline } from '../../actions/timelines';
+import ColumnHeader from '../../components/column_header';
+import { Column } from '../../components/ui';
+import Timeline from '../ui/components/timeline';
+
+const mapStateToProps = (state, props) => ({
+  hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0,
+});
+
+export default @connect(mapStateToProps)
+class HashtagTimeline extends React.PureComponent {
+
+  disconnects = [];
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    hasUnread: PropTypes.bool,
+  };
+
+  title = () => {
+    const title = [`#${this.props.params.id}`];
+
+    // TODO: wtf is all this?
+    // It exists in Mastodon's codebase, but undocumented
+    if (this.additionalFor('any')) {
+      title.push(' ', <FormattedMessage key='any' id='hashtag.column_header.tag_mode.any' values={{ additional: this.additionalFor('any') }} defaultMessage='or {additional}' />);
+    }
+
+    if (this.additionalFor('all')) {
+      title.push(' ', <FormattedMessage key='all' id='hashtag.column_header.tag_mode.all' values={{ additional: this.additionalFor('all') }} defaultMessage='and {additional}' />);
+    }
+
+    if (this.additionalFor('none')) {
+      title.push(' ', <FormattedMessage key='none' id='hashtag.column_header.tag_mode.none' values={{ additional: this.additionalFor('none') }} defaultMessage='without {additional}' />);
+    }
+
+    return title;
+  }
+
+  // TODO: wtf is this?
+  // It exists in Mastodon's codebase, but undocumented
+  additionalFor = (mode) => {
+    const { tags } = this.props.params;
+
+    if (tags && (tags[mode] || []).length > 0) {
+      return tags[mode].map(tag => tag.value).join('/');
+    } else {
+      return '';
+    }
+  }
+
+  _subscribe(dispatch, id, tags = {}) {
+    const any  = (tags.any || []).map(tag => tag.value);
+    const all  = (tags.all || []).map(tag => tag.value);
+    const none = (tags.none || []).map(tag => tag.value);
+
+    [id, ...any].map(tag => {
+      this.disconnects.push(dispatch(connectHashtagStream(id, tag, status => {
+        const tags = status.tags.map(tag => tag.name);
+
+        return all.filter(tag => tags.includes(tag)).length === all.length &&
+               none.filter(tag => tags.includes(tag)).length === 0;
+      })));
+    });
+  }
+
+  _unsubscribe() {
+    this.disconnects.map(disconnect => disconnect());
+    this.disconnects = [];
+  }
+
+  componentDidMount() {
+    const { dispatch } = this.props;
+    const { id, tags } = this.props.params;
+
+    this._subscribe(dispatch, id, tags);
+    dispatch(expandHashtagTimeline(id, { tags }));
+  }
+
+  componentDidUpdate(prevProps) {
+    const { dispatch } = this.props;
+    const { id, tags } = this.props.params;
+    const { id: prevId, tags: prevTags } = prevProps.params;
+
+    if (id !== prevId || !isEqual(tags, prevTags)) {
+      this._unsubscribe();
+      this._subscribe(dispatch, id, tags);
+      dispatch(clearTimeline(`hashtag:${id}`));
+      dispatch(expandHashtagTimeline(id, { tags }));
+    }
+  }
+
+  componentWillUnmount() {
+    this._unsubscribe();
+  }
+
+  handleLoadMore = maxId => {
+    const { id, tags } = this.props.params;
+    this.props.dispatch(expandHashtagTimeline(id, { maxId, tags }));
+  }
+
+  render() {
+    const { hasUnread } = this.props;
+    const { id } = this.props.params;
+
+    return (
+      <Column label={`#${id}`} transparent withHeader={false}>
+        <div className='px-4 pt-4 sm:p-0'>
+          <ColumnHeader active={hasUnread} title={this.title()} />
+        </div>
+        <Timeline
+          scrollKey='hashtag_timeline'
+          timelineId={`hashtag:${id}`}
+          onLoadMore={this.handleLoadMore}
+          emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
+          divideType='space'
+        />
+      </Column>
+    );
+  }
+
+}

app/soapbox/features/hashtag_timeline/index.tsx

@@ -1,161 +0,0 @@
-import isEqual from 'lodash/isEqual';
-import React from 'react';
-import { FormattedMessage } from 'react-intl';
-import { useParams } from 'react-router-dom';
-
-import { unfollowTag, followTag } from 'soapbox/actions/tags';
-import Icon from 'soapbox/components/icon';
-import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
-
-import { connectHashtagStream } from '../../actions/streaming';
-import { expandHashtagTimeline, clearTimeline } from '../../actions/timelines';
-import ColumnHeader from '../../components/column_header';
-import { Button, Column, Spinner } from '../../components/ui';
-import Timeline from '../ui/components/timeline';
-
-interface IFollowButton {
-  id: string,
-}
-
-const FollowButton: React.FC<IFollowButton> = ({ id }) => {
-  const { isFollow, loading } = useAppSelector(state => ({ loading: state.tags.loading, isFollow: state.tags.list.find((t) => t.name.toLowerCase() === id.toLowerCase()) }));
-  const dispatch = useAppDispatch();
-
-  const onClick = React.useCallback(() => {
-    const action = isFollow ? unfollowTag : followTag;
-    dispatch(action(id));
-  }, [isFollow, id]);
-
-  const text = React.useMemo(() => {
-    if (loading) return <FormattedMessage id='hashtag_timeline.loading' defaultMessage='Loading...' />;
-    return isFollow ? (
-      <FormattedMessage id='hashtag_timeline.unfollow' defaultMessage='Unfollow tag' />
-
-    ) : (
-      <FormattedMessage id='hashtag_timeline.follow' defaultMessage='Follow this tag' />
-    );
-  }, [loading, isFollow]);
-
-
-  return (
-    <Button disabled={loading} theme={isFollow ? 'secondary' : 'primary'} size='sm' onClick={onClick}>
-      {
-        loading ? <Spinner withText={false} size={16} /> : <Icon src={isFollow ? require('@tabler/icons/minus.svg') : require('@tabler/icons/plus.svg')} className='mr-1' />
-      }
-    &nbsp;
-      {text}
-    </Button>
-  );
-};
-
-
-const HashtagTimeline: React.FC = () => {
-  const dispatch = useAppDispatch();
-  const disconnects = React.useRef([]);
-  const { id, tags } = useParams<{ id: string, tags: any }>();
-  const prevParams = React.useRef({ id, tags });
-  const isLoggedIn = useAppSelector((state) => state.me);
-
-  const hasUnread = useAppSelector((state) => (state.getIn(['timelines', `hashtag:${id}`, 'unread']) as number) > 0);
-
-  // TODO: wtf is this?
-  // It exists in Mastodon's codebase, but undocumented
-  const additionalFor = React.useCallback((mode) => {
-    if (tags && (tags[mode] || []).length > 0) {
-      return tags[mode].map(tag => tag.value).join('/');
-    } else {
-      return '';
-    }
-  }, [tags]);
-
-
-  const title = React.useMemo(() => {
-    const t: React.ReactNode[] = [`#${id}`];
-
-    // TODO: wtf is all this?
-    // It exists in Mastodon's codebase, but undocumented
-    if (additionalFor('any')) {
-      t.push(' ', <FormattedMessage key='any' id='hashtag.column_header.tag_mode.any' values={{ additional: additionalFor('any') }} defaultMessage='or {additional}' />);
-    }
-
-    if (additionalFor('all')) {
-      t.push(' ', <FormattedMessage key='all' id='hashtag.column_header.tag_mode.all' values={{ additional: additionalFor('all') }} defaultMessage='and {additional}' />);
-    }
-
-    if (additionalFor('none')) {
-      t.push(' ', <FormattedMessage key='none' id='hashtag.column_header.tag_mode.none' values={{ additional: additionalFor('none') }} defaultMessage='without {additional}' />);
-    }
-
-    return t;
-  }, [id, additionalFor]);
-
-
-  const subscribe = React.useCallback((dispatch, _id, tags = {}) => {
-    const any  = (tags.any || []).map(tag => tag.value);
-    const all  = (tags.all || []).map(tag => tag.value);
-    const none = (tags.none || []).map(tag => tag.value);
-
-    [_id, ...any].map(tag => {
-      disconnects.current.push(dispatch(connectHashtagStream(_id, tag, status => {
-        const tags = status.tags.map(tag => tag.name);
-
-        return all.filter(tag => tags.includes(tag)).length === all.length &&
-               none.filter(tag => tags.includes(tag)).length === 0;
-      })));
-    });
-  }, []);
-
-  const unsubscribe = React.useCallback(() => {
-    disconnects.current.map((d) => d());
-    disconnects.current = [];
-  }, []);
-
-  React.useEffect(() => {
-    const { id: prevId, tags: prevTags } = prevParams.current;
-    if (id !== prevId || !isEqual(tags, prevTags)) {
-      dispatch(clearTimeline(`hashtag:${id}`));
-    }
-
-    subscribe(dispatch, id, tags);
-    dispatch(expandHashtagTimeline(id, { tags }));
-
-    return () => {
-      unsubscribe();
-    };
-  }, [dispatch, tags, id, subscribe, unsubscribe]);
-
-
-  const handleLoadMore = React.useCallback((maxId) => {
-    dispatch(expandHashtagTimeline(id, { maxId, tags }));
-  }, [dispatch, id, tags]);
-
-
-  return (
-    <Column label={`#${id}`} transparent withHeader={false}>
-      <div className='px-4 pt-4 sm:p-0'>
-        <ColumnHeader
-          active={hasUnread}
-          title={
-            <div className='flex justify-between items-center'>
-              { title }
-              {
-                isLoggedIn && (
-                  <FollowButton id={id} />
-                )
-              }
-            </div>
-          }
-        />
-      </div>
-      <Timeline
-        scrollKey='hashtag_timeline'
-        timelineId={`hashtag:${id}`}
-        onLoadMore={handleLoadMore}
-        emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
-        divideType='space'
-      />
-    </Column>
-  );
-};
-
-export default HashtagTimeline;

app/soapbox/features/mutes/index.tsx

@@ -23,13 +23,19 @@ const Mutes: React.FC = () => {
 
   const accountIds = useAppSelector((state) => state.user_lists.mutes.items);
   const hasMore = useAppSelector((state) => !!state.user_lists.mutes.next);
-  const loading = useAppSelector((state) => state.user_lists.mutes.isLoading);
-
 
   React.useEffect(() => {
     dispatch(fetchMutes());
   }, []);
 
+  if (!accountIds) {
+    return (
+      <Column>
+        <Spinner />
+      </Column>
+    );
+  }
+
   const emptyMessage = <FormattedMessage id='empty_column.mutes' defaultMessage="You haven't muted any users yet." />;
 
   return (
@@ -39,16 +45,12 @@ const Mutes: React.FC = () => {
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
-        itemClassName='flex flex-col gap-3 pb-4'
+        itemClassName='pb-4'
       >
         {accountIds.map((id) =>
           <AccountContainer key={id} id={id} actionType='muting' />,
         )}
-        {
-          loading && <Spinner />
-        }
       </ScrollableList>
-
     </Column>
   );
 };

app/soapbox/features/settings/index.tsx

@@ -33,9 +33,6 @@ const messages = defineMessages({
   domainBlocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
-  backups: { id: 'column.backups', defaultMessage: 'Backups' },
-  importData: { id: 'navigation_bar.import_data', defaultMessage: 'Import data' },
-  exportData: { id: 'column.export_data', defaultMessage: 'Export data' },
 });
 
 /** User settings page. */
@@ -57,9 +54,6 @@ const Settings = () => {
   const navigateToDeleteAccount = () => history.push('/settings/account');
   const navigateToMoveAccount = () => history.push('/settings/migration');
   const navigateToAliases = () => history.push('/settings/aliases');
-  const navigateToBackups = () => history.push('/settings/backups');
-  const navigateToImportData = () => history.push('/settings/import');
-  const navigateToExportData = () => history.push('/settings/export');
 
   const navigateToBlocks = () => history.push('/blocks');
   const navigateToMutes = () => history.push('/mutes');
@@ -156,27 +150,14 @@ const Settings = () => {
 
             <CardBody>
               <List>
-                {features.importData && (
-                  <ListItem label={intl.formatMessage(messages.importData)} onClick={navigateToImportData} />
+                {features.security && (
+                  <ListItem label={intl.formatMessage(messages.deleteAccount)} onClick={navigateToDeleteAccount} />
                 )}
-
-                {features.exportData && (
-                  <ListItem label={intl.formatMessage(messages.exportData)} onClick={navigateToExportData} />
-                )}
-
-                {features.backups && (
-                  <ListItem label={intl.formatMessage(messages.backups)} onClick={navigateToBackups} />
-                )}
-
                 {features.federating && (features.accountMoving ? (
                   <ListItem label={intl.formatMessage(messages.accountMigration)} onClick={navigateToMoveAccount} />
                 ) : features.accountAliases && (
                   <ListItem label={intl.formatMessage(messages.accountAliases)} onClick={navigateToAliases} />
                 ))}
-
-                {features.security && (
-                  <ListItem label={intl.formatMessage(messages.deleteAccount)} onClick={navigateToDeleteAccount} />
-                )}
               </List>
             </CardBody>
           </>

app/soapbox/features/status/components/detailed-status.tsx

@@ -161,16 +161,13 @@ const DetailedStatus: React.FC<IDetailedStatus> = ({
           )
         }
 
-        {!actualStatus.hidden && (
-          <>
-            <StatusMedia
-              status={actualStatus}
-              showMedia={showMedia}
-              onToggleVisibility={onToggleMediaVisibility}
-            />
-            { quote }
-          </>
-        )}
+        <StatusMedia
+          status={actualStatus}
+          showMedia={showMedia}
+          onToggleVisibility={onToggleMediaVisibility}
+        />
+
+        {!actualStatus.hidden && quote}
 
         <HStack justifyContent='between' alignItems='center' className='py-2'>
           <StatusInteractionBar status={actualStatus} />

app/soapbox/features/ui/components/action-button.tsx

@@ -13,7 +13,7 @@ import {
   rejectFollowRequest,
 } from 'soapbox/actions/accounts';
 import { openModal } from 'soapbox/actions/modals';
-import { Button, HStack, Text } from 'soapbox/components/ui';
+import { Button, HStack } from 'soapbox/components/ui';
 import { useAppSelector, useFeatures } from 'soapbox/hooks';
 
 import type { Account as AccountEntity } from 'soapbox/types/entities';
@@ -25,8 +25,8 @@ const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   remote_follow: { id: 'account.remote_follow', defaultMessage: 'Remote follow' },
-  requested: { id: 'account.requested', defaultMessage: 'Click to cancel' },
-  awaiting_approval: { id: 'account.awaiting_approval', defaultMessage: 'Awaiting approval' },
+  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
+  requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
@@ -94,6 +94,7 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
       ap_id: account.url,
     }));
   };
+
   /** Handles actionType='muting' */
   const mutingAction = () => {
     const isMuted = account.relationship?.muting;
@@ -205,17 +206,12 @@ const ActionButton: React.FC<IActionButton> = ({ account, actionType, small }) =
     } else if (account.relationship?.requested) {
       // Awaiting acceptance
       return (
-        <div className='flex flex-col gap-1'>
-          <Text size='xs' theme='muted'>
-            { intl.formatMessage(messages.awaiting_approval) }
-          </Text>
-          <Button
-            size='sm'
-            theme='secondary'
-            text={intl.formatMessage(messages.requested)}
-            onClick={handleFollow}
-          />
-        </div>
+        <Button
+          size='sm'
+          theme='secondary'
+          text={small ? intl.formatMessage(messages.requested_small) : intl.formatMessage(messages.requested)}
+          onClick={handleFollow}
+        />
       );
     } else if (!account.relationship?.blocking && !account.relationship?.muting) {
       // Follow & Unfollow

app/soapbox/features/ui/components/link_footer.tsx

@@ -46,6 +46,9 @@ const LinkFooter: React.FC = (): JSX.Element => {
           {account.locked && (
             <FooterLink to='/follow_requests'><FormattedMessage id='navigation_bar.follow_requests' defaultMessage='Follow requests' /></FooterLink>
           )}
+          {features.import && (
+            <FooterLink to='/settings/import'><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></FooterLink>
+          )}
           <FooterLink to='/logout' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></FooterLink>
         </>}
       </div>

app/soapbox/features/ui/components/timeline.tsx

@@ -1,7 +1,6 @@
 import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import debounce from 'lodash/debounce';
 import React, { useCallback } from 'react';
-import { createPortal } from 'react-dom';
 import { defineMessages } from 'react-intl';
 
 import { dequeueTimeline, scrollTopTimeline } from 'soapbox/actions/timelines';
@@ -54,14 +53,13 @@ const Timeline: React.FC<ITimeline> = ({
 
   return (
     <>
-      {
-        createPortal(<ScrollTopButton
-          key='timeline-queue-button-header'
-          onClick={handleDequeueTimeline}
-          count={totalQueuedItemsCount}
-          message={messages.queue}
-        />, document.body)
-      }
+      <ScrollTopButton
+        key='timeline-queue-button-header'
+        onClick={handleDequeueTimeline}
+        count={totalQueuedItemsCount}
+        message={messages.queue}
+      />
+
       <StatusList
         timelineId={timelineId}
         onScrollToTop={handleScrollToTop}

app/soapbox/features/ui/index.tsx

@@ -21,7 +21,6 @@ import { register as registerPushNotifications } from 'soapbox/actions/push_noti
 import { fetchScheduledStatuses } from 'soapbox/actions/scheduled_statuses';
 import { connectUserStream } from 'soapbox/actions/streaming';
 import { fetchSuggestionsForTimeline } from 'soapbox/actions/suggestions';
-import { fetchTags } from 'soapbox/actions/tags';
 import { expandHomeTimeline } from 'soapbox/actions/timelines';
 import Icon from 'soapbox/components/icon';
 import SidebarNavigation from 'soapbox/components/sidebar-navigation';
@@ -83,9 +82,9 @@ import {
   EmailConfirmation,
   DeleteAccount,
   SoapboxConfig,
-  ExportData,
+  // ExportData,
   ImportData,
-  Backups,
+  // Backups,
   MfaForm,
   ChatIndex,
   ChatRoom,
@@ -115,7 +114,6 @@ import {
   LogoutPage,
   AuthTokenList,
   ProfileFields,
-  FollowedHashtags,
 } from './util/async-components';
 import { WrappedRoute } from './util/react_router_helpers';
 
@@ -209,7 +207,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       <Redirect from='/main/all' to='/timeline/fediverse' />
       <Redirect from='/main/public' to='/timeline/local' />
       <Redirect from='/main/friends' to='/' />
-      <Redirect from='/tags/:id' to='/tag/:id' />
+      <Redirect from='/tag/:id' to='/tags/:id' />
       <Redirect from='/user-settings' to='/settings/profile' />
       <WrappedRoute path='/notice/:statusId' publicRoute exact page={DefaultPage} component={Status} content={children} />
       <Redirect from='/users/:username/statuses/:statusId' to='/@:username/posts/:statusId' />
@@ -245,7 +243,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       <Redirect from='/auth/password/new' to='/reset-password' />
       <Redirect from='/auth/password/edit' to={`/edit-password${search}`} />
 
-      <WrappedRoute path='/tag/:id' publicRoute page={DefaultPage} component={HashtagTimeline} content={children} />
+      <WrappedRoute path='/tags/:id' publicRoute page={DefaultPage} component={HashtagTimeline} content={children} />
 
       {features.lists && <WrappedRoute path='/lists' page={DefaultPage} component={Lists} content={children} />}
       {features.lists && <WrappedRoute path='/list/:id' page={HomePage} component={ListTimeline} content={children} />}
@@ -261,7 +259,6 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       {features.chats && <WrappedRoute path='/chats/:chatId' page={DefaultPage} component={ChatRoom} content={children} />}
 
       <WrappedRoute path='/follow_requests' page={DefaultPage} component={FollowRequests} content={children} />
-      <WrappedRoute path='/followed_hashtags' page={DefaultPage} component={FollowedHashtags} content={children} />
       <WrappedRoute path='/blocks' page={DefaultPage} component={Blocks} content={children} />
       {features.federating && <WrappedRoute path='/domain_blocks' page={DefaultPage} component={DomainBlocks} content={children} />}
       <WrappedRoute path='/mutes' page={DefaultPage} component={Mutes} content={children} />
@@ -283,11 +280,11 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       {features.scheduledStatuses && <WrappedRoute path='/scheduled_statuses' page={DefaultPage} component={ScheduledStatuses} content={children} />}
 
       <WrappedRoute path='/settings/profile' page={DefaultPage} component={EditProfile} content={children} />
-      {features.exportData && <WrappedRoute path='/settings/export' page={DefaultPage} component={ExportData} content={children} />}
+      {/* FIXME: this could DDoS our API? :\ */}
+      {/* <WrappedRoute path='/settings/export' page={DefaultPage} component={ExportData} content={children} /> */}
       {features.importData && <WrappedRoute path='/settings/import' page={DefaultPage} component={ImportData} content={children} />}
       {features.accountAliases && <WrappedRoute path='/settings/aliases' page={DefaultPage} component={Aliases} content={children} />}
       {features.accountMoving && <WrappedRoute path='/settings/migration' page={DefaultPage} component={Migration} content={children} />}
-      {features.backups && <WrappedRoute path='/settings/backups' page={DefaultPage} component={Backups} content={children} />}
       <WrappedRoute path='/settings/email' page={DefaultPage} component={EditEmail} content={children} />
       {
         !isLdapEnabled && (
@@ -299,6 +296,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
       <WrappedRoute path='/settings/mfa' page={DefaultPage} component={MfaForm} exact />
       <WrappedRoute path='/settings/tokens' page={DefaultPage} component={AuthTokenList} content={children} />
       <WrappedRoute path='/settings' page={DefaultPage} component={Settings} content={children} />
+      {/* <WrappedRoute path='/backups' page={DefaultPage} component={Backups} content={children} /> */}
       <WrappedRoute path='/soapbox/config' adminOnly page={DefaultPage} component={SoapboxConfig} content={children} />
 
       <WrappedRoute path='/soapbox/admin' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
@@ -468,13 +466,11 @@ const UI: React.FC = ({ children }) => {
 
     setTimeout(() => dispatch(fetchFilters()), 500);
 
-    setTimeout(() => dispatch(fetchTags()), 700);
-
     if (account.locked) {
-      setTimeout(() => dispatch(fetchFollowRequests()), 900);
+      setTimeout(() => dispatch(fetchFollowRequests()), 700);
     }
 
-    setTimeout(() => dispatch(fetchScheduledStatuses()), 1100);
+    setTimeout(() => dispatch(fetchScheduledStatuses()), 900);
   };
 
   useEffect(() => {

app/soapbox/features/ui/util/async-components.ts

@@ -525,7 +525,3 @@ export function FamiliarFollowersModal() {
 export function AnnouncementsPanel() {
   return import(/* webpackChunkName: "features/announcements" */'../../../components/announcements/announcements-panel');
 }
-
-export function FollowedHashtags() {
-  return import('../../../features/followed_tags');
-}

app/soapbox/locales/ar.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "أضفه أو أزله من القائمة",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "روبوت",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "ابلِغ عن @{name}",
   "account.requested": "في انتظار الموافقة. اضْغَطْ/ي لإلغاء طلب المتابعة",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "شارك ملف تعريف @{name}",
   "account.show_reblogs": "اعرض ترقيات @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "العودة",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "أو {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "التفضيلات",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "أُعجِب {name} بمنشورك",
   "notification.follow": "{name} يتابعك",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
   "status.chat": "Chat with @{name}",
   "status.copy": "نسخ رابط المنشور",
-  "status.cw": "Warning:",
   "status.delete": "احذف",
   "status.detailed_status": "تفاصيل المحادثة",
   "status.direct": "رسالة خاصة إلى @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "إدماج",
   "status.favourite": "أضف إلى المفضلة",
   "status.filtered": "مُصفّى",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "حمّل المزيد",
   "status.media_hidden": "الصورة مستترة",
   "status.mention": "أذكُر @{name}",

app/soapbox/locales/ast.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robó",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Atrás",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Esti artículu nun pue compartise",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Unviar un mensaxe direutu a @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Empotrar",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Mediu anubríu",
   "status.mention": "Mentar a @{name}",

app/soapbox/locales/bg.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Добави или премахни от списъците",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "бот",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "В очакване на одобрение",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Назад",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Предпочитания",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} хареса твоята публикация",
   "notification.follow": "{name} те последва",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Изтриване",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Предпочитани",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Споменаване",

app/soapbox/locales/bn.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "তালিকাতে আরো যুক্ত বা মুছে ফেলুন",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "রোবট",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "@{name} কে রিপোর্ট করতে",
   "account.requested": "অনুমতির অপেক্ষায় আছে। অনুসরণ করার অনুরোধ বাতিল করতে এখানে ক্লিক করুন",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "@{name}র পাতা অন্যদের দেখান",
   "account.show_reblogs": "@{name}র সমর্থনগুলো দেখুন",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "পেছনে",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "এবং {additional}",
   "hashtag.column_header.tag_mode.any": "অথবা {additional}",
   "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "পছন্দসমূহ",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "এটিতে সমর্থন দেওয়া যাবেনা",
   "status.chat": "Chat with @{name}",
   "status.copy": "লেখাটির লিংক কপি করতে",
-  "status.cw": "Warning:",
   "status.delete": "মুছে ফেলতে",
   "status.detailed_status": "বিস্তারিত কথোপকথনের হিসেবে দেখতে",
   "status.direct": "@{name} কে সরাসরি লেখা পাঠাতে",
@@ -1070,7 +1064,6 @@
   "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দের করতে",
   "status.filtered": "ছাঁকনিদিত",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "ছবি বা ভিডিও পেছনে",
   "status.mention": "@{name}কে উল্লেখ করতে",

app/soapbox/locales/br.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Ouzhpenn pe lemel ag ar listennadoù",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Disklêriañ @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez toudoù a @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/ca.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expandeix",
   "account.about": "About",
   "account.add_or_remove_from_list": "Afegir o Eliminar de les llistes",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Reporta @{name}",
   "account.requested": "Esperant aprovació. Fes clic per cancel·lar la petició de seguiment",
+  "account.requested_small": "Esperant aprovació",
   "account.search": "Search from @{name}",
   "account.share": "Comparteix el perfil de @{name}",
   "account.show_reblogs": "Mostra els impulsos de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error en suprimir el filtre",
   "column.filters.drop_header": "Deixa anar en lloc d'amagar",
   "column.filters.drop_hint": "Els missatges filtrats desapareixeran irreversiblement, encara que el filtre sigui eliminat més tard",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Caduca després de",
   "column.filters.expires_hint": "Les dates de caducitat no estan suportades actualment",
   "column.filters.home_timeline": "Línia de temps d'inici",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Configuració de Soapbox",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Enrere",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filtra els contextos",
+  "filters.context_hint": "Un o diversos contextos on s'ha d'aplicar el filtre",
+  "filters.filters_list_context_label": "Filtra els contextos:",
   "filters.filters_list_delete": "Suprimeix",
   "filters.filters_list_details_label": "Paràmetres del filtre:",
   "filters.filters_list_drop": "Abandona",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sense {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Inici",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Inici de sessió",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferències",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Configuració de Soapbox",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} ha afavorit el teu estat",
   "notification.follow": "{name} t'ha seguit",
   "notification.follow_request": "{name} ha sol·licitat seguir-te",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copia l'enllaç a la publicació",
-  "status.cw": "Warning:",
   "status.delete": "Esborrar",
   "status.detailed_status": "Visualització detallada de la conversa",
   "status.direct": "Missatge directe @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incrustar",
   "status.favourite": "Favorit",
   "status.filtered": "Filtrat",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Carrega més",
   "status.media_hidden": "Multimèdia amagat",
   "status.mention": "Esmentar @{name}",

app/soapbox/locales/co.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Palisà @{name}",
   "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Sparte u prufile di @{name}",
   "account.show_reblogs": "Vede spartere da @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Ritornu",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "è {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
   "notification.follow": "{name} v'hà seguitatu",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Stu statutu ùn pò micca esse spartutu",
   "status.chat": "Chat with @{name}",
   "status.copy": "Cupià ligame indè u statutu",
-  "status.cw": "Warning:",
   "status.delete": "Toglie",
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.direct": "Mandà un missaghju @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Integrà",
   "status.favourite": "Aghjunghje à i favuriti",
   "status.filtered": "Filtratu",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",

app/soapbox/locales/cs.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Rozšířit",
   "account.about": "About",
   "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Nahlásit uživatele @{name}",
   "account.requested": "Čeká na schválení. Kliknutím zrušíte požadavek o sledování",
+  "account.requested_small": "Čeká na schválení",
   "account.search": "Search from @{name}",
   "account.share": "Sdílet profil uživatele @{name}",
   "account.show_reblogs": "Zobrazit boosty od uživatele @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Chyba při odstraňování filtru",
   "column.filters.drop_header": "Zahodit místo schovat",
   "column.filters.drop_hint": "Filtrované příspěvky zmizí navždy, ikdyž filtr později odstraníte",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Vypršet po",
   "column.filters.expires_hint": "Vyprchávání momentálně není podporováno",
   "column.filters.home_timeline": "Domácí zeď",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox nastavení",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Zpět",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filtrovat obsah",
+  "filters.context_hint": "Jeden či více kontextů kde bude filtr aktivován",
+  "filters.filters_list_context_label": "Kontexty filtru:",
   "filters.filters_list_delete": "Odstranit",
   "filters.filters_list_details_label": "Nastavení filtru:",
   "filters.filters_list_drop": "Zahodit",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "nebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Domů",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Přihlásit se",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Předvolby",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox nastavení",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} si oblíbil/a váš příspěvek",
   "notification.follow": "{name} vás začal/a sledovat",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopírovat odkaz příspěvku",
-  "status.cw": "Warning:",
   "status.delete": "Smazat",
   "status.detailed_status": "Detailní zobrazení konverzace",
   "status.direct": "Poslat přímou zprávu uživateli @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Vložit na web",
   "status.favourite": "Oblíbit",
   "status.filtered": "Filtrováno",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Zobrazit více",
   "status.media_hidden": "Média skryta",
   "status.mention": "Zmínit uživatele @{name}",

app/soapbox/locales/cy.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Ychwanegu neu Dileu o'r rhestrau",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Adrodd @{name}",
   "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos bwstiau o @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Nôl",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "neu {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Dewisiadau",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "hoffodd {name} eich tŵt",
   "notification.follow": "dilynodd {name} chi",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ni ellir sbarduno'r tŵt hwn",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copïo cysylltiad i'r tŵt",
-  "status.cw": "Warning:",
   "status.delete": "Dileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
   "status.direct": "Neges breifat @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Plannu",
   "status.favourite": "Hoffi",
   "status.filtered": "Wedi'i hidlo",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Llwythwch mwy",
   "status.media_hidden": "Cyfryngau wedi'u cuddio",
   "status.mention": "Crybwyll @{name}",

app/soapbox/locales/da.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Rapporter @{name}",
   "account.requested": "Afventer godkendelse. Tryk for at annullere følgeanmodning",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelserne fra @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tilbage",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Præferencer",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favoriserede din status",
   "notification.follow": "{name} fulgte dig",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Denne post kan ikke boostes",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopiér link til status",
-  "status.cw": "Warning:",
   "status.delete": "Slet",
   "status.detailed_status": "Detaljeret visning af samtale",
   "status.direct": "Send direkte besked til @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Integrér",
   "status.favourite": "Favorit",
   "status.filtered": "Filtreret",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Indlæs mere",
   "status.media_hidden": "Medie skjult",
   "status.mention": "Nævn @{name}",

app/soapbox/locales/defaultMessages.json

@@ -328,6 +328,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Hide entire domain",
+        "id": "confirmations.domain_block.confirm"
+      },
       {
         "defaultMessage": "Unhide {domain}",
         "id": "account.unblock_domain"
@@ -748,10 +752,6 @@
         "defaultMessage": "Dashboard",
         "id": "tabs_bar.dashboard"
       },
-      {
-        "defaultMessage": "Hashtags",
-        "id": "navigation_bar.tags"
-      },
       {
         "defaultMessage": "Switch accounts",
         "id": "profile_dropdown.switch_account"
@@ -809,10 +809,6 @@
         "defaultMessage": "Profile directory",
         "id": "navigation_bar.profile_directory"
       },
-      {
-        "defaultMessage": "Hashtags",
-        "id": "navigation_bar.tags"
-      },
       {
         "defaultMessage": "Chats",
         "id": "tabs_bar.chats"
@@ -845,18 +841,6 @@
       {
         "defaultMessage": "Show less",
         "id": "status.show_less"
-      },
-      {
-        "defaultMessage": "Warning:",
-        "id": "status.cw"
-      },
-      {
-        "defaultMessage": "Filtered",
-        "id": "status.filtered"
-      },
-      {
-        "defaultMessage": "Status was hidden by filter settings",
-        "id": "status.filtered-hint"
       }
     ],
     "path": "app/soapbox/components/status_content.json"
@@ -1122,6 +1106,10 @@
         "defaultMessage": "{name} reposted",
         "id": "status.reblogged_by"
       },
+      {
+        "defaultMessage": "Filtered",
+        "id": "status.filtered"
+      },
       {
         "defaultMessage": "Post is unavailable.",
         "id": "statuses.quote_tombstone"
@@ -3501,17 +3489,13 @@
         "id": "column.filters.public_timeline"
       },
       {
-        "defaultMessage": "Also apply for notifications",
+        "defaultMessage": "Notifications",
         "id": "column.filters.notifications"
       },
       {
         "defaultMessage": "Conversations",
         "id": "column.filters.conversations"
       },
-      {
-        "defaultMessage": "Will also hide status in notifications",
-        "id": "column.filters.drop_notifications"
-      },
       {
         "defaultMessage": "Drop instead of hide",
         "id": "column.filters.drop_header"
@@ -3552,10 +3536,22 @@
         "defaultMessage": "You haven't created any muted words yet.",
         "id": "empty_column.filters"
       },
+      {
+        "defaultMessage": "Filter contexts",
+        "id": "filters.context_header"
+      },
+      {
+        "defaultMessage": "One or multiple contexts where the filter should apply",
+        "id": "filters.context_hint"
+      },
       {
         "defaultMessage": "Keyword or phrase:",
         "id": "filters.filters_list_phrase_label"
       },
+      {
+        "defaultMessage": "Filter contexts:",
+        "id": "filters.filters_list_context_label"
+      },
       {
         "defaultMessage": "Filter settings:",
         "id": "filters.filters_list_details_label"
@@ -3618,31 +3614,6 @@
     ],
     "path": "app/soapbox/features/follow-recommendations/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Followed hashtags",
-        "id": "column.tags"
-      },
-      {
-        "defaultMessage": "Unfollow",
-        "id": "hashtag_timeline.unfollow"
-      },
-      {
-        "defaultMessage": "Follow",
-        "id": "hashtag_timeline.follow"
-      },
-      {
-        "defaultMessage": "You don't follow any hashtag yet.",
-        "id": "column.tags.empty"
-      },
-      {
-        "defaultMessage": "See",
-        "id": "column.tags.see"
-      }
-    ],
-    "path": "app/soapbox/features/followed_tags/index.json"
-  },
   {
     "descriptors": [
       {
@@ -3819,18 +3790,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Loading...",
-        "id": "hashtag_timeline.loading"
-      },
-      {
-        "defaultMessage": "Unfollow tag",
-        "id": "hashtag_timeline.unfollow"
-      },
-      {
-        "defaultMessage": "Follow this tag",
-        "id": "hashtag_timeline.follow"
-      },
       {
         "defaultMessage": "or {additional}",
         "id": "hashtag.column_header.tag_mode.any"
@@ -5087,18 +5046,6 @@
       {
         "defaultMessage": "Muted words",
         "id": "navigation_bar.filters"
-      },
-      {
-        "defaultMessage": "Backups",
-        "id": "column.backups"
-      },
-      {
-        "defaultMessage": "Import data",
-        "id": "navigation_bar.import_data"
-      },
-      {
-        "defaultMessage": "Export data",
-        "id": "column.export_data"
       }
     ],
     "path": "app/soapbox/features/settings/index.json"
@@ -5489,12 +5436,12 @@
         "id": "account.remote_follow"
       },
       {
-        "defaultMessage": "Click to cancel",
+        "defaultMessage": "Awaiting approval. Click to cancel follow request",
         "id": "account.requested"
       },
       {
         "defaultMessage": "Awaiting approval",
-        "id": "account.awaiting_approval"
+        "id": "account.requested_small"
       },
       {
         "defaultMessage": "Unblock @{name}",
@@ -5944,6 +5891,10 @@
         "defaultMessage": "Follow requests",
         "id": "navigation_bar.follow_requests"
       },
+      {
+        "defaultMessage": "Import data",
+        "id": "navigation_bar.import_data"
+      },
       {
         "defaultMessage": "Logout",
         "id": "navigation_bar.logout"

app/soapbox/locales/el.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Μποτ",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Κατάγγειλε @{name}",
   "account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα παρακολούθησης",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Μοίρασμα του προφίλ @{name}",
   "account.show_reblogs": "Εμφάνιση προωθήσεων από @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Πίσω",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "και {additional}",
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Προτιμήσεις",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Αυτή η δημοσίευση δεν μπορεί να προωθηθεί",
   "status.chat": "Chat with @{name}",
   "status.copy": "Αντιγραφή συνδέσμου της δημοσίευσης",
-  "status.cw": "Warning:",
   "status.delete": "Διαγραφή",
   "status.detailed_status": "Προβολή λεπτομερειών συζήτησης",
   "status.direct": "Προσωπικό μήνυμα προς @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Ενσωμάτωσε",
   "status.favourite": "Σημείωσε ως αγαπημένο",
   "status.filtered": "Φιλτραρισμένα",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Φόρτωσε περισσότερα",
   "status.media_hidden": "Κρυμμένο πολυμέσο",
   "status.mention": "Ανέφερε τον/την @{name}",

app/soapbox/locales/en-Shaw.json

@@ -4,7 +4,6 @@
   "accordion.expand": "𐑦𐑒𐑕𐑐𐑨𐑯𐑛",
   "account.about": "About",
   "account.add_or_remove_from_list": "𐑨𐑛 𐑹 𐑮𐑦𐑥𐑵𐑝 𐑮𐑦𐑥𐑵𐑝 𐑤𐑦𐑕𐑑𐑕",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "𐑚𐑪𐑑",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "𐑮𐑦𐑐𐑹𐑑 @{name}",
   "account.requested": "𐑩𐑢𐑱𐑑𐑦𐑙 𐑩𐑐𐑮𐑵𐑝𐑩𐑤. 𐑒𐑤𐑦𐑒 𐑑 𐑒𐑨𐑯𐑕𐑩𐑤 𐑓𐑪𐑤𐑴 𐑮𐑦𐑒𐑢𐑧𐑕𐑑",
+  "account.requested_small": "𐑩𐑢𐑱𐑑𐑦𐑙 𐑩𐑐𐑮𐑵𐑝𐑩𐑤",
   "account.search": "Search from @{name}",
   "account.share": "𐑖𐑺 @{name}'s 𐑐𐑮𐑴𐑓𐑲𐑤",
   "account.show_reblogs": "𐑖𐑴 𐑮𐑰𐑐𐑴𐑕𐑑𐑕 𐑓𐑮𐑪𐑥 @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "𐑧𐑮𐑼 𐑛𐑦𐑤𐑰𐑑𐑦𐑙 𐑓𐑦𐑤𐑑𐑼",
   "column.filters.drop_header": "𐑛𐑮𐑪𐑐 𐑦𐑯𐑕𐑑𐑧𐑛 𐑝 𐑣𐑲𐑛",
   "column.filters.drop_hint": "𐑓𐑦𐑤𐑑𐑼𐑛 𐑐𐑴𐑕𐑑𐑕 𐑢𐑦𐑤 𐑛𐑦𐑕𐑩𐑐𐑽 𐑦𐑮𐑦𐑝𐑻𐑕𐑩𐑚𐑤𐑦, 𐑰𐑝𐑩𐑯 𐑦𐑓 𐑓𐑦𐑤𐑑𐑼 𐑦𐑟 𐑤𐑱𐑑𐑼 𐑮𐑦𐑥𐑵𐑝𐑛",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "𐑦𐑒𐑕𐑐𐑲𐑼 𐑭𐑓𐑑𐑼",
   "column.filters.expires_hint": "𐑧𐑒𐑕𐑐𐑦𐑮𐑱𐑖𐑩𐑯 𐑛𐑱𐑑𐑕 𐑸 𐑯𐑪𐑑 𐑒𐑳𐑮𐑩𐑯𐑑𐑤𐑦 𐑕𐑩𐑐𐑹𐑑𐑩𐑛",
   "column.filters.home_timeline": "𐑣𐑴𐑥 𐑑𐑲𐑥𐑤𐑲𐑯",
@@ -275,9 +274,6 @@
   "column.search": "𐑕𐑻𐑗",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "·𐑕𐑴𐑐𐑚𐑪𐑒𐑕 𐑒𐑩𐑯𐑓𐑦𐑜",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "𐑚𐑨𐑒",
   "column_forbidden.body": "𐑿 𐑛𐑵 𐑯𐑪𐑑 𐑣𐑨𐑝 𐑐𐑼𐑥𐑦𐑖𐑩𐑯 𐑑 𐑨𐑒𐑕𐑧𐑕 𐑞𐑦𐑕 𐑐𐑱𐑡.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "𐑓𐑦𐑤𐑑𐑼 𐑨𐑛𐑩𐑛.",
+  "filters.context_header": "𐑓𐑦𐑤𐑑𐑼 𐑒𐑪𐑯𐑑𐑧𐑒𐑕𐑑𐑕",
+  "filters.context_hint": "𐑢𐑳𐑯 𐑹 𐑥𐑳𐑤𐑑𐑦𐑐𐑩𐑤 𐑒𐑪𐑯𐑑𐑧𐑒𐑕𐑑𐑕 𐑢𐑺 𐑞 𐑓𐑦𐑤𐑑𐑼 𐑖𐑫𐑛 𐑩𐑐𐑤𐑲",
+  "filters.filters_list_context_label": "𐑓𐑦𐑤𐑑𐑼 𐑒𐑪𐑯𐑑𐑧𐑒𐑕𐑑𐑕:",
   "filters.filters_list_delete": "𐑛𐑦𐑤𐑰𐑑",
   "filters.filters_list_details_label": "𐑓𐑦𐑤𐑑𐑼 𐑕𐑧𐑑𐑦𐑙𐑟:",
   "filters.filters_list_drop": "𐑛𐑮𐑪𐑐",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "𐑯 {additional}",
   "hashtag.column_header.tag_mode.any": "𐑹 {additional}",
   "hashtag.column_header.tag_mode.none": "𐑢𐑦𐑞𐑬𐑑 {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "𐑣𐑴𐑥",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "𐑤𐑪𐑜 𐑦𐑯",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "𐑐𐑮𐑧𐑓𐑼𐑩𐑯𐑕𐑩𐑟",
   "navigation_bar.profile_directory": "𐑐𐑮𐑴𐑓𐑲𐑤 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦",
   "navigation_bar.soapbox_config": "·𐑕𐑴𐑐𐑚𐑪𐑒𐑕 𐑒𐑩𐑯𐑓𐑦𐑜",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} 𐑤𐑲𐑒𐑑 𐑘𐑹 𐑐𐑴𐑕𐑑",
   "notification.follow": "{name} 𐑓𐑪𐑤𐑴𐑛 𐑿",
   "notification.follow_request": "{name} 𐑣𐑨𐑟 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑩𐑛 𐑑 𐑓𐑪𐑤𐑴 𐑿",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "𐑞𐑦𐑕 𐑐𐑴𐑕𐑑 𐑒𐑨𐑯𐑪𐑑 𐑚𐑰 𐑮𐑰𐑐𐑴𐑕𐑑𐑩𐑛",
   "status.chat": "𐑗𐑨𐑑 𐑢𐑦𐑞 @{name}",
   "status.copy": "𐑒𐑪𐑐𐑦 𐑤𐑦𐑙𐑒 𐑑 𐑐𐑴𐑕𐑑",
-  "status.cw": "Warning:",
   "status.delete": "𐑛𐑦𐑤𐑰𐑑",
   "status.detailed_status": "𐑛𐑰𐑑𐑱𐑤𐑛 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑝𐑿",
   "status.direct": "𐑛𐑦𐑮𐑧𐑒𐑑 𐑥𐑧𐑕𐑦𐑡 @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": " 𐑦𐑥𐑚𐑧𐑛",
   "status.favourite": "𐑤𐑲𐑒",
   "status.filtered": "𐑓𐑦𐑤𐑑𐑼𐑛",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "𐑤𐑴𐑛 𐑥𐑹",
   "status.media_hidden": "𐑥𐑰𐑛𐑾 𐑣𐑦𐑛𐑩𐑯",
   "status.mention": "𐑥𐑧𐑯𐑖𐑩𐑯 @{name}",

app/soapbox/locales/en.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -49,7 +48,8 @@
   "account.remote_follow": "Remote follow",
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
-  "account.requested": "Click to cancel",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Mangane config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} liked your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Like",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/eo.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Roboto",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Signali @{name}",
   "account.requested": "Atendo de aprobo. Alklaku por nuligi peton de sekvado",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Diskonigi la profilon de @{name}",
   "account.show_reblogs": "Montri diskonigojn de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Reveni",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "kaj {additional}",
   "hashtag.column_header.tag_mode.any": "aŭ {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} stelumis vian mesaĝon",
   "notification.follow": "{name} eksekvis vin",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ĉi tiu mesaĝo ne diskonigeblas",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopii la ligilon al la mesaĝo",
-  "status.cw": "Warning:",
   "status.delete": "Forigi",
   "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Rekte mesaĝi @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Enkorpigi",
   "status.favourite": "Stelumi",
   "status.filtered": "Filtrita",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Ŝargi pli",
   "status.media_hidden": "Aŭdovidaĵo kaŝita",
   "status.mention": "Mencii @{name}",

app/soapbox/locales/es-AR.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Denunciar a @{name}",
   "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento.",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Volver",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Configuración",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "No se puede retootear este toot",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar enlace al estado",
-  "status.cw": "Warning:",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mensaje directo a @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Insertar",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Medios ocultos",
   "status.mention": "Mencionar a @{name}",

app/soapbox/locales/es.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Agregar o eliminar de listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Reportar a @{name}",
   "account.requested": "Esperando aprobación",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar retoots de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Atrás",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Este toot no puede retootearse",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar enlace al estado",
-  "status.cw": "Warning:",
   "status.delete": "Borrar",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mensaje directo a @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Cargar más",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",

app/soapbox/locales/et.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Raporteeri @{name}",
   "account.requested": "Ootab kinnitust. Klõpsa jälgimise soovi tühistamiseks",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Jaga @{name} profiili",
   "account.show_reblogs": "Näita kasutaja @{name} upitusi",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tagasi",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "või {additional}",
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Eelistused",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} märkis su staatuse lemmikuks",
   "notification.follow": "{name} jälgib sind",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Seda postitust ei saa upitada",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopeeri link staatusesse",
-  "status.cw": "Warning:",
   "status.delete": "Kustuta",
   "status.detailed_status": "Detailne vestluskuva",
   "status.direct": "Otsesõnum @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Sängita",
   "status.favourite": "Lemmik",
   "status.filtered": "Filtreeritud",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Lae veel",
   "status.media_hidden": "Meedia peidetud",
   "status.mention": "Mainimine @{name}",

app/soapbox/locales/eu.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot-a",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "@{name}(e)ren profila elkarbanatu",
   "account.show_reblogs": "Erakutsi @{name}(r)en bultzadak",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Atzera",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "eta {additional}",
   "hashtag.column_header.tag_mode.any": "edo {additional}",
   "hashtag.column_header.tag_mode.none": "gabe {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Hobespenak",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name}(e)k zure mezua gogoko du",
   "notification.follow": "{name}(e)k jarraitzen zaitu",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Mezu honi ezin zaio bultzada eman",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopiatu mezuaren esteka",
-  "status.cw": "Warning:",
   "status.delete": "Ezabatu",
   "status.detailed_status": "Elkarrizketaren ikuspegi xehetsua",
   "status.direct": "Mezu zuzena @{name}(r)i",
@@ -1070,7 +1064,6 @@
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
   "status.filtered": "Iragazita",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Kargatu gehiago",
   "status.media_hidden": "Multimedia ezkutatua",
   "status.mention": "Aipatu @{name}",

app/soapbox/locales/fa.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "افزودن یا برداشتن از فهرست",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "ربات",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "گزارش @{name}",
   "account.requested": "در انتظار پذیرش",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "هم‌رسانی نمایهٔ @{name}",
   "account.show_reblogs": "نشان‌دادن بازبوق‌های  @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "بازگشت",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "ترجیحات",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید",
   "notification.follow": "‫{name}‬ پیگیر شما شد",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید",
   "status.chat": "Chat with @{name}",
   "status.copy": "رونوشت‌برداری از نشانی این نوشته",
-  "status.cw": "Warning:",
   "status.delete": "پاک‌کردن",
   "status.detailed_status": "نمایش کامل گفتگو",
   "status.direct": "پیغام مستقیم به @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "جاگذاری",
   "status.favourite": "پسندیدن",
   "status.filtered": "فیلترشده",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "بیشتر نشان بده",
   "status.media_hidden": "تصویر پنهان شده",
   "status.mention": "نام‌بردن از @{name}",

app/soapbox/locales/fi.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Botti",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Raportoi @{name}",
   "account.requested": "Odottaa hyväksyntää. Peruuta seuraamispyyntö klikkaamalla",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä buustaukset käyttäjältä @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Takaisin",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "tai {additional}",
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} tykkäsi tilastasi",
   "notification.follow": "{name} seurasi sinua",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Tätä julkaisua ei voi buustata",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopioi linkki tilapäivitykseen",
-  "status.cw": "Warning:",
   "status.delete": "Poista",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
   "status.direct": "Viesti käyttäjälle @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Upota",
   "status.favourite": "Tykkää",
   "status.filtered": "Suodatettu",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Lataa lisää",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",

app/soapbox/locales/fr.json

@@ -4,11 +4,10 @@
   "accordion.expand": "Expand",
   "account.about": "À propos",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
-  "account.awaiting_approval": "En attente d’approbation",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
-  "account.block": "Bloquer",
+  "account.block": "Bloquer @{name}",
   "account.block_domain": "Tout masquer venant de {domain}",
   "account.blocked": "Bloqué",
   "account.chat": "Chat with @{name}",
@@ -37,7 +36,7 @@
   "account.member_since": "Joined {date}",
   "account.mention": "Mentionner",
   "account.moved_to": "{name} a déménagé vers :",
-  "account.mute": "Masquer",
+  "account.mute": "Masquer @{name}",
   "account.muted": "Muted",
   "account.never_active": "Jamais",
   "account.no_fields": "Cette section est vide pour le moment.",
@@ -49,7 +48,8 @@
   "account.remote_follow": "Remote follow",
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Signaler @{name}",
-  "account.requested": "Cliquez pour annuler",
+  "account.requested": "En attente d’approbation. Cliquez pour annuler la requête",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
@@ -57,12 +57,12 @@
   "account.subscribe.failure": "An error occurred trying to subscribed to this account.",
   "account.subscribe.success": "You have subscribed to this account.",
   "account.today": "Aujourd'hui",
-  "account.unblock": "Débloquer",
-  "account.unblock_domain": "Ne plus masquer",
+  "account.unblock": "Débloquer @{name}",
+  "account.unblock_domain": "Ne plus masquer {domain}",
   "account.unendorse": "Ne plus recommander sur le profil",
   "account.unendorse.success": "You are no longer featuring @{acct}",
   "account.unfollow": "Ne plus suivre",
-  "account.unmute": "Ne plus masquer",
+  "account.unmute": "Ne plus masquer @{name}",
   "account.unsubscribe": "Unsubscribe to notifications from @{name}",
   "account.unsubscribe.failure": "An error occurred trying to unsubscribed to this account.",
   "account.unsubscribe.success": "You have unsubscribed from this account.",
@@ -173,10 +173,10 @@
   "auth.invalid_credentials": "Wrong username or password",
   "auth.logged_out": "Logged out.",
   "auth_layout.register": "Create an account",
-  "backups.actions.create": "Créer une sauvegarde",
-  "backups.empty_message": "Pas de sauvegarde. {action}",
-  "backups.empty_message.action": "Créer une sauvegarde maintenant ?",
-  "backups.pending": "Sauvegarde en cours",
+  "backups.actions.create": "Create backup",
+  "backups.empty_message": "No backups found. {action}",
+  "backups.empty_message.action": "Create one now?",
+  "backups.pending": "Pending",
   "birthday_panel.title": "Birthdays",
   "birthdays_modal.empty": "None of your friends have birthday today.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci, la prochaine fois",
@@ -213,7 +213,7 @@
   "column.aliases.subheading_add_new": "Ajouter un alias",
   "column.aliases.subheading_aliases": "Alias courants",
   "column.app_create": "Create app",
-  "column.backups": "Sauvegardes",
+  "column.backups": "Backups",
   "column.birthdays": "Birthdays",
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
@@ -224,8 +224,8 @@
   "column.direct": "Messages privés",
   "column.directory": "Annuaire",
   "column.domain_blocks": "Domaines cachés",
-  "column.edit_profile": "Éditer le profil",
-  "column.export_data": "Exporter vos données",
+  "column.edit_profile": "Edit profile",
+  "column.export_data": "Export data",
   "column.familiar_followers": "People you know following {name}",
   "column.favourited_statuses": "Liked posts",
   "column.favourites": "Likes",
@@ -238,14 +238,13 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Supprimer au lieu de masquer",
   "column.filters.drop_hint": "Les statuts filtrés ne seront pas conservés, et seront donc invisibles même si le filtre est supprimé.",
-  "column.filters.drop_notifications": "Masque le statut dans les notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Accueil",
   "column.filters.keyword": "Mot-clé ou phrase",
-  "column.filters.notifications": "Appliquer également aux notifications",
+  "column.filters.notifications": "Notifications",
   "column.filters.public_timeline": "Découvrir",
-  "column.filters.subheading_add_new": "Ajouter un nouveau filtre",
+  "column.filters.subheading_add_new": "Ajouter le nouveau filtre",
   "column.filters.subheading_filters": "Filtres actuels",
   "column.filters.whole_word_header": "Mot entier",
   "column.filters.whole_word_hint": "Le filtre ne sera appliqué que s'il correspond exactement au mot entier.",
@@ -275,9 +274,6 @@
   "column.search": "Recherche",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Configuration de Mangane",
-  "column.tags": "Hashtags suivis",
-  "column.tags.empty": "Vous ne suivez aucun hashtag pour le moment.",
-  "column.tags.see": "Voir",
   "column.test": "Test timeline",
   "column_back_button.label": "Retour",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -440,7 +436,7 @@
   "edit_profile.fields.stranger_notifications_label": "Bloquer les notifications d'inconnus",
   "edit_profile.fields.website_label": "Website",
   "edit_profile.fields.website_placeholder": "Display a Link",
-  "edit_profile.header": "Éditer le profil",
+  "edit_profile.header": "Edit Profile",
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
   "edit_profile.hints.avatar": "PNG, GIF or JPG. Sera réduit à {size}",
   "edit_profile.hints.bot": "Ce compte réalise essentiellement des actions automatiques",
@@ -512,18 +508,18 @@
   "empty_column.search.statuses": "Il n'y a pas de statuts correspondant à la recherche \"{term}\"",
   "empty_column.test": "The test timeline is empty.",
   "export_data.actions.export": "Export",
-  "export_data.actions.export_blocks": "Exporter les comptes bloqués",
-  "export_data.actions.export_follows": "Exporter les comptes suivis",
-  "export_data.actions.export_mutes": "Exporter les comptes masqués",
-  "export_data.blocks_label": "Comptes bloqués",
-  "export_data.follows_label": "Comptes suivis",
-  "export_data.hints.blocks": "Obtenez un fichier csv contenant la liste des comptes bloqués",
-  "export_data.hints.follows": "Obtenez un fichier csv contenant la liste des comptes suivis",
-  "export_data.hints.mutes": "Obtenez un fichier csv contenant la liste des comptes masqués",
-  "export_data.mutes_label": "Comptes masqués",
-  "export_data.success.blocks": "Comptes bloqués exportés",
-  "export_data.success.followers": "Comptes suivis exportés",
-  "export_data.success.mutes": "Comptes masqués exportés",
+  "export_data.actions.export_blocks": "Export blocks",
+  "export_data.actions.export_follows": "Export follows",
+  "export_data.actions.export_mutes": "Export mutes",
+  "export_data.blocks_label": "Blocks",
+  "export_data.follows_label": "Follows",
+  "export_data.hints.blocks": "Get a CSV file containing a list of blocked accounts",
+  "export_data.hints.follows": "Get a CSV file containing a list of followed accounts",
+  "export_data.hints.mutes": "Get a CSV file containing a list of muted accounts",
+  "export_data.mutes_label": "Mutes",
+  "export_data.success.blocks": "Blocks exported successfully",
+  "export_data.success.followers": "Followers exported successfully",
+  "export_data.success.mutes": "Mutes exported successfully",
   "federation_restriction.federated_timeline_removal": "Fediverse timeline removal",
   "federation_restriction.followers_only": "Hidden except to followers",
   "federation_restriction.full_media_removal": "Full media removal",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filtre ajouté.",
+  "filters.context_header": "Contextes de filtrage",
+  "filters.context_hint": "Où le filtre doit-t'il s'appliquer ?",
+  "filters.filters_list_context_label": "Contextes de filtrage:",
   "filters.filters_list_delete": "Supprimer",
   "filters.filters_list_details_label": "Paramètres du filtre:",
   "filters.filters_list_drop": "Ignorer et supprimer",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
-  "hashtag_timeline.follow": "Suivre ce tag",
-  "hashtag_timeline.loading": "Chargement...",
-  "hashtag_timeline.unfollow": "Ne plus suivre",
   "header.home.label": "Accueil",
   "header.login.forgot_password": "Mot de passe oublié ?",
   "header.login.label": "Connexion",
@@ -649,7 +645,7 @@
   "lists.edit": "Éditer la liste",
   "lists.edit.submit": "Changer le titre",
   "lists.new.create": "Ajouter une liste",
-  "lists.new.create_title": "Créer",
+  "lists.new.create_title": "Create",
   "lists.new.save_title": "Save Title",
   "lists.new.title_placeholder": "Titre de la nouvelle liste",
   "lists.search": "Rechercher parmi les gens que vous suivez",
@@ -668,7 +664,7 @@
   "login.sign_in": "Connexion",
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
-  "login_form.header": "Connexion",
+  "login_form.header": "Sign In",
   "media_gallery.toggle_visible": "Modifier la visibilité",
   "media_panel.empty_message": "No media found.",
   "media_panel.title": "Media",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.profile_directory": "Annuaire",
   "navigation_bar.soapbox_config": "Configuration de Mangane",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} a ajouté à ses favoris :",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
@@ -813,7 +808,7 @@
   "patron.title": "Funding Goal",
   "pinned_accounts.title": "{name}’s choices",
   "pinned_statuses.none": "Aucun statut épinglé.",
-  "poll.chooseMultiple": "Choisissez autant d'options que vous voulez.",
+  "poll.chooseMultiple": "Choose as many as you'd like.",
   "poll.closed": "Fermé",
   "poll.non_anonymous": "Public poll",
   "poll.non_anonymous.label": "Other instances may display the options you voted for",
@@ -902,7 +897,7 @@
   "registration.validation.capital_letter": "1 capital letter",
   "registration.validation.lowercase_letter": "1 lowercase letter",
   "registration.validation.minimum_characters": "8 characters",
-  "registrations.create_account": "Créer un compte",
+  "registrations.create_account": "Create an account",
   "registrations.error": "Failed to register your account.",
   "registrations.get_started": "Let's get started!",
   "registrations.redirect": "No account yet?",
@@ -994,14 +989,14 @@
   "security.update_email.success": "Email mis à jour.",
   "security.update_password.fail": "Echec de la mise à jour du mot de passe.",
   "security.update_password.success": "Mot de passe mis à jour.",
-  "settings.account_migration": "Migrer votre compte",
+  "settings.account_migration": "Move Account",
   "settings.change_email": "Changer d'email",
   "settings.change_password": "Changer de mot de passe",
   "settings.configure_mfa": "Configurer le MFA",
   "settings.content": "Contenu",
   "settings.delete_account": "Supprimer le compte",
   "settings.edit_profile": "Mettre à jour le profil",
-  "settings.other": "Compte",
+  "settings.other": "Other options",
   "settings.preferences": "Préférences",
   "settings.profile": "Profil",
   "settings.save.success": "Vos préférences ont été enregistrées.",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copier le lien vers le statut",
-  "status.cw": "Sujet:",
   "status.delete": "Effacer",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Envoyer un message direct à @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Intégrer",
   "status.favourite": "Réagir",
   "status.filtered": "Filtré",
-  "status.filtered-hint": "Statut masqué par vos paramètres de filtrage",
   "status.load_more": "Charger plus",
   "status.media_hidden": "Média caché",
   "status.mention": "Mentionner @{name}",
@@ -1112,9 +1105,9 @@
   "status.unbookmarked": "Marque-page supprimé.",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Ne plus épingler sur le profil",
-  "status_list.queue_label": "Cliquer pour voir {count} nouveaux {count, plural, one {statut} other {statuts}}",
+  "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "statuses.quote_tombstone": "Post is unavailable.",
-  "statuses.tombstone": "Un ou plusieurs statuts ne sont pas disponibles.",
+  "statuses.tombstone": "One or more posts are unavailable.",
   "streamfield.add": "Ajouter",
   "streamfield.remove": "Remove",
   "suggestions.dismiss": "Rejeter la suggestion",

app/soapbox/locales/ga.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/gl.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Engadir ou Eliminar das listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Informar sobre @{name}",
   "account.requested": "Agardando aceptación. Pulse para cancelar a solicitude de seguimento",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Compartir o perfil de @{name}",
   "account.show_reblogs": "Mostrar repeticións de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Atrás",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} marcou como favorito o seu estado",
   "notification.follow": "{name} está a seguila",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Esta mensaxe non pode ser promovida",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar ligazón ao estado",
-  "status.cw": "Warning:",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incrustar",
   "status.favourite": "Favorita",
   "status.filtered": "Filtrado",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Cargar máis",
   "status.media_hidden": "Medios ocultos",
   "status.mention": "Mencionar @{name}",

app/soapbox/locales/he.json

@@ -4,7 +4,6 @@
   "accordion.expand": "הרחבה",
   "account.about": "About",
   "account.add_or_remove_from_list": "הוסף או הסר מהרשימות",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "בוט",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "לדווח על @{name}",
   "account.requested": "בהמתנה לאישור",
+  "account.requested_small": "מחכה לאישור",
   "account.search": "Search from @{name}",
   "account.share": "לשתף את הפרופיל של @{name}",
   "account.show_reblogs": "להראות הדהודים מאת @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "שגיאה במחיקת פילטר",
   "column.filters.drop_header": "הורד במקום להסתיר",
   "column.filters.drop_hint": "פוסטים מסוננים ייעלמו באופן בלתי הפיך, גם אם הפילטר יוסר מאוחר יותר",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "פג תוקף לאחר",
   "column.filters.expires_hint": "תאריכי תפוגה אינם נתמכים כעת",
   "column.filters.home_timeline": "ציר זמן ביתי",
@@ -275,9 +274,6 @@
   "column.search": "חפש",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "תצורות סבוניה",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "חזרה",
   "column_forbidden.body": "אין לך הרשאה לגשת לדף זה.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "פילטר נוסף.",
+  "filters.context_header": "הקשרי הפילטר",
+  "filters.context_hint": "הקשר אחד או מרובים שבהם הפילטר צריך לחול",
+  "filters.filters_list_context_label": "הקשרי הפילטר:",
   "filters.filters_list_delete": "מחק פילטר",
   "filters.filters_list_details_label": "הגדרות פילטר:",
   "filters.filters_list_drop": "הורד",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "ו-{additional}",
   "hashtag.column_header.tag_mode.any": "או {additional}",
   "hashtag.column_header.tag_mode.none": "בלי {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "בית",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "התחברות",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "העדפות",
   "navigation_bar.profile_directory": "ספריית פרופילים",
   "navigation_bar.soapbox_config": "תצורת סבוניה",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "הפוסט שלך חובב על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
   "notification.follow_request": "{name} ביקש לעקוב אחריך",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
   "status.chat": "שוחח עם @{name}",
   "status.copy": "העתק קישור לפוסט",
-  "status.cw": "Warning:",
   "status.delete": "מחיקה",
   "status.detailed_status": "תצוגת שיחה מפורטת",
   "status.direct": "הודעה ישירה @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
   "status.filtered": "מסונן",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "עוד",
   "status.media_hidden": "מדיה מוסתרת",
   "status.mention": "פניה אל @{name}",

app/soapbox/locales/hi.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/hr.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čeka pristanak",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Natrag",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Postavke",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} je lajkao tvoj status",
   "notification.follow": "{name} te sada slijedi",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ovaj post ne može biti boostan",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Obriši",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Označi omiljenim",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Učitaj više",
   "status.media_hidden": "Sakriven media sadržaj",
   "status.mention": "Spomeni @{name}",

app/soapbox/locales/hu.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Hozzáadás és elvétel listáról",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "@{name} jelentése",
   "account.requested": "Engedélyre vár. Kattints a követési kérés visszavonásához",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "@{name} profiljának megosztása",
   "account.show_reblogs": "@{name} megtolásainak mutatása",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Vissza",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "és {additional}",
   "hashtag.column_header.tag_mode.any": "vagy {additional}",
   "hashtag.column_header.tag_mode.none": "nélküle {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Beállítások",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} kedvencnek jelölte egy tülködet",
   "notification.follow": "{name} követ téged",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ez a tülk nem tolható meg",
   "status.chat": "Chat with @{name}",
   "status.copy": "Link másolása tülkbe",
-  "status.cw": "Warning:",
   "status.delete": "Törlés",
   "status.detailed_status": "Részletes beszélgetési nézet",
   "status.direct": "Közvetlen üzenet @{name} számára",
@@ -1070,7 +1064,6 @@
   "status.embed": "Beágyazás",
   "status.favourite": "Kedvenc",
   "status.filtered": "Megszűrt",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Többet",
   "status.media_hidden": "Média elrejtve",
   "status.mention": "@{name} említése",

app/soapbox/locales/hy.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Բոտ",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Բողոքել @{name}֊ից",
   "account.requested": "Հաստատման կարիք ունի։ Սեղմիր՝ հետեւելու հայցը չեղարկելու համար։",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Կիսվել @{name}֊ի էջով",
   "account.show_reblogs": "Ցուցադրել @{name}֊ի տարածածները",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Ետ",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Նախապատվություններ",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Այս թութը չի կարող տարածվել",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Ջնջել",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Բեռնել ավելին",
   "status.media_hidden": "մեդիաբովանդակությունը թաքցված է",
   "status.mention": "Նշել @{name}֊ին",

app/soapbox/locales/id.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Laporkan @{name}",
   "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan repost dari @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Kembali",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Pengaturan",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} menyukai status anda",
   "notification.follow": "{name} mengikuti anda",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Hapus",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Difavoritkan",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Tampilkan semua",
   "status.media_hidden": "Media disembunyikan",
   "status.mention": "Balasan @{name}",

app/soapbox/locales/io.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Denuncar @{name}",
   "account.requested": "Vartante aprobo",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Retro",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferi",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.follow": "{name} sequeskis tu",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Efacar",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorizar",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Kargar pluse",
   "status.media_hidden": "Kontenajo celita",
   "status.mention": "Mencionar @{name}",

app/soapbox/locales/is.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Opna",
   "account.about": "About",
   "account.add_or_remove_from_list": "Bæta við eða Fjarlægja af listum",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Vélmenni",
   "account.birthday": "Fæddist {date}",
   "account.birthday_today": "Afmæli í dag!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Kæra @{name}",
   "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
+  "account.requested_small": "Bíður eftir samþykki",
   "account.search": "Search from @{name}",
   "account.share": "Deila notandasniði fyrir @{name}",
   "account.show_reblogs": "Sýna endurbirtingar frá @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Villa við að eyða síu",
   "column.filters.drop_header": "Fella niður í staðinn fyrir að fela",
   "column.filters.drop_hint": "Síaðar færslur munu hverfa óafturkræft jafnvel þótt sían sé fjarlægð síðar",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Gildistími",
   "column.filters.expires_hint": "Gildistímar eru ekki studdir eins og er",
   "column.filters.home_timeline": "Heimatímalína",
@@ -275,9 +274,6 @@
   "column.search": "Leita",
   "column.settings_store": "Stillingargeymsla",
   "column.soapbox_config": "Stillingar Soapbox",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Prufu tímalína",
   "column_back_button.label": "Til baka",
   "column_forbidden.body": "Þú hefur ekki aðgang að þessari síðu.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Síu bætt við",
+  "filters.context_header": "Samhengi síu",
+  "filters.context_hint": "Eitt eða fleiri samhengi þar sem sían ætti að gilda",
+  "filters.filters_list_context_label": "Samhengi síu:",
   "filters.filters_list_delete": "Eyða",
   "filters.filters_list_details_label": "Síustillingar:",
   "filters.filters_list_drop": "Fella niður",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eða {additional}",
   "hashtag.column_header.tag_mode.none": "án {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Heima",
   "header.login.forgot_password": "Gleymt lykilorð?",
   "header.login.label": "Skrá inn",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Kjörstillingar",
   "navigation_bar.profile_directory": "Notandasniðamappa",
   "navigation_bar.soapbox_config": "Stillingar Soapbox",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} liked your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
   "status.chat": "Spjalla með @{name}",
   "status.copy": "Afrita tengil í færslu",
-  "status.cw": "Warning:",
   "status.delete": "Eyða",
   "status.detailed_status": "Nákvæm spjallþráðasýn",
   "status.direct": "Bein skilaboð til @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Ívefja",
   "status.favourite": "Setja í eftirlæti",
   "status.filtered": "Síað",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Hlaða inn meiru",
   "status.media_hidden": "Mynd er falin",
   "status.mention": "Minnast á @{name}",

app/soapbox/locales/it.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Espandi",
   "account.about": "About",
   "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Compleanno {date}",
   "account.birthday_today": "Compleanno, oggi!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Segnala @{name}",
   "account.requested": "In attesa di approvazione",
+  "account.requested_small": "In approvazione",
   "account.search": "Search from @{name}",
   "account.share": "Condividi il profilo di @{name}",
   "account.show_reblogs": "Mostra i ricondivisi da @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Cancella anziché nascondere",
   "column.filters.drop_hint": "I contenuti spariranno irrimediabilmente, anche dopo aver rimosso il filtro",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Scadenza",
   "column.filters.expires_hint": "Le date di scadenza non sono pronte",
   "column.filters.home_timeline": "Timeline locale",
@@ -275,9 +274,6 @@
   "column.search": "Cerca",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Indietro",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Aggiunto un nuovo filtro",
+  "filters.context_header": "Contesto del filtro",
+  "filters.context_hint": "Seleziona uno o più contesti a cui applicare il filtro",
+  "filters.filters_list_context_label": "Contesto del filtro:",
   "filters.filters_list_delete": "Elimina",
   "filters.filters_list_details_label": "Impostazioni del filtro:",
   "filters.filters_list_drop": "Cancella",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Inizio",
   "header.login.forgot_password": "Password dimenticata?",
   "header.login.label": "Entra",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.profile_directory": "Catalogo dei profili",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} ha apprezzato il contenuto",
   "notification.follow": "{name} adesso ti segue",
   "notification.follow_request": "{name} ha chiesto di seguirti",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Questo post non può essere condiviso",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copia il link al contenuto",
-  "status.cw": "Warning:",
   "status.delete": "Elimina",
   "status.detailed_status": "Vista conversazione dettagliata",
   "status.direct": "Messaggio privato @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incorpora",
   "status.favourite": "Reazioni",
   "status.filtered": "Filtrato",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Mostra di più",
   "status.media_hidden": "Allegato nascosto",
   "status.mention": "Nomina @{name}",

app/soapbox/locales/ja.json

@@ -4,7 +4,6 @@
   "accordion.expand": "開く",
   "account.about": "About",
   "account.add_or_remove_from_list": "リストから追加または外す",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "@{name}さんを通報",
   "account.requested": "フォロー承認待ちです。クリックしてキャンセル",
+  "account.requested_small": "承認待ち",
   "account.search": "Search from @{name}",
   "account.share": "@{name}さんのプロフィールを共有する",
   "account.show_reblogs": "@{name}さんからのリピートを表示",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "フィルタ削除エラー",
   "column.filters.drop_header": "非表示のかわりにドロップ",
   "column.filters.drop_hint": "フィルタが削除されてもフィルタリングされた投稿は元に戻せなくなります",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "有効期限",
   "column.filters.expires_hint": "有効期限は現在サポートされていません",
   "column.filters.home_timeline": "ホームタイムライン",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox設定",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "戻る",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "と {additional}",
   "hashtag.column_header.tag_mode.any": "か {additional}",
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "ホーム",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "ログイン",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "ユーザー設定",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox設定",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name}さんがあなたの投稿をお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "この投稿はリピートできません",
   "status.chat": "Chat with @{name}",
   "status.copy": "投稿へのリンクをコピー",
-  "status.cw": "Warning:",
   "status.delete": "削除",
   "status.detailed_status": "詳細な会話ビュー",
   "status.direct": "@{name}さんにダイレクトメッセージ",
@@ -1070,7 +1064,6 @@
   "status.embed": "埋め込み",
   "status.favourite": "お気に入り",
   "status.filtered": "フィルターされました",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "もっと見る",
   "status.media_hidden": "非表示のメディア",
   "status.mention": "@{name}さんに投稿",

app/soapbox/locales/ka.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "ბოტი",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "დაარეპორტე @{name}",
   "account.requested": "დამტკიცების მოლოდინში. დააწკაპუნეთ რომ უარყოთ დადევნების მოთხონვა",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "გააზიარე @{name}-ის პროფილი",
   "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "უკან",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "პრეფერენსიები",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად",
   "notification.follow": "{name} გამოგყვათ",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "ეს პოსტი ვერ დაიბუსტება",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "წაშლა",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "პირდაპირი წერილი @{name}-ს",
@@ -1070,7 +1064,6 @@
   "status.embed": "ჩართვა",
   "status.favourite": "ფავორიტი",
   "status.filtered": "ფილტრირებული",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",

app/soapbox/locales/kk.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Тізімге қосу немесе жою",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Бот",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Шағымдану @{name}",
   "account.requested": "Растауын күтіңіз. Жазылудан бас тарту үшін басыңыз",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "@{name} профилін бөлісу\"",
   "account.show_reblogs": "@{name} бөліскендерін көрсету",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Артқа",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "және {additional}",
   "hashtag.column_header.tag_mode.any": "немесе {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} болмай",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Басымдықтар",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} жазбаңызды таңдаулыға қосты",
   "notification.follow": "{name} сізге жазылды",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Бұл жазба бөлісілмейді",
   "status.chat": "Chat with @{name}",
   "status.copy": "Жазба сілтемесін көшір",
-  "status.cw": "Warning:",
   "status.delete": "Өшіру",
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.direct": "Хат жіберу @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embеd",
   "status.favourite": "Таңдаулы",
   "status.filtered": "Фильтрленген",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",

app/soapbox/locales/ko.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "봇",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "@{name} 신고",
   "account.requested": "승인 대기 중. 클릭해서 취소하기",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "@{name}의 프로파일 공유",
   "account.show_reblogs": "@{name}의 부스트 보기",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "돌아가기",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "그리고 {additional}",
   "hashtag.column_header.tag_mode.any": "또는 {additional}",
   "hashtag.column_header.tag_mode.none": "({additional}를 제외)",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "사용자 설정",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name}님이 즐겨찾기 했습니다",
   "notification.follow": "{name}님이 나를 팔로우 했습니다",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
   "status.chat": "Chat with @{name}",
   "status.copy": "게시물 링크 복사",
-  "status.cw": "Warning:",
   "status.delete": "삭제",
   "status.detailed_status": "대화 자세히 보기",
   "status.direct": "@{name}에게 다이렉트 메시지",
@@ -1070,7 +1064,6 @@
   "status.embed": "공유하기",
   "status.favourite": "즐겨찾기",
   "status.filtered": "필터로 걸러짐",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "더 보기",
   "status.media_hidden": "미디어 숨겨짐",
   "status.mention": "답장",

app/soapbox/locales/lt.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/lv.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Pievienot vai noņemt no saraksta",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bots",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Ziņot par lietotāju @{name}",
   "account.requested": "Gaidām apstiprinājumu. Nospied lai atceltu sekošanas pieparasījumu",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Dalīties ar lietotāja @{name}'s profilu",
   "account.show_reblogs": "Parādīt lietotāja @{name} paceltos ierakstus",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Atpakaļ",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/mk.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Додади или одстрани од листа",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Бот",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Пријави @{name}",
   "account.requested": "Се чека одобрување. Кликни за да одкажиш барање за следење",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Сподели @{name} профил",
   "account.show_reblogs": "Прикажи бустови од @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Назад",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/ms.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show reposts from @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Back",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/nl.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Rapporteer @{name}",
   "account.requested": "Wacht op goedkeuring. Klik om het volgverzoek te annuleren",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon reposts van @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Terug",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "of {additional}",
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Instellingen",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} voegde jouw toot als favoriet toe",
   "notification.follow": "{name} volgt jou nu",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Deze toot kan niet gerepost worden",
   "status.chat": "Chat with @{name}",
   "status.copy": "Link naar toot kopiëren",
-  "status.cw": "Warning:",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",
   "status.direct": "Directe toot @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Insluiten",
   "status.favourite": "Favoriet",
   "status.filtered": "Gefilterd",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Meer laden",
   "status.media_hidden": "Media verborgen",
   "status.mention": "Vermeld @{name}",

app/soapbox/locales/nn.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Legg til eller ta vekk fra liste",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Rapporter @{name}",
   "account.requested": "Venter på samtykke. Klikk for å avbryte føljar-førespurnad",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Del @{name} sin profil",
   "account.show_reblogs": "Sjå framhevingar ifrå @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tilbake",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferanser",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "This post cannot be reposted",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Load more",
   "status.media_hidden": "Media hidden",
   "status.mention": "Mention @{name}",

app/soapbox/locales/no.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Rapportér @{name}",
   "account.requested": "Venter på godkjennelse",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis reposts fra @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tilbake",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferanser",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Slett",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Bygge inn",
   "status.favourite": "Lik",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Last mer",
   "status.media_hidden": "Media skjult",
   "status.mention": "Nevn @{name}",

app/soapbox/locales/oc.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robòt",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Senhalar @{name}",
   "account.requested": "Invitacion mandada. Clicatz per anullar",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tornar",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sens {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferéncias",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} a ajustat a sos favorits",
   "notification.follow": "{name} vos sèc",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar lo ligam de l’estatut",
-  "status.cw": "Warning:",
   "status.delete": "Escafar",
   "status.detailed_status": "Vista detalhada de la convèrsa",
   "status.direct": "Messatge per @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
   "status.filtered": "Filtrat",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Cargar mai",
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",

app/soapbox/locales/pl.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Rozwiń",
   "account.about": "About",
   "account.add_or_remove_from_list": "Dodaj lub usuń z list",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Urodzony(-a) {date}",
   "account.birthday_today": "Ma dziś urodziny!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Usuń tego obserwującego",
   "account.report": "Zgłoś @{name}",
   "account.requested": "Oczekująca prośba, kliknij aby anulować",
+  "account.requested_small": "Oczekująca prośba",
   "account.search": "Search from @{name}",
   "account.share": "Udostępnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Błąd usuwania filtru",
   "column.filters.drop_header": "Usuwaj zamiast ukrywać",
   "column.filters.drop_hint": "Filtrowane wpisy znikną bezpowrotnie, nawet jeżeli filtr zostanie później usunięty",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Wygasaj po",
   "column.filters.expires_hint": "Daty wygaśnięcia nie są obecnie obsługiwane",
   "column.filters.home_timeline": "Główna oś czasu",
@@ -275,9 +274,6 @@
   "column.search": "Szukaj",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Konfiguracja Soapbox",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Testowa oś czasu",
   "column_back_button.label": "Wróć",
   "column_forbidden.body": "Nie masz uprawnień, aby odwiedzić tę stronę.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Proponowane profile",
   "feed_suggestions.view_all": "Pokaż wszystkie",
   "filters.added": "Dodano filtr.",
+  "filters.context_header": "Konteksty filtru",
+  "filters.context_hint": "Jedno lub więcej miejsc, gdzie filtr powinien zostać zaaplikowany",
+  "filters.filters_list_context_label": "Konteksty filtru:",
   "filters.filters_list_delete": "Usuń",
   "filters.filters_list_details_label": "Ustawienia filtru:",
   "filters.filters_list_drop": "Usuwaj",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "lub {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Strona główna",
   "header.login.forgot_password": "Nie pamiętasz hasła?",
   "header.login.label": "Zaloguj się",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferencje",
   "navigation_bar.profile_directory": "Katalog profilów",
   "navigation_bar.soapbox_config": "Konfiguracja Soapbox",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
   "notification.follow": "{name} zaczął(-ęła) Cię śledzić",
   "notification.follow_request": "{name} poprosił(a) Cię o możliwość śledzenia",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
   "status.chat": "Napisz do @{name}",
   "status.copy": "Skopiuj odnośnik do wpisu",
-  "status.cw": "Warning:",
   "status.delete": "Usuń",
   "status.detailed_status": "Szczegółowy widok konwersacji",
   "status.direct": "Wyślij wiadomość bezpośrednią do @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Osadź",
   "status.favourite": "Zareaguj",
   "status.filtered": "Filtrowany(-a)",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Załaduj więcej",
   "status.media_hidden": "Zawartość multimedialna ukryta",
   "status.mention": "Wspomnij o @{name}",

app/soapbox/locales/pt-BR.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Adicionar ou remover de listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robô",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Denunciar @{name}",
   "account.requested": "Aguardando aprovação. Clique para cancelar a solicitação",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Compartilhar perfil de @{name}",
   "account.show_reblogs": "Mostra compartilhamentos de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Voltar",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} adicionou a sua postagem aos favoritos",
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Esta postagem não pode ser compartilhada",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar o link para o status",
-  "status.cw": "Warning:",
   "status.delete": "Excluir",
   "status.detailed_status": "Visão detalhada da conversa",
   "status.direct": "Enviar mensagem direta a @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incorporar",
   "status.favourite": "Adicionar aos favoritos",
   "status.filtered": "Filtrado",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Carregar mais",
   "status.media_hidden": "Mídia escondida",
   "status.mention": "Mencionar @{name}",

app/soapbox/locales/pt.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Exibir",
   "account.about": "About",
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robô",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Denunciar @{name}",
   "account.requested": "A aguardar aprovação. Clique para cancelar o pedido de seguimento",
+  "account.requested_small": "A aguardar aprovação",
   "account.search": "Search from @{name}",
   "account.share": "Partilhar o perfil de @{name}",
   "account.show_reblogs": "Mostrar partilhas de @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Erro ao apagar filtro",
   "column.filters.drop_header": "Apagar em vez de ocultar",
   "column.filters.drop_hint": "Publicações filtradas desaparecerão de forma irreversível, mesmo que o filtro seja removido mais tarde",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expira após",
   "column.filters.expires_hint": "De momento, as datas de expiração não são suportadas",
   "column.filters.home_timeline": "Cronologia Inicial",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Config. do Soapbox",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Voltar",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filtrar contextos",
+  "filters.context_hint": "Um ou múltiplos contextos onde o filtro se deve aplicar",
+  "filters.filters_list_context_label": "Filtrar contexto:",
   "filters.filters_list_delete": "Apagar",
   "filters.filters_list_details_label": "Filtrar detalhes:",
   "filters.filters_list_drop": "Largar",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Início",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Iniciar Sessão",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Config. do Soapbox",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} gostou desta publicação",
   "notification.follow": "{name} começou a seguir-te",
   "notification.follow_request": "{name} pediu para te seguir",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Não é possível partilhar esta publicação",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copiar o link para a publicação",
-  "status.cw": "Warning:",
   "status.delete": "Apagar",
   "status.detailed_status": "Vista de conversação detalhada",
   "status.direct": "Mensagem direta @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Incorporar",
   "status.favourite": "Gostar",
   "status.filtered": "Filtrado",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Carregar mais",
   "status.media_hidden": "Multimédia escondida",
   "status.mention": "Mencionar @{name}",

app/soapbox/locales/ro.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Adaugă sau Elimină din liste",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Raportează @{name}",
   "account.requested": "Se așteaptă aprobarea. Apasă pentru a anula cererea de urmărire",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Distribuie profilul lui @{name}",
   "account.show_reblogs": "Arată redistribuirile de la @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Înapoi",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "și {additional}",
   "hashtag.column_header.tag_mode.any": "sau {additional}",
   "hashtag.column_header.tag_mode.none": "fără {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Preferințe",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} a adăugat statusul tău la favorite",
   "notification.follow": "{name} te urmărește",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Această postare nu poate fi redistribuită",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Șterge",
   "status.detailed_status": "Conversația detailată",
   "status.direct": "Mesaj direct @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Încorporare",
   "status.favourite": "Favorite",
   "status.filtered": "Sortate",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Încarcă mai multe",
   "status.media_hidden": "Media ascunsă",
   "status.mention": "Mentionează @{name}",

app/soapbox/locales/ru.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Раскрыть",
   "account.about": "About",
   "account.add_or_remove_from_list": "Добавить или удалить из списков",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Бот",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Пожаловаться",
   "account.requested": "Ожидает подтверждения. Нажмите для отмены",
+  "account.requested_small": "Ожидает подтверждения",
   "account.search": "Search from @{name}",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Ошибка удаления фильтра",
   "column.filters.drop_header": "Не прятать, а удалять",
   "column.filters.drop_hint": "Отфильтрованные сообщения будут неотвратимо удалены, даже после удаления фильтра.",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Сроки действия в данный момент не поддерживаются.",
   "column.filters.home_timeline": "Домашняя лента",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Настройка Soapbox",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Назад",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Настройки",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} понравился Ваш статус",
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Этот статус не может быть продвинут",
   "status.chat": "Chat with @{name}",
   "status.copy": "Копировать ссылку на запись",
-  "status.cw": "Warning:",
   "status.delete": "Удалить",
   "status.detailed_status": "Подробный просмотр обсуждения",
   "status.direct": "Написать @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Встроить",
   "status.favourite": "Нравится",
   "status.filtered": "Отфильтровано",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Показать еще",
   "status.media_hidden": "Медиа скрыто",
   "status.mention": "Упомянуть @{name}",

app/soapbox/locales/sk.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Pridaj do, alebo odober zo zoznamov",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Nahlás @{name}",
   "account.requested": "Čaká na schválenie. Klikni pre zrušenie žiadosti",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Zdieľaj @{name} profil",
   "account.show_reblogs": "Ukáž vyzdvihnutia od @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Späť",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Voľby",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
   "notification.follow": "{name} ťa začal/a následovať",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Tento príspevok nemôže byť zdieľaný",
   "status.chat": "Chat with @{name}",
   "status.copy": "Skopíruj odkaz na príspevok",
-  "status.cw": "Warning:",
   "status.delete": "Zmazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",
   "status.direct": "Súkromná správa @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Vložiť",
   "status.favourite": "Páči sa mi",
   "status.filtered": "Filtrované",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Ukáž viac",
   "status.media_hidden": "Skryté médiá",
   "status.mention": "Spomeň @{name}",

app/soapbox/locales/sl.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Dodaj ali odstrani iz seznama",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Delite profil osebe @{name}",
   "account.show_reblogs": "Pokaži spodbude osebe @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Nazaj",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "in {additional}",
   "hashtag.column_header.tag_mode.any": "ali {additional}",
   "hashtag.column_header.tag_mode.none": "brez {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Nastavitve",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} je vzljubil/a vaš status",
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Te objave ni mogoče spodbuditi",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopiraj povezavo do statusa",
-  "status.cw": "Warning:",
   "status.delete": "Izbriši",
   "status.detailed_status": "Podroben pogled pogovora",
   "status.direct": "Neposredno sporočilo @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Vgradi",
   "status.favourite": "Priljubljen",
   "status.filtered": "Filtrirano",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Naloži več",
   "status.media_hidden": "Mediji so skriti",
   "status.mention": "Omeni @{name}",

app/soapbox/locales/sq.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Shtoni ose Hiqni prej listash",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Raportojeni @{name}",
   "account.requested": "Në pritje të miratimit. Klikoni që të anulohet kërkesa për ndjekje",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
   "account.show_reblogs": "Shfaq përforcime nga @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Mbrapsht",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "dhe {additional}",
   "hashtag.column_header.tag_mode.any": "ose {additional}",
   "hashtag.column_header.tag_mode.none": "pa {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Parapëlqime",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} parapëlqeu gjendjen tuaj",
   "notification.follow": "{name} zuri t’ju ndjekë",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ky postim s’mund të përforcohet",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopjoje lidhjen te gjendje",
-  "status.cw": "Warning:",
   "status.delete": "Fshije",
   "status.detailed_status": "Pamje e hollësishme bisede",
   "status.direct": "Mesazh i drejtpërdrejt për @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Trupëzim",
   "status.favourite": "I parapëlqyer",
   "status.filtered": "I filtruar",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Ngarko më tepër",
   "status.media_hidden": "Me media të fshehur",
   "status.mention": "Përmendni @{name}",

app/soapbox/locales/sr-Latn.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Bot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čekam odobrenje. Kliknite da poništite zahtev za praćenje",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Podeli profil korisnika @{name}",
   "account.show_reblogs": "Prikaži podrške od korisnika @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Nazad",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Podešavanja",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} je stavio Vaš status kao omiljeni",
   "notification.follow": "{name} Vas je zapratio",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Ovaj status ne može da se podrži",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Obriši",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Ugradi na sajt",
   "status.favourite": "Omiljeno",
   "status.filtered": "Filtered",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Učitaj još",
   "status.media_hidden": "Multimedija sakrivena",
   "status.mention": "Pomeni korisnika @{name}",

app/soapbox/locales/sr.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Бот",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Пријави @{name}",
   "account.requested": "Чекам одобрење. Кликните да поништите захтев за праћење",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Подели профил корисника @{name}",
   "account.show_reblogs": "Прикажи подршке од корисника @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Назад",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Подешавања",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени",
   "notification.follow": "{name} Вас је запратио/ла",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Овај статус не може да се подржи",
   "status.chat": "Chat with @{name}",
   "status.copy": "Copy link to post",
-  "status.cw": "Warning:",
   "status.delete": "Обриши",
   "status.detailed_status": "Детаљни преглед разговора",
   "status.direct": "Директна порука @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Угради на сајт",
   "status.favourite": "Омиљено",
   "status.filtered": "Филтрирано",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Учитај још",
   "status.media_hidden": "Мултимедија сакривена",
   "status.mention": "Помени корисника @{name}",

app/soapbox/locales/sv.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "Lägg till eller ta bort från listor",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "Robot",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Rapportera @{name}",
   "account.requested": "Inväntar godkännande. Klicka för att avbryta följförfrågan",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "Dela @{name}s profil",
   "account.show_reblogs": "Visa knuffar från @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "Tillbaka",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "och {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "Inställningar",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} favoriserade din status",
   "notification.follow": "{name} följer dig",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "Detta inlägg kan inte knuffas",
   "status.chat": "Chat with @{name}",
   "status.copy": "Kopiera länk till status",
-  "status.cw": "Warning:",
   "status.delete": "Ta bort",
   "status.detailed_status": "Detaljerad samtalsvy",
   "status.direct": "Direktmeddela @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "Bädda in",
   "status.favourite": "Favorit",
   "status.filtered": "Filtrerat",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "Ladda fler",
   "status.media_hidden": "Media dold",
   "status.mention": "Omnämn @{name}",

app/soapbox/locales/ta.json

@@ -4,7 +4,6 @@
   "accordion.expand": "Expand",
   "account.about": "About",
   "account.add_or_remove_from_list": "பட்டியல்களில் இருந்து சேர் அல்லது நீக்குக",
-  "account.awaiting_approval": "Awaiting approval",
   "account.badges.bot": "பாட்",
   "account.birthday": "Born {date}",
   "account.birthday_today": "Birthday is today!",
@@ -50,6 +49,7 @@
   "account.remove_from_followers": "Remove this follower",
   "account.report": "Report @{name}",
   "account.requested": "ஒப்புதலுக்காக காத்திருக்கிறது. கோரிக்கையை ரத்துசெய்ய கிளிக் செய்க",
+  "account.requested_small": "Awaiting approval",
   "account.search": "Search from @{name}",
   "account.share": "பங்கிடு @{name}'s மனித முகத்தின்",
   "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
@@ -238,7 +238,6 @@
   "column.filters.delete_error": "Error deleting filter",
   "column.filters.drop_header": "Drop instead of hide",
   "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed",
-  "column.filters.drop_notifications": "Will also hide status in notifications",
   "column.filters.expires": "Expire after",
   "column.filters.expires_hint": "Expiration dates are not currently supported",
   "column.filters.home_timeline": "Home timeline",
@@ -275,9 +274,6 @@
   "column.search": "Search",
   "column.settings_store": "Settings store",
   "column.soapbox_config": "Soapbox config",
-  "column.tags": "Followed hashtags",
-  "column.tags.empty": "You don't follow any hashtag yet.",
-  "column.tags.see": "See",
   "column.test": "Test timeline",
   "column_back_button.label": "ஆதரி",
   "column_forbidden.body": "You do not have permission to access this page.",
@@ -540,6 +536,9 @@
   "feed_suggestions.heading": "Suggested profiles",
   "feed_suggestions.view_all": "View all",
   "filters.added": "Filter added.",
+  "filters.context_header": "Filter contexts",
+  "filters.context_hint": "One or multiple contexts where the filter should apply",
+  "filters.filters_list_context_label": "Filter contexts:",
   "filters.filters_list_delete": "Delete",
   "filters.filters_list_details_label": "Filter settings:",
   "filters.filters_list_drop": "Drop",
@@ -577,9 +576,6 @@
   "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
   "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
   "hashtag.column_header.tag_mode.none": "இல்லாமல் {additional}",
-  "hashtag_timeline.follow": "Follow this tag",
-  "hashtag_timeline.loading": "Loading...",
-  "hashtag_timeline.unfollow": "Unfollow tag",
   "header.home.label": "Home",
   "header.login.forgot_password": "Forgot password?",
   "header.login.label": "Log in",
@@ -733,7 +729,6 @@
   "navigation_bar.preferences": "விருப்பங்கள்",
   "navigation_bar.profile_directory": "Profile directory",
   "navigation_bar.soapbox_config": "Soapbox config",
-  "navigation_bar.tags": "Hashtags",
   "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை",
   "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்",
   "notification.follow_request": "{name} has requested to follow you",
@@ -1062,7 +1057,6 @@
   "status.cannot_reblog": "இந்த இடுகை அதிகரிக்க முடியாது",
   "status.chat": "Chat with @{name}",
   "status.copy": "நிலைக்கு இணைப்பை நகலெடு",
-  "status.cw": "Warning:",
   "status.delete": "Delete",
   "status.detailed_status": "விரிவான உரையாடல் காட்சி",
   "status.direct": "நேரடி செய்தி @{name}",
@@ -1070,7 +1064,6 @@
   "status.embed": "கிடத்து",
   "status.favourite": "விருப்பத்துக்குகந்த",
   "status.filtered": "வடிகட்டு",
-  "status.filtered-hint": "Status was hidden by filter settings",
   "status.load_more": "அதிகமாய் ஏற்று",
   "status.media_hidden": "மீடியா மறைக்கப்பட்டது",
   "status.mention": "குறிப்பிடு @{name}",