From bcac58b9c386733c2dd82a18d40079f832d6a4d8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 29 Jun 2023 15:10:45 -0500
Subject: [PATCH 01/27] Redirect to login when groups or accounts 403

---
 app/soapbox/api/hooks/accounts/useAccount.ts    | 13 ++++++++++++-
 .../api/hooks/accounts/useAccountLookup.ts      | 13 ++++++++++++-
 app/soapbox/api/hooks/groups/useGroup.ts        | 13 ++++++++++++-
 app/soapbox/api/hooks/groups/useGroupLookup.ts  | 17 +++++++++++++++--
 app/soapbox/entity-store/hooks/useEntity.ts     | 12 ++++++++++--
 .../entity-store/hooks/useEntityLookup.ts       |  8 ++++++--
 app/soapbox/features/ui/index.tsx               |  2 +-
 7 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/app/soapbox/api/hooks/accounts/useAccount.ts b/app/soapbox/api/hooks/accounts/useAccount.ts
index ac756f6ca..468049441 100644
--- a/app/soapbox/api/hooks/accounts/useAccount.ts
+++ b/app/soapbox/api/hooks/accounts/useAccount.ts
@@ -1,3 +1,6 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntity } from 'soapbox/entity-store/hooks';
 import { useFeatures, useLoggedIn } from 'soapbox/hooks';
