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

Merge upstream changes up to 377952703cf70f14008cc7938479558d8cca9903

.github/ISSUE_TEMPLATE/2.server_bug_report.yml

@@ -59,7 +59,7 @@ body:
         Any additional technical details you may have, like logs or error traces
       value: |
         If this is happening on your own Mastodon server, please fill out those:
-        - Ruby version: (from `ruby --version`, eg. v3.4.4)
+        - Ruby version: (from `ruby --version`, eg. v3.4.9)
         - Node.js version: (from `node --version`, eg. v22.16.0)
     validations:
       required: false

.github/ISSUE_TEMPLATE/3.troubleshooting.yml

@@ -60,7 +60,7 @@ body:
       value: |
         Please at least include those informations:
         - Operating system: (eg. Ubuntu 24.04.2)
-        - Ruby version: (from `ruby --version`, eg. v3.4.4)
+        - Ruby version: (from `ruby --version`, eg. v3.4.9)
         - Node.js version: (from `node --version`, eg. v22.16.0)
     validations:
       required: false

.github/actions/setup-ruby/action.yml

@@ -17,7 +17,7 @@ runs:
         sudo apt-get install -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
 
     - name: Set up Ruby
-      uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1
+      uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true

.github/workflows/bundler-audit.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1
+        uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
         with:
           bundler-cache: true
 

.github/workflows/lint-haml.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1
+        uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
         with:
           bundler-cache: true
 

.github/workflows/lint-ruby.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1
+        uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1
         with:
           bundler-cache: true
 

.ruby-version

@@ -1 +1 @@
-3.4.8
+3.4.9

Dockerfile

@@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.4.8"
+ARG RUBY_VERSION="3.4.9"
 # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="24"

Gemfile

@@ -102,10 +102,10 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'prometheus_exporter', '~> 2.2', require: false
 
-gem 'opentelemetry-api', '~> 1.7.0'
+gem 'opentelemetry-api', '~> 1.8.0'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.31.0', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.32.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.10.0', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.24.0', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.24.0', require: false

Gemfile.lock

@@ -510,10 +510,11 @@ GEM
     openssl (4.0.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.7.0)
+    opentelemetry-api (1.8.0)
+      logger
     opentelemetry-common (0.23.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.31.1)
+    opentelemetry-exporter-otlp (0.32.0)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -1020,8 +1021,8 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 2.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.8.0)
-  opentelemetry-api (~> 1.7.0)
+  opentelemetry-api (~> 1.8.0)
-  opentelemetry-exporter-otlp (~> 0.31.0)
+  opentelemetry-exporter-otlp (~> 0.32.0)
   opentelemetry-instrumentation-active_job (~> 0.10.0)
   opentelemetry-instrumentation-active_model_serializers (~> 0.24.0)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.24.0)
@@ -1097,7 +1098,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-  ruby 3.4.8
+  ruby 3.4.9
 
 BUNDLED WITH
   4.0.8

app/javascript/flavours/glitch/components/dropdown_menu.tsx

@@ -296,6 +296,7 @@ interface DropdownProps<Item extends object | null = MenuItem> {
   children?: React.ReactElement;
   icon?: string;
   iconComponent?: IconProp;
+  iconClassName?: string;
   items?: Item[];
   loading?: boolean;
   title?: string;
@@ -326,6 +327,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
   children,
   icon,
   iconComponent,
+  iconClassName,
   items,
   loading,
   title = 'Menu',
@@ -499,6 +501,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
         iconComponent={iconComponent}
         title={title}
         active={open}
+        className={iconClassName}
         {...buttonProps}
       />
     );

app/javascript/flavours/glitch/features/account_edit/components/image_edit.tsx

@@ -0,0 +1,154 @@
+import { useCallback, useMemo } from 'react';
+import type { FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import type { OffsetValue } from 'react-overlays/esm/usePopper';
+
+import type { ModalType } from '@/flavours/glitch/actions/modal';
+import { openModal } from '@/flavours/glitch/actions/modal';
+import { Dropdown } from '@/flavours/glitch/components/dropdown_menu';
+import { IconButton } from '@/flavours/glitch/components/icon_button';
+import type { MenuItem } from '@/flavours/glitch/models/dropdown_menu';
+import {
+  createAppSelector,
+  useAppDispatch,
+  useAppSelector,
+} from '@/flavours/glitch/store';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import CameraIcon from '@/material-icons/400-24px/photo_camera.svg?react';
+import ReplaceImageIcon from '@/material-icons/400-24px/replace_image.svg?react';
+
+import classes from '../styles.module.scss';
+
+const messages = defineMessages({
+  add: {
+    id: 'account_edit.image_edit.add_button',
+    defaultMessage: 'Add image',
+  },
+  replace: {
+    id: 'account_edit.image_edit.replace_button',
+    defaultMessage: 'Replace image',
+  },
+  altAdd: {
+    id: 'account_edit.image_edit.alt_add_button',
+    description: 'Alt is short for "alternative".',
+    defaultMessage: 'Add alt text',
+  },
+  altEdit: {
+    id: 'account_edit.image_edit.alt_edit_button',
+    description: 'Alt is short for "alternative".',
+    defaultMessage: 'Edit alt text',
+  },
+  remove: {
+    id: 'account_edit.image_edit.remove_button',
+    defaultMessage: 'Remove image',
+  },
+});
+
+export type ImageLocation = 'avatar' | 'header';
+
+const selectImageInfo = createAppSelector(
+  [
+    (state) => state.profileEdit.profile,
+    (_, location: ImageLocation) => location,
+  ],
+  (profile, location) => {
+    if (!profile) {
+      return {
+        hasImage: false,
+        hasAlt: false,
+      };
+    }
+
+    return {
+      hasImage: !!profile[`${location}Static`],
+      hasAlt: !!profile[`${location}Description`],
+    };
+  },
+);
+
+export const AccountImageEdit: FC<{
+  className?: string;
+  location: ImageLocation;
+}> = ({ className, location }) => {
+  const intl = useIntl();
+  const { hasAlt, hasImage } = useAppSelector((state) =>
+    selectImageInfo(state, location),
+  );
+  const dispatch = useAppDispatch();
+
+  const handleModal = useCallback(
+    (type: ModalType) => {
+      dispatch(openModal({ modalType: type, modalProps: { location } }));
+    },
+    [dispatch, location],
+  );
+
+  const items = useMemo(
+    () =>
+      [
+        {
+          text: intl.formatMessage(messages.replace),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_UPLOAD');
+          },
+          icon: ReplaceImageIcon,
+        },
+        {
+          text: intl.formatMessage(hasAlt ? messages.altEdit : messages.altAdd),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_ALT');
+          },
+          icon: hasAlt ? EditIcon : AddIcon,
+        },
+        null,
+        {
+          text: intl.formatMessage(messages.remove),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_DELETE');
+          },
+          icon: DeleteIcon,
+          dangerous: true,
+        },
+      ] satisfies MenuItem[],
+    [handleModal, hasAlt, intl],
+  );
+
+  const handleAddImage = useCallback(() => {
+    handleModal('ACCOUNT_EDIT_IMAGE_UPLOAD');
+  }, [handleModal]);
+
+  const iconClassName = classNames(classes.imageButton, className);
+
+  if (!hasImage) {
+    return (
+      <IconButton
+        title={intl.formatMessage(messages.add)}
+        icon='camera'
+        iconComponent={CameraIcon}
+        className={iconClassName}
+        onClick={handleAddImage}
+      />
+    );
+  }
+
+  return (
+    <Dropdown
+      items={items}
+      placement={location === 'header' ? 'bottom-end' : 'bottom-start'}
+      offset={popperOffset}
+      className={classes.imageMenu}
+      icon='camera'
+      title={intl.formatMessage(messages.replace)}
+      iconComponent={CameraIcon}
+      iconClassName={iconClassName}
+    />
+  );
+};
+
+const popperOffset = [0, 6] as OffsetValue;

app/javascript/flavours/glitch/features/account_edit/index.tsx

@@ -23,6 +23,7 @@ import { AccountEditColumn, AccountEditEmptyColumn } from './components/column';
 import { EditButton } from './components/edit_button';
 import { AccountField } from './components/field';
 import { AccountFieldActions } from './components/field_actions';
+import { AccountImageEdit } from './components/image_edit';
 import { AccountEditSection } from './components/section';
 import classes from './styles.module.scss';
 
@@ -164,8 +165,12 @@ export const AccountEdit: FC = () => {
       <header>
         <div className={classes.profileImage}>
           {headerSrc && <img src={headerSrc} alt='' />}
+          <AccountImageEdit location='header' />
+        </div>
+        <div className={classes.avatar}>
+          <Avatar account={account} size={80} />
+          <AccountImageEdit location='avatar' />
         </div>
-        <Avatar account={account} size={80} className={classes.avatar} />
       </header>
 
       <CustomEmojiProvider emojis={emojis}>

app/javascript/flavours/glitch/features/account_edit/modals/image_alt.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageAltModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/flavours/glitch/features/account_edit/modals/image_delete.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageDeleteModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/flavours/glitch/features/account_edit/modals/image_upload.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageUploadModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/flavours/glitch/features/account_edit/modals/index.ts

@@ -1,6 +1,9 @@
 export * from './bio_modal';
 export * from './fields_modals';
 export * from './fields_reorder_modal';
+export * from './image_alt';
+export * from './image_delete';
+export * from './image_upload';
 export * from './name_modal';
 export * from './profile_display_modal';
 export * from './verified_modal';

app/javascript/flavours/glitch/features/account_edit/styles.module.scss

@@ -5,6 +5,7 @@
   background: var(--color-bg-secondary);
   border-bottom: 1px solid var(--color-border-primary);
   overflow: hidden;
+  position: relative;
 
   @container (width >= 500px) {
     height: 160px;
@@ -16,12 +17,27 @@
     width: 100%;
     height: 100%;
   }
+
+  .imageButton {
+    top: 16px;
+    right: 24px;
+  }
 }
 
 .avatar {
   margin-top: -64px;
   margin-left: 18px;
-  border: 1px solid var(--color-border-primary);
+  position: relative;
+  width: 82px;
+
+  > :global(.account__avatar) {
+    border: 1px solid var(--color-border-primary);
+  }
+
+  .imageButton {
+    bottom: -8px;
+    right: -8px;
+  }
 }
 
 .field {
@@ -153,6 +169,41 @@
   font-size: 15px;
 }
 