@@ -12,11 +15,12 @@ interface UseAccountOpts {
 
 function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
   const api = useApi();
+  const history = useHistory();
   const features = useFeatures();
   const { me } = useLoggedIn();
   const { withRelationship } = opts;
 
-  const { entity: account, ...result } = useEntity<Account>(
+  const { entity: account, isUnauthorized, ...result } = useEntity<Account>(
     [Entities.ACCOUNTS, accountId!],
     () => api.get(`/api/v1/accounts/${accountId}`),
     { schema: accountSchema, enabled: !!accountId },
@@ -30,10 +34,17 @@ function useAccount(accountId?: string, opts: UseAccountOpts = {}) {
   const isBlocked = account?.relationship?.blocked_by === true;
   const isUnavailable = (me === account?.id) ? false : (isBlocked && !features.blockersVisible);
 
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
   return {
     ...result,
     isLoading: result.isLoading,
     isRelationshipLoading,
+    isUnauthorized,
     isUnavailable,
     account: account ? { ...account, relationship } : undefined,
   };
diff --git a/app/soapbox/api/hooks/accounts/useAccountLookup.ts b/app/soapbox/api/hooks/accounts/useAccountLookup.ts
index dc7f2fb29..ffe5885de 100644
--- a/app/soapbox/api/hooks/accounts/useAccountLookup.ts
+++ b/app/soapbox/api/hooks/accounts/useAccountLookup.ts
@@ -1,3 +1,6 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntityLookup } from 'soapbox/entity-store/hooks';
 import { useFeatures, useLoggedIn } from 'soapbox/hooks';
@@ -13,10 +16,11 @@ interface UseAccountLookupOpts {
 function useAccountLookup(acct: string | undefined, opts: UseAccountLookupOpts = {}) {
   const api = useApi();
   const features = useFeatures();
+  const history = useHistory();
   const { me } = useLoggedIn();
   const { withRelationship } = opts;
 
-  const { entity: account, ...result } = useEntityLookup<Account>(
+  const { entity: account, isUnauthorized, ...result } = useEntityLookup<Account>(
     Entities.ACCOUNTS,
     (account) => account.acct === acct,
     () => api.get(`/api/v1/accounts/lookup?acct=${acct}`),
@@ -31,10 +35,17 @@ function useAccountLookup(acct: string | undefined, opts: UseAccountLookupOpts =
   const isBlocked = account?.relationship?.blocked_by === true;
   const isUnavailable = (me === account?.id) ? false : (isBlocked && !features.blockersVisible);
 
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
   return {
     ...result,
     isLoading: result.isLoading,
     isRelationshipLoading,
+    isUnauthorized,
     isUnavailable,
     account: account ? { ...account, relationship } : undefined,
   };
diff --git a/app/soapbox/api/hooks/groups/useGroup.ts b/app/soapbox/api/hooks/groups/useGroup.ts
index 5eb6147d2..9efafb13c 100644
--- a/app/soapbox/api/hooks/groups/useGroup.ts
+++ b/app/soapbox/api/hooks/groups/useGroup.ts
@@ -1,3 +1,6 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntity } from 'soapbox/entity-store/hooks';
 import { useApi } from 'soapbox/hooks';
@@ -7,8 +10,9 @@ import { useGroupRelationship } from './useGroupRelationship';
 
 function useGroup(groupId: string, refetch = true) {
   const api = useApi();
+  const history = useHistory();
 
-  const { entity: group, ...result } = useEntity<Group>(
+  const { entity: group, isUnauthorized, ...result } = useEntity<Group>(
     [Entities.GROUPS, groupId],
     () => api.get(`/api/v1/groups/${groupId}`),
     {
@@ -19,8 +23,15 @@ function useGroup(groupId: string, refetch = true) {
   );
   const { groupRelationship: relationship } = useGroupRelationship(groupId);
 
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
   return {
     ...result,
+    isUnauthorized,
     group: group ? { ...group, relationship: relationship || null } : undefined,
   };
 }
diff --git a/app/soapbox/api/hooks/groups/useGroupLookup.ts b/app/soapbox/api/hooks/groups/useGroupLookup.ts
index 3e66f72c6..e3a979777 100644
--- a/app/soapbox/api/hooks/groups/useGroupLookup.ts
+++ b/app/soapbox/api/hooks/groups/useGroupLookup.ts
@@ -1,24 +1,37 @@
+import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntityLookup } from 'soapbox/entity-store/hooks';
 import { useApi } from 'soapbox/hooks/useApi';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
 import { groupSchema } from 'soapbox/schemas';
 
 import { useGroupRelationship } from './useGroupRelationship';
 
 function useGroupLookup(slug: string) {
   const api = useApi();
+  const features = useFeatures();
+  const history = useHistory();
 
-  const { entity: group, ...result } = useEntityLookup(
+  const { entity: group, isUnauthorized, ...result } = useEntityLookup(
     Entities.GROUPS,
     (group) => group.slug === slug,
     () => api.get(`/api/v1/groups/lookup?name=${slug}`),
-    { schema: groupSchema, enabled: !!slug },
+    { schema: groupSchema, enabled: features.groups && !!slug },
   );
 
   const { groupRelationship: relationship } = useGroupRelationship(group?.id);
 
+  useEffect(() => {
+    if (isUnauthorized) {
+      history.push('/login');
+    }
+  }, [isUnauthorized]);
+
   return {
     ...result,
+    isUnauthorized,
     entity: group ? { ...group, relationship: relationship || null } : undefined,
   };
 }
diff --git a/app/soapbox/entity-store/hooks/useEntity.ts b/app/soapbox/entity-store/hooks/useEntity.ts
index 3d57c8ab0..b9b9f001f 100644
--- a/app/soapbox/entity-store/hooks/useEntity.ts
+++ b/app/soapbox/entity-store/hooks/useEntity.ts
@@ -1,4 +1,5 @@
-import { useEffect } from 'react';
+import { AxiosError } from 'axios';
+import { useEffect, useState } from 'react';
 import z from 'zod';
 
 import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
@@ -24,6 +25,8 @@ function useEntity<TEntity extends Entity>(
   opts: UseEntityOpts<TEntity> = {},
 ) {
   const [isFetching, setPromise] = useLoading(true);
+  const [error, setError] = useState<unknown>();
+
   const dispatch = useAppDispatch();
 
   const [entityType, entityId] = path;
@@ -35,6 +38,7 @@ function useEntity<TEntity extends Entity>(
 
   const isEnabled = opts.enabled ?? true;
   const isLoading = isFetching && !entity;
+  const isLoaded = !isFetching && !!entity;
 
   const fetchEntity = async () => {
     try {
@@ -42,7 +46,7 @@ function useEntity<TEntity extends Entity>(
       const entity = schema.parse(response.data);
       dispatch(importEntities([entity], entityType));
     } catch (e) {
-      // do nothing
+      setError(e);
     }
   };
 
@@ -58,6 +62,10 @@ function useEntity<TEntity extends Entity>(
     fetchEntity,
     isFetching,
     isLoading,
+    isLoaded,
+    error,
+    isUnauthorized: error instanceof AxiosError && error.response?.status === 401,
+    isForbidden: error instanceof AxiosError && error.response?.status === 403,
   };
 }
 
diff --git a/app/soapbox/entity-store/hooks/useEntityLookup.ts b/app/soapbox/entity-store/hooks/useEntityLookup.ts
index 73b2ef938..29cf85244 100644
--- a/app/soapbox/entity-store/hooks/useEntityLookup.ts
+++ b/app/soapbox/entity-store/hooks/useEntityLookup.ts
@@ -1,4 +1,5 @@
-import { useEffect } from 'react';
+import { AxiosError } from 'axios';
+import { useEffect, useState } from 'react';
 import { z } from 'zod';
 
 import { useAppDispatch, useAppSelector, useLoading } from 'soapbox/hooks';
@@ -23,6 +24,7 @@ function useEntityLookup<TEntity extends Entity>(
 
   const dispatch = useAppDispatch();
   const [isFetching, setPromise] = useLoading(true);
+  const [error, setError] = useState<unknown>();
 
   const entity = useAppSelector(state => findEntity(state, entityType, lookupFn));
   const isEnabled = opts.enabled ?? true;
@@ -34,7 +36,7 @@ function useEntityLookup<TEntity extends Entity>(
       const entity = schema.parse(response.data);
       dispatch(importEntities([entity], entityType));
     } catch (e) {
-      // do nothing
+      setError(e);
     }
   };
 
@@ -51,6 +53,8 @@ function useEntityLookup<TEntity extends Entity>(
     fetchEntity,
     isFetching,
     isLoading,
+    isUnauthorized: error instanceof AxiosError && error.response?.status === 401,
+    isForbidden: error instanceof AxiosError && error.response?.status === 403,
   };
 }
 
diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx
index 847b29d26..6b81e38d5 100644
--- a/app/soapbox/features/ui/index.tsx
+++ b/app/soapbox/features/ui/index.tsx
@@ -327,7 +327,7 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
 
       {features.groupsTags && <WrappedRoute path='/group/:groupSlug/tags' exact page={GroupPage} component={GroupTagsSlug} content={children} />}
       {features.groupsTags && <WrappedRoute path='/group/:groupSlug/tag/:tagId' exact page={GroupsPendingPage} component={GroupTagTimelineSlug} content={children} />}
-      {features.groups && <WrappedRoute path='/group/:groupSlug' exact page={GroupPage} component={GroupTimelineSlug} content={children} />}
+      {features.groups && <WrappedRoute path='/group/:groupSlug' publicRoute exact page={GroupPage} component={GroupTimelineSlug} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug/members' exact page={GroupPage} component={GroupMembersSlug} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug/media' publicRoute={!authenticatedProfile} component={GroupGallerySlug} page={GroupPage} content={children} />}
       {features.groups && <WrappedRoute path='/group/:groupSlug/manage' exact page={ManageGroupsPage} component={ManageGroupSlug} content={children} />}

From a9db41de89cdfcfabf469c938c903790b17d5934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 5 Jul 2023 21:39:50 +0200
Subject: [PATCH 02/27] Use AvatarPicker/HeaderPicker on Edit Profile page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../api/hooks/groups/useUpdateGroup.ts        |  6 +-
 app/soapbox/components/still-image.tsx        |  2 +-
 .../components/avatar-picker.tsx}             | 18 ++--
 .../components/header-picker.tsx}             | 26 ++++--
 .../components/profile-preview.tsx            | 49 -----------
 app/soapbox/features/edit-profile/index.tsx   | 85 ++++++-------------
 app/soapbox/features/group/edit-group.tsx     |  9 +-
 .../manage-group-modal/steps/details-step.tsx |  8 +-
 app/soapbox/hooks/forms/useImageField.ts      | 10 ++-
 app/soapbox/hooks/forms/usePreview.ts         |  2 +-
 10 files changed, 79 insertions(+), 136 deletions(-)
 rename app/soapbox/features/{group/components/group-avatar-picker.tsx => edit-profile/components/avatar-picker.tsx} (61%)
 rename app/soapbox/features/{group/components/group-header-picker.tsx => edit-profile/components/header-picker.tsx} (64%)
 delete mode 100644 app/soapbox/features/edit-profile/components/profile-preview.tsx

diff --git a/app/soapbox/api/hooks/groups/useUpdateGroup.ts b/app/soapbox/api/hooks/groups/useUpdateGroup.ts
index bb3a37dc2..eb69670b1 100644
--- a/app/soapbox/api/hooks/groups/useUpdateGroup.ts
+++ b/app/soapbox/api/hooks/groups/useUpdateGroup.ts
@@ -6,8 +6,8 @@ import { groupSchema } from 'soapbox/schemas';
 interface UpdateGroupParams {
   display_name?: string
   note?: string
-  avatar?: File
-  header?: File
+  avatar?: File | '' | null
+  header?: File | '' | null
   group_visibility?: string
   discoverable?: boolean
   tags?: string[]
@@ -30,4 +30,4 @@ function useUpdateGroup(groupId: string) {
   };
 }
 
-export { useUpdateGroup };
\ No newline at end of file
+export { useUpdateGroup };
diff --git a/app/soapbox/components/still-image.tsx b/app/soapbox/components/still-image.tsx
index cdebaf359..4a3caf01e 100644
--- a/app/soapbox/components/still-image.tsx
+++ b/app/soapbox/components/still-image.tsx
@@ -67,7 +67,7 @@ const StillImage: React.FC<IStillImage> = ({ alt, className, src, style, letterb
         <canvas
           ref={canvas}
           className={clsx(baseClassName, {
-            'group-hover:invisible': hoverToPlay,
+            'absolute group-hover:invisible top-0': hoverToPlay,
           })}
         />
       )}
diff --git a/app/soapbox/features/group/components/group-avatar-picker.tsx b/app/soapbox/features/edit-profile/components/avatar-picker.tsx
similarity index 61%
rename from app/soapbox/features/group/components/group-avatar-picker.tsx
rename to app/soapbox/features/edit-profile/components/avatar-picker.tsx
index b13dfe80e..09a6b0d29 100644
--- a/app/soapbox/features/group/components/group-avatar-picker.tsx
+++ b/app/soapbox/features/edit-profile/components/avatar-picker.tsx
@@ -1,19 +1,25 @@
 import clsx from 'clsx';
 import React from 'react';
+import { FormattedMessage } from 'react-intl';
 
-import Icon from 'soapbox/components/icon';
-import { Avatar, HStack } from 'soapbox/components/ui';
+import { Avatar, Icon, HStack } from 'soapbox/components/ui';
 
 interface IMediaInput {
+  className?: string
   src: string | undefined
   accept: string
   onChange: React.ChangeEventHandler<HTMLInputElement>
   disabled?: boolean
 }
 
-const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
+const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ className, src, onChange, accept, disabled }, ref) => {
   return (
-    <label className='absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-500 ring-2 ring-white dark:ring-primary-900'>
+    <label
+      className={clsx(
+        'absolute bottom-0 left-1/2 h-20 w-20 -translate-x-1/2 translate-y-1/2 cursor-pointer rounded-full bg-primary-500 ring-2 ring-white dark:ring-primary-900',
+        className,
+      )}
+    >
       {src && <Avatar src={src} size={80} />}
       <HStack
         alignItems='center'
@@ -28,7 +34,7 @@ const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
           className='h-5 w-5 text-white'
         />
       </HStack>
-      <span className='sr-only'>Upload avatar</span>
+      <span className='sr-only'><FormattedMessage id='group.upload_avatar' defaultMessage='Upload avatar' /></span>
       <input
         ref={ref}
         name='avatar'
@@ -42,4 +48,4 @@ const AvatarPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
   );
 });
 
-export default AvatarPicker;
\ No newline at end of file
+export default AvatarPicker;
diff --git a/app/soapbox/features/group/components/group-header-picker.tsx b/app/soapbox/features/edit-profile/components/header-picker.tsx
similarity index 64%
rename from app/soapbox/features/group/components/group-header-picker.tsx
rename to app/soapbox/features/edit-profile/components/header-picker.tsx
index d2457ac1e..bb3b72054 100644
--- a/app/soapbox/features/group/components/group-header-picker.tsx
+++ b/app/soapbox/features/edit-profile/components/header-picker.tsx
@@ -1,21 +1,28 @@
 import clsx from 'clsx';
 import React from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
-import Icon from 'soapbox/components/icon';
-import { HStack, Text } from 'soapbox/components/ui';
+import { HStack, Icon, IconButton, Text } from 'soapbox/components/ui';
+
+const messages = defineMessages({
+  title: { id: 'group.upload_banner.title', defaultMessage: 'Upload background picture' },
+});
 
 interface IMediaInput {
   src: string | undefined
   accept: string
   onChange: React.ChangeEventHandler<HTMLInputElement>
+  onClear?: () => void
   disabled?: boolean
 }
 
-const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, accept, disabled }, ref) => {
+const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, onClear, accept, disabled }, ref) => {
+  const intl = useIntl();
+
   return (
     <label
       className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow'
+      title={intl.formatMessage(messages.title)}
     >
       {src && <img className='h-full w-full object-cover' src={src} alt='' />}
       <HStack
@@ -45,8 +52,17 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
           className='hidden'
         />
       </HStack>
+      {onClear && src && (
+        <IconButton
+          onClick={onClear}
+          src={require('@tabler/icons/x.svg')}
+          theme='dark'
+          className='absolute right-2 top-2 z-10 hover:scale-105 hover:bg-gray-900'
+          iconClassName='h-5 w-5'
+        />
+      )}
     </label>
   );
 });
 
-export default HeaderPicker;
\ No newline at end of file
+export default HeaderPicker;
diff --git a/app/soapbox/features/edit-profile/components/profile-preview.tsx b/app/soapbox/features/edit-profile/components/profile-preview.tsx
deleted file mode 100644
index 1edead4dc..000000000
--- a/app/soapbox/features/edit-profile/components/profile-preview.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import React from 'react';
-
-import StillImage from 'soapbox/components/still-image';
-import { Avatar, HStack, Stack, Text } from 'soapbox/components/ui';
-import VerificationBadge from 'soapbox/components/verification-badge';
-import { useSoapboxConfig } from 'soapbox/hooks';
-
-import type { Account } from 'soapbox/types/entities';
-
-interface IProfilePreview {
-  account: Pick<Account, 'acct' | 'fqn' | 'avatar' | 'header' | 'verified' | 'display_name_html'>
-}
-
-/** Displays a preview of the user's account, including avatar, banner, etc. */
-const ProfilePreview: React.FC<IProfilePreview> = ({ account }) => {
-  const { displayFqn } = useSoapboxConfig();
-
-  return (
-    <div className='dark:sm:shadow-inset overflow-hidden rounded-lg bg-white text-black dark:bg-gray-800 dark:text-white sm:shadow'>
-      <div className='relative isolate h-32 w-full overflow-hidden bg-gray-200 dark:bg-gray-900/50 md:rounded-t-lg'>
-        <StillImage src={account.header} />
-      </div>
-
-      <HStack space={3} alignItems='center' className='p-3'>
-        <div className='relative'>
-          <Avatar className='bg-gray-400' src={account.avatar} />
-
-          {account.verified && (
-            <div className='absolute -right-1.5 -top-1.5'>
-              <VerificationBadge />
-            </div>
-          )}
-        </div>
-
-        <Stack className='truncate'>
-          <Text
-            weight='medium'
-            size='sm'
-            truncate
-            dangerouslySetInnerHTML={{ __html: account.display_name_html }}
-          />
-          <Text theme='muted' size='sm'>@{displayFqn ? account.fqn : account.acct}</Text>
-        </Stack>
-      </HStack>
-    </div>
-  );
-};
-
-export default ProfilePreview;
diff --git a/app/soapbox/features/edit-profile/index.tsx b/app/soapbox/features/edit-profile/index.tsx
index eef30bfd3..7669a8682 100644
--- a/app/soapbox/features/edit-profile/index.tsx
+++ b/app/soapbox/features/edit-profile/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useState, useEffect } from 'react';
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
 import { updateNotificationSettings } from 'soapbox/actions/accounts';
@@ -8,7 +8,6 @@ import List, { ListItem } from 'soapbox/components/list';
 import {
   Button,
   Column,
-  FileInput,
   Form,
   FormActions,
   FormGroup,
@@ -18,16 +17,21 @@ import {
   Textarea,
   Toggle,
 } from 'soapbox/components/ui';
-import { useAppDispatch, useOwnAccount, useFeatures, useInstance } from 'soapbox/hooks';
-import { accountSchema } from 'soapbox/schemas';
+import { useAppDispatch, useOwnAccount, useFeatures, useInstance, useAppSelector } from 'soapbox/hooks';
+import { useImageField } from 'soapbox/hooks/forms';
 import toast from 'soapbox/toast';
-import resizeImage from 'soapbox/utils/resize-image';
+import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
-import ProfilePreview from './components/profile-preview';
+import AvatarPicker from './components/avatar-picker';
+import HeaderPicker from './components/header-picker';
 
+import type { List as ImmutableList } from 'immutable';
 import type { StreamfieldComponent } from 'soapbox/components/ui/streamfield/streamfield';
 import type { Account } from 'soapbox/schemas';
 
+const nonDefaultAvatar = (url: string | undefined) => url && isDefaultAvatar(url) ? undefined : url;
+const nonDefaultHeader = (url: string | undefined) => url && isDefaultHeader(url) ? undefined : url;
+
 /**
  * Whether the user is hiding their follows and/or followers.
  * Pleroma's config is granular, but we simplify it into one setting.
@@ -88,9 +92,9 @@ interface AccountCredentials {
   /** The account bio. */
   note?: string
   /** Avatar image encoded using multipart/form-data */
-  avatar?: File
+  avatar?: File | ''
   /** Header image encoded using multipart/form-data */
-  header?: File
+  header?: File | ''
   /** Whether manual approval of follow requests is required. */
   locked?: boolean
   /** Private information (settings) about the account. */
@@ -181,10 +185,17 @@ const EditProfile: React.FC = () => {
   const features = useFeatures();
   const maxFields = instance.pleroma.getIn(['metadata', 'fields_limits', 'max_fields'], 4) as number;
 
+  const attachmentTypes = useAppSelector(
+    state => state.instance.configuration.getIn(['media_attachments', 'supported_mime_types']) as ImmutableList<string>,
+  )?.filter(type => type.startsWith('image/')).toArray().join(',');
+
   const [isLoading, setLoading] = useState(false);
   const [data, setData] = useState<AccountCredentials>({});
   const [muteStrangers, setMuteStrangers] = useState(false);
 
+  const avatar = useImageField({ maxPixels: 400 * 400, preview: nonDefaultAvatar(account?.avatar) });
+  const header = useImageField({ maxPixels: 1920 * 1080, preview: nonDefaultHeader(account?.header) });
+
   useEffect(() => {
     if (account) {
       const credentials = accountToCredentials(account);
@@ -206,6 +217,8 @@ const EditProfile: React.FC = () => {
 
     const params = { ...data };
     if (params.fields_attributes?.length === 0) params.fields_attributes = [{ name: '', value: '' }];
+    if (header.file !== undefined) params.header = header.file || '';
+    if (avatar.file !== undefined) params.avatar = avatar.file || '';
 
     promises.push(dispatch(patchMe(params, true)));
 
@@ -259,20 +272,6 @@ const EditProfile: React.FC = () => {
     });
   };
 
-  const handleFileChange = (
-    name: keyof AccountCredentials,
-    maxPixels: number,
-  ): React.ChangeEventHandler<HTMLInputElement> => {
-    return e => {
-      const f = e.target.files?.item(0);
-      if (!f) return;
-
-      resizeImage(f, maxPixels).then(file => {
-        updateData(name, file);
-      }).catch(console.error);
-    };
-  };
-
   const handleFieldsChange = (fields: AccountCredentialsField[]) => {
     updateData('fields_attributes', fields);
   };
@@ -290,48 +289,12 @@ const EditProfile: React.FC = () => {
     updateData('fields_attributes', fields);
   };
 
-  /** Memoized avatar preview URL. */
-  const avatarUrl = useMemo(() => {
-    return data.avatar ? URL.createObjectURL(data.avatar) : account?.avatar;
-  }, [data.avatar, account?.avatar]);
-
-  /** Memoized header preview URL. */
-  const headerUrl = useMemo(() => {
-    return data.header ? URL.createObjectURL(data.header) : account?.header;
-  }, [data.header, account?.header]);
-
-  /** Preview account data. */
-  const previewAccount = useMemo(() => {
-    return accountSchema.parse({
-      id: '1',
-      ...account,
-      ...data,
-      avatar: avatarUrl,
-      header: headerUrl,
-    });
-  }, [account?.id, data.display_name, avatarUrl, headerUrl]);
-
   return (
     <Column label={intl.formatMessage(messages.header)}>
       <Form onSubmit={handleSubmit}>
-        <div className='grid grid-cols-1 gap-4 md:grid-cols-2'>
-          <ProfilePreview account={previewAccount} />
-
-          <div className='space-y-4'>
-            <FormGroup
-              labelText={<FormattedMessage id='edit_profile.fields.header_label' defaultMessage='Choose Background Picture' />}
-              hintText={<FormattedMessage id='edit_profile.hints.header' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '1920x1080px' }} />}
-            >
-              <FileInput onChange={handleFileChange('header', 1920 * 1080)} />
-            </FormGroup>
-
-            <FormGroup
-              labelText={<FormattedMessage id='edit_profile.fields.avatar_label' defaultMessage='Choose Profile Picture' />}
-              hintText={<FormattedMessage id='edit_profile.hints.avatar' defaultMessage='PNG, GIF or JPG. Will be downscaled to {size}' values={{ size: '400x400px' }} />}
-            >
-              <FileInput onChange={handleFileChange('avatar', 400 * 400)} />
-            </FormGroup>
-          </div>
+        <div className='relative mb-12 flex'>
+          <HeaderPicker accept={attachmentTypes} disabled={isLoading} {...header} />
+          <AvatarPicker className='!sm:left-6 !left-4 !translate-x-0' accept={attachmentTypes} disabled={isLoading} {...avatar} />
         </div>
 
         <FormGroup
diff --git a/app/soapbox/features/group/edit-group.tsx b/app/soapbox/features/group/edit-group.tsx
index 82f4841b4..94bbee1e1 100644
--- a/app/soapbox/features/group/edit-group.tsx
+++ b/app/soapbox/features/group/edit-group.tsx
@@ -8,8 +8,9 @@ import { useImageField, useTextField } from 'soapbox/hooks/forms';
 import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';
 
-import AvatarPicker from './components/group-avatar-picker';
-import HeaderPicker from './components/group-header-picker';
+import AvatarPicker from '../edit-profile/components/avatar-picker';
+import HeaderPicker from '../edit-profile/components/header-picker';
+
 import GroupTagsField from './components/group-tags-field';
 
 import type { List as ImmutableList } from 'immutable';
@@ -60,8 +61,8 @@ const EditGroup: React.FC<IEditGroup> = ({ params: { groupId } }) => {
     await updateGroup({
       display_name: displayName.value,
       note: note.value,
-      avatar: avatar.file,
-      header: header.file,
+      avatar: avatar.file === null ? '' : avatar.file,
+      header: header.file === null ? '' : header.file,
       tags,
     }, {
       onSuccess() {
diff --git a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
index 02dbf3279..0bf6fc325 100644
--- a/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
+++ b/app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx
@@ -3,8 +3,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { CreateGroupParams, useGroupValidation } from 'soapbox/api/hooks';
 import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
-import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
-import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
+import AvatarPicker from 'soapbox/features/edit-profile/components/avatar-picker';
+import HeaderPicker from 'soapbox/features/edit-profile/components/header-picker';
 import GroupTagsField from 'soapbox/features/group/components/group-tags-field';
 import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
 import { usePreview } from 'soapbox/hooks/forms';
@@ -66,6 +66,8 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
     };
   };
 
+  const handleImageClear = (property: keyof CreateGroupParams) => () => onChange({ [property]: undefined });
+
   const handleTagsChange = (tags: string[]) => {
     onChange({
       ...params,
@@ -92,7 +94,7 @@ const DetailsStep: React.FC<IDetailsStep> = ({ params, onChange }) => {
   return (
     <Form>
       <div className='relative mb-12 flex'>
-        <HeaderPicker src={headerSrc} accept={attachmentTypes} onChange={handleImageChange('header', 1920 * 1080)} />
+        <HeaderPicker src={headerSrc} accept={attachmentTypes} onChange={handleImageChange('header', 1920 * 1080)} onClear={handleImageClear('header')} />
         <AvatarPicker src={avatarSrc} accept={attachmentTypes} onChange={handleImageChange('avatar', 400 * 400)} />
       </div>
 
diff --git a/app/soapbox/hooks/forms/useImageField.ts b/app/soapbox/hooks/forms/useImageField.ts
index 7afe31f87..704ea45d4 100644
--- a/app/soapbox/hooks/forms/useImageField.ts
+++ b/app/soapbox/hooks/forms/useImageField.ts
@@ -13,8 +13,9 @@ interface UseImageFieldOpts {
 
 /** Returns props for `<input type="file">`, and optionally resizes the file. */
 function useImageField(opts: UseImageFieldOpts = {}) {
-  const [file, setFile] = useState<File>();
-  const src = usePreview(file) || opts.preview;
+  const [file, setFile] = useState<File | null>();
+  const src = usePreview(file) || (file === null ? undefined : opts.preview);
+  console.log(file, src);
 
   const onChange: React.ChangeEventHandler<HTMLInputElement> = async ({ target: { files } }) => {
     const file = files?.item(0);
@@ -27,12 +28,15 @@ function useImageField(opts: UseImageFieldOpts = {}) {
     }
   };
 
+  const onClear = () => setFile(null);
+
   return {
     src,
     file,
     onChange,
+    onClear,
   };
 }
 
 export { useImageField };
-export type { UseImageFieldOpts };
\ No newline at end of file
+export type { UseImageFieldOpts };
diff --git a/app/soapbox/hooks/forms/usePreview.ts b/app/soapbox/hooks/forms/usePreview.ts
index 272ea696e..dc928484d 100644
--- a/app/soapbox/hooks/forms/usePreview.ts
+++ b/app/soapbox/hooks/forms/usePreview.ts
@@ -9,4 +9,4 @@ function usePreview(file: File | null | undefined): string | undefined {
   }, [file]);
 }
 
-export { usePreview };
\ No newline at end of file
+export { usePreview };

From da42586ca5af95b45ccad08ae3053f1cf30f4447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Wed, 5 Jul 2023 21:49:56 +0200
Subject: [PATCH 03/27] Update en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/api/hooks/groups/useUpdateGroup.ts | 4 ++--
 app/soapbox/locales/en.json                    | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/api/hooks/groups/useUpdateGroup.ts b/app/soapbox/api/hooks/groups/useUpdateGroup.ts
index eb69670b1..b4ec0aa54 100644
--- a/app/soapbox/api/hooks/groups/useUpdateGroup.ts
+++ b/app/soapbox/api/hooks/groups/useUpdateGroup.ts
@@ -6,8 +6,8 @@ import { groupSchema } from 'soapbox/schemas';
 interface UpdateGroupParams {
   display_name?: string
   note?: string
-  avatar?: File | '' | null
-  header?: File | '' | null
+  avatar?: File | ''
+  header?: File | ''
   group_visibility?: string
   discoverable?: boolean
   tags?: string[]
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 123d02398..7b24fd610 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -580,7 +580,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Choose Profile Picture",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -589,7 +588,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Choose Background Picture",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -602,10 +600,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
@@ -838,7 +834,9 @@
   "group.unmute.long_label": "Unmute Group",
   "group.unmute.success": "Unmuted the group",
   "group.update.success": "Group successfully saved",
+  "group.upload_avatar": "Upload avatar",
   "group.upload_banner": "Upload photo",
+  "group.upload_banner.title": "Upload background picture",
   "groups.discover.popular.empty": "Unable to fetch popular groups at this time. Please check back later.",
   "groups.discover.popular.show_more": "Show More",
   "groups.discover.popular.title": "Popular Groups",

From 7c38f751f2731fd51dfb1470a58295abd824061d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 6 Jul 2023 13:22:15 +0200
Subject: [PATCH 04/27] Fix HeaderPicker/AvatarPicker for missing images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 .../features/edit-profile/components/header-picker.tsx    | 8 +++++++-
 app/soapbox/utils/accounts.ts                             | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/edit-profile/components/header-picker.tsx b/app/soapbox/features/edit-profile/components/header-picker.tsx
index bb3b72054..8339f95ff 100644
--- a/app/soapbox/features/edit-profile/components/header-picker.tsx
+++ b/app/soapbox/features/edit-profile/components/header-picker.tsx
@@ -19,6 +19,12 @@ interface IMediaInput {
 const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onChange, onClear, accept, disabled }, ref) => {
   const intl = useIntl();
 
+  const handleClear: React.MouseEventHandler<HTMLButtonElement> = (e) => {
+    e.stopPropagation();
+
+    onClear!();
+  };
+
   return (
     <label
       className='dark:sm:shadow-inset relative h-24 w-full cursor-pointer overflow-hidden rounded-lg bg-primary-100 text-primary-500 dark:bg-gray-800 dark:text-accent-blue sm:h-36 sm:shadow'
@@ -54,7 +60,7 @@ const HeaderPicker = React.forwardRef<HTMLInputElement, IMediaInput>(({ src, onC
       </HStack>
       {onClear && src && (
         <IconButton
-          onClick={onClear}
+          onClick={handleClear}
           src={require('@tabler/icons/x.svg')}
           theme='dark'
           className='absolute right-2 top-2 z-10 hover:scale-105 hover:bg-gray-900'
diff --git a/app/soapbox/utils/accounts.ts b/app/soapbox/utils/accounts.ts
index d8d946f9d..a51ed9aad 100644
--- a/app/soapbox/utils/accounts.ts
+++ b/app/soapbox/utils/accounts.ts
@@ -34,9 +34,10 @@ export const isLocal = (account: Pick<Account, 'acct'>): boolean => {
 export const isRemote = (account: Pick<Account, 'acct'>): boolean => !isLocal(account);
 
 /** Default header filenames from various backends */
-const DEFAULT_HEADERS = [
+const DEFAULT_HEADERS: string[] = [
   '/headers/original/missing.png', // Mastodon
   '/images/banner.png', // Pleroma
+  require('assets/images/header-missing.png'), // header not provided by backend
 ];
 
 /** Check if the avatar is a default avatar */
@@ -48,6 +49,7 @@ export const isDefaultHeader = (url: string) => {
 const DEFAULT_AVATARS = [
   '/avatars/original/missing.png', // Mastodon
   '/images/avi.png', // Pleroma
+  require('assets/images/avatar-missing.png'), // avatar not provided by backend
 ];
 
 /** Check if the avatar is a default avatar */

From 39eb76bc1819310201f6f6ff59ed703a061daa4a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 6 Jul 2023 11:14:34 -0500
Subject: [PATCH 05/27] Fix useGroupLookup test

---
 .../api/hooks/groups/__tests__/useGroupLookup.test.ts      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts b/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts
index 2397b16ce..6723aee78 100644
--- a/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts
+++ b/app/soapbox/api/hooks/groups/__tests__/useGroupLookup.test.ts
@@ -1,10 +1,11 @@
 import { __stub } from 'soapbox/api';
 import { buildGroup } from 'soapbox/jest/factory';
-import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
+import { renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
 
 import { useGroupLookup } from '../useGroupLookup';
 
 const group = buildGroup({ id: '1', slug: 'soapbox' });
+const state = rootState.setIn(['instance', 'version'], '3.4.1 (compatible; TruthSocial 1.0.0)');
 
 describe('useGroupLookup hook', () => {
   describe('with a successful request', () => {
@@ -15,7 +16,7 @@ describe('useGroupLookup hook', () => {
     });
 
     it('is successful', async () => {
-      const { result } = renderHook(() => useGroupLookup(group.slug));
+      const { result } = renderHook(() => useGroupLookup(group.slug), undefined, state);
 
       await waitFor(() => expect(result.current.isFetching).toBe(false));
 
@@ -31,7 +32,7 @@ describe('useGroupLookup hook', () => {
     });
 
     it('is has error state', async() => {
-      const { result } = renderHook(() => useGroupLookup(group.slug));
+      const { result } = renderHook(() => useGroupLookup(group.slug), undefined, state);
 
       await waitFor(() => expect(result.current.isFetching).toBe(false));
 

From 0e58f2b50522077154dd268c172a3c6e2a62a6d0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 6 Jul 2023 11:56:27 -0500
Subject: [PATCH 06/27] useAccountLookup, useGroupLookup: make lookup case
 insensitive Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1460

---
 app/soapbox/api/hooks/accounts/useAccountLookup.ts | 2 +-
 app/soapbox/api/hooks/groups/useGroupLookup.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/api/hooks/accounts/useAccountLookup.ts b/app/soapbox/api/hooks/accounts/useAccountLookup.ts
index ffe5885de..ed73617aa 100644
--- a/app/soapbox/api/hooks/accounts/useAccountLookup.ts
+++ b/app/soapbox/api/hooks/accounts/useAccountLookup.ts
@@ -22,7 +22,7 @@ function useAccountLookup(acct: string | undefined, opts: UseAccountLookupOpts =
 
   const { entity: account, isUnauthorized, ...result } = useEntityLookup<Account>(
     Entities.ACCOUNTS,
-    (account) => account.acct === acct,
+    (account) => account.acct.toLowerCase() === acct?.toLowerCase(),
     () => api.get(`/api/v1/accounts/lookup?acct=${acct}`),
     { schema: accountSchema, enabled: !!acct },
   );
diff --git a/app/soapbox/api/hooks/groups/useGroupLookup.ts b/app/soapbox/api/hooks/groups/useGroupLookup.ts
index e3a979777..8e161af78 100644
--- a/app/soapbox/api/hooks/groups/useGroupLookup.ts
+++ b/app/soapbox/api/hooks/groups/useGroupLookup.ts
@@ -16,7 +16,7 @@ function useGroupLookup(slug: string) {
 
   const { entity: group, isUnauthorized, ...result } = useEntityLookup(
     Entities.GROUPS,
-    (group) => group.slug === slug,
+    (group) => group.slug.toLowerCase() === slug.toLowerCase(),
     () => api.get(`/api/v1/groups/lookup?name=${slug}`),
     { schema: groupSchema, enabled: features.groups && !!slug },
   );

From 8da8f18a452acb1d3e5b3b765c2b29dbccd75207 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 6 Jul 2023 12:21:52 -0500
Subject: [PATCH 07/27] ProfileInfoPanel: truncate bio Fixes
 https://gitlab.com/soapbox-pub/soapbox/-/issues/1456

---
 app/soapbox/features/ui/components/profile-info-panel.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/profile-info-panel.tsx b/app/soapbox/features/ui/components/profile-info-panel.tsx
index eeb1d507c..addeff9d2 100644
--- a/app/soapbox/features/ui/components/profile-info-panel.tsx
+++ b/app/soapbox/features/ui/components/profile-info-panel.tsx
@@ -134,7 +134,6 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
     );
   }
 
-  const content = { __html: account.note_emojified };
   const deactivated = account.pleroma?.deactivated ?? false;
   const displayNameHtml = deactivated ? { __html: intl.formatMessage(messages.deactivated) } : { __html: account.display_name_html };
   const memberSinceDate = intl.formatDate(account.created_at, { month: 'long', year: 'numeric' });
@@ -174,7 +173,7 @@ const ProfileInfoPanel: React.FC<IProfileInfoPanel> = ({ account, username }) =>
         <ProfileStats account={account} />
 
         {account.note.length > 0 && (
-          <Markup size='sm' dangerouslySetInnerHTML={content} />
+          <Markup size='sm' dangerouslySetInnerHTML={{ __html: account.note_emojified }} truncate />
         )}
 
         <div className='flex flex-col items-start gap-2 md:flex-row md:flex-wrap md:items-center'>

From 07a8df4b619e73438795acb48be7475aab019060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Sun, 9 Jul 2023 18:39:00 +0200
Subject: [PATCH 08/27] Support Calckey, maybe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/utils/features.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 126248e5d..83ba42089 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -16,6 +16,12 @@ const overrides = custom('features');
 /** Truthy array convenience function */
 const any = (arr: Array<any>): boolean => arr.some(Boolean);
 
+/**
+ * Calckey, a fork of Misskey.
+ * @see {@link https://calckey.org/}
+ */
+export const CALCKEY = 'Calckey';
+
 /**
  * Ditto, a Nostr server with Mastodon API.
  * @see {@link https://gitlab.com/soapbox-pub/ditto}
@@ -139,6 +145,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/accounts/lookup
      */
     accountLookup: any([
+      v.software === CALCKEY,
       v.software === MASTODON && gte(v.compatVersion, '3.4.0'),
       v.software === PLEROMA && gte(v.version, '2.4.50'),
       v.software === TAKAHE && gte(v.version, '0.6.1'),
@@ -224,6 +231,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/bookmarks
      */
     bookmarks: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON && gte(v.compatVersion, '3.1.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
@@ -324,6 +332,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see {@link https://docs.joinmastodon.org/methods/conversations/}
      */
     conversations: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON && gte(v.compatVersion, '2.6.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
@@ -362,6 +371,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see PATCH /api/v1/accounts/update_credentials
      */
     editProfile: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON,
       v.software === MITRA,
@@ -447,6 +457,7 @@ const getInstanceFeatures = (instance: Instance) => {
 
     /** Whether the accounts who favourited or emoji-reacted to a status can be viewed through the API. */
     exposableReactions: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON,
       v.software === TAKAHE && gte(v.version, '0.6.1'),
@@ -625,6 +636,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/timelines/list/:list_id
      */
     lists: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON && gte(v.compatVersion, '2.1.0'),
       v.software === PLEROMA && gte(v.version, '0.9.9'),
@@ -737,6 +749,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see POST /api/v1/statuses
      */
     polls: any([
+      v.software === CALCKEY,
       v.software === MASTODON && gte(v.version, '2.8.0'),
       v.software === PLEROMA,
       v.software === TRUTHSOCIAL,
@@ -773,6 +786,7 @@ const getInstanceFeatures = (instance: Instance) => {
      * @see GET /api/v1/timelines/public
      */
     publicTimeline: any([
+      v.software === CALCKEY,
       v.software === FRIENDICA,
       v.software === MASTODON,
       v.software === PLEROMA,

From 34acc019f76a1a4cc449710bb7e57881df2e3e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <me@mkljczk.pl>
Date: Mon, 10 Jul 2023 06:51:20 +0000
Subject: [PATCH 09/27] Enable familiar followers on Rebased

---
 app/soapbox/utils/features.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 83ba42089..417dca281 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -471,6 +471,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     familiarFollowers: any([
       v.software === MASTODON && gte(v.version, '3.5.0'),
+      v.software === PLEROMA && gte(v.version, '2.5.52') && v.build === REBASED,
       v.software === TAKAHE,
     ]),
 

From becb80611aac7ecfb4568ff692dbe1b3000357bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 10 Jul 2023 10:24:48 +0200
Subject: [PATCH 10/27] Fix features.ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/hooks/forms/useImageField.ts | 1 -
 app/soapbox/utils/features.ts            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/hooks/forms/useImageField.ts b/app/soapbox/hooks/forms/useImageField.ts
index 704ea45d4..dea5a0079 100644
--- a/app/soapbox/hooks/forms/useImageField.ts
+++ b/app/soapbox/hooks/forms/useImageField.ts
@@ -15,7 +15,6 @@ interface UseImageFieldOpts {
 function useImageField(opts: UseImageFieldOpts = {}) {
   const [file, setFile] = useState<File | null>();
   const src = usePreview(file) || (file === null ? undefined : opts.preview);
-  console.log(file, src);
 
   const onChange: React.ChangeEventHandler<HTMLInputElement> = async ({ target: { files } }) => {
     const file = files?.item(0);
diff --git a/app/soapbox/utils/features.ts b/app/soapbox/utils/features.ts
index 417dca281..50c606fb4 100644
--- a/app/soapbox/utils/features.ts
+++ b/app/soapbox/utils/features.ts
@@ -471,7 +471,7 @@ const getInstanceFeatures = (instance: Instance) => {
      */
     familiarFollowers: any([
       v.software === MASTODON && gte(v.version, '3.5.0'),
-      v.software === PLEROMA && gte(v.version, '2.5.52') && v.build === REBASED,
+      v.software === PLEROMA && gte(v.version, '2.5.51') && v.build === REBASED,
       v.software === TAKAHE,
     ]),
 

From 13cd0b726e5b3f2b4f2441169dfa527186e449f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Mon, 10 Jul 2023 12:43:18 +0200
Subject: [PATCH 11/27] Add AvatarStack component
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/components/avatar-stack.tsx       | 40 +++++++++++++++++++
 .../components/profile-familiar-followers.tsx | 40 ++++++++++++-------
 2 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 app/soapbox/components/avatar-stack.tsx

diff --git a/app/soapbox/components/avatar-stack.tsx b/app/soapbox/components/avatar-stack.tsx
new file mode 100644
index 000000000..b7dbb050d
--- /dev/null
+++ b/app/soapbox/components/avatar-stack.tsx
@@ -0,0 +1,40 @@
+import clsx from 'clsx';
+import { List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable';
+import React from 'react';
+
+import { Avatar, HStack } from 'soapbox/components/ui';
+import { useAppSelector } from 'soapbox/hooks';
+import { makeGetAccount } from 'soapbox/selectors';
+
+import type { Account } from 'soapbox/types/entities';
+
+const getAccount = makeGetAccount();
+
+interface IAvatarStack {
+  accountIds: ImmutableOrderedSet<string>
+  limit?: number
+}
+
+const AvatarStack: React.FC<IAvatarStack> = ({ accountIds, limit = 3 }) => {
+  const accounts = useAppSelector(state => ImmutableList(accountIds.slice(0, limit).map(accountId => getAccount(state, accountId)).filter(account => account))) as ImmutableList<Account>;
+
+  return (
+    <HStack className='relative' aria-hidden>
+      {accounts.map((account, i) => (
+        <div
+          className={clsx('relative', { '-ml-3': i !== 0 })}
+          key={account.id}
+          style={{ zIndex: limit - i }}
+        >
+          <Avatar
+            className='ring-1 ring-white dark:ring-primary-900'
+            src={account.avatar}
+            size={20}
+          />
+        </div>
+      ))}
+    </HStack>
+  );
+};
+
+export default AvatarStack;
diff --git a/app/soapbox/features/ui/components/profile-familiar-followers.tsx b/app/soapbox/features/ui/components/profile-familiar-followers.tsx
index 61beea123..56023f42a 100644
--- a/app/soapbox/features/ui/components/profile-familiar-followers.tsx
+++ b/app/soapbox/features/ui/components/profile-familiar-followers.tsx
@@ -5,8 +5,9 @@ import { Link } from 'react-router-dom';
 
 import { fetchAccountFamiliarFollowers } from 'soapbox/actions/familiar-followers';
 import { openModal } from 'soapbox/actions/modals';
+import AvatarStack from 'soapbox/components/avatar-stack';
 import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
-import { Text } from 'soapbox/components/ui';
+import { HStack, Text } from 'soapbox/components/ui';
 import VerificationBadge from 'soapbox/components/verification-badge';
 import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
 import { makeGetAccount } from 'soapbox/selectors';
@@ -30,7 +31,7 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
     if (me && features.familiarFollowers) {
       dispatch(fetchAccountFamiliarFollowers(account.id));
     }
-  }, []);
+  }, [account.id]);
 
   const openFamiliarFollowersModal = () => {
     dispatch(openModal('FAMILIAR_FOLLOWERS', {
@@ -44,10 +45,18 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
 
   const accounts: Array<React.ReactNode> = familiarFollowers.map(account => !!account && (
     <HoverRefWrapper accountId={account.id} inline>
-      <Link className='mention' to={`/@${account.acct}`}>
-        <span dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
+      <Link className='mention inline-block' to={`/@${account.acct}`}>
+        <HStack space={1} alignItems='center' grow>
+          <Text
+            size='sm'
+            theme='primary'
+            truncate
+            dangerouslySetInnerHTML={{ __html: account.display_name_html }}
+          />
+          {/* <span dangerouslySetInnerHTML={{ __html: account.display_name_html }} /> */}
 
-        {account.verified && <VerificationBadge />}
+          {account.verified && <VerificationBadge />}
+        </HStack>
       </Link>
     </HoverRefWrapper>
   )).toArray();
@@ -65,15 +74,18 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
   }
 
   return (
-    <Text theme='muted' size='sm'>
-      <FormattedMessage
-        id='account.familiar_followers'
-        defaultMessage='Followed by {accounts}'
-        values={{
-          accounts: <FormattedList type='conjunction' value={accounts} />,
-        }}
-      />
-    </Text>
+    <HStack space={2} alignItems='center'>
+      <AvatarStack accountIds={familiarFollowerIds} />
+      <Text theme='muted' size='sm'>
+        <FormattedMessage
+          id='account.familiar_followers'
+          defaultMessage='Followed by {accounts}'
+          values={{
+            accounts: <FormattedList type='conjunction' value={accounts} />,
+          }}
+        />
+      </Text>
+    </HStack>
   );
 };
 

From f3fbc5055fc8b8660ad0b5873f7e69732d726239 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 13 Jul 2023 19:20:27 -0500
Subject: [PATCH 12/27] FAMILIAR_FOLLOWERS_FETCH_FAIL: skipAlert: true

---
 app/soapbox/actions/familiar-followers.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/soapbox/actions/familiar-followers.ts b/app/soapbox/actions/familiar-followers.ts
index ee38084ba..a412509a8 100644
--- a/app/soapbox/actions/familiar-followers.ts
+++ b/app/soapbox/actions/familiar-followers.ts
@@ -33,5 +33,6 @@ export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: A
       type: FAMILIAR_FOLLOWERS_FETCH_FAIL,
       id: accountId,
       error,
+      skipAlert: true,
     }));
 };

From 06b168813088b5a12381636e0daeee683972a7ef Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 15 Jul 2023 19:47:59 -0500
Subject: [PATCH 13/27] Actually, account.url is not optional

---
 app/soapbox/schemas/account.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/schemas/account.ts b/app/soapbox/schemas/account.ts
index 563e98e90..a4881f4bc 100644
--- a/app/soapbox/schemas/account.ts
+++ b/app/soapbox/schemas/account.ts
@@ -87,7 +87,7 @@ const baseAccountSchema = z.object({
   statuses_count: z.number().catch(0),
   suspended: z.boolean().catch(false),
   uri: z.string().url().catch(''),
-  url: z.string().url().catch(''),
+  url: z.string().url(),
   username: z.string().catch(''),
   verified: z.boolean().catch(false),
   website: z.string().catch(''),

From f456cb40864d644a81e7957a0dce87c873ee850a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 15 Jul 2023 20:25:39 -0500
Subject: [PATCH 14/27] Fix account.url tests

---
 .../__tests__/quoted-status.test.tsx          |   1 +
 .../__tests__/who-to-follow-panel.test.tsx    | 201 ------------------
 app/soapbox/jest/factory.ts                   |   1 +
 3 files changed, 2 insertions(+), 201 deletions(-)
 delete mode 100644 app/soapbox/features/ui/components/__tests__/who-to-follow-panel.test.tsx

diff --git a/app/soapbox/components/__tests__/quoted-status.test.tsx b/app/soapbox/components/__tests__/quoted-status.test.tsx
index d57b59b30..05c906985 100644
--- a/app/soapbox/components/__tests__/quoted-status.test.tsx
+++ b/app/soapbox/components/__tests__/quoted-status.test.tsx
@@ -11,6 +11,7 @@ describe('<QuotedStatus />', () => {
     const account = normalizeAccount({
       id: '1',
       acct: 'alex',
+      url: 'https://soapbox.test/users/alex',
     });
 
     const status = normalizeStatus({
diff --git a/app/soapbox/features/ui/components/__tests__/who-to-follow-panel.test.tsx b/app/soapbox/features/ui/components/__tests__/who-to-follow-panel.test.tsx
deleted file mode 100644
index 01a65dc49..000000000
--- a/app/soapbox/features/ui/components/__tests__/who-to-follow-panel.test.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import React from 'react';
-
-import { __stub } from 'soapbox/api';
-
-import { render, rootState, screen, waitFor } from '../../../../jest/test-helpers';
-import { normalizeInstance } from '../../../../normalizers';
-import WhoToFollowPanel from '../who-to-follow-panel';
-
-const buildTruthSuggestion = (id: string) => ({
-  account_avatar: 'avatar',
-  account_id: id,
-  acct: 'acct',
-  display_name: 'my name',
-  note: 'hello',
-  verified: true,
-});
-
-const buildSuggestion = (id: string) => ({
-  source: 'staff',
-  account: {
-    username: 'username',
-    verified: true,
-    id,
-    acct: 'acct',
-    avatar: 'avatar',
-    avatar_static: 'avatar',
-    display_name: 'my name',
-  },
-});
-
-describe('<WhoToFollow />', () => {
-  let store: any;
-
-  describe('using Truth Social software', () => {
-    beforeEach(() => {
-      store = rootState
-        .set('me', '1234')
-        .set('instance', normalizeInstance({
-          version: '3.4.1 (compatible; TruthSocial 1.0.0)',
-        }));
-    });
-
-    describe('with a single suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.getByTestId('account')).toHaveTextContent(/my name/i);
-        });
-      });
-    });
-
-    describe('with a multiple suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1'), buildTruthSuggestion('2')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={2} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(2);
-        });
-      });
-    });
-
-    describe('with a set limit', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1'), buildTruthSuggestion('2')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('respects the limit prop', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(1);
-        });
-      });
-    });
-
-    describe('when the API returns an empty list', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [], {
-              link: '',
-            });
-        });
-      });
-
-      it('renders empty', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(0);
-        });
-      });
-    });
-  });
-
-  describe('using Pleroma software', () => {
-    beforeEach(() => {
-      store = rootState.set('me', '1234');
-    });
-
-    describe('with a single suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.getByTestId('account')).toHaveTextContent(/my name/i);
-        });
-      });
-    });
-
-    describe('with a multiple suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1'), buildSuggestion('2')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={2} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(2);
-        });
-      });
-    });
-
-    describe('with a set limit', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1'), buildSuggestion('2')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('respects the limit prop', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(1);
-        });
-      });
-    });
-
-    describe('when the API returns an empty list', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [], {
-              link: '',
-            });
-        });
-      });
-
-      it('renders empty', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(0);
-        });
-      });
-    });
-  });
-});
diff --git a/app/soapbox/jest/factory.ts b/app/soapbox/jest/factory.ts
index d991a2e07..2f21df069 100644
--- a/app/soapbox/jest/factory.ts
+++ b/app/soapbox/jest/factory.ts
@@ -30,6 +30,7 @@ import type { PartialDeep } from 'type-fest';
 function buildAccount(props: PartialDeep<Account> = {}): Account {
   return accountSchema.parse(Object.assign({
     id: uuidv4(),
+    url: `https://soapbox.test/users/${uuidv4()}`,
   }, props));
 }
 