+// Image edit component
+
+.imageButton {
+  --default-bg-color: var(--color-bg-primary);
+
+  &,
+  &:global(.active) {
+    // Overrides the transparent background added by default with .active
+    --hover-bg-color: var(--color-bg-brand-softer-solid);
+  }
+
+  position: absolute;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--color-border-primary);
+  border-radius: 9999px;
+  box-sizing: border-box;
+  padding: 4px;
+  transition:
+    color 0.2s ease-in-out,
+    background-color 0.2s ease-in-out;
+
+  svg {
+    width: 18px;
+    height: 18px;
+  }
+}
+
+.imageMenu {
+  svg {
+    width: 20px;
+    height: 20px;
+  }
+}
+
 // Item list component
 
 .itemList {

app/javascript/flavours/glitch/features/account_timeline/components/redesign.module.scss

@@ -293,11 +293,7 @@ svg.badgeIcon {
 
 .fieldOverflowButton {
   --default-bg-color: var(--color-bg-secondary-solid);
-  --hover-bg-color: color-mix(
+  --hover-bg-color: var(--color-bg-brand-softer-solid);
-    in oklab,
-    var(--color-bg-brand-base),
-    var(--default-bg-color) var(--overlay-strength-brand)
-  );
 
   position: absolute;
   right: 8px;

app/javascript/flavours/glitch/features/onboarding/follows.tsx

@@ -121,7 +121,6 @@ export const Follows: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
-        showBackButton
       />
 
       <ColumnSearchHeader
@@ -146,10 +145,10 @@ export const Follows: React.FC<{
             {displayedAccountIds.length > 0 && <div className='spacer' />}
 
             <div className='column-footer'>
-              <Link className='button button--block' to='/home'>
+              <Link className='button button--block' to='/start/profile'>
                 <FormattedMessage
-                  id='onboarding.follows.done'
+                  id='onboarding.follows.next'
-                  defaultMessage='Done'
+                  defaultMessage='Next: Setup your profile'
                 />
               </Link>
             </div>

app/javascript/flavours/glitch/features/onboarding/profile.tsx

@@ -136,7 +136,7 @@ export const Profile: React.FC<{
       }),
     )
       .then(() => {
-        history.push('/start/follows');
+        history.push('/home');
         dispatch(closeOnboarding());
         return '';
       })
@@ -163,6 +163,7 @@ export const Profile: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
+        showBackButton
       />
 
       <div className='scrollable scrollable--flex'>
@@ -300,8 +301,8 @@ export const Profile: React.FC<{
               <LoadingIndicator />
             ) : (
               <FormattedMessage
-                id='onboarding.profile.save_and_continue'
+                id='onboarding.profile.finish'
-                defaultMessage='Save and continue'
+                defaultMessage='Finish'
               />
             )}
           </Button>

app/javascript/flavours/glitch/features/ui/components/modal_root.jsx

@@ -110,6 +110,9 @@ export const MODAL_COMPONENTS = {
   'ACCOUNT_EDIT_FIELD_EDIT': accountEditModal('EditFieldModal'),
   'ACCOUNT_EDIT_FIELD_DELETE': accountEditModal('DeleteFieldModal'),
   'ACCOUNT_EDIT_FIELDS_REORDER': accountEditModal('ReorderFieldsModal'),
+  'ACCOUNT_EDIT_IMAGE_ALT': accountEditModal('ImageAltModal'),
+  'ACCOUNT_EDIT_IMAGE_DELETE': accountEditModal('ImageDeleteModal'),
+  'ACCOUNT_EDIT_IMAGE_UPLOAD': accountEditModal('ImageUploadModal'),
 };
 
 /** @arg {keyof import('@/flavours/glitch/features/account_edit/modals')} type */

app/javascript/flavours/glitch/features/ui/index.jsx

@@ -238,8 +238,8 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
-            <WrappedRoute path={['/start', '/start/profile']} exact component={OnboardingProfile} content={children} />
+            <WrappedRoute path='/start/profile' exact component={OnboardingProfile} content={children} />
-            <WrappedRoute path='/start/follows' component={OnboardingFollows} content={children} />
+            <WrappedRoute path={['/start', '/start/follows']} exact component={OnboardingFollows} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
             <WrappedRoute path='/explore' component={Explore} content={children} />
             <WrappedRoute path='/search' component={Search} content={children} />

app/javascript/flavours/glitch/styles/mastodon/components.scss

@@ -2075,7 +2075,9 @@ body > [data-popper-placement] {
 .account {
   padding: 10px; // glitch: reduced padding
 
-  &:not(&--without-border) {
+  // Using :where keeps specificity low, allowing for existing
+  // .account overrides to still apply
+  &:where(:not(&--without-border)) {
     border-bottom: 1px solid var(--color-border-primary);
   }
 
@@ -11813,6 +11815,9 @@ noscript {
 
 .column-footer {
   padding: 16px;
+  position: sticky;
+  bottom: 0;
+  background: var(--color-bg-primary);
 }
 
 .lists-scrollable {

app/javascript/flavours/glitch/styles/mastodon/theme/_dark.scss

@@ -81,6 +81,11 @@
       var(--color-bg-brand-base),
       var(--overlay-strength-brand)
     )};
+  --color-bg-brand-softer-solid: color-mix(
+    in srgb,
+    var(--color-bg-primary),
+    var(--color-bg-brand-base) var(--overlay-strength-brand)
+  );
 
   // Error
   --overlay-strength-error: 10%;

app/javascript/flavours/glitch/styles/mastodon/theme/_light.scss

@@ -78,6 +78,11 @@
       #0012d8,
       var(--overlay-strength-brand)
     )};
+  --color-bg-brand-softer-solid: color-mix(
+    in srgb,
+    var(--color-bg-primary),
+    var(--color-bg-brand-base) var(--overlay-strength-brand)
+  );
 
   // Error
   --overlay-strength-error: 5%;

app/javascript/mastodon/components/dropdown_menu.tsx

@@ -296,6 +296,7 @@ interface DropdownProps<Item extends object | null = MenuItem> {
   children?: React.ReactElement;
   icon?: string;
   iconComponent?: IconProp;
+  iconClassName?: string;
   items?: Item[];
   loading?: boolean;
   title?: string;
@@ -326,6 +327,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
   children,
   icon,
   iconComponent,
+  iconClassName,
   items,
   loading,
   title = 'Menu',
@@ -499,6 +501,7 @@ export const Dropdown = <Item extends object | null = MenuItem>({
         iconComponent={iconComponent}
         title={title}
         active={open}
+        className={iconClassName}
         {...buttonProps}
       />
     );

app/javascript/mastodon/features/account_edit/components/image_edit.tsx

@@ -0,0 +1,154 @@
+import { useCallback, useMemo } from 'react';
+import type { FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import type { OffsetValue } from 'react-overlays/esm/usePopper';
+
+import type { ModalType } from '@/mastodon/actions/modal';
+import { openModal } from '@/mastodon/actions/modal';
+import { Dropdown } from '@/mastodon/components/dropdown_menu';
+import { IconButton } from '@/mastodon/components/icon_button';
+import type { MenuItem } from '@/mastodon/models/dropdown_menu';
+import {
+  createAppSelector,
+  useAppDispatch,
+  useAppSelector,
+} from '@/mastodon/store';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+import DeleteIcon from '@/material-icons/400-24px/delete.svg?react';
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import CameraIcon from '@/material-icons/400-24px/photo_camera.svg?react';
+import ReplaceImageIcon from '@/material-icons/400-24px/replace_image.svg?react';
+
+import classes from '../styles.module.scss';
+
+const messages = defineMessages({
+  add: {
+    id: 'account_edit.image_edit.add_button',
+    defaultMessage: 'Add image',
+  },
+  replace: {
+    id: 'account_edit.image_edit.replace_button',
+    defaultMessage: 'Replace image',
+  },
+  altAdd: {
+    id: 'account_edit.image_edit.alt_add_button',
+    description: 'Alt is short for "alternative".',
+    defaultMessage: 'Add alt text',
+  },
+  altEdit: {
+    id: 'account_edit.image_edit.alt_edit_button',
+    description: 'Alt is short for "alternative".',
+    defaultMessage: 'Edit alt text',
+  },
+  remove: {
+    id: 'account_edit.image_edit.remove_button',
+    defaultMessage: 'Remove image',
+  },
+});
+
+export type ImageLocation = 'avatar' | 'header';
+
+const selectImageInfo = createAppSelector(
+  [
+    (state) => state.profileEdit.profile,
+    (_, location: ImageLocation) => location,
+  ],
+  (profile, location) => {
+    if (!profile) {
+      return {
+        hasImage: false,
+        hasAlt: false,
+      };
+    }
+
+    return {
+      hasImage: !!profile[`${location}Static`],
+      hasAlt: !!profile[`${location}Description`],
+    };
+  },
+);
+
+export const AccountImageEdit: FC<{
+  className?: string;
+  location: ImageLocation;
+}> = ({ className, location }) => {
+  const intl = useIntl();
+  const { hasAlt, hasImage } = useAppSelector((state) =>
+    selectImageInfo(state, location),
+  );
+  const dispatch = useAppDispatch();
+
+  const handleModal = useCallback(
+    (type: ModalType) => {
+      dispatch(openModal({ modalType: type, modalProps: { location } }));
+    },
+    [dispatch, location],
+  );
+
+  const items = useMemo(
+    () =>
+      [
+        {
+          text: intl.formatMessage(messages.replace),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_UPLOAD');
+          },
+          icon: ReplaceImageIcon,
+        },
+        {
+          text: intl.formatMessage(hasAlt ? messages.altEdit : messages.altAdd),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_ALT');
+          },
+          icon: hasAlt ? EditIcon : AddIcon,
+        },
+        null,
+        {
+          text: intl.formatMessage(messages.remove),
+          action: () => {
+            handleModal('ACCOUNT_EDIT_IMAGE_DELETE');
+          },
+          icon: DeleteIcon,
+          dangerous: true,
+        },
+      ] satisfies MenuItem[],
+    [handleModal, hasAlt, intl],
+  );
+
+  const handleAddImage = useCallback(() => {
+    handleModal('ACCOUNT_EDIT_IMAGE_UPLOAD');
+  }, [handleModal]);
+
+  const iconClassName = classNames(classes.imageButton, className);
+
+  if (!hasImage) {
+    return (
+      <IconButton
+        title={intl.formatMessage(messages.add)}
+        icon='camera'
+        iconComponent={CameraIcon}
+        className={iconClassName}
+        onClick={handleAddImage}
+      />
+    );
+  }
+
+  return (
+    <Dropdown
+      items={items}
+      placement={location === 'header' ? 'bottom-end' : 'bottom-start'}
+      offset={popperOffset}
+      className={classes.imageMenu}
+      icon='camera'
+      title={intl.formatMessage(messages.replace)}
+      iconComponent={CameraIcon}
+      iconClassName={iconClassName}
+    />
+  );
+};
+
+const popperOffset = [0, 6] as OffsetValue;

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

@@ -23,6 +23,7 @@ import { AccountEditColumn, AccountEditEmptyColumn } from './components/column';
 import { EditButton } from './components/edit_button';
 import { AccountField } from './components/field';
 import { AccountFieldActions } from './components/field_actions';
+import { AccountImageEdit } from './components/image_edit';
 import { AccountEditSection } from './components/section';
 import classes from './styles.module.scss';
 
@@ -164,8 +165,12 @@ export const AccountEdit: FC = () => {
       <header>
         <div className={classes.profileImage}>
           {headerSrc && <img src={headerSrc} alt='' />}
+          <AccountImageEdit location='header' />
+        </div>
+        <div className={classes.avatar}>
+          <Avatar account={account} size={80} />
+          <AccountImageEdit location='avatar' />
         </div>
-        <Avatar account={account} size={80} className={classes.avatar} />
       </header>
 
       <CustomEmojiProvider emojis={emojis}>

app/javascript/mastodon/features/account_edit/modals/image_alt.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageAltModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/mastodon/features/account_edit/modals/image_delete.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageDeleteModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/mastodon/features/account_edit/modals/image_upload.tsx

@@ -0,0 +1,11 @@
+import type { FC } from 'react';
+
+import { DialogModal } from '../../ui/components/dialog_modal';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import type { ImageLocation } from '../components/image_edit';
+
+export const ImageUploadModal: FC<
+  DialogModalProps & { location: ImageLocation }
+> = ({ onClose }) => {
+  return <DialogModal title='TODO' onClose={onClose} />;
+};

app/javascript/mastodon/features/account_edit/modals/index.ts

@@ -1,6 +1,9 @@
 export * from './bio_modal';
 export * from './fields_modals';
 export * from './fields_reorder_modal';
+export * from './image_alt';
+export * from './image_delete';
+export * from './image_upload';
 export * from './name_modal';
 export * from './profile_display_modal';
 export * from './verified_modal';

app/javascript/mastodon/features/account_edit/styles.module.scss

@@ -5,6 +5,7 @@
   background: var(--color-bg-secondary);
   border-bottom: 1px solid var(--color-border-primary);
   overflow: hidden;
+  position: relative;
 
   @container (width >= 500px) {
     height: 160px;
@@ -16,12 +17,27 @@
     width: 100%;
     height: 100%;
   }
+
+  .imageButton {
+    top: 16px;
+    right: 24px;
+  }
 }
 
 .avatar {
   margin-top: -64px;
   margin-left: 18px;
-  border: 1px solid var(--color-border-primary);
+  position: relative;
+  width: 82px;
+
+  > :global(.account__avatar) {
+    border: 1px solid var(--color-border-primary);
+  }
+
+  .imageButton {
+    bottom: -8px;
+    right: -8px;
+  }
 }
 
 .field {
@@ -153,6 +169,41 @@
   font-size: 15px;
 }
 
+// Image edit component
+
+.imageButton {
+  --default-bg-color: var(--color-bg-primary);
+
+  &,
+  &:global(.active) {
+    // Overrides the transparent background added by default with .active
+    --hover-bg-color: var(--color-bg-brand-softer-solid);
+  }
+
+  position: absolute;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--color-border-primary);
+  border-radius: 9999px;
+  box-sizing: border-box;
+  padding: 4px;
+  transition:
+    color 0.2s ease-in-out,
+    background-color 0.2s ease-in-out;
+
+  svg {
+    width: 18px;
+    height: 18px;
+  }
+}
+
+.imageMenu {
+  svg {
+    width: 20px;
+    height: 20px;
+  }
+}
+
 // Item list component
 
 .itemList {

app/javascript/mastodon/features/account_timeline/components/redesign.module.scss

@@ -293,11 +293,7 @@ svg.badgeIcon {
 
 .fieldOverflowButton {
   --default-bg-color: var(--color-bg-secondary-solid);
-  --hover-bg-color: color-mix(
+  --hover-bg-color: var(--color-bg-brand-softer-solid);
-    in oklab,
-    var(--color-bg-brand-base),
-    var(--default-bg-color) var(--overlay-strength-brand)
-  );
 
   position: absolute;
   right: 8px;

app/javascript/mastodon/features/onboarding/follows.tsx

@@ -121,7 +121,6 @@ export const Follows: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
-        showBackButton
       />
 
       <ColumnSearchHeader
@@ -146,10 +145,10 @@ export const Follows: React.FC<{
             {displayedAccountIds.length > 0 && <div className='spacer' />}
 
             <div className='column-footer'>
-              <Link className='button button--block' to='/home'>
+              <Link className='button button--block' to='/start/profile'>
                 <FormattedMessage
-                  id='onboarding.follows.done'
+                  id='onboarding.follows.next'
-                  defaultMessage='Done'
+                  defaultMessage='Next: Setup your profile'
                 />
               </Link>
             </div>

app/javascript/mastodon/features/onboarding/profile.tsx

@@ -133,7 +133,7 @@ export const Profile: React.FC<{
       }),
     )
       .then(() => {
-        history.push('/start/follows');
+        history.push('/home');
         dispatch(closeOnboarding());
         return '';
       })
@@ -160,6 +160,7 @@ export const Profile: React.FC<{
         icon='person'
         iconComponent={PersonIcon}
         multiColumn={multiColumn}
+        showBackButton
       />
 
       <div className='scrollable scrollable--flex'>
@@ -297,8 +298,8 @@ export const Profile: React.FC<{
               <LoadingIndicator />
             ) : (
               <FormattedMessage
-                id='onboarding.profile.save_and_continue'
+                id='onboarding.profile.finish'
-                defaultMessage='Save and continue'
+                defaultMessage='Finish'
               />
             )}
           </Button>

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

@@ -102,6 +102,9 @@ export const MODAL_COMPONENTS = {
   'ACCOUNT_EDIT_FIELD_EDIT': accountEditModal('EditFieldModal'),
   'ACCOUNT_EDIT_FIELD_DELETE': accountEditModal('DeleteFieldModal'),
   'ACCOUNT_EDIT_FIELDS_REORDER': accountEditModal('ReorderFieldsModal'),
+  'ACCOUNT_EDIT_IMAGE_ALT': accountEditModal('ImageAltModal'),
+  'ACCOUNT_EDIT_IMAGE_DELETE': accountEditModal('ImageDeleteModal'),
+  'ACCOUNT_EDIT_IMAGE_UPLOAD': accountEditModal('ImageUploadModal'),
 };
 
 /** @arg {keyof import('@/mastodon/features/account_edit/modals')} type */

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

@@ -230,8 +230,8 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
             <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
 
-            <WrappedRoute path={['/start', '/start/profile']} exact component={OnboardingProfile} content={children} />
+            <WrappedRoute path='/start/profile' exact component={OnboardingProfile} content={children} />
-            <WrappedRoute path='/start/follows' component={OnboardingFollows} content={children} />
+            <WrappedRoute path={['/start', '/start/follows']} exact component={OnboardingFollows} content={children} />
             <WrappedRoute path='/directory' component={Directory} content={children} />
             <WrappedRoute path='/explore' component={Explore} content={children} />
             <WrappedRoute path='/search' component={Search} content={children} />

app/javascript/mastodon/locales/ar.json

@@ -717,7 +717,6 @@
   "notifications_permission_banner.how_to_control": "لتلقي الإشعارات عندما لا يكون ماستدون مفتوح، قم بتفعيل إشعارات سطح المكتب، يمكنك التحكم بدقة في أنواع التفاعلات التي تولد إشعارات سطح المكتب من خلال زر الـ{icon} أعلاه بمجرد تفعيلها.",
   "notifications_permission_banner.title": "لا تفوت شيئاً أبداً",
   "onboarding.follows.back": "عودة",
-  "onboarding.follows.done": "تمّ",
   "onboarding.follows.empty": "نأسف، لا يمكن عرض نتائج في الوقت الحالي. جرب البحث أو انتقل لصفحة الاستكشاف لإيجاد أشخاص للمتابعة، أو حاول مرة أخرى.",
   "onboarding.follows.search": "بحث",
   "onboarding.follows.title": "للبدء قم بمتابعة أشخاص",
@@ -727,7 +726,6 @@
   "onboarding.profile.display_name_hint": "اسمك الكامل أو اسمك المرح…",
   "onboarding.profile.note": "نبذة عنك",
   "onboarding.profile.note_hint": "يمكنك @ذِكر أشخاص آخرين أو استعمال #الوسوم…",
-  "onboarding.profile.save_and_continue": "حفظ و إستمرار",
   "onboarding.profile.title": "إعداد الملف الشخصي",
   "onboarding.profile.upload_avatar": "تحميل صورة الملف الشخصي",
   "onboarding.profile.upload_header": "تحميل رأسية الملف الشخصي",

app/javascript/mastodon/locales/ast.json

@@ -392,7 +392,6 @@
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
   "notifications.policy.accept": "Aceptar",
   "notifications.policy.accept_hint": "Amosar n'avisos",
-  "onboarding.follows.done": "Fecho",
   "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
   "password_confirmation.exceeds_maxlength": "La contraseña de confirmación supera la llongura de caráuteres máxima",

app/javascript/mastodon/locales/az.json

@@ -661,7 +661,6 @@
   "notifications_permission_banner.enable": "Masaüstü bildirişləri fəallaşdır",
   "notifications_permission_banner.title": "Heç nəyi buraxmayın",
   "onboarding.follows.back": "Geri",
-  "onboarding.follows.done": "Hazırdır",
   "onboarding.follows.search": "Axtar",
   "onboarding.follows.title": "Başlamaq üçün insanları izləyin",
   "onboarding.profile.discoverable": "Profilimi kəşf edilə bilən et",
@@ -670,7 +669,6 @@
   "onboarding.profile.display_name_hint": "Tam adınız və ya ləqəbiniz…",
   "onboarding.profile.note": "Bioqrafiya",
   "onboarding.profile.note_hint": "Digər insanların @adını_çəkə və ya #mövzu_etiketləri istifadə edə bilərsiniz…",
-  "onboarding.profile.save_and_continue": "Saxla və davam et",
   "onboarding.profile.title": "Profili ayarla",
   "onboarding.profile.upload_avatar": "Profil şəkli yüklə",
   "onboarding.profile.upload_header": "Profil başlığı yüklə",

app/javascript/mastodon/locales/be.json

@@ -915,7 +915,6 @@
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
   "onboarding.follows.back": "Назад",
-  "onboarding.follows.done": "Гатова",
   "onboarding.follows.empty": "На жаль, зараз немагчыма паказаць вынікі. Вы можаце паспрабаваць выкарыстоўваць пошук і праглядзець старонку агляду, каб знайсці людзей, на якіх можна падпісацца, або паўтарыць спробу пазней.",
   "onboarding.follows.search": "Пошук",
   "onboarding.follows.title": "Падпішыцеся на некага, каб пачаць",
@@ -925,7 +924,6 @@
   "onboarding.profile.display_name_hint": "Ваша поўнае імя або ваш псеўданім…",
   "onboarding.profile.note": "Біяграфія",
   "onboarding.profile.note_hint": "Вы можаце @згадваць іншых людзей або выкарыстоўваць #хэштэгі…",
-  "onboarding.profile.save_and_continue": "Захаваць і працягнуць",
   "onboarding.profile.title": "Налады профілю",
   "onboarding.profile.upload_avatar": "Загрузіць фота профілю",
   "onboarding.profile.upload_header": "Загрузіць шапку профілю",

app/javascript/mastodon/locales/bg.json

@@ -680,7 +680,6 @@
   "notifications_permission_banner.how_to_control": "За да получавате известия, когато Mastodon не е отворен, включете известията на работния плот. Може да управлявате точно кои видове взаимодействия пораждат известия на работния плот чрез бутона {icon} по-горе, след като бъдат включени.",
   "notifications_permission_banner.title": "Никога не пропускайте нищо",
   "onboarding.follows.back": "Назад",
-  "onboarding.follows.done": "Готово",
   "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате посредством търсене или сърфиране да разгледате страницата, за да намерите хора за последване, или опитайте пак по-късно.",
   "onboarding.follows.search": "Търсене",
   "onboarding.follows.title": "Последвайте хора, за да започнете",
@@ -690,7 +689,6 @@
   "onboarding.profile.display_name_hint": "Вашето пълно име или псевдоним…",
   "onboarding.profile.note": "Биография",
   "onboarding.profile.note_hint": "Може да @споменавате други хора или #хаштагове…",
-  "onboarding.profile.save_and_continue": "Запазване и продължаване",
   "onboarding.profile.title": "Настройване на профила",
   "onboarding.profile.upload_avatar": "Качване на снимка на профила",
   "onboarding.profile.upload_header": "Качване на заглавка на профила",

app/javascript/mastodon/locales/br.json

@@ -533,13 +533,11 @@
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
   "onboarding.follows.back": "Distreiñ",
-  "onboarding.follows.done": "Graet",
   "onboarding.follows.search": "Klask",
   "onboarding.profile.display_name": "Anv diskouezet",
   "onboarding.profile.display_name_hint": "Hoc'h anv klok pe hoc'h anv fentus…",
   "onboarding.profile.note": "Berr-ha-berr",
   "onboarding.profile.note_hint": "Gallout a rit @menegiñ tud all pe #gerioù-klik…",
-  "onboarding.profile.save_and_continue": "Enrollañ ha kenderc'hel",
   "onboarding.profile.title": "Kefluniañ ar profil",
   "onboarding.profile.upload_avatar": "Enporzhiañ ur skeudenn profil",
   "password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",

app/javascript/mastodon/locales/ca.json

@@ -786,7 +786,6 @@
   "notifications_permission_banner.how_to_control": "Per a rebre notificacions quan Mastodon no és obert cal activar les notificacions d’escriptori. Pots controlar amb precisió quins tipus d’interaccions generen notificacions d’escriptori després d’activar el botó {icon} de dalt.",
   "notifications_permission_banner.title": "No et perdis mai res",
   "onboarding.follows.back": "Enrere",
-  "onboarding.follows.done": "Fet",
   "onboarding.follows.empty": "Malauradament, cap resultat pot ser mostrat ara mateix. Pots provar de fer servir la cerca o visitar la pàgina Explora per a trobar gent a qui seguir o provar-ho de nou més tard.",
   "onboarding.follows.search": "Cerca",
   "onboarding.follows.title": "Seguiu gent per a començar",
@@ -796,7 +795,6 @@
   "onboarding.profile.display_name_hint": "El teu nom complet o el teu malnom…",
   "onboarding.profile.note": "Biografia",
   "onboarding.profile.note_hint": "Pots @mencionar altra gent o #etiquetes…",
-  "onboarding.profile.save_and_continue": "Desa i continua",
   "onboarding.profile.title": "Configuració del perfil",
   "onboarding.profile.upload_avatar": "Importa una foto de perfil",
   "onboarding.profile.upload_header": "Importa una capçalera de perfil",

app/javascript/mastodon/locales/cs.json

@@ -841,7 +841,6 @@
   "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
   "onboarding.follows.back": "Zpět",
-  "onboarding.follows.done": "Hotovo",
   "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit najít uživatele ke sledování za pomocí vyhledávání nebo na stránce „Objevit“, nebo to zkuste znovu později.",
   "onboarding.follows.search": "Hledat",
   "onboarding.follows.title": "Sledujte lidi a začněte",
@@ -851,7 +850,6 @@
   "onboarding.profile.display_name_hint": "Vaše celé jméno nebo přezdívka…",
   "onboarding.profile.note": "O vás",
   "onboarding.profile.note_hint": "Můžete @zmínit jiné osoby nebo #hashtagy…",
-  "onboarding.profile.save_and_continue": "Uložit a pokračovat",
   "onboarding.profile.title": "Nastavení profilu",
   "onboarding.profile.upload_avatar": "Nahrát profilový obrázek",
   "onboarding.profile.upload_header": "Nahrát hlavičku profilu",

app/javascript/mastodon/locales/cy.json

@@ -168,7 +168,6 @@
   "account_edit.field_edit_modal.add_title": "Ychwanegu maes cyfaddas",
   "account_edit.field_edit_modal.edit_title": "Golygu maes cyfaddas",
   "account_edit.field_edit_modal.name_hint": "e.e. “Gwefan bersonol”",
-  "account_edit.field_edit_modal.value_hint": "e.e. “enghraifft.fi”",
   "account_edit.field_edit_modal.value_label": "Gwerth",
   "account_edit.name_modal.add_title": "Ychwanegu enw dangos",
   "account_edit.name_modal.edit_title": "Golygu enw dangos",
@@ -938,7 +937,6 @@
   "notifications_permission_banner.how_to_control": "I dderbyn hysbysiadau pan nad yw Mastodon ar agor, galluogwch hysbysiadau bwrdd gwaith. Gallwch reoli'n union pa fathau o ryngweithiadau sy'n cynhyrchu hysbysiadau bwrdd gwaith trwy'r botwm {icon} uchod unwaith y byddan nhw wedi'u galluogi.",
   "notifications_permission_banner.title": "Peidiwch â cholli dim",
   "onboarding.follows.back": "Nôl",
-  "onboarding.follows.done": "Wedi gorffen",
   "onboarding.follows.empty": "Yn anffodus, nid oes modd dangos unrhyw ganlyniadau ar hyn o bryd. Gallwch geisio defnyddio chwilio neu bori'r dudalen archwilio i ddod o hyd i bobl i'w dilyn, neu ceisio eto yn nes ymlaen.",
   "onboarding.follows.search": "Chwilio",
   "onboarding.follows.title": "Dilynwch bobl i gychwyn arni",
@@ -948,7 +946,6 @@
   "onboarding.profile.display_name_hint": "Eich enw llawn neu'ch enw hwyl…",
   "onboarding.profile.note": "Bywgraffiad",
   "onboarding.profile.note_hint": "Gallwch @grybwyll pobl eraill neu #hashnodau…",
-  "onboarding.profile.save_and_continue": "Cadw a pharhau",
   "onboarding.profile.title": "Gosodiad proffil",
   "onboarding.profile.upload_avatar": "Llwytho llun proffil",
   "onboarding.profile.upload_header": "Llwytho pennyn proffil",

app/javascript/mastodon/locales/da.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Vi fraråder brug af brugerdefinerede emoji i kombination med url'er. Brugerdefinerede felter, der indeholder begge dele, vises kun som tekst i stedet for som et link for at undgå forvirring hos brugerne.",
   "account_edit.field_edit_modal.name_hint": "F.eks. “Personligt websted”",
   "account_edit.field_edit_modal.name_label": "Etiket",
-  "account_edit.field_edit_modal.value_hint": "F.eks. “eksempel.me”",
+  "account_edit.field_edit_modal.url_warning": "For at tilføje et link, skal du inkludere {protocol} i begyndelsen.",
+  "account_edit.field_edit_modal.value_hint": "F.eks. “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Værdi",
   "account_edit.field_reorder_modal.drag_cancel": "Trækningen blev annulleret. Feltet \"{item}\" blev sluppet.",
   "account_edit.field_reorder_modal.drag_end": "Feltet \"{item}\" blev sluppet.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Aktivér computernotifikationer for at få besked, når Mastodon ikke er åben. Når de er aktiveret, kan man via knappen {icon} ovenfor præcist styre, hvilke typer af interaktioner, som genererer computernotifikationer.",
   "notifications_permission_banner.title": "Gå aldrig glip af noget",
   "onboarding.follows.back": "Tilbage",
-  "onboarding.follows.done": "Færdig",
   "onboarding.follows.empty": "Ingen resultater tilgængelige pt. Prøv at bruge søgning eller gennemse siden for at finde personer at følge, eller forsøg igen senere.",
+  "onboarding.follows.next": "Næste: Opsætning af din profil",
   "onboarding.follows.search": "Søg",
   "onboarding.follows.title": "Følg folk for at komme i gang",
   "onboarding.profile.discoverable": "Gør min profil synlig",
   "onboarding.profile.discoverable_hint": "Når du vælger at være synlig på Mastodon, kan dine indlæg blive vist i søgeresultater og trender, og din profil kan blive foreslået til personer med samme interesser som dig.",
   "onboarding.profile.display_name": "Vist navn",
   "onboarding.profile.display_name_hint": "Dit fulde navn eller dit sjove navn…",
+  "onboarding.profile.finish": "Afslut",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "Du kan @omtale andre personer eller #hashtags…",
-  "onboarding.profile.save_and_continue": "Gem og fortsæt",
   "onboarding.profile.title": "Profilopsætning",
   "onboarding.profile.upload_avatar": "Upload profilbillede",
   "onboarding.profile.upload_header": "Upload profilbanner",

app/javascript/mastodon/locales/de.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Das Verwenden von Emojis wird bei URLs nicht empfohlen. Die Zusatzfelder werden bei dieser Kombination nur als Text und nicht als Link dargestellt.",
   "account_edit.field_edit_modal.name_hint": "z. B. „Meine Website“",
   "account_edit.field_edit_modal.name_label": "Beschriftung",
-  "account_edit.field_edit_modal.value_hint": "z. B. „example.me“",
+  "account_edit.field_edit_modal.url_warning": "Um einen Link hinzuzufügen, füge {protocol} an den Anfang ein.",
+  "account_edit.field_edit_modal.value_hint": "z. B. „https://example.me“",
   "account_edit.field_edit_modal.value_label": "Inhalt",
   "account_edit.field_reorder_modal.drag_cancel": "Das Ziehen wurde abgebrochen und das Feld „{item}“ wurde abgelegt.",
   "account_edit.field_reorder_modal.drag_end": "Das Feld „{item}“ wurde abgelegt.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Aktiviere Desktop-Benachrichtigungen, um Mitteilungen zu erhalten, wenn Mastodon nicht geöffnet ist. Du kannst für jede Kategorie einstellen, ob du Desktop-Benachrichtigungen erhalten möchtest. Sobald sie aktiviert sind, klicke dafür auf das {icon} -Symbol.",
   "notifications_permission_banner.title": "Nichts verpassen",
   "onboarding.follows.back": "Zurück",
-  "onboarding.follows.done": "Fertig",
   "onboarding.follows.empty": "Bedauerlicherweise können aktuell keine Ergebnisse angezeigt werden. Du kannst die Suche verwenden oder den Reiter „Entdecken“ auswählen, um neue Leute zum Folgen zu finden – oder du versuchst es später erneut.",
+  "onboarding.follows.next": "Nächster Schritt: Profil einrichten",
   "onboarding.follows.search": "Suchen",
   "onboarding.follows.title": "Folge Profilen, um loszulegen",
   "onboarding.profile.discoverable": "Mein Profil darf entdeckt werden",
   "onboarding.profile.discoverable_hint": "Wenn du entdeckt werden möchtest, dann können deine Beiträge in Suchergebnissen und Trends erscheinen. Dein Profil kann ebenfalls anderen mit ähnlichen Interessen vorgeschlagen werden.",
   "onboarding.profile.display_name": "Anzeigename",
   "onboarding.profile.display_name_hint": "Dein richtiger Name oder dein Fantasiename …",
+  "onboarding.profile.finish": "Fertig",
   "onboarding.profile.note": "Über mich",
   "onboarding.profile.note_hint": "Du kannst andere @Profile erwähnen oder #Hashtags verwenden …",
-  "onboarding.profile.save_and_continue": "Speichern und fortfahren",
   "onboarding.profile.title": "Profil einrichten",
   "onboarding.profile.upload_avatar": "Profilbild hochladen",
   "onboarding.profile.upload_header": "Titelbild hochladen",

app/javascript/mastodon/locales/el.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Δεν συνιστούμε τη χρήση προσαρμοσμένων emoji σε συνδυασμό με URL. Τα προσαρμοσμένα πεδία που περιέχουν και τα δύο θα εμφανίζονται ως κείμενο μόνο αντί ως σύνδεσμος, προκειμένου να αποφευχθεί η σύγχυση του χρήστη.",
   "account_edit.field_edit_modal.name_hint": "Π.χ. “Προσωπική ιστοσελίδα”",
   "account_edit.field_edit_modal.name_label": "Ετικέτα",
-  "account_edit.field_edit_modal.value_hint": "Π.χ. “example.me”",
+  "account_edit.field_edit_modal.url_warning": "Για να προσθέσεις έναν σύνδεσμο, παρακαλούμε να συμπεριλάβεις το {protocol} στην αρχή.",
+  "account_edit.field_edit_modal.value_hint": "Π.χ. “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Τιμή",
   "account_edit.field_reorder_modal.drag_cancel": "Η μετακίνηση ακυρώθηκε. Το πεδίο \"{item}\" αφέθηκε.",
   "account_edit.field_reorder_modal.drag_end": "Το πεδίο \"{item}\" αφέθηκε.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Για να λαμβάνεις ειδοποιήσεις όταν το Mastodon δεν είναι ανοιχτό, ενεργοποίησε τις ειδοποιήσεις επιφάνειας εργασίας. Μπορείς να ελέγξεις με ακρίβεια ποιοι τύποι αλληλεπιδράσεων δημιουργούν ειδοποιήσεις επιφάνειας εργασίας μέσω του κουμπιού {icon} μόλις ενεργοποιηθούν.",
   "notifications_permission_banner.title": "Μη χάσεις στιγμή",
   "onboarding.follows.back": "Πίσω",
-  "onboarding.follows.done": "Έγινε",
   "onboarding.follows.empty": "Δυστυχώς, δεν μπορούν να εμφανιστούν αποτελέσματα αυτή τη στιγμή. Μπορείς να προσπαθήσεις να χρησιμοποιήσεις την αναζήτηση ή να περιηγηθείς στη σελίδα εξερεύνησης για να βρεις άτομα να ακολουθήσεις ή να δοκιμάσεις ξανά αργότερα.",
+  "onboarding.follows.next": "Επόμενο: Ρυθμίστε το προφίλ σας",
   "onboarding.follows.search": "Αναζήτηση",
   "onboarding.follows.title": "Ακολούθησε άτομα για να ξεκινήσεις",
   "onboarding.profile.discoverable": "Κάνε το προφίλ μου ανακαλύψιμο",
   "onboarding.profile.discoverable_hint": "Όταν επιλέγεις την δυνατότητα ανακάλυψης στο Mastodon, οι αναρτήσεις σου μπορεί να εμφανιστούν στα αποτελέσματα αναζήτησης και τις τάσεις, και το προφίλ σου μπορεί να προτείνεται σε άτομα με παρόμοια ενδιαφέροντα με εσένα.",
   "onboarding.profile.display_name": "Εμφανιζόμενο όνομα",
   "onboarding.profile.display_name_hint": "Το πλήρες ή το διασκεδαστικό σου όνομα…",
+  "onboarding.profile.finish": "Ολοκλήρωση",
   "onboarding.profile.note": "Βιογραφικό",
   "onboarding.profile.note_hint": "Μπορείς να @επισημάνεις άλλα άτομα ή #ετικέτες…",
-  "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
   "onboarding.profile.title": "Ρύθμιση προφίλ",
   "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
   "onboarding.profile.upload_header": "Μεταφόρτωση κεφαλίδας προφίλ",

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

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "We recommend against the use of custom emoji in combination with URLs. Custom fields containing both will display as text only instead of as a link, in order to prevent user confusion.",
   "account_edit.field_edit_modal.name_hint": "Eg “Personal website”",
   "account_edit.field_edit_modal.name_label": "Label",
-  "account_edit.field_edit_modal.value_hint": "Eg “example.me”",
+  "account_edit.field_edit_modal.url_warning": "To add a link, please include {protocol} at the beginning.",
+  "account_edit.field_edit_modal.value_hint": "Eg “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Value",
   "account_edit.field_reorder_modal.drag_cancel": "Dragging was cancelled. Field \"{item}\" was dropped.",
   "account_edit.field_reorder_modal.drag_end": "Field \"{item}\" was dropped.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
   "onboarding.follows.back": "Back",
-  "onboarding.follows.done": "Done",
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
+  "onboarding.follows.next": "Next: set up your profile",
   "onboarding.follows.search": "Search",
   "onboarding.follows.title": "Follow people to get started",
   "onboarding.profile.discoverable": "Make my profile discoverable",
   "onboarding.profile.discoverable_hint": "When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.",
   "onboarding.profile.display_name": "Display name",
   "onboarding.profile.display_name_hint": "Your full name or your fun name…",
+  "onboarding.profile.finish": "Finish",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "You can @mention other people or #hashtags…",
-  "onboarding.profile.save_and_continue": "Save and continue",
   "onboarding.profile.title": "Profile setup",
   "onboarding.profile.upload_avatar": "Upload profile picture",
   "onboarding.profile.upload_header": "Upload profile header",

app/javascript/mastodon/locales/en.json

@@ -184,6 +184,11 @@
   "account_edit.field_reorder_modal.drag_start": "Picked up field \"{item}\".",
   "account_edit.field_reorder_modal.handle_label": "Drag field \"{item}\"",
   "account_edit.field_reorder_modal.title": "Rearrange fields",
+  "account_edit.image_edit.add_button": "Add image",
+  "account_edit.image_edit.alt_add_button": "Add alt text",
+  "account_edit.image_edit.alt_edit_button": "Edit alt text",
+  "account_edit.image_edit.remove_button": "Remove image",
+  "account_edit.image_edit.replace_button": "Replace image",
   "account_edit.name_modal.add_title": "Add display name",
   "account_edit.name_modal.edit_title": "Edit display name",
   "account_edit.profile_tab.button_label": "Customize",
@@ -960,17 +965,17 @@
   "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
   "notifications_permission_banner.title": "Never miss a thing",
   "onboarding.follows.back": "Back",
-  "onboarding.follows.done": "Done",
   "onboarding.follows.empty": "Unfortunately, no results can be shown right now. You can try using search or browsing the explore page to find people to follow, or try again later.",
+  "onboarding.follows.next": "Next: Setup your profile",
   "onboarding.follows.search": "Search",
   "onboarding.follows.title": "Follow people to get started",
   "onboarding.profile.discoverable": "Make my profile discoverable",
   "onboarding.profile.discoverable_hint": "When you opt in to discoverability on Mastodon, your posts may appear in search results and trending, and your profile may be suggested to people with similar interests to you.",
   "onboarding.profile.display_name": "Display name",
   "onboarding.profile.display_name_hint": "Your full name or your fun name…",
+  "onboarding.profile.finish": "Finish",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "You can @mention other people or #hashtags…",
-  "onboarding.profile.save_and_continue": "Save and continue",
   "onboarding.profile.title": "Profile setup",
   "onboarding.profile.upload_avatar": "Upload profile picture",
   "onboarding.profile.upload_header": "Upload profile header",

app/javascript/mastodon/locales/eo.json

@@ -698,7 +698,6 @@
   "notifications_permission_banner.how_to_control": "Por ricevi sciigojn kiam Mastodon ne estas malfermita, ebligu labortablajn sciigojn. Vi povas regi precize kiuj specoj de interagoj generas labortablajn sciigojn per la supra butono {icon} post kiam ili estas ebligitaj.",
   "notifications_permission_banner.title": "Neniam preterlasas iun ajn",
   "onboarding.follows.back": "Reen",
-  "onboarding.follows.done": "Farita",
   "onboarding.follows.empty": "Bedaŭrinde, neniu rezulto estas montrebla nuntempe. Vi povas provi serĉi aŭ foliumi la esploran paĝon por trovi kontojn por sekvi, aŭ retrovi baldaŭ.",
   "onboarding.follows.search": "Serĉi",
   "onboarding.follows.title": "Sekvi homojn por komenci",
@@ -708,7 +707,6 @@
   "onboarding.profile.display_name_hint": "Via plena nomo aŭ via kromnomo…",
   "onboarding.profile.note": "Sinprezento",
   "onboarding.profile.note_hint": "Vi povas @mencii aliajn homojn aŭ #kradvortojn…",
-  "onboarding.profile.save_and_continue": "Konservi kaj daŭrigi",
   "onboarding.profile.title": "Profila fikso",
   "onboarding.profile.upload_avatar": "Alŝuti profilbildon",
   "onboarding.profile.upload_header": "Alŝuti profilkapbildon",

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

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "No recomendamos el uso de emojis personalizados en combinación con direcciones web. Los campos personalizados que contengan ambos solo se mostrarán como texto en lugar de como enlace, con el fin de evitar la confusión del usuario.",
   "account_edit.field_edit_modal.name_hint": "Por ejemplo: «Sitio web personal»",
   "account_edit.field_edit_modal.name_label": "Etiqueta",
-  "account_edit.field_edit_modal.value_hint": "Por ejemplo: «ejemplo.com.ar»",
+  "account_edit.field_edit_modal.url_warning": "Para agregar un enlace, por favor, incluí {protocol} al comienzo.",
+  "account_edit.field_edit_modal.value_hint": "Por ejemplo: «https://ejemplo.com»",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "El arrastre fue cancelado. Se soltó el campo «{item}».",
   "account_edit.field_reorder_modal.drag_end": "Se soltó el campo «{item}».",
@@ -959,7 +960,6 @@
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
   "onboarding.follows.back": "Volver",
-  "onboarding.follows.done": "Listo",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Podés intentar usar la búsqueda o navegar por la página de exploración para encontrar cuentas a las que seguir, o intentarlo de nuevo más tarde.",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Para comenzar, empezá a seguir cuentas",
@@ -969,7 +969,6 @@
   "onboarding.profile.display_name_hint": "Tu nombre completo o tu pseudónimo…",
   "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Podés @mencionar otras cuentas o usar #etiquetas…",
-  "onboarding.profile.save_and_continue": "Guardar y continuar",
   "onboarding.profile.title": "Configuración del perfil",
   "onboarding.profile.upload_avatar": "Subir avatar",
   "onboarding.profile.upload_header": "Subir cabecera",

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

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "No recomendamos el uso de emojis personalizados en combinación con direcciones URL. Los campos personalizados que contengan ambos se mostrarán solo como texto en lugar de como un enlace, con el fin de evitar confusiones al usuario.",
   "account_edit.field_edit_modal.name_hint": "Por ejemplo, «sitio web personal»",
   "account_edit.field_edit_modal.name_label": "Etiqueta",
-  "account_edit.field_edit_modal.value_hint": "Por ejemplo, «ejemplo.me»",
+  "account_edit.field_edit_modal.url_warning": "Para agregar un enlace, incluye {protocol} al principio.",
+  "account_edit.field_edit_modal.value_hint": "Por ejemplo: “https://ejemplo.me”",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "Se canceló el arrastre. Se eliminó el campo «{item}».",
   "account_edit.field_reorder_modal.drag_end": "Se ha eliminado el campo «{item}».",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
   "onboarding.follows.back": "Volver",
-  "onboarding.follows.done": "Hecho",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar gente a la que seguir, o inténtalo de nuevo más tarde.",
+  "onboarding.follows.next": "Siguiente: Configura tu perfil",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Sigue personas para comenzar",
   "onboarding.profile.discoverable": "Hacer que mi perfil aparezca en búsquedas",
   "onboarding.profile.discoverable_hint": "Cuando permites que tu perfil aparezca en búsquedas en Mastodon, tus publicaciones pueden aparecer en los resultados de búsqueda y en las tendencias, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre para mostrar",
   "onboarding.profile.display_name_hint": "Tu nombre completo o tu apodo…",
+  "onboarding.profile.finish": "Fiinalizar",
   "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Puedes @mencionar a otras personas o #etiquetas…",
-  "onboarding.profile.save_and_continue": "Guardar y continuar",
   "onboarding.profile.title": "Configuración del perfil",
   "onboarding.profile.upload_avatar": "Subir foto de perfil",
   "onboarding.profile.upload_header": "Subir encabezado de perfil",

app/javascript/mastodon/locales/es.json

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Recomendamos no usar emojis personalizados combinados con enlaces. Los campos personalizados que contengan ambos solo se mostrarán como texto en vez de un enlace, para evitar confusiones.",
   "account_edit.field_edit_modal.name_hint": "Ej. \"Web personal\"",
   "account_edit.field_edit_modal.name_label": "Etiqueta",
-  "account_edit.field_edit_modal.value_hint": "Ej. \"ejemplo.yo\"",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "El arrastre se ha cancelado. El campo \"{item}\" se ha soltado.",
   "account_edit.field_reorder_modal.drag_end": "El campo \"{item}\" se ha soltado.",
@@ -959,7 +958,6 @@
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no esté abierto, habilite las notificaciones de escritorio. Puedes controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba una vez que estén habilitadas.",
   "notifications_permission_banner.title": "Nunca te pierdas nada",
   "onboarding.follows.back": "Atrás",
-  "onboarding.follows.done": "Hecho",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar personas a las que seguir, o inténtalo de nuevo más tarde.",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Sigue personas para comenzar",
@@ -969,7 +967,6 @@
   "onboarding.profile.display_name_hint": "Tu nombre completo o tu apodo…",
   "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Puedes @mencionar a otras personas o #etiquetas…",
-  "onboarding.profile.save_and_continue": "Guardar y continuar",
   "onboarding.profile.title": "Configuración del perfil",
   "onboarding.profile.upload_avatar": "Subir foto de perfil",
   "onboarding.profile.upload_header": "Subir encabezado de perfil",

app/javascript/mastodon/locales/et.json

@@ -845,7 +845,6 @@
   "notifications_permission_banner.how_to_control": "Et saada teateid, ajal mil Mastodon pole avatud, luba töölauamärguanded. Saad täpselt määrata, mis tüüpi tegevused tekitavad märguandeid, kasutates peale teadaannete sisse lülitamist üleval olevat nuppu {icon}.",
   "notifications_permission_banner.title": "Ära jää millestki ilma",
   "onboarding.follows.back": "Tagasi",
-  "onboarding.follows.done": "Valmis",
   "onboarding.follows.empty": "Kahjuks ei saa hetkel tulemusi näidata. Proovi kasutada otsingut või lehitse uurimise lehte, et leida inimesi, keda jälgida, või proovi hiljem uuesti.",
   "onboarding.follows.search": "Otsi",
   "onboarding.follows.title": "Jälgi inimesi, et alustada",
@@ -855,7 +854,6 @@
   "onboarding.profile.display_name_hint": "Su täisnimi või naljanimi…",
   "onboarding.profile.note": "Elulugu",
   "onboarding.profile.note_hint": "Saad @mainida teisi kasutajaid või lisada #teemaviidet…",
-  "onboarding.profile.save_and_continue": "Salvesta ja jätka",
   "onboarding.profile.title": "Profiili seadistamine",
   "onboarding.profile.upload_avatar": "Laadi üles profiilipilt",
   "onboarding.profile.upload_header": "Laadi üles profiili päis",

app/javascript/mastodon/locales/eu.json

@@ -751,7 +751,6 @@
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",
   "onboarding.follows.back": "Atzera",
-  "onboarding.follows.done": "Egina",
   "onboarding.follows.empty": "Zoritxarrez, ezin da emaitzik erakutsi orain. Bilaketa erabil dezakezu edo Arakatu orrian jendea bilatu jarraitzeko, edo saiatu geroago.",
   "onboarding.follows.search": "Bilatu",
   "onboarding.follows.title": "Jarraitu jendea hasteko",
@@ -761,7 +760,6 @@
   "onboarding.profile.display_name_hint": "Zure izena edo ezizena…",
   "onboarding.profile.note": "Biografia",
   "onboarding.profile.note_hint": "Beste pertsona batzuk @aipa ditzakezu edo #traolak erabili…",
-  "onboarding.profile.save_and_continue": "Gorde eta jarraitu",
   "onboarding.profile.title": "Profilaren konfigurazioa",
   "onboarding.profile.upload_avatar": "Igo profilaren irudia",
   "onboarding.profile.upload_header": "Igo profilaren goiburua",

app/javascript/mastodon/locales/fa.json

@@ -751,7 +751,6 @@
   "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",
   "notifications_permission_banner.title": "هرگز چیزی را از دست ندهید",
   "onboarding.follows.back": "بازگشت",
-  "onboarding.follows.done": "انجام شد",
   "onboarding.follows.empty": "متأسفانه هم‌اکنون نتیجه‌ای قابل نمایش نیست. می‌توانید استفاده از جست‌وجو یا مرور صفحهٔ کاوش را برای یافتن افرادی برای پی‌گیری آزموده یا دوباره تلاش کنید.",
   "onboarding.follows.search": "جست‌وجو",
   "onboarding.follows.title": "پی گرفتن افرادی برای آغاز",
@@ -761,7 +760,6 @@
   "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
   "onboarding.profile.note": "درباره شما",
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
-  "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
   "onboarding.profile.title": "تنظیم نمایه",
   "onboarding.profile.upload_avatar": "بازگذاری تصویر نمایه",
   "onboarding.profile.upload_header": "بارگذاری تصویر سردر نمایه",

app/javascript/mastodon/locales/fi.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Emme suosittele käyttämään mukautettuja emojeita URL-osoitteiden kanssa. Molempia sisältävät mukautetut kentät näkyvät vain tekstinä linkin sijaan, jotta estetään käyttäjien sekaannus.",
   "account_edit.field_edit_modal.name_hint": "Esim. ”Henkilökohtainen verkkosivusto”",
   "account_edit.field_edit_modal.name_label": "Nimike",
-  "account_edit.field_edit_modal.value_hint": "Esim. ”example.me”",
+  "account_edit.field_edit_modal.url_warning": "Lisää linkki sisällyttämällä alkuun {protocol}.",
+  "account_edit.field_edit_modal.value_hint": "Esim. ”https://example.me”",
   "account_edit.field_edit_modal.value_label": "Arvo",
   "account_edit.field_reorder_modal.drag_cancel": "Veto peruttu. Kenttää ”{item}” ei siirretty.",
   "account_edit.field_reorder_modal.drag_end": "Kenttä ”{item}” pudotettu.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Saadaksesi ilmoituksia, kun Mastodon ei ole auki, ota työpöytäilmoitukset käyttöön. Voit hallita tarkasti, mistä saat työpöytäilmoituksia kun ilmoitukset on otettu käyttöön yllä olevan {icon}-painikkeen kautta.",
   "notifications_permission_banner.title": "Älä anna minkään mennä ohi",
   "onboarding.follows.back": "Takaisin",
-  "onboarding.follows.done": "Valmis",
   "onboarding.follows.empty": "Valitettavasti tuloksia ei voida näyttää juuri nyt. Voit kokeilla hakua tai selata tutustumissivua löytääksesi seurattavaa tai yrittää myöhemmin uudelleen.",
+  "onboarding.follows.next": "Seuraavaksi: määrittele profiilisi",
   "onboarding.follows.search": "Haku",
   "onboarding.follows.title": "Aloita seuraamalla käyttäjiä",
   "onboarding.profile.discoverable": "Aseta profiilini löydettäväksi",
   "onboarding.profile.discoverable_hint": "Kun olet määrittänyt itsesi löydettäväksi Mastodonista, julkaisusi voivat näkyä hakutuloksissa ja suosituissa kohteissa. Lisäksi profiiliasi voidaan ehdottaa käyttäjille, jotka ovat kiinnostuneita kanssasi samoista aiheista.",
   "onboarding.profile.display_name": "Näyttönimi",
   "onboarding.profile.display_name_hint": "Koko nimesi tai lempinimesi…",
+  "onboarding.profile.finish": "Valmis",
   "onboarding.profile.note": "Elämäkerta",
   "onboarding.profile.note_hint": "Voit @mainita muita käyttäjiä tai #aihetunnisteita…",
-  "onboarding.profile.save_and_continue": "Tallenna ja jatka",
   "onboarding.profile.title": "Profiilin määritys",
   "onboarding.profile.upload_avatar": "Lähetä profiilikuva",
   "onboarding.profile.upload_header": "Lähetä profiilin otsakekuva",

app/javascript/mastodon/locales/fil.json

@@ -313,7 +313,6 @@
   "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
   "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
   "onboarding.profile.note_hint": "Maaari mong @bangitin ang ibang mga tao o mga #hashtag…",
-  "onboarding.profile.save_and_continue": "Iimbak at magpatuloy",
   "picture_in_picture.restore": "Ilagay ito pabalik",
   "poll.closed": "Sarado",
   "poll.reveal": "Ipakita ang mga resulta",

app/javascript/mastodon/locales/fo.json

@@ -915,7 +915,6 @@
   "notifications_permission_banner.how_to_control": "Ger skriviborðsfráboðanir virknar fyri at móttaka fráboðanir, tá Mastodon ikki er opið. Tá tær eru gjørdar virknar, kanst tú stýra, hvørji sløg av samvirkni geva skriviborðsfráboðanir. Hetta umvegis {icon} knøttin omanfyri.",
   "notifications_permission_banner.title": "Miss einki",
   "onboarding.follows.back": "Aftur",
-  "onboarding.follows.done": "Liðugt",
   "onboarding.follows.empty": "Tíverri kunnu eingi úrslit vísast beint nú. Tú kanst royna at brúka leiting ella at kaga gjøgnum Rannsaka síðuna fyri at finna fólk at fylgja - ella royna aftur seinni.",
   "onboarding.follows.search": "Leita",
   "onboarding.follows.title": "Fylg fólki fyri at koma í gongd",
@@ -925,7 +924,6 @@
   "onboarding.profile.display_name_hint": "Títt fulla navn ella títt stuttliga navn…",
   "onboarding.profile.note": "Ævilýsing",
   "onboarding.profile.note_hint": "Tú kanst @umrøða onnur fólk ella #frámerki…",
-  "onboarding.profile.save_and_continue": "Goym og halt fram",
   "onboarding.profile.title": "Vangauppsetan",
   "onboarding.profile.upload_avatar": "Legg vangamynd upp",
   "onboarding.profile.upload_header": "Legg vangahøvd upp",

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

@@ -18,12 +18,12 @@
   "account.add_note": "Ajouter une note personnelle",
   "account.add_or_remove_from_list": "Ajouter ou enlever de listes",
   "account.badges.admin": "Admin",
-  "account.badges.blocked": "Bloqué",
+  "account.badges.blocked": "Bloqué·e",
   "account.badges.bot": "Bot",
   "account.badges.domain_blocked": "Domaine bloqué",
   "account.badges.group": "Groupe",
-  "account.badges.muted": "Masqué",
+  "account.badges.muted": "Masqué·e",
-  "account.badges.muted_until": "Masqué jusqu’au {until}",
+  "account.badges.muted_until": "Masqué·e jusqu’au {until}",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
@@ -39,7 +39,7 @@
   "account.edit_profile_short": "Modifier",
   "account.enable_notifications": "Me notifier quand @{name} publie",
   "account.endorse": "Inclure sur profil",
-  "account.familiar_followers_many": "Suivi par {name1}, {name2}, et {othersCount, plural, one {une autre personne que vous suivez} other {# autres personnes que vous suivez}}",
+  "account.familiar_followers_many": "Suivi·e par {name1}, {name2}, et {othersCount, plural, one {une autre personne que vous suivez} other {# autres personnes que vous suivez}}",
   "account.familiar_followers_one": "Suivi·e par {name1}",
   "account.familiar_followers_two": "Suivi·e par {name1} et {name2}",
   "account.featured": "En vedette",
@@ -65,7 +65,7 @@
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
-  "account.followers_you_know_counter": "{count, plural, one {{counter} suivi·e}, other {{counter} suivi·e·s}}",
+  "account.followers_you_know_counter": "{counter} que vous suivez",
   "account.following": "Abonné·e",
   "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Nous déconseillons l'usage d'émoji personnalisé avec les URL. Les champs personnalisés contenant les deux seront affichés comme du texte et non un lien, afin d'éviter toute confusion.",
   "account_edit.field_edit_modal.name_hint": "Par exemple « Site Web personnel »",
   "account_edit.field_edit_modal.name_label": "Libellé",
-  "account_edit.field_edit_modal.value_hint": "Par exemple « exemple.me »",
+  "account_edit.field_edit_modal.url_warning": "Pour ajouter un lien, veuillez inclure {protocol} au début.",
+  "account_edit.field_edit_modal.value_hint": "Par exemple « https://exemple.me »",
   "account_edit.field_edit_modal.value_label": "Valeur",
   "account_edit.field_reorder_modal.drag_cancel": "Déplacement annulé. Le champ « {item} » a été redéposé.",
   "account_edit.field_reorder_modal.drag_end": "Le champ « {item} » a été déposé.",
@@ -959,7 +960,6 @@
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications de bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Ne rien rater",
   "onboarding.follows.back": "Retour",
-  "onboarding.follows.done": "Terminé",
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer de rechercher ou de parcourir la page \"Explorer\" pour trouver des personnes à suivre, ou réessayer plus tard.",
   "onboarding.follows.search": "Recherche",
   "onboarding.follows.title": "Suivre des personnes pour commencer",
@@ -969,7 +969,6 @@
   "onboarding.profile.display_name_hint": "Votre nom complet ou votre nom rigolo…",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "Vous pouvez @mentionner d'autres personnes ou #hashtags…",
-  "onboarding.profile.save_and_continue": "Enregistrer et continuer",
   "onboarding.profile.title": "Configuration du profil",
   "onboarding.profile.upload_avatar": "Importer une photo de profil",
   "onboarding.profile.upload_header": "Importer un entête de profil",

app/javascript/mastodon/locales/fr.json

@@ -18,12 +18,12 @@
   "account.add_note": "Ajouter une note personnelle",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.admin": "Admin",
-  "account.badges.blocked": "Bloqué",
+  "account.badges.blocked": "Bloqué·e",
   "account.badges.bot": "Bot",
   "account.badges.domain_blocked": "Domaine bloqué",
   "account.badges.group": "Groupe",
-  "account.badges.muted": "Masqué",
+  "account.badges.muted": "Masqué·e",
-  "account.badges.muted_until": "Masqué jusqu’au {until}",
+  "account.badges.muted_until": "Masqué·e jusqu’au {until}",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
@@ -39,7 +39,7 @@
   "account.edit_profile_short": "Modifier",
   "account.enable_notifications": "Me notifier les publications de @{name}",
   "account.endorse": "Recommander sur votre profil",
-  "account.familiar_followers_many": "Suivi par {name1}, {name2}, et {othersCount, plural, one {une autre personne que vous suivez} other {# autres personnes que vous suivez}}",
+  "account.familiar_followers_many": "Suivi·e par {name1}, {name2}, et {othersCount, plural, one {une autre personne que vous suivez} other {# autres personnes que vous suivez}}",
   "account.familiar_followers_one": "Suivi·e par {name1}",
   "account.familiar_followers_two": "Suivi·e par {name1} et {name2}",
   "account.featured": "En vedette",
@@ -65,14 +65,14 @@
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
-  "account.followers_you_know_counter": "{count, plural, one {{counter} suivi·e}, other {{counter} suivi·e·s}}",
+  "account.followers_you_know_counter": "{counter} que vous suivez",
   "account.following": "Abonnements",
   "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
   "account.go_to_profile": "Voir le profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
-  "account.in_memoriam": "En mémoire de.",
+  "account.in_memoriam": "En mémoire.",
   "account.joined_long": "Ici depuis le {date}",
   "account.joined_short": "Ici depuis",
   "account.languages": "Modifier les langues d'abonnements",
@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Nous déconseillons l'usage d'émoji personnalisé avec les URL. Les champs personnalisés contenant les deux seront affichés comme du texte et non un lien, afin d'éviter toute confusion.",
   "account_edit.field_edit_modal.name_hint": "Par exemple « Site Web personnel »",
   "account_edit.field_edit_modal.name_label": "Libellé",
-  "account_edit.field_edit_modal.value_hint": "Par exemple « exemple.me »",
+  "account_edit.field_edit_modal.url_warning": "Pour ajouter un lien, veuillez inclure {protocol} au début.",
+  "account_edit.field_edit_modal.value_hint": "Par exemple « https://exemple.me »",
   "account_edit.field_edit_modal.value_label": "Valeur",
   "account_edit.field_reorder_modal.drag_cancel": "Déplacement annulé. Le champ « {item} » a été redéposé.",
   "account_edit.field_reorder_modal.drag_end": "Le champ « {item} » a été déposé.",
@@ -959,7 +960,6 @@
   "notifications_permission_banner.how_to_control": "Pour recevoir des notifications lorsque Mastodon n’est pas ouvert, activez les notifications du bureau. Vous pouvez contrôler précisément quels types d’interactions génèrent des notifications de bureau via le bouton {icon} ci-dessus une fois qu’elles sont activées.",
   "notifications_permission_banner.title": "Toujours au courant",
   "onboarding.follows.back": "Retour",
-  "onboarding.follows.done": "Terminé",
   "onboarding.follows.empty": "Malheureusement, aucun résultat ne peut être affiché pour le moment. Vous pouvez essayer d'utiliser la recherche ou parcourir la page de découverte pour trouver des personnes à suivre, ou réessayez plus tard.",
   "onboarding.follows.search": "Recherche",
   "onboarding.follows.title": "Suivre des personnes pour commencer",
@@ -969,7 +969,6 @@
   "onboarding.profile.display_name_hint": "Votre nom complet ou votre nom rigolo…",
   "onboarding.profile.note": "Biographie",
   "onboarding.profile.note_hint": "Vous pouvez @mentionner d'autres personnes ou #hashtags…",
-  "onboarding.profile.save_and_continue": "Enregistrer et continuer",
   "onboarding.profile.title": "Configuration du profil",
   "onboarding.profile.upload_avatar": "Importer une photo de profil",
   "onboarding.profile.upload_header": "Importer un entête de profil",

app/javascript/mastodon/locales/fy.json

@@ -664,7 +664,6 @@
   "notifications_permission_banner.how_to_control": "Om meldingen te ûntfangen wannear’t Mastodon net iepen stiet. Jo kinne krekt bepale hokker soarte fan ynteraksjes wol of gjin desktopmeldingen jouwe fia de boppesteande {icon} knop.",
   "notifications_permission_banner.title": "Mis neat",
   "onboarding.follows.back": "Tebek",
-  "onboarding.follows.done": "Klear",
   "onboarding.follows.empty": "Spitigernôch kinne op dit stuit gjin resultaten toand wurde. Jo kinne probearje te sykjen of te blêdzjen troch de ferkenningsside om minsken te finen dy’t jo folgje kinne, of probearje it letter opnij.",
   "onboarding.follows.search": "Sykje",
   "onboarding.follows.title": "Folgje minsken om te begjinnen",
@@ -674,7 +673,6 @@
   "onboarding.profile.display_name_hint": "Jo folsleine namme of in aardige bynamme…",
   "onboarding.profile.note": "Biografy",
   "onboarding.profile.note_hint": "Jo kinne oare minsken @fermelde of #hashtags brûke…",
-  "onboarding.profile.save_and_continue": "Bewarje en trochgean",
   "onboarding.profile.title": "Profyl ynstelle",
   "onboarding.profile.upload_avatar": "Profylfoto oplade",
   "onboarding.profile.upload_header": "Omslachfoto foar profyl oplade",

app/javascript/mastodon/locales/ga.json

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Molaimid gan emoji saincheaptha a úsáid i gcomhar le Urlanna. Taispeánfar réimsí saincheaptha ina bhfuil an dá cheann mar théacs amháin seachas mar nasc, chun mearbhall úsáideoirí a sheachaint.",
   "account_edit.field_edit_modal.name_hint": "M.sh. “Suíomh Gréasáin pearsanta”",
   "account_edit.field_edit_modal.name_label": "Lipéad",
-  "account_edit.field_edit_modal.value_hint": "M.sh. “shampla.me”",
   "account_edit.field_edit_modal.value_label": "Luach",
   "account_edit.field_reorder_modal.drag_cancel": "Cuireadh an tarraingt ar ceal. Baineadh an réimse \"{item}\".",
   "account_edit.field_reorder_modal.drag_end": "Baineadh an réimse \"{item}\".",
@@ -959,7 +958,6 @@
   "notifications_permission_banner.how_to_control": "Chun fógraí a fháil nuair nach bhfuil Mastodon oscailte, cumasaigh fógraí deisce. Is féidir leat a rialú go beacht cé na cineálacha idirghníomhaíochtaí a ghineann fógraí deisce tríd an gcnaipe {icon} thuas nuair a bhíonn siad cumasaithe.",
   "notifications_permission_banner.title": "Ná caill aon rud go deo",
   "onboarding.follows.back": "Ar ais",
-  "onboarding.follows.done": "Déanta",
   "onboarding.follows.empty": "Ar an drochuair, ní féidir aon torthaí a thaispeáint faoi láthair. Is féidir leat triail a bhaint as cuardach nó brabhsáil ar an leathanach taiscéalaíochta chun teacht ar dhaoine le leanúint, nó bain triail eile as níos déanaí.",
   "onboarding.follows.search": "Cuardach",
   "onboarding.follows.title": "Lean daoine le tosú",
@@ -969,7 +967,6 @@
   "onboarding.profile.display_name_hint": "D’ainm iomlán nó d’ainm spraíúil…",
   "onboarding.profile.note": "Bith",
   "onboarding.profile.note_hint": "Is féidir leat @ daoine eile a lua nó #hashtags…",
-  "onboarding.profile.save_and_continue": "Sábháil agus lean ar aghaidh",
   "onboarding.profile.title": "Socrú próifíle",
   "onboarding.profile.upload_avatar": "Íosluchtaigh pictiúr próifíl",
   "onboarding.profile.upload_header": "Íoslódáil an ceanntásca próifíl",

app/javascript/mastodon/locales/gd.json

@@ -752,7 +752,6 @@
   "notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
   "notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
   "onboarding.follows.back": "Air ais",
-  "onboarding.follows.done": "Deiseil",
   "onboarding.follows.empty": "Gu mì-fhortanach, chan urrainn dhuinn toradh a shealltainn an-dràsta. Feuch gleus an luirg no duilleag an rùrachaidh airson daoine ri leantainn a lorg no feuch ris a-rithist an ceann tamaill.",
   "onboarding.follows.search": "Lorg",
   "onboarding.follows.title": "Lean daoine airson tòiseachadh",
@@ -762,7 +761,6 @@
   "onboarding.profile.display_name_hint": "D’ ainm slàn no spòrsail…",
   "onboarding.profile.note": "Cunntas-beatha",
   "onboarding.profile.note_hint": "’S urrainn dhut @iomradh a thoirt air càch no air #tagaicheanHais…",
-  "onboarding.profile.save_and_continue": "Sàbhail ’s lean air adhart",
   "onboarding.profile.title": "Suidheachadh na pròifile",
   "onboarding.profile.upload_avatar": "Luchdaich suas dealbh na pròifil",
   "onboarding.profile.upload_header": "Luchdaich suas bann-cinn na pròifil",

app/javascript/mastodon/locales/gl.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Non recomendamos o uso de emojis persoais combinados con URLs. Os campos persoais que conteñen ambos móstranse só como texto e non como unha ligazón, para evitar a confusión de quen os lea.",
   "account_edit.field_edit_modal.name_hint": "Ex. \"Páxina web persoal\"",
   "account_edit.field_edit_modal.name_label": "Etiqueta",
-  "account_edit.field_edit_modal.value_hint": "Ex. \"exemplo.gal\"",
+  "account_edit.field_edit_modal.url_warning": "Para engadir unha ligazón, inclúe {protocol} diante.",
+  "account_edit.field_edit_modal.value_hint": "Ex. “https://exemplo.me”",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "Cancelouse o arrastrado. Soltouse o campo \"{item}\".",
   "account_edit.field_reorder_modal.drag_end": "Soltouse o campo \"{item}\".",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Activa as notificacións de escritorio para recibir notificacións mentras Mastodon non está aberto. Podes controlar de xeito preciso o tipo de interaccións que crean as notificacións de escritorio a través da {icon} superior unha vez están activadas.",
   "notifications_permission_banner.title": "Non perder nada",
   "onboarding.follows.back": "Volver",
-  "onboarding.follows.done": "Feito",
   "onboarding.follows.empty": "Desgraciadamente agora mesmo non hai nada que mostrar. Podes intentalo coa busca ou na páxina descubrir para atopar persoas ás que seguir, ou intentalo máis tarde.",
+  "onboarding.follows.next": "Seguinte: Configura o teu perfil",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Comeza seguindo algunhas persoas",
   "onboarding.profile.discoverable": "Que o meu perfil se poida atopar",
   "onboarding.profile.discoverable_hint": "Cando elixes que poidan atoparte en Mastodon as túas publicacións aparecerán nos resultados das buscas e nos temas en voga, e o teu perfil podería ser suxerido para seguimento a persoas con intereses semellantes aos teus.",
   "onboarding.profile.display_name": "Nome público",
   "onboarding.profile.display_name_hint": "O teu nome completo ou un nome divertido…",
+  "onboarding.profile.finish": "Finalizar",
   "onboarding.profile.note": "Acerca de ti",
   "onboarding.profile.note_hint": "Podes @mencionar a outras persoas ou usar #cancelos…",
-  "onboarding.profile.save_and_continue": "Gardar e continuar",
   "onboarding.profile.title": "Configuración do perfil",
   "onboarding.profile.upload_avatar": "Subir imaxe do perfil",
   "onboarding.profile.upload_header": "Subir cabeceira para o perfil",

app/javascript/mastodon/locales/he.json

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "אנו ממליצים נגד שימוש באמוג'י ייחודיים ביחד עם URL. שדות מיוחדים שמכילים את שניהם יופיעו כמלל בלבד ולא כקישור, כדי למנוע בלבול משתמשים.",
   "account_edit.field_edit_modal.name_hint": "למשל \"אתר אישי\"",
   "account_edit.field_edit_modal.name_label": "תווית",
-  "account_edit.field_edit_modal.value_hint": "למשל “example.me”",
   "account_edit.field_edit_modal.value_label": "ערך",
   "account_edit.field_reorder_modal.drag_cancel": "הגרירה בוטלה. השדה \"{item}\" נעזב.",
   "account_edit.field_reorder_modal.drag_end": "השדה \"{item}\" נעזב.",
@@ -959,7 +958,6 @@
   "notifications_permission_banner.how_to_control": "כדי לקבל התראות גם כאשר מסטודון סגור יש לאפשר התראות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא להתראות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
   "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
   "onboarding.follows.back": "בחזרה",
-  "onboarding.follows.done": "בוצע",
   "onboarding.follows.empty": "למצער, תוצאות לחיפושך אינן בנמצא. ניתן להשתמש בחיפוש או בדף החקירות לשם מציאת אנשים ולעקבם. אפשר גם לנסות שוב אחר כך.",
   "onboarding.follows.search": "חיפוש",
   "onboarding.follows.title": "כדי להתחיל, יש לעקוב אחרי אנשים",
@@ -969,7 +967,6 @@
   "onboarding.profile.display_name_hint": "שמך המלא או כינוי הכיף שלך…",
   "onboarding.profile.note": "אודות",
   "onboarding.profile.note_hint": "ניתן @לאזכר משתמשים אחרים או #תגיות…",
-  "onboarding.profile.save_and_continue": "לשמור ולהמשיך",
   "onboarding.profile.title": "הגדרת פרופיל",
   "onboarding.profile.upload_avatar": "העלאת תמונת פרופיל",
   "onboarding.profile.upload_header": "העלאת כותרת פרופיל",

app/javascript/mastodon/locales/hu.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Nem javasoljuk az egyéni emodzsik és webcímek együttes használatát. A mindkettőt tartalmazó egyéni mezők a felhasználók megzavarásának elkerülése érdekében csak szövegként jelennek meg, nem hivatkozásként.",
   "account_edit.field_edit_modal.name_hint": "Például „Személyes webhely”",
   "account_edit.field_edit_modal.name_label": "Címke",
-  "account_edit.field_edit_modal.value_hint": "Például „example.me”",
+  "account_edit.field_edit_modal.url_warning": "Hivatkozás hozzáadásakor add meg a {protocol} protokollt az elején.",
+  "account_edit.field_edit_modal.value_hint": "Például „https://example.me”",
   "account_edit.field_edit_modal.value_label": "Érték",
   "account_edit.field_reorder_modal.drag_cancel": "Az áthúzás megszakítva. A(z) „{item}” mező el lett dobva.",
   "account_edit.field_reorder_modal.drag_end": "A(z) „{item}” mező el lett dobva.",
@@ -959,7 +960,6 @@
   "notifications_permission_banner.how_to_control": "Ahhoz, hogy értesítéseket kapj akkor, amikor a Mastodon nincs megnyitva, engedélyezd az asztali értesítéseket. Pontosan be tudod állítani, hogy milyen interakciókról értesülj a fenti {icon} gombon keresztül, ha egyszer már engedélyezted őket.",
   "notifications_permission_banner.title": "Soha ne mulassz el semmit",
   "onboarding.follows.back": "Vissza",
-  "onboarding.follows.done": "Kész",
   "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.",
   "onboarding.follows.search": "Keresés",
   "onboarding.follows.title": "A kezdéshez kezdj el embereket követni",
@@ -969,7 +969,6 @@
   "onboarding.profile.display_name_hint": "Teljes neved vagy vicces neved…",
   "onboarding.profile.note": "Bemutatkozás",
   "onboarding.profile.note_hint": "Megemlíthetsz @másokat vagy #hashtag-eket…",
-  "onboarding.profile.save_and_continue": "Mentés és folytatás",
   "onboarding.profile.title": "Profilbeállítás",
   "onboarding.profile.upload_avatar": "Profilkép feltöltése",
   "onboarding.profile.upload_header": "Profil fejléc feltöltése",

app/javascript/mastodon/locales/ia.json

@@ -707,7 +707,6 @@
   "notifications_permission_banner.how_to_control": "Pro reciper notificationes quando Mastodon non es aperte, activa le notificationes de scriptorio. Post lor activation, es possibile controlar precisemente qual typos de interaction genera notificationes de scriptorio per medio del button {icon} hic supra.",
   "notifications_permission_banner.title": "Non mancar jammais a un cosa",
   "onboarding.follows.back": "Retro",
-  "onboarding.follows.done": "Facite",
   "onboarding.follows.empty": "Regrettabilemente, non es possibile monstrar resultatos al momento. Tu pote tentar usar le recerca o percurrer le pagina de exploration pro cercar personas a sequer, o tentar lo de novo plus tarde.",
   "onboarding.follows.search": "Cercar",
   "onboarding.follows.title": "Seque personas pro comenciar",
@@ -717,7 +716,6 @@
   "onboarding.profile.display_name_hint": "Tu nomine complete o tu supernomine…",
   "onboarding.profile.note": "Bio",
   "onboarding.profile.note_hint": "Tu pote @mentionar altere personas o #hashtags…",
-  "onboarding.profile.save_and_continue": "Salvar e continuar",
   "onboarding.profile.title": "Configuration del profilo",
   "onboarding.profile.upload_avatar": "Incargar imagine de profilo",
   "onboarding.profile.upload_header": "Actualisar capite de profilo",

app/javascript/mastodon/locales/ie.json

@@ -478,7 +478,6 @@
   "onboarding.profile.display_name_hint": "Tui complet nómine o tui amusant nómine…",
   "onboarding.profile.note": "Biografie",
   "onboarding.profile.note_hint": "Tu posse @mentionar altri persones o #hashtags…",
-  "onboarding.profile.save_and_continue": "Conservar e avansar",
   "onboarding.profile.title": "Popular tu profil",
   "onboarding.profile.upload_avatar": "Cargar profil-portrete",
   "onboarding.profile.upload_header": "Cargar cap-image",

app/javascript/mastodon/locales/io.json

@@ -614,7 +614,6 @@
   "notifications_permission_banner.how_to_control": "Por ganar savigi kande Mastodon ne es desklozita, ebligez komputilsavigi.",
   "notifications_permission_banner.title": "Irga kozo ne pasas vu",
   "onboarding.follows.back": "Retro",
-  "onboarding.follows.done": "Finis",
   "onboarding.follows.empty": "Regretinde, nula rezultajo povas montresar nune. Vu povas esforcar serchar, o irar al explorala pagino por trovar personi sequinda, o esforcar itere pose.",
   "onboarding.follows.search": "Serchar",
   "onboarding.follows.title": "Sequez personi por komencar",
@@ -624,7 +623,6 @@
   "onboarding.profile.display_name_hint": "Vua tota nomo o vua gaya nomo…",
   "onboarding.profile.note": "Biografio",
   "onboarding.profile.note_hint": "Vu povas @mencionar altra personi o #hashtagi…",
-  "onboarding.profile.save_and_continue": "Preservez e avancez",
   "onboarding.profile.title": "Kompletigez la profilo",
   "onboarding.profile.upload_avatar": "Kargez profiloportreto",
   "onboarding.profile.upload_header": "Kargez profilokapimajo",

app/javascript/mastodon/locales/is.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Við mælum gegn því að nota sérsniðin tjáningartákn saman með vefslóðum. Sérsniðnir reitir sem innihalda hvort tveggja munu birtast sem einungis texti í stað þess að vera tenglar, til að koma í veg fyrir að notendur taki annað í misgripum fyrir hitt.",
   "account_edit.field_edit_modal.name_hint": "T.d. \"Eigið vefsvæði\"",
   "account_edit.field_edit_modal.name_label": "Skýring",
-  "account_edit.field_edit_modal.value_hint": "T.d. \"minnvefur.is\"",
+  "account_edit.field_edit_modal.url_warning": "Til að bæta við tengli skaltu hafa {protocol} á undan.",
+  "account_edit.field_edit_modal.value_hint": "T.d. “https://vefur.is”",
   "account_edit.field_edit_modal.value_label": "Gildi",
   "account_edit.field_reorder_modal.drag_cancel": "Hætt var við að draga. Reitnum \"{item}\" var sleppt.",
   "account_edit.field_reorder_modal.drag_end": "Reitnum \"{item}\" var sleppt.",
@@ -959,7 +960,6 @@
   "notifications_permission_banner.how_to_control": "Til að taka á móti tilkynningum þegar Mastodon er ekki opið, skaltu virkja tilkynningar á skjáborði. Þegar þær eru orðnar virkar geturðu stýrt nákvæmlega hverskonar atvik framleiða tilkynningar með því að nota {icon}-hnappinn hér fyrir ofan.",
   "notifications_permission_banner.title": "Aldrei missa af neinu",
   "onboarding.follows.back": "Til baka",
-  "onboarding.follows.done": "Lokið",
   "onboarding.follows.empty": "Því miður er ekki hægt að birta neinar niðurstöður í augnablikinu. Þú getur reynt að nota leitina eða skoðað könnunarsíðuna til að finna fólk til að fylgjast með, nú eða prófað aftur síðar.",
   "onboarding.follows.search": "Leita",
   "onboarding.follows.title": "Þú ættir að fylgjast með fólki til að komast í gang",
@@ -969,7 +969,6 @@
   "onboarding.profile.display_name_hint": "Fullt nafn þitt eða eitthvað til gamans…",
   "onboarding.profile.note": "Æviágrip",
   "onboarding.profile.note_hint": "Þú getur @minnst á annað fólk eða #myllumerki…",
-  "onboarding.profile.save_and_continue": "Vista og halda áfram",
   "onboarding.profile.title": "Uppsetning notandasniðs",
   "onboarding.profile.upload_avatar": "Sendu inn auðkennismynd",
   "onboarding.profile.upload_header": "Sendu inn bakgrunnsmynd í haus notandasniðs",

app/javascript/mastodon/locales/it.json

@@ -171,9 +171,10 @@
   "account_edit.field_edit_modal.limit_header": "Superato il limite di caratteri consigliato",
   "account_edit.field_edit_modal.limit_message": "Gli utenti dai dispositivi mobili potrebbero non visualizzare completamente il tuo campo.",
   "account_edit.field_edit_modal.link_emoji_warning": "Sconsigliamo l'uso di emoji personalizzate in combinazione con gli URL. I campi personalizzati che contengono entrambi verranno visualizzati solo come testo anziché come link, in modo da evitare confusione nell'utente.",
-  "account_edit.field_edit_modal.name_hint": "Ad esempio: “Sito web personale”",
+  "account_edit.field_edit_modal.name_hint": "Per esempio: “Sito web personale”",
   "account_edit.field_edit_modal.name_label": "Etichetta",
-  "account_edit.field_edit_modal.value_hint": "Ad esempio: “example.me”",
+  "account_edit.field_edit_modal.url_warning": "Per aggiungere un collegamento, si prega di includere {protocol} all’inizio.",
+  "account_edit.field_edit_modal.value_hint": "Per esempio: “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Valore",
   "account_edit.field_reorder_modal.drag_cancel": "Il trascinamento è stato annullato. Il campo \"{item}\" è stato eliminato.",
   "account_edit.field_reorder_modal.drag_end": "Il campo \"{item}\" è stato eliminato.",
@@ -959,17 +960,17 @@
   "notifications_permission_banner.how_to_control": "Per ricevere le notifiche quando Mastodon non è aperto, abilita le notifiche desktop. Puoi controllare precisamente quali tipi di interazioni generano le notifiche destkop, tramite il pulsante {icon} sopra, una volta abilitate.",
   "notifications_permission_banner.title": "Non perderti mai nulla",
   "onboarding.follows.back": "Indietro",
-  "onboarding.follows.done": "Fatto",
   "onboarding.follows.empty": "Sfortunatamente, nessun risultato può essere mostrato in questo momento. Puoi provare a utilizzare la ricerca o sfogliare la pagina di esplorazione per trovare persone da seguire, oppure riprova più tardi.",
+  "onboarding.follows.next": "Successivo: imposta il tuo profilo",
   "onboarding.follows.search": "Cerca",
   "onboarding.follows.title": "Segui le persone per iniziare",
   "onboarding.profile.discoverable": "Rendi il mio profilo rilevabile",
   "onboarding.profile.discoverable_hint": "Quando attivi la rilevabilità su Mastodon, i tuoi post potrebbero apparire nei risultati di ricerca e nelle tendenze e il tuo profilo potrebbe essere suggerito a persone con interessi simili ai tuoi.",
   "onboarding.profile.display_name": "Nome da visualizzare",
   "onboarding.profile.display_name_hint": "Il tuo nome completo o il tuo nome divertente…",
+  "onboarding.profile.finish": "Fine",
   "onboarding.profile.note": "Biografia",
   "onboarding.profile.note_hint": "Puoi @menzionare altre persone o #hashtags…",
-  "onboarding.profile.save_and_continue": "Salva e continua",
   "onboarding.profile.title": "Configurazione del profilo",
   "onboarding.profile.upload_avatar": "Carica l'immagine del profilo",
   "onboarding.profile.upload_header": "Carica l'intestazione del profilo",

app/javascript/mastodon/locales/ja.json

@@ -695,7 +695,6 @@
   "notifications_permission_banner.how_to_control": "Mastodonを閉じている間でも通知を受信するにはデスクトップ通知を有効にしてください。有効にすると上の {icon} ボタンから通知の内容を細かくカスタマイズできます。",
   "notifications_permission_banner.title": "お見逃しなく",
   "onboarding.follows.back": "戻る",
-  "onboarding.follows.done": "完了",
   "onboarding.follows.empty": "表示できる結果はありません。検索やエクスプローラーを使ったり、ほかのアカウントをフォローしたり、後でもう一度試しください。",
   "onboarding.follows.search": "検索",
   "onboarding.follows.title": "最初にフォローする人を選ぶ",
@@ -705,7 +704,6 @@
   "onboarding.profile.display_name_hint": "フルネーム、あるいは面白い名前など",
   "onboarding.profile.note": "自己紹介",
   "onboarding.profile.note_hint": "ほかのユーザーへのメンション (@mention) や、 #ハッシュタグ が使用できます",
-  "onboarding.profile.save_and_continue": "保存して続ける",
   "onboarding.profile.title": "プロフィールの設定",
   "onboarding.profile.upload_avatar": "プロフィール画像をアップロード",
   "onboarding.profile.upload_header": "プロフィールのヘッダー画像をアップロード",

app/javascript/mastodon/locales/kab.json

@@ -592,14 +592,12 @@
   "notifications_permission_banner.enable": "Rmed ilɣa n tnarit",
   "notifications_permission_banner.title": "Ur zeggel acemma",
   "onboarding.follows.back": "Uɣal",
-  "onboarding.follows.done": "Immed",
   "onboarding.follows.search": "Nadi",
   "onboarding.follows.title": "Ḍfeṛ walbɛaḍ i wakken ad ttebdud",
   "onboarding.profile.display_name": "Isem ara d-yettwaskanen",
   "onboarding.profile.display_name_hint": "Isem-ik·im ummid neɣ isem-ik·im n uqeṣṣer…",
   "onboarding.profile.note": "Tameddurt",
   "onboarding.profile.note_hint": "Tzemreḍ ad d-@tbedreḍ imdanen niḍen neɣ #ihacṭagen …",
-  "onboarding.profile.save_and_continue": "Sekles, tkemmleḍ",
   "onboarding.profile.title": "Asbadu n umaɣnu",
   "onboarding.profile.upload_avatar": "Sali tugna n umaɣnu",
   "onboarding.profile.upload_header": "Sali tacacit n umaɣnu",

app/javascript/mastodon/locales/ko.json

@@ -796,7 +796,6 @@
   "notifications_permission_banner.how_to_control": "마스토돈이 열려 있지 않을 때에도 알림을 받으려면, 데스크탑 알림을 활성화 하세요. 당신은 어떤 종류의 반응이 데스크탑 알림을 발생할 지를 {icon} 버튼을 통해 세세하게 설정할 수 있습니다.",
   "notifications_permission_banner.title": "아무것도 놓치지 마세요",
   "onboarding.follows.back": "뒤로가기",
-  "onboarding.follows.done": "완료",
   "onboarding.follows.empty": "안타깝지만 아직은 아무 것도 보여드릴 수 없습니다. 검색을 이용하거나 둘러보기 페이지에서 팔로우 할 사람을 찾을 수 있습니다. 아니면 잠시 후에 다시 시도하세요.",
   "onboarding.follows.search": "검색",
   "onboarding.follows.title": "사람들을 팔로우하기",
@@ -806,7 +805,6 @@
   "onboarding.profile.display_name_hint": "진짜 이름 또는 재미난 이름…",
   "onboarding.profile.note": "자기소개",
   "onboarding.profile.note_hint": "남을 @mention 하거나 #hashtag 태그를 달 수 있습니다…",
-  "onboarding.profile.save_and_continue": "저장 및 계속",
   "onboarding.profile.title": "프로필 설정",
   "onboarding.profile.upload_avatar": "프로필 사진 업로드",
   "onboarding.profile.upload_header": "프로필 헤더 업로드",

app/javascript/mastodon/locales/lad.json

@@ -594,7 +594,6 @@
   "notifications_permission_banner.how_to_control": "Para risivir avizos kuando Mastodon no esta avierto, kapasita avizos de ensimameza. Puedes kontrolar presizamente kualos tipos de enteraksiones djeneren avizos de ensimameza kon el boton {icon} arriva kuando esten kapasitadas.",
   "notifications_permission_banner.title": "Nunkua te piedres niente",
   "onboarding.follows.back": "Atras",
-  "onboarding.follows.done": "Fecho",
   "onboarding.follows.empty": "Malorozamente, no se pueden amostrar rezultados en este momento. Puedes aprovar uzar la bushkeda o navigar por la pajina de eksplorasyon para topar personas a las que segir, o aprovarlo de muevo mas tadre.",
   "onboarding.follows.search": "Bushka",
   "onboarding.follows.title": "Sige personas para ampezar",
@@ -604,7 +603,6 @@
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
   "onboarding.profile.note": "Tu deskripsyon",
   "onboarding.profile.note_hint": "Puedes @enmentar a otra djente o #etiketas…",
-  "onboarding.profile.save_and_continue": "Guadra i kontinua",
   "onboarding.profile.title": "Konfigurasyon de profil",
   "onboarding.profile.upload_avatar": "Karga imaje de profil",
   "onboarding.profile.upload_header": "Karga kavesera de profil",

app/javascript/mastodon/locales/lt.json

@@ -745,7 +745,6 @@
   "notifications_permission_banner.how_to_control": "Jei nori gauti pranešimus, kai Mastodon nėra atidarytas, įjunk darbalaukio pranešimus. Įjungęs (-usi) darbalaukio pranešimus, gali tiksliai valdyti, kokių tipų sąveikos generuoja darbalaukio pranešimus, naudojant pirmiau esančiu mygtuku {icon}.",
   "notifications_permission_banner.title": "Niekada nieko nepraleisk",
   "onboarding.follows.back": "Atgal",
-  "onboarding.follows.done": "Atlikta",
   "onboarding.follows.empty": "Deja, šiuo metu jokių rezultatų parodyti negalima. Gali pabandyti naudoti paiešką arba naršyti atradimo puslapį, kad surastum žmonių, kuriuos nori sekti, arba bandyti vėliau.",
   "onboarding.follows.search": "Ieškoti",
   "onboarding.follows.title": "Sekite asmenis, kad pradėtumėte",
@@ -755,7 +754,6 @@
   "onboarding.profile.display_name_hint": "Tavo pilnas vardas arba linksmas vardas…",
   "onboarding.profile.note": "Biografija",
   "onboarding.profile.note_hint": "Gali @paminėti kitus žmones arba #saitažodžius…",
-  "onboarding.profile.save_and_continue": "Išsaugoti ir tęsti",
   "onboarding.profile.title": "Profilio sąranka",
   "onboarding.profile.upload_avatar": "Įkelti profilio nuotrauką",
   "onboarding.profile.upload_header": "Įkelti profilio antraštę",

app/javascript/mastodon/locales/lv.json

@@ -610,7 +610,6 @@
   "onboarding.profile.display_name_hint": "Tavs pilnais vārds vai Tavs joku vārds…",
   "onboarding.profile.note": "Apraksts",
   "onboarding.profile.note_hint": "Tu vari @pieminēt citus cilvēkus vai #tēmturus…",
-  "onboarding.profile.save_and_continue": "Saglabāt un turpināt",
   "onboarding.profile.title": "Profila iestatīšana",
   "onboarding.profile.upload_avatar": "Augšupielādēt profila attēlu",
   "onboarding.profile.upload_header": "Augšupielādēt profila galveni",

app/javascript/mastodon/locales/ms.json

@@ -481,7 +481,6 @@
   "onboarding.profile.display_name": "Nama paparan",
   "onboarding.profile.display_name_hint": "Nama penuh anda atau nama anda yang menyeronokkan…",
   "onboarding.profile.note_hint": "Anda boleh @menyebut orang lain atau #hashtags…",
-  "onboarding.profile.save_and_continue": "Simpan dan teruskan",
   "onboarding.profile.upload_avatar": "Muat naik gambar profil",
   "password_confirmation.exceeds_maxlength": "Pengesahan kata laluan melebihi panjang kata laluan maksimum",
   "password_confirmation.mismatching": "Pengesahan kata laluan tidak sepadan",

app/javascript/mastodon/locales/my.json

@@ -385,7 +385,6 @@
   "onboarding.profile.display_name": "ဖော်ပြမည့်အမည်",
   "onboarding.profile.display_name_hint": "သင့်အမည်အပြည့်အစုံ သို့မဟုတ် သင့်အမည်ပြောင်။",
   "onboarding.profile.note": "ကိုယ်ရေးအကျဉ်း",
-  "onboarding.profile.save_and_continue": "သိမ်းပြီး ဆက်လုပ်ပါ",
   "onboarding.profile.title": "ပရိုဖိုင်စနစ် ထည့်သွင်းခြင်း",
   "onboarding.profile.upload_avatar": "ပရိုဖိုင်ပုံ အပ်လုဒ်လုပ်ပါ",
   "password_confirmation.exceeds_maxlength": "စကားဝှက်အတည်ပြုခြင်းတွင် အများဆုံးစကားဝှက်အရှည်ထက် ကျော်လွန်နေပါသည်",

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

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Lán無建議佇URL內底用自訂ê emoji。為著避免用者舞花去，自訂ê框á若包含自訂emoji kap URL，kan-ta ē顯示做文字。",
   "account_edit.field_edit_modal.name_hint": "例：「個人網站」",
   "account_edit.field_edit_modal.name_label": "標簽",
-  "account_edit.field_edit_modal.value_hint": "例：「example.me」",
   "account_edit.field_edit_modal.value_label": "值",
   "account_edit.field_reorder_modal.drag_cancel": "Giú ê動作取消ah。框á「{item}」予lâng khǹg ah。",
   "account_edit.field_reorder_modal.drag_end": "框á「{item}」予lâng khǹg ah。",
@@ -951,7 +950,6 @@
   "notifications_permission_banner.how_to_control": "Nā beh佇Mastodon關起來ê時陣收通知，請啟用桌面通知。若準啟用，Lí ē當通過面頂ê {icon} 鈕á，準準控制siánn物互動ê類型ē生桌面通知。",
   "notifications_permission_banner.title": "逐ê著看",
   "onboarding.follows.back": "轉去",
-  "onboarding.follows.done": "做好ah",
   "onboarding.follows.empty": "可惜，tsit-má無半條結果通顯示。Lí ē當試用tshiau-tshuē á是瀏覽探索ê頁，來tshuē beh跟tuè ê lâng，或者是sió等leh koh試。",
   "onboarding.follows.search": "Tshiau-tshuē",
   "onboarding.follows.title": "請跟tuè lâng來開始。",
@@ -961,7 +959,6 @@
   "onboarding.profile.display_name_hint": "Lí ê全名á是別號……",
   "onboarding.profile.note": "個人紹介",
   "onboarding.profile.note_hint": "Lí ē當 @mention 別lâng á是用 #hashtag……",
-  "onboarding.profile.save_and_continue": "儲存了後繼續",
   "onboarding.profile.title": "個人資料ê設定",
   "onboarding.profile.upload_avatar": "Kā個人資料ê相片傳起去。",
   "onboarding.profile.upload_header": "Kā個人資料ê橫條á ê圖傳起去",

app/javascript/mastodon/locales/nl.json

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "We raden aan om aangepaste emoji in combinatie met urls te gebruiken. Aangepaste velden die beide bevatten worden alleen als tekst weergegeven in plaats van als een link, om verwarring van de gebruiker te voorkomen.",
   "account_edit.field_edit_modal.name_hint": "Bijv. \"Persoonlijke website\"",
   "account_edit.field_edit_modal.name_label": "Label",
-  "account_edit.field_edit_modal.value_hint": "Bijv. \"voorbeeld.me\"",
   "account_edit.field_edit_modal.value_label": "Waarde",
   "account_edit.field_reorder_modal.drag_cancel": "Slepen is geannuleerd. Veld \"{item}\" is weggevallen.",
   "account_edit.field_reorder_modal.drag_end": "Veld \"{item}\" was weggevallen.",
@@ -959,7 +958,6 @@
   "notifications_permission_banner.how_to_control": "Om meldingen te ontvangen wanneer Mastodon niet open staat. Je kunt precies bepalen welke soort interacties wel of geen desktopmeldingen geven via de bovenstaande {icon} knop.",
   "notifications_permission_banner.title": "Mis nooit meer iets",
   "onboarding.follows.back": "Terug",
-  "onboarding.follows.done": "Klaar",
   "onboarding.follows.empty": "Helaas kunnen op dit moment geen resultaten worden getoond. Je kunt proberen te zoeken of op de verkenningspagina te bladeren om mensen te vinden die je kunt volgen, of probeer het later opnieuw.",
   "onboarding.follows.search": "Zoeken",
   "onboarding.follows.title": "Volg mensen om te beginnen",
@@ -969,7 +967,6 @@
   "onboarding.profile.display_name_hint": "Jouw volledige naam of een leuke bijnaam…",
   "onboarding.profile.note": "Biografie",
   "onboarding.profile.note_hint": "Je kunt andere mensen @vermelden of #hashtags gebruiken…",
-  "onboarding.profile.save_and_continue": "Opslaan en doorgaan",
   "onboarding.profile.title": "Profiel instellen",
   "onboarding.profile.upload_avatar": "Profielfoto uploaden",
   "onboarding.profile.upload_header": "Omslagfoto voor het profiel uploaden",

app/javascript/mastodon/locales/nn.json

@@ -913,7 +913,6 @@
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
   "notifications_permission_banner.title": "Gå aldri glipp av noko",
   "onboarding.follows.back": "Tilbake",
-  "onboarding.follows.done": "Ferdig",
   "onboarding.follows.empty": "Me kan ikkje visa deg nokon resultat no. Du kan prøva å søkja eller bla gjennom utforsk-sida for å finna folk å fylgja, eller du kan prøva att seinare.",
   "onboarding.follows.search": "Søk",
   "onboarding.follows.title": "Fylg folk for å koma i gang",
@@ -923,7 +922,6 @@
   "onboarding.profile.display_name_hint": "Det fulle namnet eller kallenamnet ditt…",
   "onboarding.profile.note": "Om meg",
   "onboarding.profile.note_hint": "Du kan @nemna folk eller #emneknaggar…",
-  "onboarding.profile.save_and_continue": "Lagre og hald fram",
   "onboarding.profile.title": "Profiloppsett",
   "onboarding.profile.upload_avatar": "Last opp profilbilete",
   "onboarding.profile.upload_header": "Last opp profiltoppbilete",

app/javascript/mastodon/locales/no.json

@@ -643,7 +643,6 @@
   "notifications_permission_banner.how_to_control": "For å motta varsler når Mastodon ikke er åpne, aktiver desktop varsler. Du kan kontrollere nøyaktig hvilke typer interaksjoner genererer skrivebordsvarsler gjennom {icon} -knappen ovenfor når de er aktivert.",
   "notifications_permission_banner.title": "Aldri gå glipp av noe",
   "onboarding.follows.back": "Tilbake",
-  "onboarding.follows.done": "Ferdig",
   "onboarding.follows.empty": "Dessverre kan ingen resultater vises akkurat nå. Du kan prøve å bruke søk eller bla gjennom utforske-siden for å finne folk å følge, eller prøve igjen senere.",
   "onboarding.follows.search": "Søk",
   "onboarding.follows.title": "Følg folk for å komme i gang",
@@ -652,7 +651,6 @@
   "onboarding.profile.display_name_hint": "Ditt fulle navn eller ditt morsomme navn…",
   "onboarding.profile.note": "Om meg",
   "onboarding.profile.note_hint": "Du kan @nevne andre eller #emneknagger…",
-  "onboarding.profile.save_and_continue": "Lagre og fortsett",
   "onboarding.profile.title": "Konfigurering av profil",
   "onboarding.profile.upload_avatar": "Last opp profilbilde",
   "onboarding.profile.upload_header": "Last opp profiltoppbilde",

app/javascript/mastodon/locales/pa.json

@@ -552,11 +552,9 @@
   "notifications.policy.filter_not_following_hint": "ਜਦ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਖੁਦ ਮਨਜ਼ੂਰੀ ਨਹੀਂ ਦਿੰਦੇ",
   "notifications_permission_banner.enable": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ ਸਮਰੱਥ ਕਰੋ",
   "onboarding.follows.back": "ਪਿੱਛੇ",
-  "onboarding.follows.done": "ਮੁਕੰਮਲ",
   "onboarding.follows.search": "ਖੋਜੋ",
   "onboarding.profile.display_name": "ਦਿਖਾਇਆ ਜਾਣ ਵਾਲਾ ਨਾਂ",
   "onboarding.profile.note": "ਜਾਣਕਾਰੀ",
-  "onboarding.profile.save_and_continue": "ਸੰਭਾਲੋ ਅਤੇ ਜਾਰੀ ਰੱਖੋ",
   "onboarding.profile.title": "ਪਰੋਫਾਈਲ ਸੈਟਅੱਪ",
   "onboarding.profile.upload_avatar": "ਪਰੋਫਾਈਲ ਤਸਵੀਰ ਅੱਪਲੋਡ ਕਰੋ",
   "poll.closed": "ਬੰਦ ਹੈ",

app/javascript/mastodon/locales/pl.json

@@ -733,7 +733,6 @@
   "notifications_permission_banner.how_to_control": "Aby otrzymywać powiadomienia, gdy Mastodon nie jest otwarty, włącz powiadomienia na pulpicie. Możesz wybrać, które dokładnie typy interakcji generują powiadomienia na pulpicie za pomocą przycisku {icon} powyżej po ich włączeniu.",
   "notifications_permission_banner.title": "Nigdy niczego nie przegapisz",
   "onboarding.follows.back": "Wróć",
-  "onboarding.follows.done": "Gotowe",
   "onboarding.follows.empty": "Niestety, w tej chwili nie można nic wyświetlić. Możesz użyć wyszukiwania lub przeglądać stronę główną, aby znaleźć osoby, które chcesz obserwować, albo spróbuj ponownie później.",
   "onboarding.follows.search": "Szukaj",
   "onboarding.follows.title": "Zaobserwuj kogoś, aby zacząć",
@@ -743,7 +742,6 @@
   "onboarding.profile.display_name_hint": "Twoje imię lub pseudonim…",
   "onboarding.profile.note": "Opis",
   "onboarding.profile.note_hint": "Możesz @wzmiankować innych lub dodawać #hashtagi…",
-  "onboarding.profile.save_and_continue": "Zapisz i kontynuuj",
   "onboarding.profile.title": "Ustawienia profilu",
   "onboarding.profile.upload_avatar": "Dodaj zdjęcie profilowe",
   "onboarding.profile.upload_header": "Dodaj baner",

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

@@ -153,6 +153,7 @@
   "account_edit.column_title": "Editar perfil",
   "account_edit.custom_fields.name": "Campo",
   "account_edit.custom_fields.placeholder": "Insira seus pronomes, links externos ou qualquer coisa que queira compartilhar.",
+  "account_edit.custom_fields.reorder_button": "Reordenar campos",
   "account_edit.custom_fields.tip_content": "Você pode facilmente dar credibilidade à sua conta Mastodon verificando os links para os seus sites.",
   "account_edit.custom_fields.tip_title": "Dica: Adicionando links verificados",
   "account_edit.custom_fields.title": "Campos personalizados",
@@ -167,9 +168,16 @@
   "account_edit.field_delete_modal.title": "Excluir campo personalizado?",
   "account_edit.field_edit_modal.add_title": "Adicionar campo personalizado",
   "account_edit.field_edit_modal.edit_title": "Editar campo personalizado",
+  "account_edit.field_edit_modal.limit_header": "Limite recomendado de caracteres excedido",
+  "account_edit.field_edit_modal.limit_message": "Usuários de dispositivos móveis podem não ver seu campo completo.",
+  "account_edit.field_edit_modal.link_emoji_warning": "Recomendamos não utilizar emojis personalizados combinados com URLs. Campos personalizados contendo ambos serão exibidos apenas como texto em vez de link, para evitar confusão dos usuários.",
   "account_edit.field_edit_modal.name_hint": "Ex. \"Site pessoal\"",
   "account_edit.field_edit_modal.name_label": "Descrição",
+  "account_edit.field_edit_modal.url_warning": "Para adicionar um link, por favor inclia {protocol} no início.",
+  "account_edit.field_edit_modal.value_hint": "Ex.: \"https://example.me\"",
   "account_edit.field_edit_modal.value_label": "Valor",
+  "account_edit.field_reorder_modal.drag_cancel": "O arrasto foi cancelado. O campo \"{item}\" foi descartado.",
+  "account_edit.field_reorder_modal.drag_end": "O campo \"{item}\" foi descartado.",
   "account_edit.name_modal.add_title": "Inserir nome de exibição",
   "account_edit.name_modal.edit_title": "Editar nome de exibição",
   "account_edit.profile_tab.button_label": "Personalizar",
@@ -324,12 +332,14 @@
   "collections.create_collection": "Criar coleção",
   "collections.delete_collection": "Eliminar coleção",
   "collections.description_length_hint": "Limite de 100 caracteres",
+  "collections.detail.accept_inclusion": "OK",
   "collections.detail.accounts_heading": "Contas",
   "collections.detail.author_added_you": "{author} adicionou você a esta coleção",
   "collections.detail.curated_by_author": "Curadoria de {author}",
   "collections.detail.curated_by_you": "Curadoria por você",
   "collections.detail.loading": "Carregando coleção…",
   "collections.detail.other_accounts_in_collection": "Outros nesta coleção:",
+  "collections.detail.revoke_inclusion": "Remover-me",
   "collections.detail.sensitive_note": "Esta coleção contém contas e conteúdo que podem ser sensíveis a alguns usuários.",
   "collections.detail.share": "Compartilhar esta coleção",
   "collections.edit_details": "Editar detalhes",
@@ -345,6 +355,9 @@
   "collections.old_last_post_note": "Publicado pela última vez semana passada",
   "collections.remove_account": "Remover esta conta",
   "collections.report_collection": "Denunciar esta coleção",
+  "collections.revoke_collection_inclusion": "Remover-me desta coleção",
+  "collections.revoke_inclusion.confirmation": "Você foi removido de \"{collection}\"",
+  "collections.revoke_inclusion.error": "Houve um erro, por favor tente novamente mais tarde.",
   "collections.search_accounts_label": "Buscar contas para adicionar…",
   "collections.search_accounts_max_reached": "Você acrescentou o numero máximo de contas",
   "collections.sensitive": "Sensível",
@@ -468,6 +481,9 @@
   "confirmations.remove_from_followers.confirm": "Remover seguidor",
   "confirmations.remove_from_followers.message": "{name} vai parar de te seguir. Tem certeza de que deseja continuar?",
   "confirmations.remove_from_followers.title": "Remover seguidor?",
+  "confirmations.revoke_collection_inclusion.confirm": "Remover-me",
+  "confirmations.revoke_collection_inclusion.message": "Esta ação é permanente e o curador não poderá adicionar-lhe de volta à coleção mais tarde.",
+  "confirmations.revoke_collection_inclusion.title": "Remover-se desta coleção?",
   "confirmations.revoke_quote.confirm": "Remover publicação",
   "confirmations.revoke_quote.message": "Esta ação não pode ser desfeita.",
   "confirmations.revoke_quote.title": "Remover publicação?",
@@ -937,7 +953,6 @@
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no computador. Você pode controlar precisamente quais tipos de interações geram notificações no computador através do botão {icon}.",
   "notifications_permission_banner.title": "Nunca perca nada",
   "onboarding.follows.back": "Voltar",
-  "onboarding.follows.done": "Feito",
   "onboarding.follows.empty": "Infelizmente, não é possível mostrar resultados agora. Você pode tentar usar a busca ou navegar na página de exploração para encontrar pessoas para seguir, ou tentar novamente mais tarde.",
   "onboarding.follows.search": "Buscar",
   "onboarding.follows.title": "Comece seguindo pessoas",
@@ -947,7 +962,6 @@
   "onboarding.profile.display_name_hint": "Seu nome completo ou apelido…",
   "onboarding.profile.note": "Biografia",
   "onboarding.profile.note_hint": "Você pode @mencionar outras pessoas ou usar #hashtags…",
-  "onboarding.profile.save_and_continue": "Salvar e continuar",
   "onboarding.profile.title": "Configuração do perfil",
   "onboarding.profile.upload_avatar": "Enviar imagem de perfil",
   "onboarding.profile.upload_header": "Carregar cabeçalho do perfil",

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

@@ -173,7 +173,6 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Não recomendamos o uso de emojis personalizados em combinação com URLs. Campos personalizados que contenham ambos serão exibidos apenas como texto, em vez de como hiperligação, para evitar confusão aos utilizadores.",
   "account_edit.field_edit_modal.name_hint": "Ex.: \"Site pessoal\"",
   "account_edit.field_edit_modal.name_label": "Rótulo",
-  "account_edit.field_edit_modal.value_hint": "Ex.: “exemplo.me”",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "O arrastamento foi cancelado. O campo \"{item}\" foi largado.",
   "account_edit.field_reorder_modal.drag_end": "O campo \"{item}\" foi largado.",
@@ -958,7 +957,6 @@
   "notifications_permission_banner.how_to_control": "Para receberes notificações quando o Mastodon não estiver aberto, ativa as notificações no ambiente de trabalho. Após isso, podes controlar precisamente que tipos de interações geram notificações no ambiente de trabalho através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca percas nada",
   "onboarding.follows.back": "Voltar",
-  "onboarding.follows.done": "Concluído",
   "onboarding.follows.empty": "Infelizmente não é possível mostrar resultados neste momento. Podes tentar pesquisar ou navegar na página \"Explorar\" para encontrares pessoas para seguires ou tentar novamente mais tarde.",
   "onboarding.follows.search": "Pesquisar",
   "onboarding.follows.title": "Segue pessoas para começar",
@@ -968,7 +966,6 @@
   "onboarding.profile.display_name_hint": "O teu nome completo ou o teu nome divertido…",
   "onboarding.profile.note": "Biografia",
   "onboarding.profile.note_hint": "Podes @mencionar outras pessoas e usar #etiquetas…",
-  "onboarding.profile.save_and_continue": "Guardar e continuar",
   "onboarding.profile.title": "Configuração do perfil",
   "onboarding.profile.upload_avatar": "Enviar foto de perfil",
   "onboarding.profile.upload_header": "Enviar cabeçalho do perfil",

app/javascript/mastodon/locales/ru.json

@@ -725,7 +725,6 @@
   "notifications_permission_banner.how_to_control": "Чтобы получать уведомления, даже когда Mastodon закрыт, включите уведомления на рабочем столе. После того как вы их включите, вы сможете тонко настроить виды взаимодействий, о которых вы будете оповещены через уведомления на рабочем столе, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
   "onboarding.follows.back": "Назад",
-  "onboarding.follows.done": "Готово",
   "onboarding.follows.empty": "К сожалению, на данный момент предложения отсутствуют. Чтобы найти, на кого подписаться, вы можете просматривать раздел «Актуальное» или воспользоваться поиском.",
   "onboarding.follows.search": "Поиск",
   "onboarding.follows.title": "Начните подписываться на людей",
@@ -735,7 +734,6 @@
   "onboarding.profile.display_name_hint": "Ваше полное имя или псевдоним…",
   "onboarding.profile.note": "О себе",
   "onboarding.profile.note_hint": "Вы можете @упоминать других людей, а также использовать #хештеги…",
-  "onboarding.profile.save_and_continue": "Сохранить и продолжить",
   "onboarding.profile.title": "Создайте свой профиль",
   "onboarding.profile.upload_avatar": "Загрузить фото профиля",
   "onboarding.profile.upload_header": "Загрузить обложку профиля",

app/javascript/mastodon/locales/sc.json

@@ -562,12 +562,10 @@
   "notifications_permission_banner.how_to_control": "Pro retzire notìficas cando Mastodon no est abertu, abilita is notìficas de iscrivania. Podes controllare cun pretzisione is castas de interatziones chi ingendrant notìficas de iscrivania pro mèdiu de su butone {icon} in subra, cando sunt abilitadas.",
   "notifications_permission_banner.title": "Non ti perdas mai nudda",
   "onboarding.follows.back": "A coa",
-  "onboarding.follows.done": "Fatu",
   "onboarding.follows.search": "Chirca",
   "onboarding.follows.title": "Sighi a gente pro cumintzare",
   "onboarding.profile.display_name": "Nòmine visìbile",
   "onboarding.profile.note": "Biografia",
-  "onboarding.profile.save_and_continue": "Sarva e sighi",
   "onboarding.profile.title": "Cunfiguratzione de profilu",
   "onboarding.profile.upload_avatar": "Càrriga una fotografia de profilu",
   "picture_in_picture.restore": "Torra·ddu a ue fiat",

app/javascript/mastodon/locales/si.json

@@ -636,7 +636,6 @@
   "notifications_permission_banner.how_to_control": "Mastodon විවෘතව නොමැති විට දැනුම්දීම් ලබා ගැනීමට, ඩෙස්ක්ටොප් දැනුම්දීම් සක්‍රීය කරන්න. ඒවා සක්‍රීය කළ පසු ඉහත {icon} බොත්තම හරහා ඩෙස්ක්ටොප් දැනුම්දීම් ජනනය කරන්නේ කුමන ආකාරයේ අන්තර්ක්‍රියාද යන්න ඔබට නිශ්චිතවම පාලනය කළ හැකිය.",
   "notifications_permission_banner.title": "කිසිවක් අතපසු නොකරන්න",
   "onboarding.follows.back": "ආපසු",
-  "onboarding.follows.done": "කළා",
   "onboarding.follows.empty": "අවාසනාවකට, දැන් ප්‍රතිඵල කිසිවක් පෙන්විය නොහැක. අනුගමනය කිරීමට පුද්ගලයින් සොයා ගැනීමට ඔබට සෙවීම භාවිතා කිරීමට හෝ ගවේෂණ පිටුව බ්‍රවුස් කිරීමට උත්සාහ කළ හැකිය, නැතහොත් පසුව නැවත උත්සාහ කරන්න.",
   "onboarding.follows.search": "සෙවීම",
   "onboarding.follows.title": "ආරම්භ කිරීමට පුද්ගලයින් අනුගමනය කරන්න",
@@ -646,7 +645,6 @@
   "onboarding.profile.display_name_hint": "ඔබේ සම්පූර්ණ නම හෝ ඔබේ විනෝදජනක නම…",
   "onboarding.profile.note": "ජෛව",
   "onboarding.profile.note_hint": "ඔබට වෙනත් පුද්ගලයින් හෝ #හැෂ් ටැග්…@සඳහන් කළ හැක.",
-  "onboarding.profile.save_and_continue": "සුරකින්න සහ ඉදිරියට යන්න",
   "onboarding.profile.title": "පැතිකඩ සැකසුම",
   "onboarding.profile.upload_avatar": "පැතිකඩ පින්තූරය උඩුගත කරන්න",
   "onboarding.profile.upload_header": "පැතිකඩ ශීර්ෂය උඩුගත කරන්න",

app/javascript/mastodon/locales/sk.json

@@ -634,7 +634,6 @@
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
   "onboarding.follows.back": "Späť",
-  "onboarding.follows.done": "Hotovo",
   "onboarding.follows.empty": "Žiaľ, momentálne sa nedajú zobraziť žiadne výsledky. Môžete skúsiť použiť vyhľadávanie alebo navštíviť stránku objavovania a nájsť ľudí, ktorých chcete sledovať, alebo to skúste znova neskôr.",
   "onboarding.follows.search": "Hľadať",
   "onboarding.follows.title": "Pre začiatok nasleduj ľudí",
@@ -644,7 +643,6 @@
   "onboarding.profile.display_name_hint": "Vaše celé meno alebo pokojne aj vtipná prezývka…",
   "onboarding.profile.note": "Niečo o vás",
   "onboarding.profile.note_hint": "Môžete @označiť iných ľudí alebo #hashtagy…",
-  "onboarding.profile.save_and_continue": "Uložiť a pokračovať",
   "onboarding.profile.title": "Nastavenie profilu",
   "onboarding.profile.upload_avatar": "Nahrať profilový obrázok",
   "onboarding.profile.upload_header": "Nahrať obrázok v záhlaví profilu",

app/javascript/mastodon/locales/sl.json

@@ -706,7 +706,6 @@
   "notifications_permission_banner.how_to_control": "Če želite prejemati obvestila, ko Mastodon ni odprt, omogočite namizna obvestila. Natančno lahko nadzirate, katere vrste interakcij naj tvorijo namizna obvestila; ko so omogočena, za to uporabite gumb {icon} zgoraj.",
   "notifications_permission_banner.title": "Nikoli ne zamudite ničesar",
   "onboarding.follows.back": "Nazaj",
-  "onboarding.follows.done": "Opravljeno",
   "onboarding.follows.empty": "Žal trenutno ni mogoče prikazati nobenih rezultatov. Lahko poskusite z iskanjem ali brskanjem po strani za raziskovanje, da poiščete osebe, ki jim želite slediti, ali poskusite znova pozneje.",
   "onboarding.follows.search": "Išči",
   "onboarding.follows.title": "Vaš prvi korak je, da sledite ljudem",
@@ -716,7 +715,6 @@
   "onboarding.profile.display_name_hint": "Vaše polno ime ali lažno ime ...",
   "onboarding.profile.note": "Biografija",
   "onboarding.profile.note_hint": "Lahko @omenite druge osebe ali dodate #ključnike ...",
-  "onboarding.profile.save_and_continue": "Shrani in nadaljuj",
   "onboarding.profile.title": "Nastavitev profila",
   "onboarding.profile.upload_avatar": "Naloži sliko profila",
   "onboarding.profile.upload_header": "Naloži glavo profila",

app/javascript/mastodon/locales/sq.json

@@ -173,7 +173,8 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Rekomandojmë të mos përdoren emoji të përshtatur tok me url-ra. Fusha të përshtatura që i përmbajnë të dyja llojetn do t’i shfaqin si tekst, në vend se si një lidhje, për të parandaluar ngatërrim të përdoruesve.",
   "account_edit.field_edit_modal.name_hint": "P.sh., “Sajt personal”",
   "account_edit.field_edit_modal.name_label": "Etiketë",
-  "account_edit.field_edit_modal.value_hint": "P.sh., “shembull.me”",
+  "account_edit.field_edit_modal.url_warning": "Që të shtoni një lidhje, ju lutemi, përfshini {protocol} në fillim.",
+  "account_edit.field_edit_modal.value_hint": "P.sh., “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Vlerë",
   "account_edit.field_reorder_modal.drag_cancel": "Tërheqja u anulua. Fusha “{item}” u la jashtë.",
   "account_edit.field_reorder_modal.drag_instructions": "Që të risistemoni fusha vetjake, shtypni tastin Space, ose Enter. Teksa tërhiqen, përdorni tastet shigjetë që të lëvizn fushat lart ose poshtë. Shtypni sërish tastin Space ose Enter që të lihet fusha te pozicioni i saj i ri, ose shtypni tastin Esc, që të anulohet.",
@@ -953,7 +954,6 @@
   "notifications_permission_banner.how_to_control": "Për të marrë njoftime, kur Mastodon-i s’është i hapur, aktivizoni njoftime në desktop. Përmes butoni {icon} më sipër, mund të kontrolloni me përpikëri cilat lloje ndërveprimesh prodhojnë njoftime në desktop, pasi të jenë aktivizuar.",
   "notifications_permission_banner.title": "Mos t’ju shpëtojë gjë",
   "onboarding.follows.back": "Mbrapsht",
-  "onboarding.follows.done": "U bë",
   "onboarding.follows.empty": "Mjerisht, s’mund të shfaqen përfundime tani. Mund të provoni të përdorni kërkimin, ose të shfletoni faqen e eksplorimit, që të gjeni persona për ndjekje, ose të riprovoni më vonë.",
   "onboarding.follows.search": "Kërkoni",
   "onboarding.follows.title": "Që t’ia filloni, ndiqni persona",
@@ -963,7 +963,6 @@
   "onboarding.profile.display_name_hint": "Emri juaj i plotë, ose ç’të doni…",
   "onboarding.profile.note": "Jetëshkrim",
   "onboarding.profile.note_hint": "Mund të @përmendni persona të tjerë, ose #hashtagë…",
-  "onboarding.profile.save_and_continue": "Ruaje dhe vazhdo",
   "onboarding.profile.title": "Udjisje profili",
   "onboarding.profile.upload_avatar": "Ngarkoni foto profili",
   "onboarding.profile.upload_header": "Ngarkoni krye profili",

app/javascript/mastodon/locales/sr-Latn.json

@@ -483,7 +483,6 @@
   "onboarding.profile.display_name_hint": "Vaše puno ime ili nadimak…",
   "onboarding.profile.note": "Biografija",
   "onboarding.profile.note_hint": "Možete da @pomenete druge ljude ili #heš oznake…",
-  "onboarding.profile.save_and_continue": "Sačuvaj i nastavi",
   "onboarding.profile.title": "Podešavanje profila",
   "onboarding.profile.upload_avatar": "Otpremi sliku profila",
   "onboarding.profile.upload_header": "Otpremi zaglavlje profila",