From 2546c986a6a515316da28656b2acd33a3b2baaa6 Mon Sep 17 00:00:00 2001
From: Elaine Jackson <me@elaine.is>
Date: Sun, 16 Jul 2023 15:14:28 +0000
Subject: [PATCH 15/27] Update publicPath output to either use environment
 variable provided by developer building or default to '/' to avoid broken
 builds on Windows.

---
 webpack/development.ts | 1 +
 webpack/production.ts  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/webpack/development.ts b/webpack/development.ts
index 9ebbca4be..52f98d3a8 100644
--- a/webpack/development.ts
+++ b/webpack/development.ts
@@ -109,6 +109,7 @@ const configuration: Configuration = {
 
   output: {
     pathinfo: true,
+    publicPath: process.env.FE_SUBDIRECTORY || '/',
   },
 
   watchOptions: Object.assign(
diff --git a/webpack/production.ts b/webpack/production.ts
index 119c2b92c..aef0669c4 100644
--- a/webpack/production.ts
+++ b/webpack/production.ts
@@ -25,6 +25,7 @@ const configuration: Configuration = {
     filename: 'packs/js/[name]-[chunkhash].js',
     chunkFilename: 'packs/js/[name]-[chunkhash].chunk.js',
     hotUpdateChunkFilename: 'packs/js/[id]-[contenthash].hot-update.js',
+    publicPath: process.env.FE_SUBDIRECTORY || '/',
   },
 
   optimization: {

From 155012b332025e589164187d549d181afc8578b3 Mon Sep 17 00:00:00 2001
From: Elaine Jackson <me@elaine.is>
Date: Sun, 16 Jul 2023 15:21:41 +0000
Subject: [PATCH 16/27] Move changes to shared.ts

---
 webpack/development.ts | 1 -
 webpack/production.ts  | 1 -
 webpack/shared.ts      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/webpack/development.ts b/webpack/development.ts
index 52f98d3a8..9ebbca4be 100644
--- a/webpack/development.ts
+++ b/webpack/development.ts
@@ -109,7 +109,6 @@ const configuration: Configuration = {
 
   output: {
     pathinfo: true,
-    publicPath: process.env.FE_SUBDIRECTORY || '/',
   },
 
   watchOptions: Object.assign(
diff --git a/webpack/production.ts b/webpack/production.ts
index aef0669c4..119c2b92c 100644
--- a/webpack/production.ts
+++ b/webpack/production.ts
@@ -25,7 +25,6 @@ const configuration: Configuration = {
     filename: 'packs/js/[name]-[chunkhash].js',
     chunkFilename: 'packs/js/[name]-[chunkhash].chunk.js',
     hotUpdateChunkFilename: 'packs/js/[id]-[contenthash].hot-update.js',
-    publicPath: process.env.FE_SUBDIRECTORY || '/',
   },
 
   optimization: {
diff --git a/webpack/shared.ts b/webpack/shared.ts
index 2a8fdcb50..41ad28773 100644
--- a/webpack/shared.ts
+++ b/webpack/shared.ts
@@ -58,7 +58,7 @@ const configuration: Configuration = {
     chunkFilename: 'packs/js/[name].chunk.js',
     hotUpdateChunkFilename: 'packs/js/[id].hot-update.js',
     path: output.path,
-    publicPath: join(FE_SUBDIRECTORY, '/'),
+    publicPath: process.env.FE_SUBDIRECTORY || '/',
   },
 
   optimization: {

From 6b8be7af3c09e01c3ed5cb8b5d06bee26addac50 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Jul 2023 10:19:27 -0500
Subject: [PATCH 17/27] Fix scheduled posts Fixes
 https://gitlab.com/soapbox-pub/soapbox/-/issues/1445

---
 .../scheduled-statuses/components/scheduled-status.tsx   | 1 -
 app/soapbox/normalizers/status.ts                        | 3 ++-
 app/soapbox/utils/normalizers.ts                         | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
index e7e0ab697..11760b05a 100644
--- a/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
+++ b/app/soapbox/features/scheduled-statuses/components/scheduled-status.tsx
@@ -22,7 +22,6 @@ interface IScheduledStatus {
 const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) => {
   const status = useAppSelector((state) => {
     const scheduledStatus = state.scheduled_statuses.get(statusId);
-
     if (!scheduledStatus) return null;
     return buildStatus(state, scheduledStatus);
   }) as StatusEntity | null;
diff --git a/app/soapbox/normalizers/status.ts b/app/soapbox/normalizers/status.ts
index fae88470a..23601f248 100644
--- a/app/soapbox/normalizers/status.ts
+++ b/app/soapbox/normalizers/status.ts
@@ -14,6 +14,7 @@ import { normalizeAttachment } from 'soapbox/normalizers/attachment';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
 import { accountSchema, cardSchema, groupSchema, pollSchema, tombstoneSchema } from 'soapbox/schemas';
+import { maybeFromJS } from 'soapbox/utils/normalizers';
 
 import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
 
@@ -245,7 +246,7 @@ const normalizeDislikes = (status: ImmutableMap<string, any>) => {
 
 const parseAccount = (status: ImmutableMap<string, any>) => {
   try {
-    const account = accountSchema.parse(status.get('account').toJS());
+    const account = accountSchema.parse(maybeFromJS(status.get('account')));
     return status.set('account', account);
   } catch (_e) {
     return status.set('account', null);
diff --git a/app/soapbox/utils/normalizers.ts b/app/soapbox/utils/normalizers.ts
index 64638dd29..343b1103b 100644
--- a/app/soapbox/utils/normalizers.ts
+++ b/app/soapbox/utils/normalizers.ts
@@ -26,4 +26,13 @@ export type Normalizer<V, R> = (value: V) => R;
  */
 export const toSchema = <V, R>(normalizer: Normalizer<V, R>) => {
   return z.custom<V>().transform<R>(normalizer);
+};
+
+/** Legacy normalizer transition helper function. */
+export const maybeFromJS = (value: any): unknown => {
+  if ('toJS' in value) {
+    return value.toJS();
+  } else {
+    return value;
+  }
 };
\ No newline at end of file

From ceb83716f3557e165a10740549132459b888287e Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 28 Jun 2023 02:23:07 +0000
Subject: [PATCH 18/27] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1593 of 1593 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index d632ca173..ff47c68d8 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -14,7 +14,7 @@
   "account.deactivated": "已停用",
   "account.direct": "发送私信给 @{name}",
   "account.domain_blocked": "站点已隐藏",
-  "account.edit_profile": "修改个人资料",
+  "account.edit_profile": "编辑个人资料",
   "account.endorse": "在个人资料中推荐此用户",
   "account.endorse.success": "您在个人资料上推荐了 @{acct}",
   "account.familiar_followers": "被 {accounts} 关注",
@@ -308,7 +308,7 @@
   "column.app_create": "创建应用",
   "column.backups": "备份",
   "column.birthdays": "生日",
-  "column.blocks": "已屏蔽的用户",
+  "column.blocks": "屏蔽",
   "column.bookmarks": "书签",
   "column.chats": "聊天",
   "column.community": "本站时间轴",
@@ -367,7 +367,7 @@
   "column.mfa_disable_button": "关闭",
   "column.mfa_setup": "同意并继续",
   "column.migration": "帐号迁移",
-  "column.mutes": "已静音的用户",
+  "column.mutes": "静音",
   "column.notifications": "通知",
   "column.pins": "置顶帖文",
   "column.preferences": "首选项",
@@ -510,6 +510,9 @@
   "confirmations.mute.confirm": "静音",
   "confirmations.mute.heading": "静音 @{name}",
   "confirmations.mute.message": "您确定要静音 {name} 吗？",
+  "confirmations.mute_group.confirm": "静音",
+  "confirmations.mute_group.heading": "静音群组",
+  "confirmations.mute_group.message": "您即将静音此小组。您想继续吗？",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.heading": "删除并重新编辑",
   "confirmations.redraft.message": "您确定要删除此帖文并重新编辑它吗？所有相关的转发和点赞都会被清除，回复将会失去关联。",
@@ -658,9 +661,9 @@
   "empty_column.account_timeline": "这里没有帖文！",
   "empty_column.account_unavailable": "个人资料不可用",
   "empty_column.admin.announcements": "目前还没有公告。",
-  "empty_column.aliases": "您尚未创建别名。",
+  "empty_column.aliases": "您尚未创建过任何别名。",
   "empty_column.aliases.suggestions": "没有相匹配的帐号建议。",
-  "empty_column.blocks": "您目前没有屏蔽任何用户。",
+  "empty_column.blocks": "您尚未屏蔽过任何用户。",
   "empty_column.bookmarks": "您还没有任何书签，一旦您将帖文加入书签，它就会显示在这里。",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "您还没有使用过私信。当您发出或者收到私信时，它会在这里显示。",
@@ -670,7 +673,7 @@
   "empty_column.event_participants": "没有人加入过此活动。若有，则会显示在这里。",
   "empty_column.favourited_statuses": "您还没有点赞过任何帖文。点赞过的帖文会显示在这里。",
   "empty_column.favourites": "没有人点赞过此帖文。若有，则会显示在这里。",
-  "empty_column.filters": "您还没有添加任何过滤词。",
+  "empty_column.filters": "您尚未添加过任何过滤词。",
   "empty_column.follow_recommendations": "似乎暂未有推荐信息，您可以尝试搜索用户或者浏览热门话题标签。",
   "empty_column.follow_requests": "您没有收到新的关注请求。收到了之后就会显示在这里。",
   "empty_column.group": "此群组还没有帖文。",
@@ -683,7 +686,7 @@
   "empty_column.home.title": "您尚未关注任何人",
   "empty_column.list": "此列表中暂时没有内容。列表中用户所发送的的新帖文将会在这里显示。",
   "empty_column.lists": "您还没有创建过列表。您创建的列表会在这里显示。",
-  "empty_column.mutes": "您没有静音任何用户。",
+  "empty_column.mutes": "您尚未静音过任何用户。",
   "empty_column.notifications": "您还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.notifications_filtered": "您还没有任何此类通知。",
   "empty_column.public": "这里什么都没有！写一些公开的帖文，或者关注其他服务器的用户后，这里就会有帖文出现了",
@@ -717,7 +720,7 @@
   "event_map.navigate": "导航",
   "events.create_event": "创建活动",
   "events.joined_events": "已加入的活动",
-  "events.joined_events.empty": "您尚未加入任何活动。",
+  "events.joined_events.empty": "您尚未加入过任何活动。",
   "events.recent_events": "近期活动",
   "events.recent_events.empty": "目前没有公开活动。",
   "export_data.actions.export": "导出",
@@ -793,6 +796,9 @@
   "group.manage": "管理群组",
   "group.member.admin.limit.summary": "目前您可以为群组分配最多 {count} 个管理员。",
   "group.member.admin.limit.title": "已达到管理员个数限制",
+  "group.mute.label": "静音",
+  "group.mute.long_label": "静音群组",
+  "group.mute.success": "已静音群组",
   "group.popover.action": "查看群组",
   "group.popover.summary": "您必须是群组成员才能回复此状态。",
   "group.popover.title": "需要成员身份",
@@ -826,6 +832,9 @@
   "group.tags.unpin": "取消置顶主题",
   "group.tags.unpin.success": "已取消置顶！",
   "group.tags.visible.success": "主题已标记为可见",
+  "group.unmute.label": "取消静音",
+  "group.unmute.long_label": "取消静音群组",
+  "group.unmute.success": "已取消静音群组",
   "group.update.success": "群组已成功保存",
   "group.upload_banner": "已上传照片",
   "groups.discover.popular.empty": "目前无法获取热门群组。请稍后再试。",
@@ -1039,6 +1048,7 @@
   "mute_modal.auto_expire": "静音自动过期？",
   "mute_modal.duration": "持续时间",
   "mute_modal.hide_notifications": "同时隐藏来自此用户的通知？",
+  "mutes.empty.groups": "您尚未静音过任何群组。",
   "navbar.login.action": "登录",
   "navbar.login.email.placeholder": "电子邮箱地址",
   "navbar.login.forgot_password": "忘记密码？",
@@ -1351,14 +1361,17 @@
   "security.update_password.fail": "更新密码失败。",
   "security.update_password.success": "密码已成功更新。",
   "settings.account_migration": "迁移帐号",
+  "settings.blocks": "屏蔽帐号",
   "settings.change_email": "修改邮箱",
   "settings.change_password": "修改密码",
   "settings.configure_mfa": "配置多重认证（MFA）",
   "settings.delete_account": "删除帐号",
   "settings.edit_profile": "编辑个人资料",
   "settings.messages.label": "允许用户与您开始新的聊天",
+  "settings.mutes": "静音帐号",
   "settings.other": "其他选项",
   "settings.preferences": "首选项",
+  "settings.privacy": "隐私",
   "settings.profile": "个人资料",
   "settings.save.success": "您的首选项已保存！",
   "settings.security": "安全性",

From 5f9b58e2c1dd7e6c6c4b55158fce3be6dff8f9ab Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sun, 2 Jul 2023 16:05:00 +0000
Subject: [PATCH 19/27] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1596 of 1596 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/zh_Hans/
---
 app/soapbox/locales/zh-CN.json | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index ff47c68d8..70c067b1a 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -350,6 +350,7 @@
   "column.filters.title": "标题",
   "column.filters.whole_word": "全词匹配",
   "column.follow_requests": "关注请求",
+  "column.followed_tags": "关注的话题标签",
   "column.followers": "关注者",
   "column.following": "正在关注",
   "column.group_blocked_members": "已封禁成员",
@@ -575,7 +576,7 @@
   "edit_federation.reject": "拒绝所有信息交互",
   "edit_federation.save": "保存",
   "edit_federation.success": "{host} 联邦设定已保存",
-  "edit_federation.unlisted": "将帖文强制标记移出公共时间轴",
+  "edit_federation.unlisted": "强制帖文为不公开",
   "edit_password.header": "修改密码",
   "edit_profile.error": "个人资料更新失败",
   "edit_profile.fields.accepts_email_list_label": "接收邮件列表",
@@ -676,6 +677,7 @@
   "empty_column.filters": "您尚未添加过任何过滤词。",
   "empty_column.follow_recommendations": "似乎暂未有推荐信息，您可以尝试搜索用户或者浏览热门话题标签。",
   "empty_column.follow_requests": "您没有收到新的关注请求。收到了之后就会显示在这里。",
+  "empty_column.followed_tags": "您尚未关注任何话题标签。",
   "empty_column.group": "此群组还没有帖文。",
   "empty_column.group_blocks": "此群组还没有封禁任何用户。",
   "empty_column.group_membership_requests": "此群组没有待处理的成员申请。",
@@ -1083,6 +1085,7 @@
   "navigation_bar.favourites": "点赞",
   "navigation_bar.filters": "过滤",
   "navigation_bar.follow_requests": "关注请求",
+  "navigation_bar.followed_tags": "关注的话题标签",
   "navigation_bar.import_data": "导入数据",
   "navigation_bar.in_reply_to": "回复至",
   "navigation_bar.invites": "邀请",
@@ -1213,10 +1216,10 @@
   "privacy.direct.short": "仅被提及者",
   "privacy.private.long": "只有关注您的用户能看到",
   "privacy.private.short": "仅关注者",
-  "privacy.public.long": "所有人可见，出现在公共时间轴上",
-  "privacy.public.short": "公共时间轴",
-  "privacy.unlisted.long": "所有人可见，但不会出现在公共时间轴上",
-  "privacy.unlisted.short": "所有人",
+  "privacy.public.long": "发布在公共时间轴上",
+  "privacy.public.short": "公开",
+  "privacy.unlisted.long": "不会发布在公共时间轴上",
+  "privacy.unlisted.short": "不公开",
   "profile_dropdown.add_account": "添加一个已有帐号",
   "profile_dropdown.logout": "注销 @{acct}",
   "profile_dropdown.switch_account": "切换帐号",

From 19fe1748aebcee0575b45d68fa6d6c50c240a9c9 Mon Sep 17 00:00:00 2001
From: abidin toumi <abidin24@disroot.org>
Date: Wed, 5 Jul 2023 08:41:56 +0000
Subject: [PATCH 20/27] Translated using Weblate (Arabic)

Currently translated at 98.9% (1579 of 1596 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ar/
---
 app/soapbox/locales/ar.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index f7e68e5f6..49277e670 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -234,7 +234,7 @@
   "chat_message_list.network_failure.title": "المعذرة!",
   "chat_message_list_intro.actions.accept": "قبول",
   "chat_message_list_intro.actions.leave_chat": "الخروج من الدردشة",
-  "chat_message_list_intro.actions.message_lifespan": "تُحْذَفُ الرسائل الأقدم من {day، plural، one {# day} other {# days}}.",
+  "chat_message_list_intro.actions.message_lifespan": "تُحْذَفُ الرسائل الأقدم من {day, plural, one {يوم} two {يومين} few {# أيام} many {# يومًا} other {# يوم}}.",
   "chat_message_list_intro.actions.report": "تبليغ",
   "chat_message_list_intro.intro": "يريد مراسلتك",
   "chat_message_list_intro.leave_chat.confirm": "الخروج من الدردشة",
@@ -252,7 +252,7 @@
   "chat_settings.auto_delete.30days": "30 يوماً",
   "chat_settings.auto_delete.7days": "7 أيام",
   "chat_settings.auto_delete.90days": "90 يوماً",
-  "chat_settings.auto_delete.days": "{number, plural, one {# يوم} other {# أيام}}",
+  "chat_settings.auto_delete.days": "{day, plural, one {يوم} two {يومان} few {# أيام} many {# يومًا} other {# يوم}}",
   "chat_settings.auto_delete.hint": "سَتُحْذَفُ الرسائل المرسلة بشكل تلقائي بعد انقضاء الفترة المحددة",
   "chat_settings.auto_delete.label": "الحذف التلقائي للرسائل",
   "chat_settings.block.confirm": "حظر",
@@ -269,8 +269,8 @@
   "chat_settings.unblock.confirm": "رفع الحظر",
   "chat_settings.unblock.heading": "رفع الحظر عن @{acct}",
   "chat_settings.unblock.message": "سيسمح إلغاء الحظر لهذا المِلَفّ الشخصي بتوجيه رسالة إليك وعرض المحتوى الخاص بك.",
-  "chat_window.auto_delete_label": "حذف تلقائي بعد {day، plural، one {# يوم} other {# أيام}}",
-  "chat_window.auto_delete_tooltip": "ضُبِطَتْ رسائل الدردشة على الحذف التلقائي بعد {day، plural، one {# يوم} other {# أيام}} عند الإرسال.",
+  "chat_window.auto_delete_label": "حذف تلقائي بعد {day, plural, one {يوم} two {يومين} few {# أيام} many {# يومًا} other {# يوم}}",
+  "chat_window.auto_delete_tooltip": "ضُبِطَتْ رسائل الدردشة على الحذف التلقائي بعد {day, plural, one {يوم} two {يومين} few {# أيام} many {# يومًا} other {# يوم}} من الإرسال.",
   "chats.actions.copy": "نسخ",
   "chats.actions.delete": "حذف الرسالة",
   "chats.actions.deleteForMe": "الحذف عندي",
@@ -350,6 +350,7 @@
   "column.filters.title": "عنوان",
   "column.filters.whole_word": "الكلمة كلّها",
   "column.follow_requests": "طلبات المتابعة",
+  "column.followed_tags": "الوسوم المتابَعة",
   "column.followers": "المتابعين",
   "column.following": "يتابع",
   "column.group_blocked_members": "الأعضاء المحظورين",
@@ -673,6 +674,7 @@
   "empty_column.filters": "لم ترشِّح أيّ كلمة بعد.",
   "empty_column.follow_recommendations": "يبدو أنه لا يمكن إنشاء اقتراحات مناسبة لك. يمكنك استخدام خانة البحث للعثور على أشخاص قد تعرفهم أو استكشاف المواضيع الشائعة عن طريق الوُسوم.",
   "empty_column.follow_requests": "ليس لديك أي طلب للمتابعة بعد. سوف تظهر الطلبات هنا عندما تتلقى البعض منها.",
+  "empty_column.followed_tags": "لم تُتابع أي وسم بعد.",
   "empty_column.group": "لا توجد مشاركات في هذه المجموعة حتى الآن.",
   "empty_column.group_blocks": "لم تحظر المجموعة أي مستخدمين حتى الآن.",
   "empty_column.group_membership_requests": "لا توجد طلبات عضوية معلقة لهذه المجموعة.",
@@ -1073,6 +1075,7 @@
   "navigation_bar.favourites": "المفضلة",
   "navigation_bar.filters": "المُرشِّحات",
   "navigation_bar.follow_requests": "طلبات المتابعة",
+  "navigation_bar.followed_tags": "الوسوم المتابَعة",
   "navigation_bar.import_data": "استيراد البيانات",
   "navigation_bar.in_reply_to": "ردّا على",
   "navigation_bar.invites": "الدعوات",
@@ -1359,6 +1362,7 @@
   "settings.messages.label": "السماح للمستخدمين بمراسلتك",
   "settings.other": "خيارات أخرى",
   "settings.preferences": "تفضيلات",
+  "settings.privacy": "الخصوصية",
   "settings.profile": "الملف الشخصي",
   "settings.save.success": "تم حِفظ التفضيلات بنجاح!",
   "settings.security": "الأمان",

From fe40bc47db4a9bf8181852776c10ff2eef511ef5 Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Thu, 6 Jul 2023 08:23:36 +0200
Subject: [PATCH 21/27] Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/
---
 app/soapbox/locales/ar.json      | 4 ----
 app/soapbox/locales/ast.json     | 2 --
 app/soapbox/locales/bg.json      | 2 --
 app/soapbox/locales/bn.json      | 2 --
 app/soapbox/locales/br.json      | 2 --
 app/soapbox/locales/ca.json      | 4 ----
 app/soapbox/locales/co.json      | 2 --
 app/soapbox/locales/cs.json      | 4 ----
 app/soapbox/locales/cy.json      | 4 ----
 app/soapbox/locales/da.json      | 2 --
 app/soapbox/locales/de.json      | 4 ----
 app/soapbox/locales/el.json      | 4 ----
 app/soapbox/locales/en-Shaw.json | 4 ----
 app/soapbox/locales/eo.json      | 2 --
 app/soapbox/locales/es-AR.json   | 4 ----
 app/soapbox/locales/es.json      | 4 ----
 app/soapbox/locales/et.json      | 2 --
 app/soapbox/locales/eu.json      | 2 --
 app/soapbox/locales/fa.json      | 4 ----
 app/soapbox/locales/fi.json      | 2 --
 app/soapbox/locales/fr.json      | 4 ----
 app/soapbox/locales/ga.json      | 4 ----
 app/soapbox/locales/gl.json      | 2 --
 app/soapbox/locales/he.json      | 4 ----
 app/soapbox/locales/hi.json      | 4 ----
 app/soapbox/locales/hr.json      | 4 ----
 app/soapbox/locales/hu.json      | 4 ----
 app/soapbox/locales/hy.json      | 2 --
 app/soapbox/locales/id.json      | 4 ----
 app/soapbox/locales/io.json      | 4 ----
 app/soapbox/locales/is.json      | 4 ----
 app/soapbox/locales/it.json      | 4 ----
 app/soapbox/locales/ja.json      | 4 ----
 app/soapbox/locales/ka.json      | 2 --
 app/soapbox/locales/kk.json      | 4 ----
 app/soapbox/locales/ko.json      | 4 ----
 app/soapbox/locales/lt.json      | 4 ----
 app/soapbox/locales/lv.json      | 4 ----
 app/soapbox/locales/mk.json      | 4 ----
 app/soapbox/locales/ms.json      | 4 ----
 app/soapbox/locales/nl.json      | 2 --
 app/soapbox/locales/nn.json      | 4 ----
 app/soapbox/locales/no.json      | 4 ----
 app/soapbox/locales/oc.json      | 4 ----
 app/soapbox/locales/pl.json      | 4 ----
 app/soapbox/locales/pt-BR.json   | 4 ----
 app/soapbox/locales/pt.json      | 4 ----
 app/soapbox/locales/ro.json      | 4 ----
 app/soapbox/locales/ru.json      | 4 ----
 app/soapbox/locales/sk.json      | 4 ----
 app/soapbox/locales/sl.json      | 4 ----
 app/soapbox/locales/sq.json      | 2 --
 app/soapbox/locales/sr-Latn.json | 4 ----
 app/soapbox/locales/sr.json      | 4 ----
 app/soapbox/locales/sv.json      | 4 ----
 app/soapbox/locales/ta.json      | 4 ----
 app/soapbox/locales/te.json      | 4 ----
 app/soapbox/locales/th.json      | 4 ----
 app/soapbox/locales/tr.json      | 4 ----
 app/soapbox/locales/uk.json      | 4 ----
 app/soapbox/locales/zh-CN.json   | 4 ----
 app/soapbox/locales/zh-HK.json   | 4 ----
 app/soapbox/locales/zh-TW.json   | 4 ----
 63 files changed, 222 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 49277e670..c28df482d 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -577,7 +577,6 @@
   "edit_password.header": "تغيير كلمة المرور",
   "edit_profile.error": "فشل تحديث الملف الشخصي",
   "edit_profile.fields.accepts_email_list_label": "الاشتراك في النشرة الإخبارية",
-  "edit_profile.fields.avatar_label": "الصورة الشخصية",
   "edit_profile.fields.bio_label": "نبذة شخصية",
   "edit_profile.fields.bio_placeholder": "حدثنا عن نفسك.",
   "edit_profile.fields.birthday_label": "يوم الميلاد",
@@ -586,7 +585,6 @@
   "edit_profile.fields.discoverable_label": "السماح باكتشاف الحساب",
   "edit_profile.fields.display_name_label": "الاسم الظاهر",
   "edit_profile.fields.display_name_placeholder": "الاسم",
-  "edit_profile.fields.header_label": "صورة الغلاف",
   "edit_profile.fields.hide_network_label": "اخفاء الشبكة",
   "edit_profile.fields.location_label": "الموقع",
   "edit_profile.fields.location_placeholder": "الموقع",
@@ -599,10 +597,8 @@
   "edit_profile.fields.website_placeholder": "إظهار رابط",
   "edit_profile.header": "تعديل الملف الشخصي",
   "edit_profile.hints.accepts_email_list": "الإشتراك في الأخبار والتحديثات التسويقية.",
-  "edit_profile.hints.avatar": "الصور بامتداد png او gif او jpg. سيتم تخفيض حجمهم إلى {size}",
   "edit_profile.hints.bot": "يقوم هذا الحساب بتنفيذ إجراءات آلية بشكل أساسي، وقد لا تتم مراقبته",
   "edit_profile.hints.discoverable": "عرض الحساب في دليل الملف الشخصي والسماح بالفهرسة من خلال الخدمات الخارجية",
-  "edit_profile.hints.header": "PNG, GIF أو JPG. سيتم تصغيرها إلى {size}",
   "edit_profile.hints.hide_network": "اخفاء من تتابع ومن يتابعك من ملفك الشخصي",
   "edit_profile.hints.locked": "يتطلب الموافقة على طلبات المتابعة",
   "edit_profile.hints.meta_fields": "بالإمكان عرض {count, plural, one {# custom field} other {# custom fields}} على ملفك الشخصي",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index c62fc8bb8..43f6971b8 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -111,9 +111,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index e56a77622..076e7d2a5 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -97,9 +97,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 9871550f2..af06d33cc 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index e10f06009..d468f5ffa 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -102,9 +102,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 7b4638aad..7d8bbeb75 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -213,18 +213,14 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bot_label": "Aquest compte és un bot",
   "edit_profile.fields.display_name_label": "Mostra el nom",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Capçalera",
   "edit_profile.fields.locked_label": "Bloqueja el compte",
   "edit_profile.fields.meta_fields.content_placeholder": "Contingut",
   "edit_profile.fields.meta_fields.label_placeholder": "Etiqueta",
   "edit_profile.fields.website_label": "Website",
-  "edit_profile.hints.avatar": "PNG, GIF o JPG. Com a màxim 2 MB. Es reduirà a 400x400px",
   "edit_profile.hints.bot": "Aquest compte realitza principalment accions automatitzades i pot ser que no sigui controlat",
-  "edit_profile.hints.header": "PNG, GIF o JPG. Com a màxim 2 MB. Es reduirà a 1500x500px",
   "edit_profile.hints.locked": "Cal que aprovis els seguidors manualment",
   "edit_profile.save": "Desa",
   "edit_profile.success": "Profile saved!",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index a25de09ce..d599ae70f 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -136,9 +136,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index b1f0b7403..f090e7cd5 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -263,13 +263,11 @@
   "edit_email.placeholder": "me@example.com",
   "edit_federation.save": "Uložit",
   "edit_profile.error": "Chyba při změně profilu",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "O vás",
   "edit_profile.fields.bio_placeholder": "Řekněte nám o sobě něco.",
   "edit_profile.fields.bot_label": "Tohle je účet robota",
   "edit_profile.fields.display_name_label": "Zobrazované jméno",
   "edit_profile.fields.display_name_placeholder": "Jméno",
-  "edit_profile.fields.header_label": "Záhlaví",
   "edit_profile.fields.hide_network_label": "Skrýt mou síť",
   "edit_profile.fields.location_label": "Poloha",
   "edit_profile.fields.location_placeholder": "Poloha",
@@ -280,9 +278,7 @@
   "edit_profile.fields.stranger_notifications_label": "Blokovat oznámení od neznámých uživatelů",
   "edit_profile.fields.website_label": "Website",
   "edit_profile.header": "Upravit profil",
-  "edit_profile.hints.avatar": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na {size}",
   "edit_profile.hints.bot": "Tento účet funguje automaticky a není jisté, jestli ho někdo sleduje.",
-  "edit_profile.hints.header": "PNG, GIF nebo JPG. Maximálně 2 MB. Bude zmenšen na {size}",
   "edit_profile.hints.hide_network": "Koho sledujete a kdo sleduje vás bude na vašem profilu skryto",
   "edit_profile.hints.locked": "Žádosti o sledování budete muset ručně schvalovat.",
   "edit_profile.hints.meta_fields": "Ke svému profilu můžete přidat až {count, plural, one {# položku} few {# položky} other {# položek}}.",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index aeb6b1564..c9a469ac0 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index a24867cd9..218cf6bc2 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 1d49a0701..1eafbed1a 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -531,7 +531,6 @@
   "edit_password.header": "Passwort ändern",
   "edit_profile.error": "Profil konnte nicht geändert werden",
   "edit_profile.fields.accepts_email_list_label": "Newsletter abonnieren",
-  "edit_profile.fields.avatar_label": "Profilbild",
   "edit_profile.fields.bio_label": "Kurzbeschreibung",
   "edit_profile.fields.bio_placeholder": "Schreibe etwas über dich.",
   "edit_profile.fields.birthday_label": "Geburtstag",
@@ -540,7 +539,6 @@
   "edit_profile.fields.discoverable_label": "Konto im Instanz-Verzeichnis eintragen",
   "edit_profile.fields.display_name_label": "Angezeigter Nutzername",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Profilbanner",
   "edit_profile.fields.hide_network_label": "Follower und Nutzer, denen du folgst, nicht öffentlich anzeigen",
   "edit_profile.fields.location_label": "Wohnort",
   "edit_profile.fields.location_placeholder": "Wohnort",
@@ -553,10 +551,8 @@
   "edit_profile.fields.website_placeholder": "Link anzeigen",
   "edit_profile.header": "Profil bearbeiten",
   "edit_profile.hints.accepts_email_list": "Status- und Werbenachrichten abonnieren.",
-  "edit_profile.hints.avatar": "PNG, GIF oder JPG. Wird auf {size} verkleinert",
   "edit_profile.hints.bot": "Dieses Konto wird größtenteils automatisiert betrieben. Aktivitäten werden möglicherweise nicht moderiert",
   "edit_profile.hints.discoverable": "Konto im Verzeichnis listen und Indexierung durch externe Dienste ermöglichen",
-  "edit_profile.hints.header": "PNG, GIF oder JPG. Wird auf {size} verkleinert",
   "edit_profile.hints.hide_network": "Deine Follower und wem du folgst wird nicht in deinem Profil angezeigt",
   "edit_profile.hints.locked": "Follower müssen einzeln bestätigt werden",
   "edit_profile.hints.meta_fields": "Du kannst bis zu {count, plural, one {# Feld} other {# Felder}} in deinem Profil anzeigen lassen.",
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 13761643f..78e0f39ab 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/en-Shaw.json b/app/soapbox/locales/en-Shaw.json
index 46d44dd93..50b518945 100644
--- a/app/soapbox/locales/en-Shaw.json
+++ b/app/soapbox/locales/en-Shaw.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑 𐑓𐑱𐑤𐑛",
   "edit_profile.fields.accepts_email_list_label": "𐑕𐑩𐑚𐑕𐑒𐑮𐑲𐑚 𐑑 𐑯𐑿𐑟𐑤𐑧𐑑𐑼",
-  "edit_profile.fields.avatar_label": "𐑨𐑝𐑩𐑑𐑸",
   "edit_profile.fields.bio_label": "𐑚𐑲𐑴",
   "edit_profile.fields.bio_placeholder": "𐑑𐑧𐑤 𐑳𐑕 𐑩𐑚𐑬𐑑 𐑘𐑹𐑕𐑧𐑤𐑓.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "𐑩𐑤𐑬 𐑩𐑒𐑬𐑯𐑑 𐑛𐑦𐑕𐑒𐑳𐑝𐑼𐑦",
   "edit_profile.fields.display_name_label": "𐑛𐑦𐑕𐑐𐑤𐑱 𐑯𐑱𐑥",
   "edit_profile.fields.display_name_placeholder": "𐑯𐑱𐑥",
-  "edit_profile.fields.header_label": "𐑣𐑧𐑛𐑼",
   "edit_profile.fields.hide_network_label": "𐑣𐑲𐑛 𐑯𐑧𐑑𐑢𐑻𐑒",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "edit_profile.header": "Edit Profile",
   "edit_profile.hints.accepts_email_list": "𐑪𐑐𐑑-𐑦𐑯 𐑑 𐑯𐑿𐑟 𐑯 𐑥𐑸𐑒𐑩𐑑𐑦𐑙 𐑳𐑐𐑛𐑱𐑑𐑕.",
-  "edit_profile.hints.avatar": "PNG, GIF 𐑹 JPG. 𐑢𐑦𐑤 𐑚𐑰 downscaled 𐑑 {size}",
   "edit_profile.hints.bot": "𐑞𐑦𐑕 𐑩𐑒𐑬𐑯𐑑 𐑥𐑱𐑯𐑤𐑦 𐑐𐑼𐑓𐑹𐑥𐑟 𐑷𐑑𐑩𐑥𐑱𐑑𐑩𐑛 𐑨𐑒𐑖𐑩𐑯𐑟 𐑯 𐑥𐑲𐑑 𐑯𐑪𐑑 𐑚𐑰 𐑥𐑪𐑯𐑦𐑑𐑼𐑛",
   "edit_profile.hints.discoverable": "𐑛𐑦𐑕𐑐𐑤𐑱 𐑩𐑒𐑬𐑯𐑑 𐑦𐑯 𐑐𐑮𐑴𐑓𐑲𐑤 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦 𐑯 𐑩𐑤𐑬 𐑦𐑯𐑛𐑧𐑒𐑕𐑦𐑙 𐑚𐑲 𐑦𐑒𐑕𐑑𐑻𐑯𐑩𐑤 𐑕𐑻𐑝𐑦𐑕𐑩𐑟",
-  "edit_profile.hints.header": "PNG, GIF 𐑹 JPG. 𐑢𐑦𐑤 𐑚𐑰 downscaled 𐑑 {size}",
   "edit_profile.hints.hide_network": "𐑣𐑵 𐑿 𐑓𐑪𐑤𐑴 𐑯 𐑣𐑵 𐑓𐑪𐑤𐑴𐑟 𐑿 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑖𐑴𐑯 𐑪𐑯 𐑘𐑹 𐑐𐑮𐑴𐑓𐑲𐑤",
   "edit_profile.hints.locked": "𐑮𐑦𐑒𐑢𐑲𐑼𐑟 𐑿 𐑑 𐑥𐑨𐑯𐑘𐑫𐑩𐑤𐑦 𐑩𐑐𐑮𐑵𐑝 𐑓𐑪𐑤𐑴𐑼𐑟",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 7d0fc20d6..b0706a932 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 82d8881d3..eb1a459a9 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -450,7 +450,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -459,7 +458,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -472,10 +470,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 0c0e081fe..019cbbad8 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -571,7 +571,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -580,7 +579,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -593,10 +591,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index 77ae38b80..b899c3f32 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index fc7c8a5b1..cd693407d 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index dba8e1a91..727121e60 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index c2e5b2c98..cd700964e 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -137,9 +137,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index e2421e71e..0ab74a043 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -515,7 +515,6 @@
   "edit_password.header": "Changer de mot de passe",
   "edit_profile.error": "La mise à jour du profil a échoué",
   "edit_profile.fields.accepts_email_list_label": "S'inscrire à la lettre d'information",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Biographie",
   "edit_profile.fields.bio_placeholder": "Dites-nous en plus plus à propos de vous.",
   "edit_profile.fields.birthday_label": "Anniversaire",
@@ -524,7 +523,6 @@
   "edit_profile.fields.discoverable_label": "Autoriser la découvert du profil",
   "edit_profile.fields.display_name_label": "Nom affiché",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Cacher le réseau",
   "edit_profile.fields.location_label": "Lieu",
   "edit_profile.fields.location_placeholder": "Lieu",
@@ -537,10 +535,8 @@
   "edit_profile.fields.website_placeholder": "Afficher un lien",
   "edit_profile.header": "Éditer le profil",
   "edit_profile.hints.accepts_email_list": "Activer les nouvelles et mises à jour marketing",
-  "edit_profile.hints.avatar": "PNG, GIF or JPG. Sera réduit à une taille de {size}",
   "edit_profile.hints.bot": "Ce compte fait principalement des actions automatiques et peut ne pas être surveillé",
   "edit_profile.hints.discoverable": "Afficher le compte dans le répertoire des profil et autoriser son indexation par des services externes",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Sera réduit à la taille de {size}",
   "edit_profile.hints.hide_network": "Votre profil n'indiquera pas qui vous suivez et qui vous suit",
   "edit_profile.hints.locked": "Nécessite que vous approuvier manuellement vos abonnés",
   "edit_profile.hints.meta_fields": "Vous pouvez avoir jusqu'à {count, plural, one {# custom field} other {# custom fields}} affichés sur votre profil.",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index 278d41ace..99114e524 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index 406c6f980..04db48782 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -141,9 +141,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 95444dc6b..e86a87dc1 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -400,7 +400,6 @@
   "edit_password.header": "שנה סיסמא",
   "edit_profile.error": "עדכון הפרופיל נכשל",
   "edit_profile.fields.accepts_email_list_label": "הירשם לעדכונים",
-  "edit_profile.fields.avatar_label": "אווטאר",
   "edit_profile.fields.bio_label": "ביוגרפיה",
   "edit_profile.fields.bio_placeholder": "ספר לנו על עצמך.",
   "edit_profile.fields.birthday_label": "יום הולדת",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "אפשר גילוי חשבון",
   "edit_profile.fields.display_name_label": "שם תצוגה",
   "edit_profile.fields.display_name_placeholder": "שם",
-  "edit_profile.fields.header_label": "כותרת",
   "edit_profile.fields.hide_network_label": "הסתר רשת",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "edit_profile.header": "ערוך פרופיל",
   "edit_profile.hints.accepts_email_list": "הצטרפו לעדכוני חדשות ועדכונים שיווקיים.",
-  "edit_profile.hints.avatar": "PNG, GIF או JPG. יוקטן ל-{size}",
   "edit_profile.hints.bot": "חשבון זה מבצע בעיקר פעולות אוטומטיות וייתכן שלא יהיה פיקוח",
   "edit_profile.hints.discoverable": "הצג חשבון בספריית הפרופילים ואפשר הוספה לאינדקס על ידי שירותים חיצוניים",
-  "edit_profile.hints.header": "PNG, GIF או JPG. יוקטן ל-{size}",
   "edit_profile.hints.hide_network": "מי אתה עוקב ומי עוקב אחריך לא יוצג בפרופיל שלך",
   "edit_profile.hints.locked": "מחייב אותך לאשר עוקבים באופן ידני",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 2308ef9dd..1f4e9e8f8 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index 17931dc36..59f02b14c 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -514,7 +514,6 @@
   "edit_password.header": "Promjena lozinke",
   "edit_profile.error": "Ažuriranje profila nije uspjelo",
   "edit_profile.fields.accepts_email_list_label": "Pretplatite se na newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Reci nam o sebi.",
   "edit_profile.fields.birthday_label": "Rođendan",
@@ -523,7 +522,6 @@
   "edit_profile.fields.discoverable_label": "Dopusti otkrivanje računa",
   "edit_profile.fields.display_name_label": "Ime za prikaz",
   "edit_profile.fields.display_name_placeholder": "Ime",
-  "edit_profile.fields.header_label": "Odaberite pozadinsku sliku",
   "edit_profile.fields.hide_network_label": "Sakrij mrežu",
   "edit_profile.fields.location_label": "Lokacija",
   "edit_profile.fields.location_placeholder": "Lokacija",
@@ -536,10 +534,8 @@
   "edit_profile.fields.website_placeholder": "Prikaži poveznicu",
   "edit_profile.header": "Uredi profil",
   "edit_profile.hints.accepts_email_list": "Uključite se u novosti i marketinška ažuriranja.",
-  "edit_profile.hints.avatar": "PNG, GIF ili JPG. Smanjit će se na {size}",
   "edit_profile.hints.bot": "Ovaj račun uglavnom izvodi automatizirane radnje i možda se neće nadzirati",
   "edit_profile.hints.discoverable": "Prikaži račun u imeniku profila i omogući indeksiranje vanjskim uslugama",
-  "edit_profile.hints.header": "PNG, GIF ili JPG. Smanjit će se na {size}",
   "edit_profile.hints.hide_network": "Koga pratite i tko vas prati neće biti prikazan na vašem profilu",
   "edit_profile.hints.locked": "Zahtijevi da ručno odobrite sljedbenike",
   "edit_profile.hints.meta_fields": "Na svom profilu možete prikazati do {count, plural, one {# prilagođenih polja} other {# prilagođenih polja}}.",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 725b2bda7..82360fafb 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index 9647f6461..f821a822a 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -121,9 +121,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index f4614f33f..ed6704b14 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index eea03929f..e7762c0fb 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/is.json b/app/soapbox/locales/is.json
index 77da0b6a4..afabe9223 100644
--- a/app/soapbox/locales/is.json
+++ b/app/soapbox/locales/is.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Breyta lykilorði",
   "edit_profile.error": "Mistókst að vista notandasnið",
   "edit_profile.fields.accepts_email_list_label": "Gerast áskrifandi að fréttabréfi",
-  "edit_profile.fields.avatar_label": "Notandamynd",
   "edit_profile.fields.bio_label": "Æviágrip",
   "edit_profile.fields.bio_placeholder": "Segðu okkur frá sjálfum þér.",
   "edit_profile.fields.birthday_label": "Afmæli",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Gera kleift að finna þig",
   "edit_profile.fields.display_name_label": "Birtingarnafn",
   "edit_profile.fields.display_name_placeholder": "Nafn",
-  "edit_profile.fields.header_label": "Síðuhaus",
   "edit_profile.fields.hide_network_label": "Fela lið þitt",
   "edit_profile.fields.location_label": "Staðstening",
   "edit_profile.fields.location_placeholder": "Staðstening",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Sýna hlekk",
   "edit_profile.header": "Breyta notandasniði",
   "edit_profile.hints.accepts_email_list": "Skrá þig fyrir fréttir og markaðsuppfærslur.",
-  "edit_profile.hints.avatar": "PNG, GIF eða JPG. Verður minnkað að {size}",
   "edit_profile.hints.bot": "Þessi reikningur framkvæmir aðallega sjálfvirkar aðgerðir og það gæti verið að ekki er eftirlit á honum",
   "edit_profile.hints.discoverable": "Virkja notandasniðamöppu þannig að aðrir netþjónar geta séð þig á því",
-  "edit_profile.hints.header": "PNG, GIF eða JPG. Verður minnkað að {size}",
   "edit_profile.hints.hide_network": "Hverjir þú fylgist með og hverjir fylgja þér verða ekki sýndir á notandasniði þínu",
   "edit_profile.hints.locked": "Krefst þess að þú samþykkir fylgjendur handvirkt",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 881ee1eca..016e50484 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -575,7 +575,6 @@
   "edit_password.header": "Modifica la password",
   "edit_profile.error": "Impossibile salvare le modifiche",
   "edit_profile.fields.accepts_email_list_label": "Autorizzo gli amministratori al trattamento dei dati per l'invio di comunicazioni",
-  "edit_profile.fields.avatar_label": "Emblema o immagine",
   "edit_profile.fields.bio_label": "Autobiografia",
   "edit_profile.fields.bio_placeholder": "Scrivi qualcosa di te, verrà mostrato pubblicamente.",
   "edit_profile.fields.birthday_label": "Compleanno",
@@ -584,7 +583,6 @@
   "edit_profile.fields.discoverable_label": "Permetti la catalogazione del profilo",
   "edit_profile.fields.display_name_label": "Nome visualizzato",
   "edit_profile.fields.display_name_placeholder": "Nome",
-  "edit_profile.fields.header_label": "Immagine di testata",
   "edit_profile.fields.hide_network_label": "Nascondi le relazioni",
   "edit_profile.fields.location_label": "Località",
   "edit_profile.fields.location_placeholder": "Località",
@@ -597,10 +595,8 @@
   "edit_profile.fields.website_placeholder": "Mostra il link",
   "edit_profile.header": "Modifica il tuo profilo",
   "edit_profile.hints.accepts_email_list": "Potresti ricevere informazioni e promozioni, di tanto in tanto.",
-  "edit_profile.hints.avatar": "PNG, GIF o JPG. Verrà ridimensionato: {size}",
   "edit_profile.hints.bot": "Questo profilo svolge prevalentemente attività automatiche e potrebbe non essere presidiato da una persona",
   "edit_profile.hints.discoverable": "Mostra il profilo nel catalogo delle istanze e permetti che sia indicizzato da servizi esterni",
-  "edit_profile.hints.header": "PNG, GIF o JPG. Verrà ridimensionato: {size}",
   "edit_profile.hints.hide_network": "Evita di mostrare Following e Follower nel profilo pubblico",
   "edit_profile.hints.locked": "Approva manualmente le richieste da nuove persone Follower",
   "edit_profile.hints.meta_fields": "Sul tuo profilo, puoi mostrare fino a {count, plural, one {# campo personalizzato} other {# campi personalizzati}}.",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index b94bd46db..16a932c25 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -459,7 +459,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "アバター画像",
   "edit_profile.fields.bio_label": "自己紹介",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "誕生日",
@@ -468,7 +467,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "表示名",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "ヘッダー",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -481,10 +479,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "edit_profile.header": "Edit Profile",
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
-  "edit_profile.hints.avatar": "PNG, GIF もしくは JPG. 最大 2 MB. 400x400pxへ縮小されます",
   "edit_profile.hints.bot": "このアカウントは主に自動で行動し、監視されていない場合があります",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF もしくは JPG. 最大 2 MB. 1500x500pxへ縮小されます",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "フォロワーを手動で承認する必要があります",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 55b0f0499..30a19ee18 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -134,9 +134,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index de3f7d434..4845da814 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index d733e326d..3297c1f4a 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index 90149ded3..8b0eb6deb 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index c49b0b0eb..c7b5373e0 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 67c1e6590..56cf9fb94 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 6d5678b52..1209a7f6c 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index aed0ba5e1..2263267b8 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -136,9 +136,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index f1e0db882..83de98344 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 594045632..d26976ee7 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -573,7 +573,6 @@
   "edit_password.header": "Endre passord",
   "edit_profile.error": "Profiloppdatering mislyktes",
   "edit_profile.fields.accepts_email_list_label": "Meld deg på nyhetsbrev",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Fortell oss om deg selv.",
   "edit_profile.fields.birthday_label": "Fødselsdag",
@@ -582,7 +581,6 @@
   "edit_profile.fields.discoverable_label": "Tillat kontooppdagelse",
   "edit_profile.fields.display_name_label": "Visningsnavn",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Skjul nettverk",
   "edit_profile.fields.location_label": "Plassering",
   "edit_profile.fields.location_placeholder": "Plassering",
@@ -595,10 +593,8 @@
   "edit_profile.fields.website_placeholder": "Vis en lenke",
   "edit_profile.header": "Rediger profil",
   "edit_profile.hints.accepts_email_list": "Meld deg på nyheter og markedsføringsoppdateringer.",
-  "edit_profile.hints.avatar": "PNG, GIF eller JPG. Vil bli nedskalert til {size}.",
   "edit_profile.hints.bot": "Denne kontoen utfører hovedsakelig automatiserte handlinger og er kanskje ikke overvåket",
   "edit_profile.hints.discoverable": "Vis konto i profilkatalog og tillat indeksering av eksterne tjenester",
-  "edit_profile.hints.header": "PNG, GIF eller JPG. Vil bli nedskalert til {size}",
   "edit_profile.hints.hide_network": "Hvem du følger og hvem som følger deg vil ikke bli vist på profilen din",
   "edit_profile.hints.locked": "Krever at du manuelt godkjenner følgere",
   "edit_profile.hints.meta_fields": "Du kan ha opptil {count, plural, one {# custom field} other {# custom fields}} vist på profilen din.",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index 2bff8c415..45e43f884 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index d027c4b84..7df05fe92 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -569,7 +569,6 @@
   "edit_password.header": "Zmień hasło",
   "edit_profile.error": "Aktualizacja profilu nie powiodła się",
   "edit_profile.fields.accepts_email_list_label": "Zasubskrybuj newsletter",
-  "edit_profile.fields.avatar_label": "Awatar",
   "edit_profile.fields.bio_label": "Opis",
   "edit_profile.fields.bio_placeholder": "Powiedz nam coś o sobie.",
   "edit_profile.fields.birthday_label": "Urodziny",
@@ -578,7 +577,6 @@
   "edit_profile.fields.discoverable_label": "Pozwól na odkrywanie konta",
   "edit_profile.fields.display_name_label": "Nazwa wyświetlana",
   "edit_profile.fields.display_name_placeholder": "Nazwa",
-  "edit_profile.fields.header_label": "Nagłówek",
   "edit_profile.fields.hide_network_label": "Ukryj swoją sieć",
   "edit_profile.fields.location_label": "Lokalizacja",
   "edit_profile.fields.location_placeholder": "Lokalizacja",
@@ -591,10 +589,8 @@
   "edit_profile.fields.website_placeholder": "Wyświetl odnośnik",
   "edit_profile.header": "Edytuj profil",
   "edit_profile.hints.accepts_email_list": "Otrzymuj wiadomości i nowości marketingowe.",
-  "edit_profile.hints.avatar": "PNG, GIF lub JPG. Zostanie zmniejszony do {size}",
   "edit_profile.hints.bot": "To konto podejmuje głównie zautomatyzowane działania i może nie być nadzorowane",
   "edit_profile.hints.discoverable": "Wyświetlaj konto w katalogu profilów i pozwalaj na indeksowanie przez zewnętrzne usługi",
-  "edit_profile.hints.header": "PNG, GIF lub JPG. Zostanie zmniejszony do {size}",
   "edit_profile.hints.hide_network": "To, kogo obserwujesz i kto Cię obserwuje nie będzie wyświetlane na Twoim profilu",
   "edit_profile.hints.locked": "Wymaga ręcznego zatwierdzania obserwacji",
   "edit_profile.hints.meta_fields": "Możesz ustawić {count, plural, one {# niestandardowe pole wyświetlane} few {# niestandardowe pola wyświetlane} many {# niestandardowych pól wyświetlanych}} na Twoim profilu.",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index f53311155..581b8e5d9 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index cf9fb910e..b7198c50e 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Biografia",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Nome de exibição",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Cabeçalho",
   "edit_profile.fields.hide_network_label": "Ocultar a minha rede",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "edit_profile.header": "Edit Profile",
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
-  "edit_profile.hints.avatar": "PNG, GIF ou JPG. Pelo menos 2 MB. Será reduzido para 400x400px",
   "edit_profile.hints.bot": "Esta conta principalmente realiza ações automatizadas e podem não ser monitorizadas",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF ou JPG. Pelo menos 2 MB. Será reduzido para 1500x500px",
   "edit_profile.hints.hide_network": "Quem segues e quem te segue não será apresentado no teu perfil",
   "edit_profile.hints.locked": "Requer que aproves manualmente seguidores",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 7ee15d5f9..f9a9b6193 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index a19cab662..45793039e 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Сменить картинку профиля",
   "edit_profile.fields.bio_label": "Описание профиля",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Отображаемое имя(Можно на русском)",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index f391d77ea..791184170 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index c310438b8..cdc34ea7b 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index ff08a559c..4ee54b212 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -135,9 +135,7 @@
   "developers.navigation.network_error_label": "Network error",
   "direct.search_placeholder": "Send a message to…",
   "edit_email.placeholder": "me@example.com",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.locked_label": "Lock account",
   "edit_profile.fields.meta_fields.content_placeholder": "Content",
   "edit_profile.fields.meta_fields.label_placeholder": "Label",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index 7cf1217bf..7a0962579 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 598ab4325..97f4a279e 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index 0eb2f231f..651617407 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index a00885a55..052bf9228 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 734003c53..55d92a360 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 10288886e..e2ce554b7 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Avatar",
   "edit_profile.fields.bio_label": "Bio",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Display name",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Header",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "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. Will be downscaled to {size}",
   "edit_profile.hints.bot": "This account mainly performs automated actions and might not be monitored",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF or JPG. Will be downscaled to {size}",
   "edit_profile.hints.hide_network": "Who you follow and who follows you will not be shown on your profile",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 2862ff7e6..1a568d3f0 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -571,7 +571,6 @@
   "edit_password.header": "Şifre Değiştir",
   "edit_profile.error": "Profil güncellemesi başarısız oldu",
   "edit_profile.fields.accepts_email_list_label": "Bültene abone ol",
-  "edit_profile.fields.avatar_label": "Profil Resmi Seçin",
   "edit_profile.fields.bio_label": "Hakkında",
   "edit_profile.fields.bio_placeholder": "Bize kendinden bahset.",
   "edit_profile.fields.birthday_label": "Doğum günü",
@@ -580,7 +579,6 @@
   "edit_profile.fields.discoverable_label": "Hesap keşfine izin ver",
   "edit_profile.fields.display_name_label": "Görünen isim",
   "edit_profile.fields.display_name_placeholder": "İsim",
-  "edit_profile.fields.header_label": "Arka Plan Resmi Seçin",
   "edit_profile.fields.hide_network_label": "Ağı gizle",
   "edit_profile.fields.location_label": "Konum",
   "edit_profile.fields.location_placeholder": "Konum",
@@ -593,10 +591,8 @@
   "edit_profile.fields.website_placeholder": "Bağlantı Görüntüle",
   "edit_profile.header": "Profili Düzenle",
   "edit_profile.hints.accepts_email_list": "Haberlere ve pazarlama güncellemelerine kaydolun.",
-  "edit_profile.hints.avatar": "PNG, GIF veya JPG formatları kabul edilmektedir. {size} boyutuna küçültülecek",
   "edit_profile.hints.bot": "Bu hesap çoğunlukla otomatik işlemler gerçekleştirir ve izlenmiyor olabilir",
   "edit_profile.hints.discoverable": "Hesabı profil dizininde görüntüleyin ve harici hizmetler tarafından dizine eklenmesine izin verin",
-  "edit_profile.hints.header": "PNG, GIF veya JPG formatları kabul edilmektedir. {size} boyutuna küçültülecek",
   "edit_profile.hints.hide_network": "Kimleri takip ettiğiniz ve kimlerin sizi takip ettiği profilinizde gösterilmeyecek",
   "edit_profile.hints.locked": "Takipçileri elle onaylamanızı gerektirir",
   "edit_profile.hints.meta_fields": "Profilinize {count}'a kadar ek alan ekleyebilirsiniz.",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index 79b068ce0..d6db01a53 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -400,7 +400,6 @@
   "edit_password.header": "Change Password",
   "edit_profile.error": "Profile update failed",
   "edit_profile.fields.accepts_email_list_label": "Subscribe to newsletter",
-  "edit_profile.fields.avatar_label": "Аватар",
   "edit_profile.fields.bio_label": "Про Вас",
   "edit_profile.fields.bio_placeholder": "Tell us about yourself.",
   "edit_profile.fields.birthday_label": "Birthday",
@@ -409,7 +408,6 @@
   "edit_profile.fields.discoverable_label": "Allow account discovery",
   "edit_profile.fields.display_name_label": "Ім'я",
   "edit_profile.fields.display_name_placeholder": "Name",
-  "edit_profile.fields.header_label": "Заголовок",
   "edit_profile.fields.hide_network_label": "Hide network",
   "edit_profile.fields.location_label": "Location",
   "edit_profile.fields.location_placeholder": "Location",
@@ -422,10 +420,8 @@
   "edit_profile.fields.website_placeholder": "Display a Link",
   "edit_profile.header": "Edit Profile",
   "edit_profile.hints.accepts_email_list": "Opt-in to news and marketing updates.",
-  "edit_profile.hints.avatar": "PNG, GIF, або JPG. Буде зменшено до {size}",
   "edit_profile.hints.bot": "Цей акаунт виконує автоматичні дії та може не відстежуватися",
   "edit_profile.hints.discoverable": "Display account in profile directory and allow indexing by external services",
-  "edit_profile.hints.header": "PNG, GIF, або JPG. Буде зменшено до {size}",
   "edit_profile.hints.hide_network": "У вашому профілі не буде відображено підписки та підписників",
   "edit_profile.hints.locked": "Requires you to manually approve followers",
   "edit_profile.hints.meta_fields": "You can have up to {count, plural, one {# custom field} other {# custom fields}} displayed on your profile.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 70c067b1a..670dc1dc9 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -580,7 +580,6 @@
   "edit_password.header": "修改密码",
   "edit_profile.error": "个人资料更新失败",
   "edit_profile.fields.accepts_email_list_label": "接收邮件列表",
-  "edit_profile.fields.avatar_label": "头像",
   "edit_profile.fields.bio_label": "简介",
   "edit_profile.fields.bio_placeholder": "请介绍一下您自己。",
   "edit_profile.fields.birthday_label": "生日",
@@ -589,7 +588,6 @@
   "edit_profile.fields.discoverable_label": "允许别人发现您",
   "edit_profile.fields.display_name_label": "昵称",
   "edit_profile.fields.display_name_placeholder": "您的昵称",
-  "edit_profile.fields.header_label": "个人资料页横幅图片",
   "edit_profile.fields.hide_network_label": "隐藏网络状态",
   "edit_profile.fields.location_label": "地点",
   "edit_profile.fields.location_placeholder": "地点",
@@ -602,10 +600,8 @@
   "edit_profile.fields.website_placeholder": "显示链接",
   "edit_profile.header": "编辑个人资料",
   "edit_profile.hints.accepts_email_list": "接收新闻和推广邮件。",
-  "edit_profile.hints.avatar": "支持 PNG、GIF 或 JPG 格式，大小将会被缩放至 {size}",
   "edit_profile.hints.bot": "此帐号主要执行自动化操作，可能不受用户控制",
   "edit_profile.hints.discoverable": "在配置文件目录中显示帐号并允许外部服务索引",
-  "edit_profile.hints.header": "支持 PNG、GIF 或 JPG 格式，大小将会被缩放至 {size}",
   "edit_profile.hints.hide_network": "您关注的人和关注您的人不会显示在您的个人资料中",
   "edit_profile.hints.locked": "需要您手动批准关注请求",
   "edit_profile.hints.meta_fields": "您最多能在个人资料页面上展示 {count} 条自定义字段。",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index b57824417..f37957d0f 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -369,7 +369,6 @@
   "edit_password.header": "修改密碼",
   "edit_profile.error": "個人資料更新失敗",
   "edit_profile.fields.accepts_email_list_label": "訂閲電子郵件列表",
-  "edit_profile.fields.avatar_label": "頭帖",
   "edit_profile.fields.bio_label": "簡介",
   "edit_profile.fields.bio_placeholder": "介紹一下自己",
   "edit_profile.fields.birthday_label": "生日",
@@ -378,7 +377,6 @@
   "edit_profile.fields.discoverable_label": "公開自己",
   "edit_profile.fields.display_name_label": "昵稱",
   "edit_profile.fields.display_name_placeholder": "你的昵稱",
-  "edit_profile.fields.header_label": "個人資料頁橫幅圖片",
   "edit_profile.fields.hide_network_label": "隱藏網絡狀態",
   "edit_profile.fields.location_label": "地點",
   "edit_profile.fields.location_placeholder": "地點",
@@ -391,10 +389,8 @@
   "edit_profile.fields.website_placeholder": "顯示連結",
   "edit_profile.header": "編輯個人資料",
   "edit_profile.hints.accepts_email_list": "接收新聞和推廣電郵",
-  "edit_profile.hints.avatar": "只支援 PNG, GIF or JPG。 尺寸將會被縮放至 {size}",
   "edit_profile.hints.bot": "此帳户主要執行自動化操作，可能不受用户控制",
   "edit_profile.hints.discoverable": "在配置文件目錄中顯示帳户並允許外部服務索引",
-  "edit_profile.hints.header": "只支援 PNG, GIF or JPG。 尺寸將會被縮放至 {size}",
   "edit_profile.hints.hide_network": "您追蹤的人和追蹤您的人不會顯示在您的個人資料中",
   "edit_profile.hints.locked": "需要您手動批准追蹤請求",
   "edit_profile.hints.meta_fields": "你能在個人資料頁面上最多顯示  {count} 行自定義列",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index a9ba226a1..2131fea74 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -369,7 +369,6 @@
   "edit_password.header": "修改密碼",
   "edit_profile.error": "個人資料更新失敗",
   "edit_profile.fields.accepts_email_list_label": "訂閲電子郵件列表",
-  "edit_profile.fields.avatar_label": "頭帖",
   "edit_profile.fields.bio_label": "簡介",
   "edit_profile.fields.bio_placeholder": "介紹一下自己",
   "edit_profile.fields.birthday_label": "生日",
@@ -378,7 +377,6 @@
   "edit_profile.fields.discoverable_label": "公開自己",
   "edit_profile.fields.display_name_label": "昵稱",
   "edit_profile.fields.display_name_placeholder": "你的昵稱",
-  "edit_profile.fields.header_label": "個人資料頁橫幅圖片",
   "edit_profile.fields.hide_network_label": "隱藏網路狀態",
   "edit_profile.fields.location_label": "地點",
   "edit_profile.fields.location_placeholder": "地點",
@@ -391,10 +389,8 @@
   "edit_profile.fields.website_placeholder": "顯示連結",
   "edit_profile.header": "編輯個人資料",
   "edit_profile.hints.accepts_email_list": "接收新聞和推廣電郵",
-  "edit_profile.hints.avatar": "只支援 PNG, GIF or JPG。 尺寸將會被縮放至 {size}",
   "edit_profile.hints.bot": "此帳戶主要執行自動化操作，可能不受用戶控制",
   "edit_profile.hints.discoverable": "在配置文件目錄中顯示帳戶並允許外部服務索引",
-  "edit_profile.hints.header": "只支援 PNG, GIF or JPG。 尺寸將會被縮放至 {size}",
   "edit_profile.hints.hide_network": "您追蹤的人和追蹤您的人不會顯示在您的個人資料中",
   "edit_profile.hints.locked": "需要您手動批准追蹤請求",
   "edit_profile.hints.meta_fields": "你能在個人資料頁面上最多顯示  {count} 行自定義列",

From 3297b263a75ab7a14d8b8553364622e9a9067d3a Mon Sep 17 00:00:00 2001
From: Alexander Minkin <weryskok@gmail.com>
Date: Thu, 6 Jul 2023 23:04:05 +0000
Subject: [PATCH 22/27] Translated using Weblate (Russian)

Currently translated at 72.8% (1161 of 1594 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ru/
---
 app/soapbox/locales/ru.json | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 45793039e..98073fddd 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -10,6 +10,7 @@
   "account.block_domain": "Блокировать все с {domain}",
   "account.blocked": "Заблокирован(а)",
   "account.chat": "Chat with @{name}",
+  "account.copy": "Скопировать ссылку на профиль",
   "account.deactivated": "Отключение Аккаунта",
   "account.direct": "Написать @{name}",
   "account.domain_blocked": "Domain hidden",
@@ -18,7 +19,7 @@
   "account.endorse.success": "You are now featuring @{acct} on your profile",
   "account.familiar_followers": "Followed by {accounts}",
   "account.familiar_followers.empty": "No one you know follows {name}.",
-  "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow",
+  "account.familiar_followers.more": "{count, plural, one {# другой, которого} other {# других, которых}} вы читаете",
   "account.follow": "Подписаться",
   "account.followers": "Подписаны",
   "account.followers.empty": "Никто не подписан на этого пользователя.",
@@ -47,6 +48,7 @@
   "account.report": "Пожаловаться",
   "account.requested": "Ожидает подтверждения. Нажмите для отмены",
   "account.requested_small": "Ожидает подтверждения",
+  "account.rss_feed": "Подписаться на RSS-ленту",
   "account.search": "Search from @{name}",
   "account.search_self": "Search your posts",
   "account.share": "Поделиться профилем @{name}",
@@ -84,6 +86,12 @@
   "account_search.placeholder": "Search for an account",
   "actualStatus.edited": "Edited {date}",
   "actualStatuses.quote_tombstone": "Post is unavailable.",
+  "admin.announcements.action": "Создать объявление",
+  "admin.announcements.all_day": "Весь день",
+  "admin.announcements.delete": "Удалить",
+  "admin.announcements.edit": "Изменить",
+  "admin.announcements.ends_at": "Заканчивается в:",
+  "admin.announcements.starts_at": "Начинается с:",
   "admin.awaiting_approval.empty_message": "Сейчас здесь пусто. Записи на одобрение появятся, когда кто-нибудь зарегистрируется.",
   "admin.dashboard.registration_mode.approval_hint": "Пользователи могут зарегистрироваться, но одобрение проводится администратором.",
   "admin.dashboard.registration_mode.approval_label": "Требуется Одобрение",
@@ -100,7 +108,18 @@
   "admin.dashcounters.user_count_label": "пользователи",
   "admin.dashwidgets.email_list_header": "Email list",
   "admin.dashwidgets.software_header": "Software",
-  "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}",
+  "admin.edit_announcement.created": "Объявление создано",
+  "admin.edit_announcement.deleted": "Объявление удалено",
+  "admin.edit_announcement.fields.all_day_hint": "Если флажок установлен, будут отображаться только даты временного диапазона",
+  "admin.edit_announcement.fields.content_label": "Содержание",
+  "admin.edit_announcement.fields.content_placeholder": "Содержание объявления",
+  "admin.edit_announcement.fields.end_time_label": "Дата окончания",
+  "admin.edit_announcement.fields.end_time_placeholder": "Объявление заканчивается:",
+  "admin.edit_announcement.fields.start_time_label": "Дата начала",
+  "admin.edit_announcement.fields.start_time_placeholder": "Объявление начинается:",
+  "admin.edit_announcement.save": "Сохранить",
+  "admin.edit_announcement.updated": "Объявление отредактировано",
+  "admin.latest_accounts_panel.more": "Нажмите, чтобы увидеть {count, plural, one {# профиль} few {# профиля} other {# профилей}}",
   "admin.latest_accounts_panel.title": "Latest Accounts",
   "admin.moderation_log.empty_message": "Пока что вы не проводили работы по модерации. Когда начнёте, здесь появится история.",
   "admin.reports.actions.close": "Закрыть",
@@ -114,6 +133,7 @@
   "admin.statuses.status_deleted_message": "Сообщение от @{acct} было удалено.",
   "admin.statuses.status_marked_message_not_sensitive": "Сообщение от @{acct} помечено как не чувстительное.",
   "admin.statuses.status_marked_message_sensitive": "Сообщение от @{acct} помечено как чувстительное.",
+  "admin.theme.title": "Тема",
   "admin.user_index.empty": "No users found.",
   "admin.user_index.search_input_placeholder": "Who are you looking for?",
   "admin.users.actions.deactivate_user": "Деактивировать @{name}",
@@ -134,7 +154,7 @@
   "admin_nav.awaiting_approval": "Ожидает одобрения",
   "admin_nav.dashboard": "Стена",
   "admin_nav.reports": "Репорты",
-  "age_verification.body": "{siteTitle} requires users to be at least {ageMinimum} years old to access its platform. Anyone under the age of {ageMinimum} years old cannot access this platform.",
+  "age_verification.body": "{siteTitle} требует, чтобы пользователям было больше {ageMinimum, plural, one {# года} other {# лет}}, чтобы посещать платформу. Любой младше {ageMinimum, plural, one {# года} other {# лет}} не может посетить эту платформу.",
   "age_verification.fail": "You must be {ageMinimum, plural, one {# year} other {# years}} old or older.",
   "age_verification.header": "Enter your birth date",
   "alert.unexpected.body": "We're sorry for the interruption. If the problem persists, please reach out to our support team. You may also try to {clearCookies} (this will log you out).",
@@ -164,9 +184,11 @@
   "app_create.scopes_placeholder": "e.g. 'read write follow'",
   "app_create.submit": "Create app",
   "app_create.website_label": "Website",
+  "auth.awaiting_approval": "Ваш профиль ожидает одобрения",
   "auth.invalid_credentials": "Wrong username or password",
   "auth.logged_out": "Logged out.",
   "auth_layout.register": "Create an account",
+  "authorize.success": "Одобрено",
   "backups.actions.create": "Создать резервную копию",
   "backups.empty_message": "Резервных копий не найдено. {action}",
   "backups.empty_message.action": "Создать?",
@@ -183,6 +205,10 @@
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
   "card.back.label": "Back",
+  "chat.actions.send": "Отправить",
+  "chat.failed_to_send": "Не удалось отправить сообщение.",
+  "chat.input.placeholder": "Напишите сообщение",
+  "chat.new_message.title": "Новое сообщение",
   "chats.actions.delete": "Удалить Сообщение",
   "chats.actions.more": "Ещё",
   "chats.actions.report": "Пожаловаться на пользователя",

From adaa096aeaddbca2c6cbecb55a5d002351b73ac2 Mon Sep 17 00:00:00 2001
From: PUFF1N <frkmhyt@gmail.com>
Date: Thu, 6 Jul 2023 21:06:18 +0000
Subject: [PATCH 23/27] Translated using Weblate (Turkish)

Currently translated at 95.7% (1527 of 1594 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 1a568d3f0..fbfa02c3a 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -10,6 +10,7 @@
   "account.block_domain": "{domain} alan adından her şeyi gizle",
   "account.blocked": "Engellenmiş",
   "account.chat": "@{name} ile sohbet",
+  "account.copy": "Bağlantıyı profile kopyala",
   "account.deactivated": "Devre dışı bırakıldı",
   "account.direct": "@{name} adlı hesaba özel mesaj gönder",
   "account.domain_blocked": "Alan adı gizli",
@@ -221,6 +222,8 @@
   "chat.welcome.accepting_messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
   "chat.welcome.notice": "Bu ayarları daha sonra değiştirebilirsiniz.",
   "chat.welcome.submit": "Kaydet ve ilerle",
+  "chat.welcome.subtitle": "Diğer kullanıcılardan doğrudan mesaj alışverişinde bulunun.",
+  "chat.welcome.title": "{br} sohbetlerine hoş geldiniz!",
   "chat_composer.unblock": "Engeli kaldır",
   "chat_list_item.blocked_you": "Bu kullanıcı sizi engelledi",
   "chat_list_item.blocking": "Bu kullanıcıyı engellediniz",
@@ -347,6 +350,7 @@
   "column.filters.title": "Başlık",
   "column.filters.whole_word": "Tüm kelime",
   "column.follow_requests": "Takip istekleri",
+  "column.followed_tags": "Takip edilen hashtagler",
   "column.followers": "Takipçiler",
   "column.following": "Takip edilenler",
   "column.group_blocked_members": "Engellenen Üyeler",
@@ -356,7 +360,7 @@
   "column.import_data": "Verileri içe aktar",
   "column.info": "Sunucu bilgisi",
   "column.lists": "Listeler",
-  "column.manage_group": "Grubu yönet",
+  "column.manage_group": "Grubu Yönet",
   "column.mentions": "Bahsetmeler",
   "column.mfa": "Çok Faktörlü Kimlik Doğrulama",
   "column.mfa_cancel": "İptal",
@@ -385,6 +389,7 @@
   "compose.character_counter.title": "{chars}/{maxChars} karakter kullanıldı",
   "compose.edit_success": "Gönderiniz düzenlendi",
   "compose.invalid_schedule": "Bir gönderiyi en az 5 dakika sonrasına zamanlayabilirsiniz.",
+  "compose.reply_group_indicator.message": "{groupLink}'te paylaşılıyor",
   "compose.submit_success": "Gönderiniz gönderildi!",
   "compose_event.create": "Oluştur",
   "compose_event.edit_success": "Etkinliğiniz düzenlendi",
@@ -506,6 +511,9 @@
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.mute.heading": "@{name} adlı hesabı sessize al",
   "confirmations.mute.message": "{name} adlı hesabı sessize almak istiyor musunuz?",
+  "confirmations.mute_group.confirm": "Sessize Al",
+  "confirmations.mute_group.heading": "Gurubu Sessize Al",
+  "confirmations.mute_group.message": "Bu gurubu sessize almak üzeresiniz. Devam etmek istediğinize emin misiniz?",
   "confirmations.redraft.confirm": "Sil ve yeniden tasarla",
   "confirmations.redraft.heading": "Sil ve yeniden taslaklaştır",
   "confirmations.redraft.message": "Bu gönderiyi silip tekrar taslaklaştırmak istediğinizden emin misiniz? Tüm yanıtlar, yeniden gönderiler ve beğenileri kaybedeceksiniz.",
@@ -524,9 +532,10 @@
   "confirmations.scheduled_status_delete.heading": "Zamanlanan gönderiyi iptal et",
   "confirmations.scheduled_status_delete.message": "Bu zamanlanmış gönderiyi iptal etmek istediğinizden emin misiniz?",
   "confirmations.unfollow.confirm": "Takibi kaldır",
+  "copy.success": "Panoya kopyalandı!",
   "crypto_donate.explanation_box.message": "{siteTitle}, kripto para bağışlarını kabul eder. Aşağıdaki adreslerden herhangi birine bağış gönderebilirsiniz. Desteğin için teşekkürler!",
   "crypto_donate.explanation_box.title": "Kripto para bağışları gönderme",
-  "crypto_donate_panel.actions.view": "Click to see {count} {count, plural, one {wallet} other {wallets}}",
+  "crypto_donate_panel.actions.view": "Click to see {count} {count, plural, one {# wallet} other {# wallets}}",
   "crypto_donate_panel.heading": "Kripto Para Bağışlayın",
   "crypto_donate_panel.intro.message": "{siteTitle}, hizmetlerini finanse etmek için kripto para bağışlarını kabul eder. Desteğin için teşekkürler!",
   "datepicker.day": "Gün",
@@ -664,6 +673,7 @@
   "empty_column.filters": "Henüz sessize alınan kelime oluşturmadınız.",
   "empty_column.follow_recommendations": "Görünüşe göre sizin için hiçbir öneri oluşturulamadı. Tanıyor olabileceğiniz kişileri aramak veya trend olan hashtag'leri keşfetmek için aramayı kullanmayı deneyebilirsiniz.",
   "empty_column.follow_requests": "Hiç takip isteğiniz yok. Bir tane aldığınızda burada görünecek.",
+  "empty_column.followed_tags": "Henüz herhangi bir etiketi takip etmediniz.",
   "empty_column.group": "Bu grupta henüz bir gönderi yok.",
   "empty_column.group_blocks": "Grup henüz hiçbir kullanıcıyı engellemedi.",
   "empty_column.group_membership_requests": "Bu grup için bekleyen üyelik isteği bulunmamaktadır.",
@@ -758,8 +768,10 @@
   "gdpr.message": "{siteTitle}, web sitesinin çalışması için gerekli olan oturum tanımlama bilgilerini kullanır.",
   "gdpr.title": "{siteTitle} çerezleri kullanır",
   "getting_started.open_source_notice": "{code_name} açık kaynaklı bir yazılımdır. Gitlab {code_link} (v{code_version}).",
+  "group.banned.message": "{group} gurubu sizi banladı",
   "group.cancel_request": "İsteği iptal et",
   "group.delete.success": "Grup başarıyla silindi",
+  "group.deleted.message": "Bu gurup silindi.",
   "group.demote.user.success": "@{name} artık bir üye",
   "group.group_mod_authorize.fail": "@{name} onaylanamadı",
   "group.group_mod_block": "@{name} adlı hesabı gruptan engelle",
@@ -775,12 +787,16 @@
   "group.join.private": "Erişim İsteği",
   "group.join.public": "Gruba Katıl",
   "group.join.request_success": "Gruba katılma isteği grup sahibine iletildi",
+  "group.join.success": "Gurup başarıyla katıldı!",
   "group.leave": "Gruptan ayrıl",
   "group.leave.label": "Ayrıl",
   "group.leave.success": "Gruptan ayrıldı",
   "group.manage": "Grubu Yönet",
   "group.member.admin.limit.summary": "Şu an için gruba en fazla {count} yönetici atayabilirsiniz.",
   "group.member.admin.limit.title": "Yönetici sınırına ulaşıldı",
+  "group.mute.label": "Sessize Al",
+  "group.mute.long_label": "Gurubu Sustur",
+  "group.mute.success": "Gurup susturuldu",
   "group.popover.action": "Grubu Görüntüle",
   "group.popover.summary": "Bu gönderiye yanıt verebilmek için grup üyesi olmanız gerekmektedir.",
   "group.popover.title": "Üyelik gerekli",
@@ -790,16 +806,32 @@
   "group.privacy.public": "Herkese açık",
   "group.privacy.public.full": "Herkese Açık Grup",
   "group.privacy.public.info": "Keşfedilebilir. Herkes katılabilir.",
+  "group.private.message": "İçeriği yalnızca gurup üyeleri görebilir",
   "group.promote.admin.confirmation.message": "Yönetici rolünü @{name} adlı hesaba atamak istediğinizden emin misiniz?",
   "group.promote.admin.confirmation.title": "Yönetici Rolü Atama",
   "group.promote.admin.success": "@{name} artık bir yönetici",
   "group.report.label": "Bildir",
   "group.role.admin": "Yönetici",
   "group.role.owner": "Sahibi",
+  "group.share.label": "Paylaş",
   "group.tabs.all": "Tümü",
+  "group.tabs.media": "Medya",
   "group.tabs.members": "Üyeler",
+  "group.tabs.tags": "Konular",
+  "group.tags.empty": "Bu gurupta henüz konular mevcut değil.",
+  "group.tags.hidden.success": "Konu gizli olarak işaretlendi",
+  "group.tags.hide": "Konuyu gizle",
   "group.tags.hint": "Grupta temel tartışma konuları olarak kullanılacak en fazla 3 anahtar kelime ekleyin.",
   "group.tags.label": "Etiketler",
+  "group.tags.pin": "Konuyu sabitle",
+  "group.tags.pin.success": "Sabitlendi!",
+  "group.tags.show": "Konuyu göster",
+  "group.tags.total": "Toplam Gönderiler",
+  "group.tags.unpin": "Konuyu Sabitlemeden Kaldır",
+  "group.tags.unpin.success": "Sabitlenmeden Çıkarıldı!",
+  "group.tags.visible.success": "Konu görünebilir olarak işaretlendi",
+  "group.unmute.label": "Susturmayı Aç",
+  "group.unmute.long_label": "Gurubun Susturmasını Aç",
   "group.upload_banner": "Fotoğraf yükle",
   "groups.discover.popular.empty": "Şu anda popüler gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
   "groups.discover.popular.show_more": "Daha Fazla Göster",

From 1b75721233df3e87459140b2f98952cd524c75d7 Mon Sep 17 00:00:00 2001
From: Alexander Minkin <weryskok@gmail.com>
Date: Sun, 9 Jul 2023 09:29:10 +0000
Subject: [PATCH 24/27] Translated using Weblate (Russian)

Currently translated at 76.0% (1212 of 1594 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/ru/
---
 app/soapbox/locales/ru.json | 53 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 98073fddd..4368d928c 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -56,7 +56,7 @@
   "account.subscribe": "Subscribe to notifications from @{name}",
   "account.subscribe.failure": "An error occurred trying to subscribe to this account.",
   "account.subscribe.success": "You have subscribed to this account.",
-  "account.unblock": "Разблокировать",
+  "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unendorse.success": "You are no longer featuring @{acct}",
@@ -111,6 +111,7 @@
   "admin.edit_announcement.created": "Объявление создано",
   "admin.edit_announcement.deleted": "Объявление удалено",
   "admin.edit_announcement.fields.all_day_hint": "Если флажок установлен, будут отображаться только даты временного диапазона",
+  "admin.edit_announcement.fields.all_day_label": "На целый день",
   "admin.edit_announcement.fields.content_label": "Содержание",
   "admin.edit_announcement.fields.content_placeholder": "Содержание объявления",
   "admin.edit_announcement.fields.end_time_label": "Дата окончания",
@@ -127,6 +128,8 @@
   "admin.reports.empty_message": "Открытых репортов нет. В будущем они появятся здесь.",
   "admin.reports.report_closed_message": "Репорт на @{name} закрыт",
   "admin.reports.report_title": "Репорт на {acct}",
+  "admin.software.backend": "Бэкенд",
+  "admin.software.frontend": "Фронтенд",
   "admin.statuses.actions.delete_status": "Удалить сообщение",
   "admin.statuses.actions.mark_status_not_sensitive": "Пометить сообщение как не чувстительное.",
   "admin.statuses.actions.mark_status_sensitive": "Пометить сообщение как чувстительное.",
@@ -209,6 +212,54 @@
   "chat.failed_to_send": "Не удалось отправить сообщение.",
   "chat.input.placeholder": "Напишите сообщение",
   "chat.new_message.title": "Новое сообщение",
+  "chat.page_settings.accepting_messages.label": "Разрешить пользователям начинать общаться с вами",
+  "chat.page_settings.play_sounds.label": "Воспроизводить звук при получении сообщения",
+  "chat.page_settings.preferences": "Параметры",
+  "chat.page_settings.privacy": "Конфиденциальность",
+  "chat.page_settings.submit": "Сохранить",
+  "chat.page_settings.title": "Настройки сообщений",
+  "chat.retry": "Повторить?",
+  "chat.welcome.accepting_messages.label": "Разрешить пользователям начинать общаться с вами",
+  "chat.welcome.notice": "Вы сможете изменить эти настройки позднее.",
+  "chat.welcome.submit": "Сохранить и продолжить",
+  "chat.welcome.subtitle": "Обменивайтесь сообщениями с другими пользователями.",
+  "chat.welcome.title": "Добро пожаловать в {br} Чаты!",
+  "chat_composer.unblock": "Разблокировать",
+  "chat_list_item.blocked_you": "Этот пользователь заблокировал вас",
+  "chat_list_item.blocking": "Вы заблокировали этого пользователя",
+  "chat_message_list.blocked": "Вы заблокировали этого пользователя",
+  "chat_message_list.blockedBy": "Вы заблокированы",
+  "chat_message_list.network_failure.action": "Повторить",
+  "chat_message_list.network_failure.subtitle": "Мы столкнулись с проблемой с подключением.",
+  "chat_message_list.network_failure.title": "Упс!",
+  "chat_message_list_intro.actions.accept": "Принять",
+  "chat_message_list_intro.actions.leave_chat": "Покинуть чат",
+  "chat_message_list_intro.actions.message_lifespan": "Сообщения старше {day, plural, one {# дня} other {# дней}} будут удалены.",
+  "chat_message_list_intro.actions.report": "Пожаловаться",
+  "chat_message_list_intro.intro": "хочет общаться с вами",
+  "chat_message_list_intro.leave_chat.confirm": "Покинуть чат",
+  "chat_message_list_intro.leave_chat.heading": "Покинуть чат",
+  "chat_message_list_intro.leave_chat.message": "Вы действительно хотите покинуть этот чат? Сообщения будут удалены у вас и этот чат пропадёт из списка.",
+  "chat_search.blankslate.body": "Найти тех, с кем можно пообщаться.",
+  "chat_search.blankslate.title": "Начать чат",
+  "chat_search.empty_results_blankslate.action": "Написать",
+  "chat_search.empty_results_blankslate.body": "Попробуйте поискать другое имя.",
+  "chat_search.empty_results_blankslate.title": "Совпадений не найдено",
+  "chat_search.placeholder": "Введите имя",
+  "chat_search.title": "Сообщения",
+  "chat_settings.auto_delete.14days": "14 дней",
+  "chat_settings.auto_delete.2minutes": "2 минуты",
+  "chat_settings.auto_delete.30days": "30 дней",
+  "chat_settings.auto_delete.7days": "7 дней",
+  "chat_settings.auto_delete.90days": "90 дней",
+  "chat_settings.auto_delete.days": "{day, plural, one {# день} few {# дня} other {# дней}}",
+  "chat_settings.auto_delete.hint": "Отправленные сообщения будут удалены автоматически после выбранного периода",
+  "chat_settings.auto_delete.label": "Автоудаление сообщений",
+  "chat_settings.block.confirm": "Заблокировать",
+  "chat_settings.block.heading": "Заблокировать @{acct}",
+  "chat_settings.block.message": "Блокировка запретит этому пользователю писать вам и просматривать ваш контент. Вы сможете отменить блокировку позже.",
+  "chat_settings.leave.confirm": "Покинуть чат",
+  "chat_settings.leave.heading": "Покинуть чат",
   "chats.actions.delete": "Удалить Сообщение",
   "chats.actions.more": "Ещё",
   "chats.actions.report": "Пожаловаться на пользователя",

From 2321493abdf4496584d9c10e28733380d6c1296b Mon Sep 17 00:00:00 2001
From: PUFF1N <frkmhyt@gmail.com>
Date: Fri, 14 Jul 2023 20:23:39 +0000
Subject: [PATCH 25/27] Translated using Weblate (Turkish)

Currently translated at 99.8% (1591 of 1594 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 87 ++++++++++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 26 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index fbfa02c3a..d20d05060 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -19,7 +19,7 @@
   "account.endorse.success": "Artık profilinizde @{acct} adlı hesabı öne çıkarıyorsunuz",
   "account.familiar_followers": "{accounts} tarafından takip edildi",
   "account.familiar_followers.empty": "{name} tanıdığınız kimse tarafından takip edilmiyor.",
-  "account.familiar_followers.more": "{count} {count, plural, one {other} other {others}} you follow",
+  "account.familiar_followers.more": "{count} {count, plural, {other} kişisini ve diğer {others}} kişilerini takip ediyorsun",
   "account.follow": "Takip et",
   "account.followers": "Takipçiler",
   "account.followers.empty": "Henüz kimse bu hesabı takip etmiyor.",
@@ -43,7 +43,7 @@
   "account.profile": "Profil",
   "account.profile_external": "Profili {domain} üzerinde görüntüle",
   "account.register": "Kayıt ol",
-  "account.remote_follow": "Aracılığıyla takip et",
+  "account.remote_follow": "Takip et (sunucu dışı)",
   "account.remove_from_followers": "Bu takipçiyi kaldır",
   "account.report": "@{name} adlı hesabı bildir",
   "account.requested": "Onay Bekleniyor. Takip isteğini iptal etmek için tıklayın",
@@ -120,7 +120,7 @@
   "admin.edit_announcement.fields.start_time_placeholder": "Duyuru başlıyor:",
   "admin.edit_announcement.save": "Kaydet",
   "admin.edit_announcement.updated": "Duyuru düzenlendi",
-  "admin.latest_accounts_panel.more": "Click to see {count} {count, plural, one {account} other {accounts}}",
+  "admin.latest_accounts_panel.more": "{count, plural, one {account} kadar hesabı ve diğer {# accounts}} hesapları görmek için için tıkla",
   "admin.latest_accounts_panel.title": "Son Hesaplar",
   "admin.moderation_log.empty_message": "Henüz herhangi bir moderasyon işlemi gerçekleştirmediniz. Burada yaptığınız moderasyon işlemlerinin geçmişi gösterilecektir.",
   "admin.reports.actions.close": "Kapat",
@@ -157,7 +157,7 @@
   "admin_nav.awaiting_approval": "Onay Bekleniyor",
   "admin_nav.dashboard": "Yönetici Paneli",
   "admin_nav.reports": "Bildirimler",
-  "age_verification.body": "{siteTitle} platformuna erişmek için kullanıcıların en az {ageMinimum} yaşında olması gerekir. {ageMinimum} yaşından küçükler bu platforma erişemez.",
+  "age_verification.body": "{siteTitle} platformuna erişmek için kullanıcıların en az {ageMinimum, plural, one {# year} other {# years}} yaşında olması gerekir. {ageMinimum, plural, one {# year} other {# years}} yaşından küçükler bu platforma erişemez.",
   "age_verification.fail": "{ageMinimum} yaşında veya daha büyük olmalısınız.",
   "age_verification.header": "Doğum tarihinizi giriniz",
   "alert.unexpected.body": "Kesinti için özür dileriz. Sorun devam ederse, lütfen destek ekibimizle iletişime geçin. {clearCookies} işlemini de deneyebilirsiniz (bu işlem oturumunuzu kapatır).",
@@ -221,14 +221,14 @@
   "chat.retry": "Tekrar dene?",
   "chat.welcome.accepting_messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
   "chat.welcome.notice": "Bu ayarları daha sonra değiştirebilirsiniz.",
-  "chat.welcome.submit": "Kaydet ve ilerle",
+  "chat.welcome.submit": "Kaydet ve İlerle",
   "chat.welcome.subtitle": "Diğer kullanıcılardan doğrudan mesaj alışverişinde bulunun.",
   "chat.welcome.title": "{br} sohbetlerine hoş geldiniz!",
   "chat_composer.unblock": "Engeli kaldır",
   "chat_list_item.blocked_you": "Bu kullanıcı sizi engelledi",
   "chat_list_item.blocking": "Bu kullanıcıyı engellediniz",
   "chat_message_list.blocked": "Bu kullanıcıyı engellediniz",
-  "chat_message_list.blockedBy": "tarafından engellendin",
+  "chat_message_list.blockedBy": "Tarafından engellendiniz:",
   "chat_message_list.network_failure.action": "Tekrar deneyiniz",
   "chat_message_list.network_failure.subtitle": "Bir ağ hatasıyla karşılaşıldı.",
   "chat_message_list.network_failure.title": "Hay aksi!",
@@ -240,7 +240,7 @@
   "chat_message_list_intro.leave_chat.confirm": "Sohbetten Ayrıl",
   "chat_message_list_intro.leave_chat.heading": "Sohbetten Ayrıl",
   "chat_message_list_intro.leave_chat.message": "Bu sohbetten ayrılmaktan emin misiniz? Ayrıldığınızda sohbet ve mesajlar gelen kutunuzdan kaldırılacaktır.",
-  "chat_search.blankslate.body": "Sohbet etmek için birini arayın.",
+  "chat_search.blankslate.body": "Sohbet etmek için birini aratın.",
   "chat_search.blankslate.title": "Sohbet başlat",
   "chat_search.empty_results_blankslate.action": "Birine mesaj gönder",
   "chat_search.empty_results_blankslate.body": "Başka bir isim aramayı deneyin.",
@@ -308,7 +308,7 @@
   "column.app_create": "Uygulama oluştur",
   "column.backups": "Yedekler",
   "column.birthdays": "Doğum günleri",
-  "column.blocks": "Engellenen kullanıcılar",
+  "column.blocks": "Engellenenler",
   "column.bookmarks": "Yer imleri",
   "column.chats": "Sohbetler",
   "column.community": "Yerel zaman tüneli",
@@ -368,7 +368,7 @@
   "column.mfa_disable_button": "Devre dışı bırak",
   "column.mfa_setup": "Kuruluma Devam Edin",
   "column.migration": "Hesap taşıma",
-  "column.mutes": "Sessize alınmış kullanıcılar",
+  "column.mutes": "Sessize alınmışlar",
   "column.notifications": "Bildirimler",
   "column.pins": "Sabitlenmiş gönderiler",
   "column.preferences": "Tercihler",
@@ -493,14 +493,14 @@
   "confirmations.delete_event.message": "Bu etkinliği silmek istediğinizden emin misiniz?",
   "confirmations.delete_from_group.message": "@{name} adlı hesabın gönderisini silmek istediğinizden emin misiniz?",
   "confirmations.delete_group.confirm": "Sil",
-  "confirmations.delete_group.heading": "Grubu sil",
+  "confirmations.delete_group.heading": "Grubu Sil",
   "confirmations.delete_group.message": "Bu grubu silmek istediğinizden emin misiniz? Bu, geri alınamayan kalıcı bir eylemdir.",
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.heading": "Listeyi sil",
   "confirmations.delete_list.message": "Bu listeyi kalıcı olarak silmek istediğinize emin misiniz?",
   "confirmations.domain_block.confirm": "Alan adının tamamını gizle",
   "confirmations.domain_block.heading": "{domain} alan adını engelle",
-  "confirmations.domain_block.message": "Tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç hedefli engel ve susturma işi görür ve tercih edilir.",
+  "confirmations.domain_block.message": "Tüm {domain} alan adını engellemek istediğinizden emin misiniz? Genellikle birkaç engel ve sessize alma işinizi görür ve tercih edilesidir. Bu alan adından dışarıya açık akışınızdan ua da bildirimlerden herhangi bir içerik görmeyeceksiniz.",
   "confirmations.kick_from_group.confirm": "Gruptan At",
   "confirmations.kick_from_group.message": "@{name} adlı hesabı gruptan atmak istediğinizden emin misiniz?",
   "confirmations.leave_event.confirm": "Etkinlikten ayrıl",
@@ -792,7 +792,7 @@
   "group.leave.label": "Ayrıl",
   "group.leave.success": "Gruptan ayrıldı",
   "group.manage": "Grubu Yönet",
-  "group.member.admin.limit.summary": "Şu an için gruba en fazla {count} yönetici atayabilirsiniz.",
+  "group.member.admin.limit.summary": "Şu an için gruba en fazla {count, plural, one {admin} other {admins}} yönetici atayabilirsiniz.",
   "group.member.admin.limit.title": "Yönetici sınırına ulaşıldı",
   "group.mute.label": "Sessize Al",
   "group.mute.long_label": "Gurubu Sustur",
@@ -832,7 +832,11 @@
   "group.tags.visible.success": "Konu görünebilir olarak işaretlendi",
   "group.unmute.label": "Susturmayı Aç",
   "group.unmute.long_label": "Gurubun Susturmasını Aç",
+  "group.unmute.success": "Sessize alınmadan çıkarılmış guruplar",
+  "group.update.success": "Grup başarıyla kaydedildi",
+  "group.upload_avatar": "Bir profil resmi yükle",
   "group.upload_banner": "Fotoğraf yükle",
+  "group.upload_banner.title": "Bir arkaplan resmi yükle",
   "groups.discover.popular.empty": "Şu anda popüler gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
   "groups.discover.popular.show_more": "Daha Fazla Göster",
   "groups.discover.popular.title": "Popüler Gruplar",
@@ -850,6 +854,10 @@
   "groups.discover.suggested.empty": "Şu anda önerilen gruplar getirilemiyor. Lütfen daha sonra tekrar kontrol edin.",
   "groups.discover.suggested.show_more": "Daha Fazla Göster",
   "groups.discover.suggested.title": "Sizin İçin Önerilenler",
+  "groups.discover.tags.empty": "Popüler olan konular yüklenemedi. Lütfen daha sonra tekrar kontrol edin.",
+  "groups.discover.tags.show_more": "Daha Fazla Göster",
+  "groups.discover.tags.title": "Konulara Gözat",
+  "groups.discovery.tags.no_of_groups": "Grup sayısı",
   "groups.empty.subtitle": "Katılabileceğiniz grupları keşfetmeye başlayın veya kendi grubunuzu oluşturun.",
   "groups.empty.title": "Henüz Grup Yok",
   "groups.pending.count": "bekleyen istek",
@@ -858,10 +866,14 @@
   "groups.pending.label": "Bekleyen İstekler",
   "groups.popular.label": "Önerilen Gruplar",
   "groups.search.placeholder": "Gruplarımda Ara",
+  "groups.suggested.label": "Önerilen Guruplar",
+  "groups.tags.title": "Konulara Gözat",
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
+  "hashtag.follow": "Hashtag'i takip edin",
   "header.home.label": "Anasayfa",
+  "header.login.email.placeholder": "E-posta adresi",
   "header.login.forgot_password": "Şifrenizi mi unuttunuz?",
   "header.login.label": "Giriş Yap",
   "header.login.password.label": "Şifre",
@@ -928,6 +940,8 @@
   "landing_page_modal.download": "İndir",
   "landing_page_modal.helpCenter": "Yardım Merkezi",
   "lightbox.close": "Kapat",
+  "lightbox.expand": "Genişlet",
+  "lightbox.minimize": "Küçült",
   "lightbox.next": "Sonraki",
   "lightbox.previous": "Önceki",
   "lightbox.view_context": "İçeriği göster",
@@ -946,6 +960,7 @@
   "lists.subheading": "Listeleriniz",
   "loading_indicator.label": "Yükleniyor…",
   "location_search.placeholder": "Adres ara",
+  "login.fields.email_label": "E-posta adresi",
   "login.fields.instance_label": "Sunucu",
   "login.fields.instance_placeholder": "example.com",
   "login.fields.otp_code_hint": "Telefon uygulamanız tarafından oluşturulan iki faktörlü kodu girin veya kurtarma kodlarınızdan birini kullanın",
@@ -967,10 +982,10 @@
   "manage_group.confirmation.info_3": "Üye sayısını artırmak için yeni grubunuzu arkadaşlarınız, aileniz ve takipçilerinizle paylaşın.",
   "manage_group.confirmation.share": "Bu grubu paylaşın",
   "manage_group.confirmation.title": "Her şey hazır!",
-  "manage_group.create": "Oluştur",
-  "manage_group.delete_group": "Grubu sil",
+  "manage_group.create": "Gurup Oluştur",
+  "manage_group.delete_group": "Grubu Sil",
   "manage_group.done": "Bitti",
-  "manage_group.edit_group": "Grubu düzenle",
+  "manage_group.edit_group": "Grubu Düzenle",
   "manage_group.fields.cannot_change_hint": "Grup oluşturulduktan sonra bu değiştirilemez.",
   "manage_group.fields.description_label": "Açıklama",
   "manage_group.fields.description_placeholder": "Açıklama",
@@ -1033,12 +1048,15 @@
   "mute_modal.auto_expire": "Sessize alma işlemi otomatik olarak sona ersin mi?",
   "mute_modal.duration": "Süre",
   "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
+  "mutes.empty.groups": "Herhangi bir gurubu henüz susturmadınız.",
   "navbar.login.action": "Giriş yap",
+  "navbar.login.email.placeholder": "E-posta adresi",
   "navbar.login.forgot_password": "Şifrenizi mi unuttunuz?",
   "navbar.login.password.label": "Şifre",
   "navbar.login.username.placeholder": "E-posta ya da kullanıcı adı",
   "navigation.chats": "Sohbetler",
   "navigation.compose": "Gönderi oluştur",
+  "navigation.compose_group": "Guruba İçerik Oluştur",
   "navigation.dashboard": "Yönetici Paneli",
   "navigation.developers": "Geliştiriciler",
   "navigation.direct_messages": "Mesajlar",
@@ -1052,15 +1070,20 @@
   "navigation_bar.compose_direct": "Özel mesaj",
   "navigation_bar.compose_edit": "Gönderiyi düzenle",
   "navigation_bar.compose_event": "Etkinliği yönet",
+  "navigation_bar.compose_group": "Guruba içerik oluştur",
+  "navigation_bar.compose_group_reply": "Grup gönderisine yanıt ver",
   "navigation_bar.compose_quote": "Gönderiyi alıntıla",
   "navigation_bar.compose_reply": "Gönderiyi yanıtla",
   "navigation_bar.create_event": "Yeni etkinlik oluştur",
   "navigation_bar.create_group": "Grup Oluştur",
+  "navigation_bar.create_group.private": "Özel Grup Oluştur",
+  "navigation_bar.create_group.public": "Genele Açık Gurup Oluştur",
   "navigation_bar.domain_blocks": "Alan adı engelleri",
   "navigation_bar.edit_group": "Grubu Düzenle",
   "navigation_bar.favourites": "Beğeniler",
   "navigation_bar.filters": "Sessize alınmış kelimeler",
   "navigation_bar.follow_requests": "Takip istekleri",
+  "navigation_bar.followed_tags": "Takip edilen hashtagler",
   "navigation_bar.import_data": "Verileri içe aktar",
   "navigation_bar.in_reply_to": "Cevap olarak",
   "navigation_bar.invites": "Davetler",
@@ -1078,6 +1101,8 @@
   "notification.favourite": "{name} senin gönderini beğenilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
   "notification.follow_request": "{name} sizi takip etmek istiyor",
+  "notification.group_favourite": "{name} grup gönderinizi beğendi",
+  "notification.group_reblog": "{name} grup gönderinizi yeniden yayınladı",
   "notification.mention": "{name} senden bahsetti",
   "notification.mentioned": "{name} senden bahsetti",
   "notification.move": "{name}, {targetName} konumuna taşındı.",
@@ -1101,7 +1126,7 @@
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
   "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
-  "notifications.group": "{count} bildirim",
+  "notifications.group": "{count, plural, one {# bildirim} ve diğer {# bildirimler}}",
   "notifications.queue_label": "{count} yeni {count, plural, one {bildirimi} other {bildirimleri}} görmek için tıklayınız",
   "oauth_consumer.tooltip": "{provider} ile giriş yapın",
   "oauth_consumers.title": "Diğer oturum açma yöntemleri",
@@ -1134,6 +1159,7 @@
   "onboarding.suggestions.title": "Önerilen hesaplar",
   "onboarding.view_feed": "Beslemeyi Görüntüle",
   "password_reset.confirmation": "Onay için e-postanızı kontrol edin.",
+  "password_reset.fields.email_placeholder": "E-posta adresi",
   "password_reset.fields.username_placeholder": "E-posta ya da kullanıcı adı",
   "password_reset.header": "Şifre Sıfırlama",
   "password_reset.reset": "Şifreyi sıfırla",
@@ -1252,6 +1278,7 @@
   "remote_interaction.dislike": "Beğenmemeyi onaylayın",
   "remote_interaction.dislike_title": "Gönderiyi uzaktan beğenmeme",
   "remote_interaction.divider": "veya",
+  "remote_interaction.event_join": "Katılmaya devam et",
   "remote_interaction.event_join_title": "Etkinliğe uzaktan katılın",
   "remote_interaction.favourite": "Beğenmeye devam et",
   "remote_interaction.favourite_title": "Bir gönderiyi uzaktan beğen",
@@ -1312,7 +1339,7 @@
   "search_results.filter_message": "@{acct} adlı hesabın gönderilerini arıyorsunuz.",
   "search_results.hashtags": "Hashtagler",
   "search_results.statuses": "Gönderiler",
-  "security.codes.fail": "Yedek kodlar getirilemedi",
+  "security.codes.fail": "Kurtarma kodları yüklenemedi",
   "security.confirm.fail": "Yanlış kod veya şifre. Tekrar deneyin.",
   "security.delete_account.fail": "Hesap silme işlemi başarısız oldu.",
   "security.delete_account.success": "Hesap başarıyla silindi.",
@@ -1335,14 +1362,17 @@
   "security.update_password.fail": "Şifre güncelleme başarısız oldu.",
   "security.update_password.success": "Şifre başarıyla güncellendi.",
   "settings.account_migration": "Hesabı taşı",
+  "settings.blocks": "Engellemeler",
   "settings.change_email": "E-postayı Değiştir",
-  "settings.change_password": "Şifre Değiştir",
+  "settings.change_password": "Şifreyi Değiştir",
   "settings.configure_mfa": "Çok Faktörlü Kimlik Doğrulamayı Yapılandır",
   "settings.delete_account": "Hesabı sil",
   "settings.edit_profile": "Profili Düzenle",
   "settings.messages.label": "Kullanıcıların sizinle yeni bir sohbet başlatmasına izin verin",
-  "settings.other": "Diğer seçenekler",
+  "settings.mutes": "Sessize alınanlar",
+  "settings.other": "Diğer Seçenekler",
   "settings.preferences": "Tercihler",
+  "settings.privacy": "Gizlilik",
   "settings.profile": "Profil",
   "settings.save.success": "Tercihleriniz kaydedildi!",
   "settings.security": "Güvenlik",
@@ -1350,9 +1380,9 @@
   "settings.settings": "Ayarlar",
   "shared.tos": "Kullanım Şartları",
   "signup_panel.subtitle": "Ne olduğunu tartışmak için şimdi kaydolun.",
-  "signup_panel.title": "{site_title} sitesinde yeni misiniz?",
+  "signup_panel.title": "{site_title} sitesine yeni misiniz?",
   "site_preview.preview": "Önizleme",
-  "sms_verification.expired": "SMS belirtecinizin süresi doldu.",
+  "sms_verification.expired": "SMS tokeninizin süresi doldu.",
   "sms_verification.fail": "Telefon numaranıza SMS mesajı gönderilemedi.",
   "sms_verification.header": "Telefon numaranızı girin",
   "sms_verification.invalid": "Lütfen geçerli bir telefon numarası girin.",
@@ -1401,6 +1431,7 @@
   "soapbox_config.home_footer.meta_fields.label_placeholder": "Etiket",
   "soapbox_config.home_footer.meta_fields.url_placeholder": "URL",
   "soapbox_config.media_preview_hint": "Bazı yazılımlar zaman çizelgelerinde görüntülenmek üzere resim ve videoların optimize edilmiş bir ön izleme sürümünü sağlar. Ancak, bu ön izleme görüntüleri ek yapılandırma olmadan çok küçük olabilir.",
+  "soapbox_config.media_preview_label": "Küçük resimler için önizlemeyi tercih et",
   "soapbox_config.promo_panel.meta_fields.icon_placeholder": "Simge",
   "soapbox_config.promo_panel.meta_fields.label_placeholder": "Etiket",
   "soapbox_config.promo_panel.meta_fields.url_placeholder": "URL",
@@ -1426,7 +1457,7 @@
   "status.cancel_reblog_private": "Yeniden paylaşımı kaldır",
   "status.cannot_reblog": "Bu gönderi yeniden gönderilemez",
   "status.chat": "@{name} ile sohbet edin",
-  "status.copy": "Gönderi bağlantısını kopyala",
+  "status.copy": "Gönderi'nin Bağlantısını Kopyala",
   "status.delete": "Sil",
   "status.detailed_status": "Detaylı yazışma dökümü",
   "status.direct": "@{name} adlı hesaba özel mesaj gönder",
@@ -1446,9 +1477,11 @@
   "status.load_more": "Daha fazla",
   "status.mention": "@{name} adlı hesaptan bahset",
   "status.more": "Daha fazla",
-  "status.mute_conversation": "Yazışmayı sessize al",
-  "status.open": "Bu gönderiyi genişlet",
+  "status.mute_conversation": "Yazışmayı Sessize Al",
+  "status.open": "Gönderi Detaylarını Göster",
   "status.pin": "Profile sabitle",
+  "status.pin_to_group": "Guruba Sabitle",
+  "status.pin_to_group.success": "Guruba Sabitlendi!",
   "status.pinned": "Sabitlenmiş gönderi",
   "status.quote": "Gönderiyi alıntıla",
   "status.reactions.cry": "Üzgün",
@@ -1462,6 +1495,7 @@
   "status.reblog": "Yeniden Gönder",
   "status.reblog_private": "Orjinal kitleye yeniden gönder",
   "status.reblogged_by": "{name} adlı hesap gönderinizi yeniden yayınladı",
+  "status.reblogged_by_with_group": "{name} {group} gurubunda yeniden paylaşıldı",
   "status.reblogs.empty": "Kimse bu gönderiyi yeniden yayınlamadı. Biri yaptığında burada gözükecek.",
   "status.redraft": "Sil ve tekrar taslağa çevir",
   "status.remove_account_from_group": "Hesabı gruptan kaldır",
@@ -1476,14 +1510,15 @@
   "status.show_less_all": "Hepsi için daha az göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
   "status.show_original": "Orijinali göster",
-  "status.title": "Post",
+  "status.title": "Gönderi Detayları",
   "status.title_direct": "Özel mesaj",
   "status.translate": "Tercüme et",
   "status.translated_from_with": "{provider} kullanılarak {lang} dilinden çevrildi",
   "status.unbookmark": "Yer imini kaldır",
   "status.unbookmarked": "Yer imi kaldırıldı.",
-  "status.unmute_conversation": "Yazışmayı sessizden kaldır",
+  "status.unmute_conversation": "Yazışmayı Sessize Almadan Kaldır",
   "status.unpin": "Profilden sabitlemeyi kaldır",
+  "status.unpin_to_group": "Guruptan Sabitleneni Kaldır",
   "status_list.queue_label": "{count} yeni {count, plural, one {bildirimi} other {bildirimleri}} görmek için tıklayınız",
   "statuses.quote_tombstone": "Gönderi bulunamadı.",
   "statuses.tombstone": "Bir veya daha fazla mesaj bulunamadı.",

From ded43c54ab44a07f6d8c421bc4ba140ccba70f44 Mon Sep 17 00:00:00 2001
From: PUFF1N <frkmhyt@gmail.com>
Date: Sun, 16 Jul 2023 03:31:04 +0000
Subject: [PATCH 26/27] Translated using Weblate (Turkish)

Currently translated at 99.8% (1591 of 1594 strings)

Translation: Soapbox/Soapbox
Translate-URL: https://hosted.weblate.org/projects/soapbox-pub/soapbox/tr/
---
 app/soapbox/locales/tr.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index d20d05060..3a413834f 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -23,7 +23,7 @@
   "account.follow": "Takip et",
   "account.followers": "Takipçiler",
   "account.followers.empty": "Henüz kimse bu hesabı takip etmiyor.",
-  "account.follows": "Takip edilenler",
+  "account.follows": "Takip ediliyor",
   "account.follows.empty": "Bu kullanıcı henüz kimseyi takip etmiyor.",
   "account.follows_you": "Seni takip ediyor",
   "account.header.alt": "Profil başlığı",
@@ -120,7 +120,7 @@
   "admin.edit_announcement.fields.start_time_placeholder": "Duyuru başlıyor:",
   "admin.edit_announcement.save": "Kaydet",
   "admin.edit_announcement.updated": "Duyuru düzenlendi",
-  "admin.latest_accounts_panel.more": "{count, plural, one {account} kadar hesabı ve diğer {# accounts}} hesapları görmek için için tıkla",
+  "admin.latest_accounts_panel.more": "{count, plural, one {# account} kadar hesabı ve diğer {# accounts}} hesapları görmek için tıkla",
   "admin.latest_accounts_panel.title": "Son Hesaplar",
   "admin.moderation_log.empty_message": "Henüz herhangi bir moderasyon işlemi gerçekleştirmediniz. Burada yaptığınız moderasyon işlemlerinin geçmişi gösterilecektir.",
   "admin.reports.actions.close": "Kapat",
@@ -146,8 +146,8 @@
   "admin.users.actions.promote_to_admin_message": "@{acct} adlı hesap yönetici seviyesine yükseltildi",
   "admin.users.actions.promote_to_moderator_message": "@{acct} adlı hesap moderatörlük seviyesine yükseltildi",
   "admin.users.badges_saved_message": "Özel etiketler güncellendi.",
-  "admin.users.remove_donor_message": "@{acct} was removed as a donor",
-  "admin.users.set_donor_message": "@{acct} was set as a donor",
+  "admin.users.remove_donor_message": "@{acct} artık bağışçılardan biri değil",
+  "admin.users.set_donor_message": "@{acct} bağışçı olarak ayarlandı",
   "admin.users.user_deactivated_message": "@{acct} devre dışı bırakıldı",
   "admin.users.user_deleted_message": "@{acct} adlı hesap silindi",
   "admin.users.user_suggested_message": "@{acct} adlı hesap önerildi",
@@ -335,7 +335,7 @@
   "column.filters.create_error": "Filtre eklenirken hata oluştu",
   "column.filters.delete": "Sil",
   "column.filters.delete_error": "Filtre silinirken hata oluştu",
-  "column.filters.drop_header": "Drop instead of hide",
+  "column.filters.drop_header": "Gizlemek yerine bırak",
   "column.filters.drop_hint": "Filtrelenen gönderiler, filtre daha sonra kaldırılsa bile geri alınamayacak şekilde kaybolacak",
   "column.filters.edit": "Düzenle",
   "column.filters.expires": "Şu tarihten sonra sona eriyor:",
@@ -352,7 +352,7 @@
   "column.follow_requests": "Takip istekleri",
   "column.followed_tags": "Takip edilen hashtagler",
   "column.followers": "Takipçiler",
-  "column.following": "Takip edilenler",
+  "column.following": "Takip ediliyor",
   "column.group_blocked_members": "Engellenen Üyeler",
   "column.group_pending_requests": "Bekleyen istekler",
   "column.groups": "Gruplar",
@@ -462,7 +462,7 @@
   "confirmations.admin.delete_user.heading": "@{acct} adlı hesabı sil",
   "confirmations.admin.delete_user.message": "@{acct} adlı hesabı silmek üzeresiniz. BU, GERİ DÖNÜŞÜ OLMAYAN YIKICI BİR EYLEMDİR.",
   "confirmations.admin.mark_status_not_sensitive.confirm": "Gönderiyi hassas değil olarak işaretle",
-  "confirmations.admin.mark_status_not_sensitive.heading": "Gönderiyi hassas değil olarak işaretle",
+  "confirmations.admin.mark_status_not_sensitive.heading": "Gönderiyi hassas değil olarak işaretle.",
   "confirmations.admin.mark_status_not_sensitive.message": "@{acct} tarafından gönderilen bir gönderiyi hassas değil olarak işaretlemek üzeresiniz.",
   "confirmations.admin.mark_status_sensitive.confirm": "Gönderiyi hassas olarak işaretle",
   "confirmations.admin.mark_status_sensitive.heading": "Gönderiyi hassas olarak işaretle",
@@ -614,7 +614,7 @@
   "email_passthru.fail.expired": "E-posta bağlantınızın süresi doldu",
   "email_passthru.fail.generic": "E-postanızı onaylayamadık",
   "email_passthru.fail.invalid_token": "Bağlantı hatalı",
-  "email_passthru.fail.not_found": "E-posta bağlantınız geçersiz",
+  "email_passthru.fail.not_found": "E-posta bağlantınız geçersiz.",
   "email_passthru.generic_fail.body": "Lütfen yeni bir e-posta onayı isteyin.",
   "email_passthru.generic_fail.heading": "Bir şeyler yanlış gitti",
   "email_passthru.success": "Email adresin onaylandı!",
@@ -726,7 +726,7 @@
   "export_data.actions.export_follows": "Takipleri dışa aktar",
   "export_data.actions.export_mutes": "Sessize almaları dışa aktar",
   "export_data.blocks_label": "Engellemeler",
-  "export_data.follows_label": "Takip edilenler",
+  "export_data.follows_label": "Takip ediyor",
   "export_data.hints.blocks": "Engellenen hesapların listesini içeren bir CSV dosyası alın",
   "export_data.hints.follows": "Takip edilen hesapların listesini içeren bir CSV dosyası alın",
   "export_data.hints.mutes": "Sessize alınan hesapların listesini içeren bir CSV dosyası alın",
@@ -1022,8 +1022,8 @@
   "mfa.otp_enabled_title": "OTP Etkin",
   "mfa.setup_recoverycodes": "Kurtarma kodları",
   "mfa.setup_warning": "Bu kodları not edin veya güvenli bir yere kaydedin - aksi halde bir daha görmezsiniz. 2FA uygulamanıza ve kurtarma kodlarına erişiminizi kaybederseniz, hesabınız kilitlenir.",
-  "migration.fields.acct.label": "Handle of the new account",
-  "migration.fields.acct.placeholder": "username@domain",
+  "migration.fields.acct.label": "Yeni hesabın tanıtıcısı",
+  "migration.fields.acct.placeholder": "kullanıcıismi@alanadı",
   "migration.fields.confirm_password.label": "Mevcut Şifre",
   "migration.hint": "Bu, takipçilerinizi yeni hesaba taşıyacaktır. Başka hiçbir veri taşınmayacak. Taşıma işlemini gerçekleştirmek için önce yeni hesabınızda {link} oluşturmanız gerekir.",
   "migration.hint.cooldown_period": "Hesabınızı taşırsanız, {cooldownPeriod, plural, one {bir gün} other {sonraki # gün}} boyunca hesabınızı tekrar taşıyamazsınız.",
@@ -1105,7 +1105,7 @@
   "notification.group_reblog": "{name} grup gönderinizi yeniden yayınladı",
   "notification.mention": "{name} senden bahsetti",
   "notification.mentioned": "{name} senden bahsetti",
-  "notification.move": "{name}, {targetName} konumuna taşındı.",
+  "notification.move": "{name}, {targetName} konumuna taşındı",
   "notification.name": "{link}{others}",
   "notification.others": " + {count} diğer",
   "notification.pleroma:chat_mention": "{name} sana bir mesaj gönderdi",
@@ -1122,7 +1122,7 @@
   "notifications.filter.boosts": "Yeniden gönderimler",
   "notifications.filter.emoji_reacts": "Emoji tepkileri",
   "notifications.filter.favourites": "Beğeniler",
-  "notifications.filter.follows": "Takip edilenler",
+  "notifications.filter.follows": "Takip ediyor",
   "notifications.filter.mentions": "Bahsetmeler",
   "notifications.filter.polls": "Anket sonuçları",
   "notifications.filter.statuses": "Takip ettiğiniz kişilerden gelen güncellemeler",
@@ -1274,7 +1274,7 @@
   "remote_instance.federation_panel.some_restrictions_message": "{siteTitle}, {host} üzerinde bazı kısıtlamalar getirdi.",
   "remote_instance.pin_host": "{host}'u sabitle",
   "remote_instance.unpin_host": "{host}'un sabitlemesini kaldırın",
-  "remote_interaction.account_placeholder": "İşlem yapmak istediğiniz tam kullanıcı adınızı (ör: @kullanici@example.com) yazınız.",
+  "remote_interaction.account_placeholder": "İşlem yapmak istediğiniz tam kullanıcı adınızı (ör: @kullanici@example.com) yazınız",
   "remote_interaction.dislike": "Beğenmemeyi onaylayın",
   "remote_interaction.dislike_title": "Gönderiyi uzaktan beğenmeme",
   "remote_interaction.divider": "veya",
@@ -1326,7 +1326,7 @@
   "reset_password.fail": "Süresi dolmuş bağlantı, lütfen tekrar deneyin.",
   "reset_password.header": "Yeni Şifre Belirle",
   "reset_password.password.label": "Şifre",
-  "reset_password.password.placeholder": "Placeholder",
+  "reset_password.password.placeholder": "Yer tutucu",
   "save": "Kaydet",
   "schedule.post_time": "Gönderme Tarihi/Saati",
   "schedule.remove": "Zamanlamayı kaldır",
@@ -1388,7 +1388,7 @@
   "sms_verification.invalid": "Lütfen geçerli bir telefon numarası girin.",
   "sms_verification.modal.enter_code": "Size SMS yoluyla 6 haneli bir kod gönderdik. Aşağıya girin.",
   "sms_verification.modal.resend_code": "Doğrulama kodu yeniden gönderilsin mi?",
-  "sms_verification.modal.verify_code": "Doğrulama kodu",
+  "sms_verification.modal.verify_code": "Kodu doğrula",
   "sms_verification.modal.verify_help_text": "{instance} kullanmaya başlamak için telefon numaranızı doğrulayın.",
   "sms_verification.modal.verify_number": "Telefon numarasını doğrulayın",
   "sms_verification.modal.verify_sms": "SMS'i doğrula",
@@ -1424,7 +1424,7 @@
   "soapbox_config.headings.options": "Seçenekler",
   "soapbox_config.headings.theme": "Tema",
   "soapbox_config.hints.crypto_addresses": "Sitenizin kullanıcılarının size bağış yapabilmesi için kripto para adresleri ekleyin. Sıra önemlidir ve küçük harfli ticker değerleri kullanmalısınız.",
-  "soapbox_config.hints.home_footer_fields": "Statik sayfalarınızın altbilgisinde görüntülenen özel tanımlı bağlantılara sahip olabilirsiniz.",
+  "soapbox_config.hints.home_footer_fields": "Statik sayfalarınızın altbilgisinde görüntülenen özel tanımlı bağlantılara sahip olabilirsiniz",
   "soapbox_config.hints.logo": "SVG. En fazla 2 MB. En boy oranı korunarak 50px yüksekliğe kadar görüntülenecektir",
   "soapbox_config.hints.promo_panel_fields": "Zaman çizelgeleri sayfasının sağ panelinde görüntülenen özel tanımlı bağlantılara sahip olabilirsiniz.",
   "soapbox_config.hints.promo_panel_icons.link": "Soapbox Simge Listesi",
@@ -1489,7 +1489,7 @@
   "status.reactions.heart": "Sevdim",
   "status.reactions.laughing": "Haha",
   "status.reactions.like": "Beğendim",
-  "status.reactions.open_mouth": "Wow",
+  "status.reactions.open_mouth": "Vaouuv",
   "status.reactions.weary": "Bıkkın",
   "status.read_more": "Daha dazla oku",
   "status.reblog": "Yeniden Gönder",

From 59ee3b102d56327d6bc2ad0ade587fbad40d5e3c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 17 Jul 2023 10:55:08 -0500
Subject: [PATCH 27/27] Fix FE_SUBDIRECTORY lint error

---
 webpack/shared.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webpack/shared.ts b/webpack/shared.ts
index 41ad28773..3d71bfa79 100644
--- a/webpack/shared.ts
+++ b/webpack/shared.ts
@@ -58,7 +58,7 @@ const configuration: Configuration = {
     chunkFilename: 'packs/js/[name].chunk.js',
     hotUpdateChunkFilename: 'packs/js/[id].hot-update.js',
     path: output.path,
-    publicPath: process.env.FE_SUBDIRECTORY || '/',
+    publicPath: FE_SUBDIRECTORY || '/',
   },
 
   optimization: {