Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00 · 2023-06-18 13:41:33 +02:00 · 6c99479ef4
commit 6c99479ef4
parent d795c2c70c 9e245d147b
214 changed files with 3232 additions and 3494 deletions
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@ -69,7 +69,7 @@ services:
        hard: -1

  libretranslate:
-    image: libretranslate/libretranslate:v1.3.10
+    image: libretranslate/libretranslate:v1.3.11
    restart: unless-stopped
    volumes:
      - lt-data:/home/libretranslate/.local
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@ -56,7 +56,6 @@ Lint/AmbiguousBlockAssociation:
    - 'spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb'
    - 'spec/services/activitypub/process_status_update_service_spec.rb'
    - 'spec/services/post_status_service_spec.rb'
-    - 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'

 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@ -202,14 +201,9 @@ Naming/VariableNumber:
    - 'db/migrate/20190820003045_update_statuses_index.rb'
    - 'db/migrate/20190823221802_add_local_index_to_statuses.rb'
    - 'db/migrate/20200119112504_add_public_index_to_statuses.rb'
-    - 'spec/controllers/activitypub/followers_synchronizations_controller_spec.rb'
-    - 'spec/lib/feed_manager_spec.rb'
    - 'spec/models/account_spec.rb'
-    - 'spec/models/concerns/account_interactions_spec.rb'
-    - 'spec/models/custom_emoji_filter_spec.rb'
    - 'spec/models/domain_block_spec.rb'
    - 'spec/models/user_spec.rb'
-    - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'

 # This cop supports unsafe autocorrection (--autocorrect-all).
 Performance/UnfreezeString:
@ -361,7 +355,6 @@ RSpec/LetSetup:
    - 'spec/services/suspend_account_service_spec.rb'
    - 'spec/services/unallow_domain_service_spec.rb'
    - 'spec/services/unsuspend_account_service_spec.rb'
-    - 'spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb'
    - 'spec/workers/scheduler/user_cleanup_scheduler_spec.rb'

 RSpec/MessageChain:
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -97,26 +97,26 @@ GEM
    attr_required (1.0.1)
    awrence (1.2.1)
    aws-eventstream (1.2.0)
-    aws-partitions (1.772.0)
-    aws-sdk-core (3.174.0)
+    aws-partitions (1.780.0)
+    aws-sdk-core (3.175.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.65.0)
+    aws-sdk-kms (1.67.0)
      aws-sdk-core (~> 3, >= 3.174.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.123.0)
+    aws-sdk-s3 (1.125.0)
      aws-sdk-core (~> 3, >= 3.174.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
    aws-sigv4 (1.5.2)
      aws-eventstream (~> 1, >= 1.0.2)
    bcrypt (3.1.18)
-    better_errors (2.9.1)
-      coderay (>= 1.0.0)
+    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
+      rouge (>= 1.0.0)
    better_html (2.0.1)
      actionview (>= 6.0)
      activesupport (>= 6.0)
@ -154,7 +154,7 @@ GEM
      sshkit (~> 1.3)
    capistrano-yarn (2.0.2)
      capistrano (~> 3.0)
-    capybara (3.39.1)
+    capybara (3.39.2)
      addressable
      matrix
      mini_mime (>= 0.1.3)
@ -174,7 +174,6 @@ GEM
    chunky_png (1.4.0)
    climate_control (0.2.0)
    cocoon (1.2.15)
-    coderay (1.1.3)
    color_diff (0.1)
    concurrent-ruby (1.2.2)
    connection_pool (2.4.1)
@ -229,7 +228,7 @@ GEM
    erubi (1.12.0)
    et-orbi (1.2.7)
      tzinfo
-    excon (0.99.0)
+    excon (0.100.0)
    fabrication (2.30.0)
    faker (3.2.0)
      i18n (>= 1.8.11, < 2)
@ -319,7 +318,7 @@ GEM
    httplog (1.6.2)
      rack (>= 2.0)
      rainbow (>= 2.0.0)
-    i18n (1.13.0)
+    i18n (1.14.1)
      concurrent-ruby (~> 1.0)
    i18n-tasks (1.0.12)
      activesupport (>= 4.0.2)
@ -355,7 +354,7 @@ GEM
    json-schema (4.0.0)
      addressable (>= 2.8)
    jsonapi-renderer (0.2.2)
-    jwt (2.7.0)
+    jwt (2.7.1)
    kaminari (1.2.2)
      activesupport (>= 4.1.0)
      kaminari-actionview (= 1.2.2)
@ -414,12 +413,12 @@ GEM
    mini_mime (1.1.2)
    mini_portile2 (2.8.2)
    minitest (5.18.0)
-    msgpack (1.7.0)
+    msgpack (1.7.1)
    multi_json (1.15.0)
    multipart-post (2.3.0)
    net-http (0.3.2)
      uri
-    net-imap (0.3.4)
+    net-imap (0.3.6)
      date
      net-protocol
    net-ldap (0.18.0)
@ -436,7 +435,7 @@ GEM
    nokogiri (1.15.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    oj (3.14.3)
+    oj (3.15.0)
    omniauth (1.9.2)
      hashie (>= 3.4.6)
      rack (>= 1.6.2, < 3)
@ -496,7 +495,7 @@ GEM
    pundit (2.3.0)
      activesupport (>= 3.0.0)
    raabro (1.4.0)
-    racc (1.7.0)
+    racc (1.7.1)
    rack (2.2.7)
    rack-attack (6.6.1)
      rack (>= 1.0, < 3)
@ -548,13 +547,13 @@ GEM
      thor (~> 1.0)
    rainbow (3.1.1)
    rake (13.0.6)
-    rdf (3.2.10)
+    rdf (3.2.11)
      link_header (~> 0.0, >= 0.0.8)
-    rdf-normalize (0.5.1)
+    rdf-normalize (0.6.0)
      rdf (~> 3.2)
    redcarpet (3.6.0)
    redis (4.8.1)
-    redis-namespace (1.10.0)
+    redis-namespace (1.11.0)
      redis (>= 4)
    redlock (1.3.2)
      redis (>= 3.0.0, < 6.0)
@ -566,6 +565,7 @@ GEM
      railties (>= 5.2)
    rexml (3.2.5)
    rotp (6.2.2)
+    rouge (4.1.2)
    rpam2 (4.0.2)
    rqrcode (2.2.0)
      chunky_png (~> 1.0)
@ -606,6 +606,8 @@ GEM
      parser (>= 3.2.1.0)
    rubocop-capybara (2.18.0)
      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
    rubocop-performance (1.18.0)
      rubocop (>= 1.7.0, < 2.0)
      rubocop-ast (>= 0.4.0)
@ -613,16 +615,17 @@ GEM
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
-    rubocop-rspec (2.19.0)
+    rubocop-rspec (2.22.0)
      rubocop (~> 1.33)
      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
    ruby-progressbar (1.13.0)
-    ruby-saml (1.13.0)
-      nokogiri (>= 1.10.5)
+    ruby-saml (1.15.0)
+      nokogiri (>= 1.13.10)
      rexml
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
-    rufus-scheduler (3.8.2)
+    rufus-scheduler (3.9.1)
      fugit (~> 1.1, >= 1.1.6)
    safety_net_attestation (0.4.0)
      jwt (~> 2.0)
@ -681,13 +684,13 @@ GEM
      attr_required (>= 0.0.5)
      httpclient (>= 2.4)
    sysexits (1.2.0)
-    temple (0.10.0)
+    temple (0.10.2)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
    terrapin (0.6.0)
      climate_control (>= 0.0.3, < 1.0)
    thor (1.2.2)
-    tilt (2.1.0)
+    tilt (2.2.0)
    timeout (0.3.2)
    tpm-key_attestation (0.12.0)
      bindata (~> 2.4)
--- a/app/controllers/api/v1/conversations_controller.rb
+++ b/app/controllers/api/v1/conversations_controller.rb
@ -45,7 +45,7 @@ class Api::V1::ConversationsController < Api::BaseController
                           },
                         ]
                       )
-                       .to_a_paginated_by_id(limit_param(LIMIT), **params_slice(:max_id, :since_id, :min_id))
+                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
  end

  def insert_pagination_headers
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@ -88,8 +88,10 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
  def after_confirmation_path_for(_resource_name, user)
    if user.created_by_application && truthy_param?(:redirect_to_app)
      user.created_by_application.confirmation_redirect_uri
+    elsif user_signed_in?
+      web_url('start')
    else
-      super
+      new_user_session_path
    end
  end
 end
--- a/app/controllers/settings/verifications_controller.rb
+++ b/app/controllers/settings/verifications_controller.rb
@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Settings::VerificationsController < Settings::BaseController
+  before_action :set_account
+
+  def show
+    @verified_links = @account.fields.select(&:verified?)
+  end
+
+  private
+
+  def set_account
+    @account = current_account
+  end
+end
--- a/app/javascript/mastodon/features/compose/components/upload.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload.jsx
@ -46,7 +46,7 @@ export default class Upload extends ImmutablePureComponent {
    const y = ((focusY / -2) + .5) * 100;

    return (
-      <div className='compose-form__upload' tabIndex={0} role='button'>
+      <div className='compose-form__upload'>
        <Motion defaultStyle={{ scale: 0.8 }} style={{ scale: spring(1, { stiffness: 180, damping: 12 }) }}>
          {({ scale }) => (
            <div className='compose-form__upload-thumbnail' style={{ transform: `scale(${scale})`, backgroundImage: `url(${media.get('preview_url')})`, backgroundPosition: `${x}% ${y}%` }}>
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@ -393,11 +393,6 @@ class UI extends PureComponent {
      navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
    }

-    // On first launch, redirect to the follow recommendations page
-    if (signedIn && this.props.firstLaunch) {
-      this.context.router.history.replace('/start');
-    }
-
    if (signedIn) {
      this.props.dispatch(fetchMarkers());
      this.props.dispatch(expandHomeTimeline());
--- a/app/models/account_conversation.rb
+++ b/app/models/account_conversation.rb
@ -43,22 +43,21 @@ class AccountConversation < ApplicationRecord
  end

  class << self
-    def to_a_paginated_by_id(limit, min_id: nil, max_id: nil, since_id: nil, preload_participants: true)
+    def to_a_paginated_by_id(limit, options = {})
      array = begin
-        if min_id
-          paginate_by_min_id(limit, min_id, max_id).reverse
+        if options[:min_id]
+          paginate_by_min_id(limit, options[:min_id], options[:max_id]).reverse
        else
-          paginate_by_max_id(limit, max_id, since_id).to_a
+          paginate_by_max_id(limit, options[:max_id], options[:since_id]).to_a
        end
      end

-      if preload_participants
-        participant_ids = array.flat_map(&:participant_account_ids)
-        accounts_by_id = Account.where(id: participant_ids).index_by(&:id)
+      # Preload participants
+      participant_ids = array.flat_map(&:participant_account_ids)
+      accounts_by_id = Account.where(id: participant_ids).index_by(&:id)

-        array.each do |conversation|
-          conversation.participant_accounts = conversation.participant_account_ids.filter_map { |id| accounts_by_id[id] }
-        end
+      array.each do |conversation|
+        conversation.participant_accounts = conversation.participant_account_ids.filter_map { |id| accounts_by_id[id] }
      end

      array
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@ -26,6 +26,7 @@ class Admin::AccountAction
  alias include_statuses? include_statuses

  validates :type, :target_account, :current_account, presence: true
+  validates :type, inclusion: { in: TYPES }

  def initialize(attributes = {})
    @send_email_notification = true
@ -71,6 +72,10 @@ class Admin::AccountAction
        TYPES - %w(none disable)
      end
    end
+
+    def i18n_scope
+      :activerecord
+    end
  end

  private
--- a/app/views/settings/featured_tags/index.html.haml
+++ b/app/views/settings/featured_tags/index.html.haml
@ -1,13 +1,15 @@
 - content_for :page_title do
  = t('settings.featured_tags')

-%p= t('featured_tags.hint_html')
-
-%hr.spacer/
+- content_for :heading do
+  %h2= t('settings.profile')
+  = render partial: 'settings/shared/profile_navigation'

 = simple_form_for @featured_tag, url: settings_featured_tags_path do |f|
  = render 'shared/error_messages', object: @featured_tag

+  %p.lead= t('featured_tags.hint_html')
+
  .fields-group
    = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@recently_used_tags.map { |tag| link_to("##{tag.display_name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ')

--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@ -1,76 +1,76 @@
 - content_for :page_title do
  = t('settings.edit_profile')

- content_for :heading_actions do
-  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_profile'
+- content_for :heading do
+  %h2= t('settings.profile')
+  = render partial: 'settings/shared/profile_navigation'

 = simple_form_for @account, url: settings_profile_path, html: { method: :put, id: 'edit_profile' } do |f|
  = render 'shared/error_messages', object: @account

-  .fields-row
-    .fields-row__column.fields-group.fields-row__column-6
-      = f.input :display_name, wrapper: :with_label, input_html: { maxlength: Account::MAX_DISPLAY_NAME_LENGTH, data: { default: @account.username } }, hint: false
-      = f.input :note, wrapper: :with_label, input_html: { maxlength: Account::MAX_NOTE_LENGTH }, hint: false
+  %p.lead= t('edit_profile.hint_html')
+
+  %h4= t('edit_profile.basic_information')

  .fields-row
    .fields-row__column.fields-row__column-6
-      = render 'application/card', account: @account
+      .fields-group
+        = f.input :display_name, wrapper: :with_block_label, input_html: { maxlength: Account::MAX_DISPLAY_NAME_LENGTH, data: { default: @account.username } }

-    .fields-row__column.fields-group.fields-row__column-6
-      = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT)), @account.header)
+      .fields-group
+        = f.input :note, wrapper: :with_block_label, input_html: { maxlength: Account::MAX_NOTE_LENGTH }

-      = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: picture_hint(t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT)), @account.avatar)
-
-  %hr.spacer/
-
-  .fields-group
-    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
-
-  .fields-group
-    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
-
-  .fields-group
-    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
-
-  .fields-group
-    = f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network')
-
-  %hr.spacer/
-
-  .fields-row
    .fields-row__column.fields-group.fields-row__column-6
      .input.with_block_label
        %label= t('simple_form.labels.defaults.fields')
-        %span.hint= t('simple_form.hints.defaults.fields', count: Account::DEFAULT_FIELDS_SIZE)
+        %span.hint= t('simple_form.hints.account.fields')

        = f.simple_fields_for :fields do |fields_f|
          .row
            = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
            = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }

-    .fields-row__column.fields-group.fields-row__column-6
-      %h6= t('verification.verification')
-      %p.hint= t('verification.explanation_html')
+  .fields-row
+    .fields-row__column.fields-row__column-6
+      .fields-group
+        = f.input :avatar, wrapper: :with_block_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))

-      .input-copy
-        .input-copy__wrapper
-          %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: 'me').to_str }
-        %button{ type: :button }= t('generic.copy')
+    - if @account.avatar.present?
+      .fields-row__column.fields-row__column-6
+        .fields-group
+          = image_tag @account.avatar.url, class: 'fields-group__thumbnail', width: 90, height: 90
+          = link_to settings_profile_picture_path('avatar'), data: { method: :delete }, class: 'link-button link-button--destructive' do
+            = fa_icon 'trash fw'
+            = t('generic.delete')
+
+  .fields-row
+    .fields-row__column.fields-row__column-6
+      .fields-group
+        = f.input :header, wrapper: :with_block_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
+
+    - if @account.header.present?
+      .fields-row__column.fields-row__column-6
+        .fields-group
+          = image_tag @account.header.url, class: 'fields-group__thumbnail'
+          = link_to settings_profile_picture_path('header'), data: { method: :delete }, class: 'link-button link-button--destructive' do
+            = fa_icon 'trash fw'
+            = t('generic.delete')
+
+  %h4= t('edit_profile.safety_and_privacy')
+
+  .fields-group
+    = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
+
+  .fields-group
+    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
+
+  .fields-group
+    = f.input :hide_collections, as: :boolean, wrapper: :with_label, label: t('simple_form.labels.defaults.setting_hide_network'), hint: t('simple_form.hints.defaults.setting_hide_network')
+
+  %h4= t('edit_profile.other')
+
+  .fields-group
+    = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')

  .actions
    = f.button :button, t('generic.save_changes'), type: :submit
-
-%hr/
-
-%h6= t('auth.migrate_account')
-%p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
-
-%hr.spacer/
-
-%h6= t 'migrations.incoming_migrations'
-%p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
-
-%hr.spacer/
-
-%h6= t('auth.delete_account')
-%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
--- a/app/views/settings/shared/_links.html.haml
+++ b/app/views/settings/shared/_links.html.haml
@ -1,10 +0,0 @@
-%ul.no-list
-  - if controller_name != 'profiles'
-    %li= link_to t('settings.edit_profile'), settings_profile_path
-  - if controller_name != 'preferences'
-    %li= link_to t('settings.preferences'), settings_preferences_path
-  - if controller_name != 'registrations'
-    %li= link_to t('auth.change_password'), edit_user_registration_path
-  - if controller_name != 'two_factor_authentications'
-    %li= link_to t('settings.two_factor_authentication'), settings_two_factor_authentication_path
-  %li= link_to t('settings.back'), root_path
--- a/app/views/settings/shared/_profile_navigation.html.haml
+++ b/app/views/settings/shared/_profile_navigation.html.haml
@ -0,0 +1,6 @@
+.content__heading__tabs
+  = render_navigation renderer: :links do |primary|
+    :ruby
+      primary.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_path
+      primary.item :verification, safe_join([fa_icon('check fw'), t('verification.verification')]), settings_verification_path
+      primary.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_path
--- a/app/views/settings/verifications/show.html.haml
+++ b/app/views/settings/verifications/show.html.haml
@ -0,0 +1,30 @@
+- content_for :page_title do
+  = t('verification.verification')
+
+- content_for :heading do
+  %h2= t('settings.profile')
+  = render partial: 'settings/shared/profile_navigation'
+
+.simple_form
+  %p.lead= t('verification.hint_html')
+
+  %h4= t('verification.here_is_how')
+
+  %p.lead= t('verification.instructions_html')
+
+  .input-copy.lead
+    .input-copy__wrapper
+      %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: 'me').to_str }
+    %button{ type: :button }= t('generic.copy')
+
+  %p.lead= t('verification.extra_instructions_html')
+
+  - if @verified_links.any?
+    %h4= t('verification.verified_links')
+
+    %ul.lead
+      - @verified_links.each do |field|
+        %li
+          %span.verified-badge
+            = fa_icon 'check', class: 'verified-badge__mark'
+            %span= field.value
--- a/babel.config.js
+++ b/babel.config.js
@ -12,6 +12,9 @@ module.exports = (api) => {
    debug: false,
    include: [
      'transform-numeric-separator',
+      'transform-optional-chaining',
+      'transform-nullish-coalescing-operator',
+      'transform-class-properties',
    ],
  };

@ -24,8 +27,6 @@ module.exports = (api) => {
    plugins: [
      ['formatjs'],
      'preval',
-      '@babel/plugin-transform-optional-chaining',
-      '@babel/plugin-transform-nullish-coalescing-operator',
    ],
    overrides: [
      {
--- a/config/locales-glitch/simple_form.en.yml
+++ b/config/locales-glitch/simple_form.en.yml
@ -4,7 +4,6 @@ en:
    glitch_only: glitch-soc
    hints:
      defaults:
-        fields: You can have up to %{count} items displayed as a table on your profile
        setting_default_content_type_html: When writing toots, assume they are written in raw HTML, unless specified otherwise
        setting_default_content_type_markdown: When writing toots, assume they are using Markdown for rich text formatting, unless specified otherwise
        setting_default_content_type_plain: When writing toots, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior)
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@ -940,7 +940,6 @@ an:
    your_token: Lo tuyo token d'acceso
  auth:
    apply_for_account: Solicitar una cuenta
-    change_password: Clau
    delete_account: Borrar cuenta
    delete_account_html: Si deseya eliminar la suya cuenta, puede <a href="%{path}">proceder aquí</a>. Será pediu d'una confirmación.
    description:
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -990,7 +990,6 @@ ar:
    your_token: رمز نفاذك
  auth:
    apply_for_account: اطلُب حسابًا
-    change_password: الكلمة السرية
    confirmations:
      wrong_email_hint: إذا كان عنوان البريد الإلكتروني هذا غير صحيح، يمكنك تغييره في إعدادات الحساب.
    delete_account: حذف الحساب
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@ -449,7 +449,6 @@ ast:
    warning: Ten munchu curiáu con estos datos, ¡enxamás nun los compartas con naide!
    your_token: El pase d'accesu
  auth:
-    change_password: Contraseña
    confirmations:
      wrong_email_hint: Si la direición de corréu electrónicu nun ye correuta, pues camudala na configuración de la cuenta.
    delete_account: Desaniciu de la cuenta
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@ -1015,7 +1015,6 @@ be:
    your_token: Ваш токен доступу
  auth:
    apply_for_account: Пакінуць заяўку
-    change_password: Пароль
    confirmations:
      wrong_email_hint: Калі гэты адрас электроннай пошты памылковы, вы можаце змяніць яго ў наладах уліковага запісу.
    delete_account: Выдаліць уліковы запіс
@ -1768,7 +1767,6 @@ be:
    seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
    signed_in_as: 'Увайшлі як:'
  verification:
-    explanation_html: 'Вы можаце <strong>пацвердзіць сябе як уладальніка спасылак у метададзеных вашага профілю</strong>. Для гэтага спасылка на вэб-сайт павінна ўтрымліваць спасылку на ваш профіль Mastodon. Пасля дадавання спасылка, вам спатрэбіцца вярнуцца і перазахаваць свой профіль, каб усё адбыдося. Зваротная спасылка <strong>павінна</strong> мець атрыбут <code>rel="me"</code>. Тэкставы змест спасылкі не мае значэння. Вось прыклад:'
    verification: Верыфікацыя
  webauthn_credentials:
    add: Дадаць новы ключ бяспекі
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@ -979,7 +979,6 @@ bg:
    your_token: Вашият код за достъп
  auth:
    apply_for_account: Заявка за акаунт
-    change_password: Парола
    confirmations:
      wrong_email_hint: Ако този адрес на е-поща не е правилен, то може да го промените в настройки на акаунта.
    delete_account: Изтриване на акаунта
@ -1704,7 +1703,6 @@ bg:
    seamless_external_login: Влезли сте чрез външна услуга, така че настройките за парола и имейл не са налични.
    signed_in_as: 'Влезли като:'
  verification:
-    explanation_html: 'Може да <strong>потвърдите себе си като собственик на връзките в метаданните на профила си</strong>. За целта свързаният уебсайт трябва да съдържа обратна връзка към профилa ви в Mastodon. След добавянето на връзката, може да се наложи да се върнете тук и да запазите пак профила си, за да влезе в сила потвърждаването. Връзката обратно <strong>трябва</strong> да има атрибут <code>rel="me"</code>. Текстовото съдържание на връзката няма значение. Ето пример:'
    verification: Проверка
  webauthn_credentials:
    add: Добавяне на нов ключ за сигурност
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@ -288,7 +288,6 @@ br:
    view: 'Sellet :'
    view_status: Gwelet ar c'hannad
  auth:
-    change_password: Ger-tremen
    delete_account: Dilemel ar gont
    login: Mont tre
    logout: Digennaskañ
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -979,7 +979,6 @@ ca:
    your_token: El teu identificador d'accés
  auth:
    apply_for_account: Sol·licitar un compte
-    change_password: Contrasenya
    confirmations:
      wrong_email_hint: Si aquesta adreça de correu electrònic no és correcte, pots canviar-la en els ajustos del compte.
    delete_account: Elimina el compte
@ -1704,7 +1703,6 @@ ca:
    seamless_external_login: Has iniciat sessió via un servei extern per tant els ajustos de contrasenya i correu electrònic no estan disponibles.
    signed_in_as: 'Sessió iniciada com a:'
  verification:
-    explanation_html: 'Pots <strong>verificar-te com a propietari dels enllaços a les metadades del teu perfil</strong>. Per això, el lloc web enllaçat ha de contenir un enllaç al teu perfil de Mastodon. Després d''afegir l''enllaç, podries necessitar tornar aquí a desar el teu perfil per a fer efectiva la verificació. El vincle <strong>ha de</strong> tenir l''atribut <code>rel="me"</code>. El contingut del text de l''enllaç no importa. Aquí tens un exemple:'
    verification: Verificació
  webauthn_credentials:
    add: Afegir nova clau de seguretat
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@ -587,7 +587,6 @@ ckb:
    warning: زۆر ئاگاداربە لەم داتایە. هەرگیز لەگەڵ کەس دا هاوبەشی مەکە!
    your_token: کۆدی دەستپێگەیشتنی ئێوە
  auth:
-    change_password: تێپەڕوشە
    delete_account: سڕینەوەی هەژمارە
    delete_account_html: گەر هەرەکتە هەژمارەکەت بسڕیتەوە، لە <a href="%{path}">لەم قوناغانە</a> بڕۆیتە پێشەوە. داوای پەسەند کردنتان لێدەگیرێت.
    description:
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@ -553,7 +553,6 @@ co:
    warning: Abbadate à quessi dati. Ùn i date à nisunu!
    your_token: Rigenerà a fiscia d’accessu
  auth:
-    change_password: Chjave d’accessu
    delete_account: Sguassà u contu
    delete_account_html: S’è voi vulete toglie u vostru contu <a href="%{path}">ghjè quì</a>. Duverete cunfirmà a vostra scelta.
    description:
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -1015,7 +1015,6 @@ cs:
    your_token: Váš přístupový token
  auth:
    apply_for_account: Požádat o účet
-    change_password: Heslo
    confirmations:
      wrong_email_hint: Pokud není e-mail správný, můžete si ho změnit v nastavení účtu.
    delete_account: Odstranit účet
@ -1768,7 +1767,6 @@ cs:
    seamless_external_login: Jste přihlášeni přes externí službu, nastavení hesla a e-mailu proto nejsou dostupná.
    signed_in_as: 'Přihlášeni jako:'
  verification:
-    explanation_html: 'Můžete se <strong>ověřit jako vlastník odkazů v metadatech profilu</strong>. Pro tento účel musí stránka v odkazu obsahovat odkaz zpět na váš profil na Mastodonu. Po přidání odkazu budete potřebovat vrátit se sem a znovu uložit profil, aby se ověření provedlo. Odkaz zpět <strong>musí</strong> mít atribut <code>rel="me"</code>. Na textu odkazu nezáleží. Zde je příklad:'
    verification: Ověření
  webauthn_credentials:
    add: Přidat nový bezpečnostní klíč
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@ -1051,7 +1051,6 @@ cy:
    your_token: Eich tocyn mynediad
  auth:
    apply_for_account: Gofyn am gyfrif
-    change_password: Cyfrinair
    confirmations:
      wrong_email_hint: Os nad yw'r cyfeiriad e-bost hwnnw'n gywir, gallwch ei newid yng ngosodiadau'r cyfrif.
    delete_account: Dileu cyfrif
@ -1832,7 +1831,6 @@ cy:
    seamless_external_login: Yr ydych wedi'ch mewngofnodi drwy wasanaeth allanol, felly nid yw gosodiadau cyfrinair ac e-bost ar gael.
    signed_in_as: 'Wedi mewngofnodi fel:'
  verification:
-    explanation_html: 'Gallwch <strong>wirio eich hun fel perchennog y dolenni ym metadata eich proffil</strong> . Ar gyfer gwneud hynny, rhaid i''r wefan gysylltiedig gynnwys dolen yn ôl i''ch proffil Mastodon. Ar ôl ychwanegu''r ddolen efallai y bydd angen i chi ddod yn ôl yma ac ail-gadw''ch proffil er mwyn i''r dilysiad ddod i rym. <strong>Rhaid</strong> i''r ddolen yn ôl gael priodoledd <code>rêl="me"</code>. Nid yw cynnwys testun y ddolen o bwys. Dyma enghraifft:'
    verification: Dilysu
  webauthn_credentials:
    add: Ychwanegu allwedd ddiogelwch newydd
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -979,7 +979,6 @@ da:
    your_token: Dit adgangstoken
  auth:
    apply_for_account: Anmod om en konto
-    change_password: Adgangskode
    confirmations:
      wrong_email_hint: Er denne e-mailadresse ikke korrekt, kan den ændres i kontoindstillinger.
    delete_account: Slet konto
@ -1704,7 +1703,6 @@ da:
    seamless_external_login: Du er logget ind via en ekstern tjeneste, så adgangskode- og e-mailindstillinger er utilgængelige.
    signed_in_as: 'Logget ind som:'
  verification:
-    explanation_html: 'Man kan <strong>bekræfte sig selv som ejer af linkene i profilmetadataene</strong>. For at gøre dette, skal det linkede websted indeholde et link tilbage til Mastodon-profilen. Efter tilføjelse af linket, skal man muligvis returnere hertil og gemme sin profil igen, før bekræftelsen effektueres. Returlinket <strong>skal</strong> have en <code>rel="me"</code>-attribut. Linkets tekstindhold er ligegyldigt. Her er et eksempel:'
    verification: Bekræftelse
  webauthn_credentials:
    add: Tilføj ny sikkerhedsnøgle
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -979,7 +979,6 @@ de:
    your_token: Dein Zugangs-Token
  auth:
    apply_for_account: Konto beantragen
-    change_password: Passwort
    confirmations:
      wrong_email_hint: Sollte diese E-Mail-Adresse nicht korrekt sein, kannst du sie in den Kontoeinstellungen ändern.
    delete_account: Konto löschen
@ -1704,7 +1703,6 @@ de:
    seamless_external_login: Du bist über einen externen Dienst angemeldet, daher sind Passwort- und E-Mail-Einstellungen nicht verfügbar.
    signed_in_as: 'Angemeldet als:'
  verification:
-    explanation_html: "Du kannst <strong>bestätigen, dass die Links in deinen Profil-Metadaten dir gehören</strong>. Dafür muss die verlinkte Website einen Link zurück auf dein Mastodon-Profil enthalten. \nNach dem Hinzufügen des Links musst du möglicherweise hierhin zurückkommen und dein Profil erneut speichern, um dass die Verifikation wirksam wird. Der Link zurück <strong>muss</strong> ein <code>rel=\"me\"</code>-Attribut enthalten. Der Linktext ist dabei egal. Hier ist ein Beispiel:"
    verification: Verifizierung
  webauthn_credentials:
    add: Sicherheitsschlüssel hinzufügen
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -979,7 +979,6 @@ el:
    your_token: Το διακριτικό πρόσβασής σου
  auth:
    apply_for_account: Ζήτα έναν λογαριασμό
-    change_password: Συνθηματικό
    confirmations:
      wrong_email_hint: Εάν αυτή η διεύθυνση email δεν είναι σωστή, μπορείς να την αλλάξεις στις ρυθμίσεις λογαριασμού.
    delete_account: Διαγραφή λογαριασμού
@ -1704,7 +1703,6 @@ el:
    seamless_external_login: Επειδή έχεις συνδεθεί μέσω τρίτης υπηρεσίας, οι ρυθμίσεις συνθηματικού και email δεν είναι διαθέσιμες.
    signed_in_as: 'Έχεις συνδεθεί ως:'
  verification:
-    explanation_html: 'Μπορείς να <strong>επαληθεύσεις τον εαυτό σου ως ιδιοκτήτη των συνδέσμων που εμφανίζεις στα μεταδεδομένα του προφίλ σου</strong>. Για να συμβεί αυτό, ο συνδεδεμένος ιστότοπος πρέπει να περιέχει ένα σύνδεσμο που να επιστρέφει προς το προφίλ σου στο Mastodon. Ο σύνδεσμος επιστροφής <strong>πρέπει</strong> να περιέχει την ιδιότητα <code>rel="me"</code>. Το περιεχόμενο του κειμένου δεν έχει σημασία. Για παράδειγμα:'
    verification: Πιστοποίηση
  webauthn_credentials:
    add: Προσθήκη νέου κλειδιού ασφαλείας
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@ -979,7 +979,6 @@ en-GB:
    your_token: Your access token
  auth:
    apply_for_account: Request an account
-    change_password: Password
    confirmations:
      wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
    delete_account: Delete account
@ -1704,7 +1703,6 @@ en-GB:
    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
    signed_in_as: 'Signed in as:'
  verification:
-    explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. After adding the link you may need to come back here and re-save your profile for the verification to take effect. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
    verification: Verification
  webauthn_credentials:
    add: Add new security key
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -996,7 +996,6 @@ en:
      help_html: If you have issues solving the CAPTCHA, you can get in touch with us through %{email} and we can assist you.
      hint_html: Just one more thing! We need to confirm you're a human (this is so we can keep the spam out!). Solve the CAPTCHA below and click "Continue".
      title: Security check
-    change_password: Password
    confirmations:
      wrong_email_hint: If that e-mail address is not correct, you can change it in account settings.
    delete_account: Delete account
@ -1150,6 +1149,11 @@ en:
      your_appeal_rejected: Your appeal has been rejected
  domain_validator:
    invalid_domain: is not a valid domain name
+  edit_profile:
+    basic_information: Basic information
+    hint_html: "<strong>Customize what people see on your public profile and next to your posts.</strong> Other people are more likely to follow you back and interact with you when you have a filled out profile and a profile picture."
+    other: Other
+    safety_and_privacy: Safety and privacy
  errors:
    '400': The request you submitted was invalid or malformed.
    '403': You don't have permission to view this page.
@ -1187,7 +1191,7 @@ en:
    add_new: Add new
    errors:
      limit: You have already featured the maximum number of hashtags
-    hint_html: "<strong>What are featured hashtags?</strong> They are displayed prominently on your public profile and allow people to browse your public posts specifically under those hashtags. They are a great tool for keeping track of creative works or long-term projects."
+    hint_html: "<strong>Feature your most important hashtags on your profile.</strong> A great tool for keeping track of your creative works and long-term projects, featured hashtags are displayed prominently on your profile and allow quick access to your own posts."
  filters:
    contexts:
      account: Profiles
@ -1585,7 +1589,7 @@ en:
    migrate: Account migration
    notifications: Notifications
    preferences: Preferences
-    profile: Profile
+    profile: Public profile
    relationships: Follows and followers
    statuses_cleanup: Automated post deletion
    strikes: Moderation strikes
@ -1779,8 +1783,12 @@ en:
    seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.
    signed_in_as: 'Signed in as:'
  verification:
-    explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. After adding the link you may need to come back here and re-save your profile for the verification to take effect. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
+    extra_instructions_html: <strong>Tip:</strong> The link on your website can be invisible. The important part is <code>rel="me"</code> which prevents impersonation on websites with user-generated content. You can even use a <code>link</code> tag in the header of the page instead of <code>a</code>, but the HTML must be accessible without executing JavaScript.
+    here_is_how: Here's how
+    hint_html: "<strong>Verifying your identity on Mastodon is for everyone.</strong> Based on open web standards, now and forever free. All you need is a personal website that people recognize you by. When you link to this website from your profile, we will check that the website links back to your profile and show a visual indicator on it."
+    instructions_html: Copy and paste the code below into the HTML of your website. Then add the address of your website into one of the extra fields on your profile from the "Edit profile" tab and save changes.
    verification: Verification
+    verified_links: Your verified links
  webauthn_credentials:
    add: Add new security key
    create:
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -971,7 +971,6 @@ eo:
    your_token: Via alira ĵetono
  auth:
    apply_for_account: Peti konton
-    change_password: Pasvorto
    confirmations:
      wrong_email_hint: Se tiu retpoŝtadreso ne estas ĝusta, vi povas ŝanĝi ĝin en la agordoj pri la konto.
    delete_account: Forigi konton
@ -1683,7 +1682,6 @@ eo:
    seamless_external_login: Vi estas ensalutinta per ekstera servo, do pasvortaj kaj retadresaj agordoj ne estas disponeblaj.
    signed_in_as: 'Salutinta kiel:'
  verification:
-    explanation_html: 'Vi povas <strong>pruvi, ke vi estas la posedanto de la ligiloj en viaj profilaj metadatumoj</strong>. Por fari tion, la alligita retejo devas enhavi ligilon reen al via Mastodon-profilo. La religilo <strong>devas</strong> havi la atributon <code>rel="me"</code>. Ne gravas la teksta enhavo de la religilo. Jen ekzemplo:'
    verification: Kontrolo
  webauthn_credentials:
    add: Aldoni novan sekurecan ŝlosilon
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@ -979,7 +979,6 @@ es-AR:
    your_token: Tu clave de acceso
  auth:
    apply_for_account: Solicitar una cuenta
-    change_password: Contraseña
    confirmations:
      wrong_email_hint: Si esa dirección de correo electrónico no es correcta, podés cambiarla en la configuración de la cuenta.
    delete_account: Eliminar cuenta
@ -1704,7 +1703,6 @@ es-AR:
    seamless_external_login: Iniciaste sesión desde un servicio externo, así que la configuración de contraseña y correo electrónico no están disponibles.
    signed_in_as: 'Iniciaste sesión como:'
  verification:
-    explanation_html: 'Podés <strong>verificarte a vos mismo como el propietario de los enlaces en los metadatos de tu perfil</strong>. Para eso, el sitio web del enlace debe contener un enlace de vuelta a tu perfil de Mastodon. Después de agregar el enlace, puede que tengás que volver acá y volver a guardar los cambios en tu perfil para que la verificación surta efecto. El enlace en tu sitio <strong>debe</strong> tener un atributo <code>rel="me"</code>. El contenido del texto del enlace no importa. Acá tenés un ejemplo:'
    verification: Verificación
  webauthn_credentials:
    add: Agregar nueva llave de seguridad
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@ -979,7 +979,6 @@ es-MX:
    your_token: Tu token de acceso
  auth:
    apply_for_account: Solicitar una cuenta
-    change_password: Contraseña
    confirmations:
      wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
    delete_account: Borrar cuenta
@ -1704,7 +1703,6 @@ es-MX:
    seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
    signed_in_as: 'Sesión iniciada como:'
  verification:
-    explanation_html: 'Puedes <strong>verificarte a ti mismo como el dueño de los links en los metadatos de tu perfil</strong>. Para eso, el sitio enlazado debe contener un enlace a tu perfil de Mastodon. Después de añadir el enlace, necesitarás regresar aquí y volver a guardar tu perfil para que la verificación tenga efecto. El enlace en tu sitio <strong>debe</strong> tener un atributo <code>rel="me"</code>. El texto del contenido del enlace no importa. Aquí un ejemplo:'
    verification: Verificación
  webauthn_credentials:
    add: Agregar nueva clave de seguridad
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -979,7 +979,6 @@ es:
    your_token: Tu token de acceso
  auth:
    apply_for_account: Solicitar una cuenta
-    change_password: Contraseña
    confirmations:
      wrong_email_hint: Si esa dirección de correo electrónico no es correcta, puedes cambiarla en la configuración de la cuenta.
    delete_account: Borrar cuenta
@ -1704,7 +1703,6 @@ es:
    seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles.
    signed_in_as: 'Sesión iniciada como:'
  verification:
-    explanation_html: 'Puedes <strong>verificarte a ti mismo como propietario de los enlaces en los metadatos de tu perfil</strong>. Para ello, el sitio web vinculado debe contener un enlace a tu perfil de Mastodon. Después de añadir el enlace, es posible que debas volver aquí y volver a guardar tu perfil para que la verificación surta efecto. El enlace de tu sitio <strong>debe</strong> tener un atributo <code>rel="me"</code>. El contenido textual del enlace no tiene relevancia. Aquí un ejemplo:'
    verification: Verificación
  webauthn_credentials:
    add: Agregar nueva clave de seguridad
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@ -979,7 +979,6 @@ et:
    your_token: Su juurdepääsutunnus
  auth:
    apply_for_account: Konto taotluse esitamine
-    change_password: Salasõna
    confirmations:
      wrong_email_hint: Kui see e-postiaadress pole korrektne, saad seda kontosätetes muuta.
    delete_account: Konto kustutamine
@ -1709,7 +1708,6 @@ et:
    seamless_external_login: Välise teenuse kaudu sisse logides pole salasõna ja e-posti sätted saadaval.
    signed_in_as: 'Sisse logitud kasutajana:'
  verification:
-    explanation_html: 'Saad <strong>kinnitada ennast oma profiili metaandmete veebiviidete omanikuna.</strong> Selleks peab lingitud veebilehel olema viide tagasi sinu Mastodoni profiilile. Pärast lingi lisamist pead võib-olla siia tagasi tulema ja oma profiili uuesti salvestama, et kinnitus jõustuks. Tagasiviide <strong>peab</strong> sisaldama <code>rel="me"</code> atribuuti. Lingi tekstiline sisu ei ole oluline. Siin on näide:'
    verification: Kinnitamine
  webauthn_credentials:
    add: Uue turvavõtme lisamine
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@ -981,7 +981,6 @@ eu:
    your_token: Zure sarbide token-a
  auth:
    apply_for_account: Kontu bat eskatu
-    change_password: Pasahitza
    confirmations:
      wrong_email_hint: Helbide-elektroniko hori zuzena ez bada, kontuaren ezarpenetan alda dezakezu.
    delete_account: Ezabatu kontua
@ -1706,7 +1705,6 @@ eu:
    seamless_external_login: Kanpo zerbitzu baten bidez hasi duzu saioa, beraz pasahitza eta e-mail ezarpenak ez daude eskuragarri.
    signed_in_as: 'Saioa honela hasita:'
  verification:
-    explanation_html: '<strong>Zure profileko metadatuetako esteken jabe zarela egiazta</strong> dezakezu. Horretarako, webguneak zure Mastodoneko profilaren esteka eduki behar du. Esteka webgunean erantsi ondoren, aldaketak berriro gorde beharko dituzu egiaztapena burutu ahal izateko. Estekak <code>rel="me"</code> atributua eduki <strong>behar</strong> du. Estekaren testu-edukia ez da aintzat hartzen. Hemen duzu adibide bat:'
    verification: Egiaztaketa
  webauthn_credentials:
    add: Gehitu segurtasun gako berria
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -819,7 +819,6 @@ fa:
    your_token: کد دسترسی شما
  auth:
    apply_for_account: درخواست یک حساب
-    change_password: گذرواژه
    delete_account: پاک‌کردن حساب
    delete_account_html: اگر می‌خواهید حساب خود را پاک کنید، از <a href="%{path}">این‌جا</a> پیش بروید. از شما درخواست تأیید خواهد شد.
    description:
@ -1474,7 +1473,6 @@ fa:
    seamless_external_login: شما با یک سرویس خارج از مجموعه وارد شده‌اید، به همین دلیل تنظیمات ایمیل و گذرواژه برای شما در دسترس نیست.
    signed_in_as: 'واردشده به نام:'
  verification:
-    explanation_html: 'می‌توانید <strong>خودتان را به عنوان مالک پیوندهای درون فراداده‌های نمایه‌تان تأیید کنید</strong>. برای این کار پایگاه وب پیوند شده باید پیوند بازگشتی به حساب ماستودونتان داشته باشد. شاید لازم باشد پس از افزودن پیوند برای اعمال تآیید به این‌جا بازگشته و نمایه‌تان را دوباره ذخیره کنید. پیوند بازگشتی <strong>باید</strong> مقدار <code>rel="me"</code> را داشته باشد. محتوای متنی پیوند مهم نیست. یک نمونه در این‌جا آورده شده:'
    verification: تأیید
  webauthn_credentials:
    add: افزودن کلید امنیتی
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -979,7 +979,6 @@ fi:
    your_token: Pääsytunnus
  auth:
    apply_for_account: Pyydä tiliä
-    change_password: Salasana
    confirmations:
      wrong_email_hint: Jos sähköpostiosoite ei ole oikein, voit muuttaa sen tilin asetuksista.
    delete_account: Poista tili
@ -1704,7 +1703,6 @@ fi:
    seamless_external_login: Olet kirjautunut ulkoisen palvelun kautta, joten salasana- ja sähköpostiasetukset eivät ole käytettävissä.
    signed_in_as: 'Kirjautunut tilillä:'
  verification:
-    explanation_html: 'Voit <strong>vahvistaa olevasi profiilisi metatietojen sisältämien linkkien omistaja</strong>. Tätä varten linkitetyn verkkosivuston täytyy sisältää paluulinkki Mastodon-profiiliisi. Paluulinkillä <strong>täytyy</strong> olla määre <code>rel="me"</code>. Linkin tekstisisällöllä ei ole merkitystä. Tässä esimerkki:'
    verification: Vahvistus
  webauthn_credentials:
    add: Lisää uusi suojausavain
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@ -979,7 +979,6 @@ fo:
    your_token: Títt atgongdstekn
  auth:
    apply_for_account: Bið um eina kontu
-    change_password: Loyniorð
    confirmations:
      wrong_email_hint: Um hesin teldupoststaðurin ikki er rættur, so kanst tú broyta hann í kontustillingunum.
    delete_account: Strika kontu
@ -1704,7 +1703,6 @@ fo:
    seamless_external_login: Tú er ritað/ur inn umvegis eina uttanhýsis tænastu, so loyniorð og teldupoststillingar eru ikki tøkar.
    signed_in_as: 'Ritað/ur inn sum:'
  verification:
-    explanation_html: 'Tú kanst <strong>vátta teg sjálva/n sum eigara av leinkjunum í metadátunum á vanganum hjá tær</strong>. Til tess má leinkjaða vevstaðið innihalda eitt leinki aftur til Mastodon vangan hjá tær. Eftir at tú hevur lagt leinkið afturat, so er møguliga neyðugt at koma aftur her og goyma vangan hjá tær av nýggjum fyri at fáa góðkenningina at rigga. Leinkið <strong>má</strong> hava eina <code>rel="me"</code> viðseting. Tekstinnihaldið í leikinum er óviðkomandi. Her er eitt dømi:'
    verification: Váttan
  webauthn_credentials:
    add: Legg nýggjan trygdarlykil afturat
--- a/config/locales/fr-QC.yml
+++ b/config/locales/fr-QC.yml
@ -977,7 +977,6 @@ fr-QC:
    your_token: Votre jeton d’accès
  auth:
    apply_for_account: Demander un compte
-    change_password: Mot de passe
    confirmations:
      wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
    delete_account: Supprimer le compte
@ -1688,7 +1687,6 @@ fr-QC:
    seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
    signed_in_as: 'Connecté·e en tant que :'
  verification:
-    explanation_html: 'Vous pouvez <strong>vous vérifier en tant que propriétaire des liens dans les métadonnées de votre profil</strong>. Pour cela, le site web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour <strong>doit</strong> avoir un attribut <code>rel="me"</code> . Le texte du lien n’a pas d’importance. Voici un exemple :'
    verification: Vérification
  webauthn_credentials:
    add: Ajouter une nouvelle clé de sécurité
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -977,7 +977,6 @@ fr:
    your_token: Votre jeton d’accès
  auth:
    apply_for_account: Demander un compte
-    change_password: Mot de passe
    confirmations:
      wrong_email_hint: Si cette adresse de courriel est incorrecte, vous pouvez la modifier dans vos paramètres de compte.
    delete_account: Supprimer le compte
@ -1688,7 +1687,6 @@ fr:
    seamless_external_login: Vous êtes connecté via un service externe, donc les paramètres concernant le mot de passe et le courriel ne sont pas disponibles.
    signed_in_as: 'Connecté·e en tant que :'
  verification:
-    explanation_html: 'Vous pouvez <strong>vous vérifier en tant que propriétaire des liens dans les métadonnées de votre profil</strong>. Pour cela, le site web lié doit contenir un lien vers votre profil Mastodon. Le lien de retour <strong>doit</strong> avoir un attribut <code>rel="me"</code> . Le texte du lien n’a pas d’importance. Voici un exemple :'
    verification: Vérification
  webauthn_credentials:
    add: Ajouter une nouvelle clé de sécurité
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@ -979,7 +979,6 @@ fy:
    your_token: Jo tagongskoade
  auth:
    apply_for_account: Account oanfreegje
-    change_password: Wachtwurd
    confirmations:
      wrong_email_hint: As it e-mailadres net korrekt is, kinne jo dat wizigje yn de accountynstellingen.
    delete_account: Account fuortsmite
@ -1704,7 +1703,6 @@ fy:
    seamless_external_login: Jo binne oanmeld fia in eksterne tsjinst, dêrom binne wachtwurden en e-mailynstellingen net beskikber.
    signed_in_as: 'Oanmeld as:'
  verification:
-    explanation_html: 'Jo kinne <strong>josels ferifiearje as de eigener fan de keppelingen yn de metadata fan jo profyl</strong>. Hjirfoar moat op de keppele website in keppeling werom nei jo Mastodon-profyl stean. Nei it tafoegjen fan de keppeling moatte jo miskien hjir werom komme en jo profyl opnij bewarje om de ferifikaasje te befêstigjen. Dizze keppeling <strong>moat</strong> it <code>rel="me"</code>-attribút befetsje. De omskriuwing fan de keppeling makket net út. Hjir is in foarbyld:'
    verification: Ferifikaasje
  webauthn_credentials:
    add: Nije befeiligingskaai tafoegje
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@ -322,7 +322,6 @@ ga:
        delete_statuses: a gcuid postálacha a scrios
        none: rabhadh
  auth:
-    change_password: Pasfhocal
    delete_account: Scrios cuntas
    login: Logáil isteach
    logout: Logáil Amach
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@ -1013,7 +1013,6 @@ gd:
    your_token: An tòcan inntrigidh agad
  auth:
    apply_for_account: Iarr cunntas
-    change_password: Facal-faire
    confirmations:
      wrong_email_hint: Mur eil an seòladh puist-d seo mar bu chòir, ’s urrainn dhut atharrachadh ann an roghainnean a’ chunntais.
    delete_account: Sguab às an cunntas
@ -1752,7 +1751,6 @@ gd:
    seamless_external_login: Rinn thu clàradh a-steach le seirbheis on taobh a-muigh, mar sin chan eil roghainnean an fhacail-fhaire ’s a’ phuist-d ri làimh dhut.
    signed_in_as: 'Chlàraich thu a-steach mar:'
  verification:
-    explanation_html: '’S urrainn dhut <strong>dearbhadh gur e seilbheadair nan ceanglaichean ann am meata-dàta na pròifil agad a th’ annad</strong>. Airson sin a dhèanamh, feumaidh ceangal air ais dhan phròifil Mastodon a bhith aig an làrach-lìn cheangailte. Nuair a bhios tu air a’ cheangal a chur ris, dh’fhaoidte gum bi agad ri tilleadh an-seo agus a’ phròifil agad a shàbhaladh a-rithist mus obraich an dearbhadh. <strong>Feumaidh</strong> buadh <code>rel="me"</code> a bhith aig a’ cheangal air ais. Chan eil e gu diofar dè an t-susbaint a tha ann an teacsa a’ cheangail. Seo ball-eisimpleir dhut:'
    verification: Dearbhadh
  webauthn_credentials:
    add: Cuir iuchair tèarainteachd ùr ris
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -979,7 +979,6 @@ gl:
    your_token: O seu testemuño de acceso
  auth:
    apply_for_account: Solicita unha conta
-    change_password: Contrasinal
    confirmations:
      wrong_email_hint: Se o enderezo de email non é correcto, podes cambialo nos axustes da conta.
    delete_account: Eliminar conta
@ -1704,7 +1703,6 @@ gl:
    seamless_external_login: Accedeches a través dun servizo externo, polo que os axustes de contrasinal e email non están dispoñibles.
    signed_in_as: 'Rexistrada como:'
  verification:
-    explanation_html: 'Podes <strong>validarte a ti mesma como a dona das ligazóns nos metadatos do perfil</strong>. Para isto, o sitio web ligado debe conter unha ligazón de retorno ao perfil de Mastodon. Despois de engadir a ligazón tes que volver aquí e volver a gardar o teu perfil para que a verificación tome efecto. A ligazón de retorno <strong>ten que</strong> ter un atributo <code>rel="me"</code>. O texto da ligazón non ten importancia. Aquí tes un exemplo:'
    verification: Validación
  webauthn_credentials:
    add: Engadir nova chave de seguridade
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -1015,7 +1015,6 @@ he:
    your_token: אסימון הגישה שלך
  auth:
    apply_for_account: הגשת בקשה לחשבון
-    change_password: סיסמה
    confirmations:
      wrong_email_hint: אם כתובת הדואל הזו איננה נכונה, ניתן לשנות אותה בעמוד ההגדרות.
    delete_account: מחיקת חשבון
@ -1768,7 +1767,6 @@ he:
    seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
    signed_in_as: 'מחובר בתור:'
  verification:
-    explanation_html: 'תוכל/י <strong>לאמת את עצמך כבעל/ת הקישורים שבפרופיל שלך</strong>. לשם כך, על האתר המקושר להכיל קישור חוזר לפרופיל המסטודון שלך. אחרי הוספת הקישור ניתן לשוב לפה ולשמור מחדש את הפרופיל כדי להפעיל את אימות הקישור. הקישור החוזר <strong>חייב</strong> להכיל בקוד ה-HTML שלו את התכונה <code>rel="me"</code>. התוכן הטקסטואלי של הקישור לא משנה. הנה דוגמא:'
    verification: אימות
  webauthn_credentials:
    add: הוספת מפתח אבטחה חדש
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@ -16,5 +16,3 @@ hi:
    platforms:
      kai_os: काइ ओएस
      unknown_platform: अनजान प्लेटफॉर्म
-  verification:
-    explanation_html: 'आप अपने <strong> प्रोफाइल में इस्तेमाल किए गए लिंक वेरिफाई कर सकते हैं</strong>। इसके लिए आपके वेबसाइट पर आपके मॅस्टोडॉन प्रोफाइल का लिंक होना चाहिए। वेरिफिकेशन पूरा करने के लिए लिंक जोड़ने के बाद यहाँ वापस आकर अपना प्रोफाइल पुनः सेव करें। लिंक बैक में <code>rel="me"</code> अट्रीब्यूट <strong>ज़रूर</strong> होना चाहिए। लिंक पर लिखे टेक्स्ट से कोई मतलब नहीं। ये रहा उदाहरण:'
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -979,7 +979,6 @@ hu:
    your_token: Hozzáférési kulcsod
  auth:
    apply_for_account: Fiók kérése
-    change_password: Jelszó
    confirmations:
      wrong_email_hint: Ha az emailcím nem helyes, a fiókbeállításokban megváltoztathatod.
    delete_account: Felhasználói fiók törlése
@ -1704,7 +1703,6 @@ hu:
    seamless_external_login: Külső szolgáltatáson keresztül jelentkeztél be, így a jelszó és e-mail beállítások nem elérhetőek.
    signed_in_as: Bejelentkezve mint
  verification:
-    explanation_html: 'A profilodon <strong>hitelesítheted magad, mint az itt található hivatkozások tulajdonosa</strong>. Ehhez a hivatkozott weboldalnak tartalmaznia kell egy visszahivatkozást a Mastodon-profilodra. A hivatkozás hozzáadása után lehet, hogy vissza kell ide térned, és újra mentened kell a profilodat, hogy az ellenőrzés életbe lépjen. A visszahivatkozásnak <strong>tartalmaznia kell</strong> a <code>rel="me"</code> attribútumot. A hivatkozás szövege bármi lehet. Itt egy példa:'
    verification: Hitelesítés
  webauthn_credentials:
    add: Biztonsági kulcs hozzáadása
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@ -462,7 +462,6 @@ hy:
    regenerate_token: Ստեղծել նոր հասանելիութեան կտրոն
    your_token: Քո մուտքի բանալին
  auth:
-    change_password: Գաղտնաբառ
    delete_account: Ջնջել հաշիվը
    description:
      prefix_sign_up: Գրանցուի՛ր Մաստոդոնում հենց այսօր
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@ -918,7 +918,6 @@ id:
    your_token: Token akses Anda
  auth:
    apply_for_account: Permintaan akun
-    change_password: Kata sandi
    delete_account: Hapus akun
    delete_account_html: Jika Anda ingin menghapus akun Anda, Anda dapat <a href="%{path}">memproses ini</a>. Anda akan dikonfirmasi.
    description:
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@ -896,7 +896,6 @@ io:
    warning: Sorgemez per ca informi. Ne partigez kun irgu!
    your_token: Vua acesficho
  auth:
-    change_password: Pasvorto
    delete_account: Efacez konto
    delete_account_html: Se vu volas efacar vua konto, vu povas <a href="%{path}">irar hike</a>. Vu demandesos konfirmar.
    description:
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@ -979,7 +979,6 @@ is:
    your_token: Aðgangsteiknið þitt
  auth:
    apply_for_account: Biðja um notandaaðgang
-    change_password: Lykilorð
    confirmations:
      wrong_email_hint: Ef það tölvupóstfang er ekki rétt geturðu breytt því í stillingum notandaaðgangsins.
    delete_account: Eyða notandaaðgangi
@ -1704,7 +1703,6 @@ is:
    seamless_external_login: Innskráning þín er í gegnum utanaðkomandi þjónustu, þannig að stillingar fyrir lykilorð og tölvupóst eru ekki aðgengilegar.
    signed_in_as: 'Skráð inn sem:'
  verification:
-    explanation_html: 'Þú getur <strong>sannvottað sjálfa/n þig sem eiganda tenglanna í notandasniðinu þinu</strong>. Til að það virki, þarf tilvísaða vefsvæðið að innihalda tengil til baka á notandasnið þitt á Mastodon. Eftir að tenglinum hefur verið bætt inn, gætirðu þurft að koma aftur hingað og vista aftur notandasniðið þitt áður en sannvottunin fer að virka. Tengillinn til baka <strong>verður</strong> að innihalda <code>rel="me"</code> eigindi. Efni textans í tenglinum skiptir ekki máli. Hér er dæmi:'
    verification: Sannprófun
  webauthn_credentials:
    add: Bæta við nýjum öryggislykli
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -981,7 +981,6 @@ it:
    your_token: Il tuo token di accesso
  auth:
    apply_for_account: Richiedi un account
-    change_password: Password
    confirmations:
      wrong_email_hint: Se l'indirizzo e-mail non è corretto, puoi modificarlo nelle impostazioni dell'account.
    delete_account: Elimina account
@ -1706,7 +1705,6 @@ it:
    seamless_external_login: Hai effettuato l'accesso tramite un servizio esterno, quindi le impostazioni di password e e-mail non sono disponibili.
    signed_in_as: 'Hai effettuato l''accesso come:'
  verification:
-    explanation_html: 'Puoi <strong>verificarti come proprietario dei link nei metadati del tuo profilo</strong>. Per questo, il sito web collegato deve contenere un collegamento al tuo profilo Mastodon. Dopo aver aggiunto il collegamento, potrebbe essere necessario tornare qui e salvare nuovamente il profilo affinché la verifica abbia effetto. Il link di ritorno <strong>deve</strong> avere un attributo <code>rel="me"</code>. Il contenuto del testo del collegamento non ha importanza. Ecco un esempio:'
    verification: Verifica
  webauthn_credentials:
    add: Aggiungi una nuova chiave di sicurezza
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -961,7 +961,6 @@ ja:
    your_token: アクセストークン
  auth:
    apply_for_account: アカウントのリクエスト
-    change_password: パスワード
    confirmations:
      wrong_email_hint: メールアドレスが正しくない場合は、アカウント設定で変更できます。
    delete_account: アカウントの削除
@ -1674,7 +1673,6 @@ ja:
    seamless_external_login: あなたは外部サービスを介してログインしているため、パスワードとメールアドレスの設定は利用できません。
    signed_in_as: '下記でログイン中:'
  verification:
-    explanation_html: <strong>プロフィール補足情報のリンクの所有者であることを認証できます</strong>。認証するには、リンク先のウェブサイトにMastodonプロフィールへのリンクを追加してください。リンクを追加後、このページで変更の保存を再実行すると認証が反映されます。プロフィールへのリンクには<code>rel="me"</code>属性を<strong>かならず</strong>付与してください。リンク内のテキストは自由に記述できます。以下は一例です：
    verification: 認証
  webauthn_credentials:
    add: セキュリティキーを追加
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@ -216,7 +216,6 @@ ka:
    warning: იყავით ძალიან ფრთხილად ამ მონაცემთან. არასდროს გააზიაროთ ეს!
    your_token: თქვენი წვდომის ტოკენი
  auth:
-    change_password: პაროლი
    delete_account: ანგარიშის გაუქმება
    delete_account_html: თუ გსურთ გააუქმოთ თქვენი ანგარიში, შეგიძლიათ <a href="%{path}">გააგრძელოთ აქ</a>. საჭირო იქნება დამოწმება.
    forgot_password: დაგავიწყდათ პაროლი?
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@ -441,7 +441,6 @@ kab:
    token_regenerated: Ajuṭu n unekcum yettusirew i tikkelt-nniḍen akken iwata
    your_token: Ajiṭun-ik·im n unekcum
  auth:
-    change_password: Awal uffir
    delete_account: Kkes amiḍan
    description:
      prefix_invited_by_user: "@%{name} inced-ik·ikem ad ternuḍ ɣer uqeddac-a n Mastodon!"
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@ -335,7 +335,6 @@ kk:
    warning: Be very carеful with this data. Never share it with anyone!
    your_token: Your access tokеn
  auth:
-    change_password: Құпиясөз
    delete_account: Аккаунт өшіру
    delete_account_html: Аккаунтыңызды жойғыңыз келсе, <a href="%{path}">мына жерді</a> басыңыз. Сізден растау сұралатын болады.
    description:
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -963,7 +963,6 @@ ko:
    your_token: 액세스 토큰
  auth:
    apply_for_account: 가입 요청하기
-    change_password: 암호
    confirmations:
      wrong_email_hint: 만약 이메일 주소가 올바르지 않다면, 계정 설정에서 수정할 수 있습니다.
    delete_account: 계정 삭제
@ -1674,7 +1673,6 @@ ko:
    seamless_external_login: 외부 서비스를 이용해 로그인했으므로 이메일과 암호는 설정할 수 없습니다.
    signed_in_as: '다음과 같이 로그인 중:'
  verification:
-    explanation_html: '<strong>내 프로필 메타데이터에 담긴 링크의 소유 여부를 검증</strong>할 수 있습니다. 이를 위해서 반드시 링크한 웹사이트에 Mastodon 프로필에 대한 역링크가 포함되어야 합니다. 링크를 추가한 후 이곳으로 돌아와서 프로필을 다시 저장해야 인증을 적용할 수 있습니다. 돌아오는 링크에는 <strong>반드시</strong> <code>rel="me"</code> 속성이 있어야 합니다. 링크의 텍스트 콘텐트는 중요하지 않습니다. 다음 예제를 참고하세요:'
    verification: 검증
  webauthn_credentials:
    add: 보안 키 추가
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@ -937,7 +937,6 @@ ku:
    your_token: Nîşana gihîştinê te
  auth:
    apply_for_account: Ajimêrekê bixwaze
-    change_password: Borînpeyv
    delete_account: Ajimêr jê bibe
    delete_account_html: Ku tu dixwazî ajimêra xwe jê bibe, tu dikarî <a href="%{path}">li vir bidomîne</a>. Ji te tê xwestin ku were pejirandin.
    description:
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@ -254,7 +254,6 @@ lt:
    warning: Būkite atsargūs su šia informacija. Niekada jos nesidalinkite!
    your_token: Jūsų prieigos žetonas
  auth:
-    change_password: Slaptažodis
    delete_account: Ištrinti paskyrą
    delete_account_html: Jeigu norite ištrinti savo paskyrą, galite eiti <a href="%{path}">čia</a>. Jūsų prašys patvirtinti pasirinkimą.
    forgot_password: Pamiršote slaptažodį?
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -997,7 +997,6 @@ lv:
    your_token: Tavs piekļuves marķieris
  auth:
    apply_for_account: Pieprasīt kontu
-    change_password: Parole
    confirmations:
      wrong_email_hint: Ja šī e-pasta adrese nav pareiza, varat to mainīt konta iestatījumos.
    delete_account: Dzēst kontu
@ -1736,7 +1735,6 @@ lv:
    seamless_external_login: Tu esi pieteicies, izmantojot ārēju pakalpojumu, tāpēc paroles un e-pasta iestatījumi nav pieejami.
    signed_in_as: 'Pierakstījies kā:'
  verification:
-    explanation_html: 'Tu vari <strong>apstiprināt sevi kā sava profila metadatos esošo saišu īpašnieku</strong>. Lai to izdarītu, saistītajā vietnē ir jābūt saitei uz tavu Mastodon profilu. Pēc saites pievienošanas tev, iespējams, vajadzēs atgriezties šeit un atkārtoti saglabāt savu profilu, lai pārbaude stātos spēkā. Atpakaļsaitē <strong>jābūt</strong> atribūtam <code>rel="me"</code>. Saites teksta saturam nav nozīmes. Šeit ir piemērs:'
    verification: Pārbaude
  webauthn_credentials:
    add: Pievienot jaunu drošības atslēgu
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@ -752,7 +752,6 @@ ms:
    view_profile: Lihat profil
    view_status: Lihat hantaran
  auth:
-    change_password: Kata laluan
    delete_account: Padam akaun
    description:
      prefix_sign_up: Daftar pada Mastodon hari ini!
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@ -965,7 +965,6 @@ my:
    your_token: သင့် အသုံးပြုခွင့်တိုကင်
  auth:
    apply_for_account: အကောင့်တစ်ခုတောင်းဆိုပါ
-    change_password: စကားဝှက်
    confirmations:
      wrong_email_hint: ထိုအီးမေးလ်လိပ်စာ မမှန်ပါက အကောင့်သတ်မှတ်ချက်များတွင် ပြောင်းလဲနိုင်သည်။
    delete_account: အကောင့်ဖျက်ပါ
@ -1678,7 +1677,6 @@ my:
    seamless_external_login: ပြင်ပဝန်ဆောင်မှုမှတစ်ဆင့် အကောင့်ဝင်ထားသောကြောင့် စကားဝှက်နှင့် အီးမေးလ်သတ်မှတ်ချက်များကို မရနိုင်ပါ။
    signed_in_as: အဖြစ် အကောင့်ဝင်ခဲ့သည် -
  verification:
-    explanation_html: သင်သည် <strong>သင့်ပရိုဖိုင်မက်တာဒေတာရှိ လင့်ခ်များ၏ ပိုင်ရှင်အဖြစ် သင်ကိုယ်တိုင် အတည်ပြုနိုင်သည်</strong>။ ယင်းအတွက် လင့်ခ်ချိတ်ထားသော ဝဘ်ဆိုက်တွင် သင်၏ Mastodon ပရိုဖိုင်သို့ ပြန်သွားရန် လင့်ခ်တစ်ခု ပါရှိရပါမည်။ လင့်ခ်ထည့်သွင်းပြီးနောက် ဤနေရာသို့ပြန်လာရန်နှင့် အတည်ပြုနိုင်ရန်အတွက် သင့်ပရိုဖိုင်ကို ပြန်လည်သိမ်းဆည်းရန် လိုအပ်နိုင်ပါသည်။ နောက်ပြန်လင့်ခ်တွင် <code>rel="me"</code> ရည်ညွှန်းချက် <strong>ပါရှိရပါမည်</strong>။ လင့်ခ် စာသားအကြောင်းအရာမှာ အရေးမကြီးပါ။ ဤတွင် ဥပမာတစ်ခုရှိပါသည် -
    verification: စိစစ်ခြင်း
  webauthn_credentials:
    add: လုံခြုံရေးကီးအသစ်ထည့်ပါ
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -979,7 +979,6 @@ nl:
    your_token: Jouw toegangscode
  auth:
    apply_for_account: Account aanvragen
-    change_password: Wachtwoord
    confirmations:
      wrong_email_hint: Als dat e-mailadres niet correct is, kun je het wijzigen in je accountinstellingen.
    delete_account: Account verwijderen
@ -1704,7 +1703,6 @@ nl:
    seamless_external_login: Je bent ingelogd via een externe dienst, daarom zijn wachtwoorden en e-mailinstellingen niet beschikbaar.
    signed_in_as: 'Ingelogd als:'
  verification:
-    explanation_html: 'Je kunt <strong>jezelf verifiëren als de eigenaar van de links in de metadata van jouw profiel</strong>. Hiervoor moet op de gelinkte website een link terug naar jouw Mastodonprofiel staan. Na het toevoegen van de link moet je hier mogelijk terugkomen en je profiel opnieuw bewaren om de verificatie te bevestigen. Deze link <strong>moet</strong> het <code>rel="me"</code>-attribuut bevatten. De omschrijving van de link maakt niet uit. Hier is een voorbeeld:'
    verification: Verificatie
  webauthn_credentials:
    add: Nieuwe beveiligingssleutel toevoegen
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -965,7 +965,6 @@ nn:
    your_token: Tilgangsnykelen din
  auth:
    apply_for_account: Søk om ein konto
-    change_password: Passord
    confirmations:
      wrong_email_hint: Viss epostadressa er feil, kan du endra ho i kontoinnstillingane.
    delete_account: Slett konto
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@ -928,7 +928,6 @@
    your_token: Din tilgangsnøkkel
  auth:
    apply_for_account: Be om en konto
-    change_password: Passord
    delete_account: Slett konto
    delete_account_html: Hvis du ønsker å slette kontoen din, kan du <a href="%{path}">gå hit</a>. Du vil bli spurt om bekreftelse.
    description:
@ -1636,7 +1635,6 @@
    seamless_external_login: Du er logget inn via en ekstern tjeneste, så passord og e-post innstillinger er ikke tilgjengelige.
    signed_in_as: 'Innlogget som:'
  verification:
-    explanation_html: 'Du kan <strong>bekrefte at du selv eier lenkene i din profilmetadata</strong>. For å gjøre det, må det tillenkede nettstedet inneholde en lenke som fører tilbake til Mastodon-profilen din. Etter å ha laget den lenken må du kanskje komme tilbake hit og lagre profilen på ny, for at verifisering skal kunne gjennomføres. Lenken tilbake <strong>må</strong> ha en <code>rel="me"</code>-attributt. Tekstinnholdet til lenken er irrelevant. Her er et eksempel:'
    verification: Bekreftelse
  webauthn_credentials:
    add: Legg til ny sikkerhetsnøkkel
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@ -475,7 +475,6 @@ oc:
    warning: Mèfi ! Agachatz de partejar aquela donada amb degun !
    your_token: Vòstre geton d’accès
  auth:
-    change_password: Senhal
    delete_account: Suprimir lo compte
    delete_account_html: Se volètz suprimir vòstre compte, podètz <a href="%{path}">o far aquí</a>. Vos demandarem que confirmetz.
    description:
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -1015,7 +1015,6 @@ pl:
    your_token: Twój token dostępu
  auth:
    apply_for_account: Poproś o założenie konta
-    change_password: Hasło
    confirmations:
      wrong_email_hint: Jeśli ten adres e-mail nie jest poprawny, możesz go zmienić w ustawieniach konta.
    delete_account: Usunięcie konta
@ -1768,7 +1767,6 @@ pl:
    seamless_external_login: Zalogowano z użyciem zewnętrznej usługi, więc ustawienia hasła i adresu e-mail nie są dostępne.
    signed_in_as: 'Zalogowano jako:'
  verification:
-    explanation_html: 'Możesz <strong>zweryfikować siebie jako właściciela stron, do których odnośniki znajdują się w metadanych</strong>. Aby to zrobić, strona musi zawierać odnośnik do Twojego profilu na Mastodonie. Odnośnik <strong>musi</strong> zawierać atrybut <code>rel="me"</code>. Jego zawartość nie ma znaczenia. Przykład:'
    verification: Weryfikacja
  webauthn_credentials:
    add: Dodaj nowy klucz bezpieczeństwa
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -979,7 +979,6 @@ pt-BR:
    your_token: Seu código de acesso
  auth:
    apply_for_account: Solicitar uma conta
-    change_password: Senha
    confirmations:
      wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
    delete_account: Excluir conta
@ -1704,7 +1703,6 @@ pt-BR:
    seamless_external_login: Você entrou usando um serviço externo, então configurações de e-mail e senha não estão disponíveis.
    signed_in_as: 'Entrou como:'
  verification:
-    explanation_html: 'Você pode <strong>se verificar como proprietário dos links nos metadados do seu perfil</strong>. Para isso, o site vinculado deve conter um link de volta para o seu perfil de Mastodon. Depois de adicionar o link, talvez você precise voltar aqui e salvar novamente o seu perfil para que a verificação tenha efeito. O link de volta <strong>deve</strong> ter um atributo <code>rel="me"</code>. O conteúdo do texto do link não importa. Aqui está um exemplo:'
    verification: Verificação
  webauthn_credentials:
    add: Adicionar nova chave de segurança
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@ -979,7 +979,6 @@ pt-PT:
    your_token: O teu token de acesso
  auth:
    apply_for_account: Solicitar uma conta
-    change_password: Palavra-passe
    confirmations:
      wrong_email_hint: Se esse endereço de e-mail não estiver correto, você pode alterá-lo nas configurações da conta.
    delete_account: Eliminar conta
@ -1704,7 +1703,6 @@ pt-PT:
    seamless_external_login: Tu estás ligado via um serviço externo. Por isso, as configurações da palavra-passe e do e-mail não estão disponíveis.
    signed_in_as: 'Registado como:'
  verification:
-    explanation_html: 'Pode <strong>comprovar que é o dono das hiperligações nos metadados do seu perfil</strong>. Para isso, a página para a qual a hiperligação aponta tem de conter uma outra para o seu perfil do Mastodon. Após adicionar a hiperligação, poderá ter de voltar aqui e voltar a guardar o seu perfil para que a verificação produza efeito. Essa hiperligação <strong>tem</strong> de ter um atributo <code>rel="me"</code>. O conteúdo do texto não é importante. Eis um exemplo:'
    verification: Verificação
  webauthn_credentials:
    add: Adicionar nova chave de segurança
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -423,7 +423,6 @@ ro:
    warning: Fiți foarte atent cu aceste date. Nu le împărtășiți niciodată cu cineva!
    your_token: Token-ul tău de acces
  auth:
-    change_password: Parolă
    delete_account: Șterge contul
    delete_account_html: Dacă vrei să ștergi acest cont <a href="%{path}">poți începe aici</a>. Va trebui să confirmi această acțiune.
    description:
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -1015,7 +1015,6 @@ ru:
    your_token: Ваш токен доступа
  auth:
    apply_for_account: Запросить аккаунт
-    change_password: Пароль
    confirmations:
      wrong_email_hint: Если этот адрес электронной почты неверен, вы можете изменить его в настройках аккаунта.
    delete_account: Удалить учётную запись
@ -1768,7 +1767,6 @@ ru:
    seamless_external_login: Вы залогинены через сторонний сервис, поэтому настройки e-mail и пароля недоступны.
    signed_in_as: 'Выполнен вход под именем:'
  verification:
-    explanation_html: 'Вы можете <strong>подтвердить владение</strong> любой из ссылок в таблице. Для этого страница по ссылке должна содержать обратную ссылку на ваш профиль Mastodon, а у самой ссылки <strong>должен</strong> атрибут <code>rel="me"</code>. Текст ссылки значения не имеет. Вот пример:'
    verification: Верификация ссылок
  webauthn_credentials:
    add: Добавить новый ключ безопасности
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@ -507,7 +507,6 @@ sc:
    warning: Dae cara a custos datos. Non ddos cumpartzas mai cun nemos!
    your_token: S'identificadore tuo de atzessu
  auth:
-    change_password: Crae
    delete_account: Cantzella su contu
    delete_account_html: Si boles cantzellare su contu, ddu podes <a href="%{path}">fàghere inoghe</a>. T'amus a dimandare una cunfirmatzione.
    description:
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@ -930,7 +930,6 @@ sco:
    your_token: Yer access token
  auth:
    apply_for_account: Request a accoont
-    change_password: Passwird
    delete_account: Delete accoont
    delete_account_html: If ye'r wantin tae delete yer accoont, ye kin <a href="%{path}">dae it here</a>. Ye'll get asked fir confirmation.
    description:
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@ -773,7 +773,6 @@ si:
    warning: මෙම දත්ත සමඟ ඉතා ප්රවේශම් වන්න. එය කිසි විටෙක කිසිවෙකු සමඟ බෙදා නොගන්න!
    your_token: ඔබේ ප්‍රවේශ ටෝකනය
  auth:
-    change_password: මුර පදය
    delete_account: ගිණුම මකන්න
    delete_account_html: ඔබට ඔබගේ ගිණුම මකා දැමීමට අවශ්‍ය නම්, ඔබට <a href="%{path}">මෙතැනින් ඉදිරියට යා හැක</a>. තහවුරු කිරීම සඳහා ඔබෙන් අසනු ඇත.
    description:
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@ -39,7 +39,6 @@ an:
        digest: Solo ninviau dimpués d'un largo periodo d'inactividat y nomás si has recibiu mensaches personals entre la tuya ausencia
        discoverable: Permite que la tuya cuenta sía descubierta per extranyos a traviés de recomendacions, tendencias y atras caracteristicas
        email: Se le ninviará un correu de confirmación
-        fields: Puetz tener dica 4 elementos amostrando-se como una tabla en o tuyo perfil
        header: PNG, GIF u JPG. Maximo %{size}. Será escalau a %{dimensions}px
        inbox_url: Copia la URL d'a pachina prencipal d'o relés que quiers utilizar
        irreversible: Las publicacions filtradas desapareixerán irreversiblement, mesmo si este filtro ye eliminau mas abance
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@ -39,7 +39,6 @@ ar:
        digest: تُرسَل إليك بعد مُضيّ مدة مِن خمول نشاطك و فقط إذا ما تلقيت رسائل شخصية مباشِرة أثناء فترة غيابك مِن الشبكة
        discoverable: السماح للغرباء اكتشاف حسابك من خلال التوصيات والمتداولة وغيرها من الميزات
        email: سوف تتلقى رسالة إلكترونية للتأكيد
-        fields: يُمكنك عرض 4 عناصر على شكل جدول في صفحتك التعريفية
        header: ملف PNG أو GIF أو JPG. حجمه على أقصى تصدير %{size}. سيتم تصغيره إلى %{dimensions}px
        inbox_url: نسخ العنوان الذي تريد استخدامه مِن صفحة الاستقبال للمُرحَّل
        irreversible: المنشورات التي تم تصفيتها ستختفي لا محالة حتى و إن تمت إزالة عامِل التصفية لاحقًا
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@ -19,7 +19,6 @@ ast:
        bot: Avisa a otres persones de qu'esta cuenta fai principalmente aiciones automatizaes ya de que ye posible que nun tean supervisaes
        digest: Namás s'unvia dempués d'un periodu llongu d'inactividá ya namás si recibiesti dalgún mensaxe personal demientres la to ausencia
        discoverable: Permite que persones desconocíes descubran la to cuenta pente recomendaciones, tendencies ya otres funciones
-        fields: Pues tener hasta 4 elementos qu'apaecen nuna tabla dientro del to perfil
        header: Ficheros PNG, GIF o JPG de %{size} como muncho. La semeya va redimensionase a %{dimensions} px
        irreversible: Los artículos peñeraos desapaecen de forma irreversible, magar que la peñera se quite dempués
        locale: La llingua de la interfaz, los mensaxes per corréu electrónicu ya los avisos push
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@ -39,7 +39,6 @@ be:
        digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
        discoverable: Дазволіць незнаёмым людзям знаходзіць ваш уліковы запіс праз рэкамендацыі, трэнды і іншыя функцыі
        email: Пацвярджэнне будзе выслана па электроннай пошце
-        fields: У вашаму профілі можа быць паказана да 4 элементаў у выглядзе табліцы
        header: PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
        inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
        irreversible: Адфільтраваныя пасты прападуць незваротна, нават калі фільтр потым будзе выдалены
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@ -39,7 +39,6 @@ bg:
        digest: Изпраща се само след дълъг период на бездействие и само ако сте получили лични съобщения във ваше отсъствие
        discoverable: Позволяване на странници да откриват вашия акаунт чрез препоръки, нашумели и други неща
        email: Ще ви се изпрати имейл за потвърждение
-        fields: Може да добавите до 4 елемента в таблицата към профила си
        header: PNG, GIF или JPG. До най-много %{size}. Ще се смали до %{dimensions} пиксела
        inbox_url: Копирайте URL адреса на заглавната страница на предаващия сървър, който искат да използвате
        irreversible: Филтрираните публикации ще изчезнат безвъзвратно, дори филтърът да бъде премахнат по-късно
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@ -39,7 +39,6 @@ ca:
        digest: Només s'envia després d'un llarg període d'inactivitat i només si has rebut algun missatge personal durant la teva absència
        discoverable: Permet que el teu compte sigui descobert per desconeguts a través de recomanacions, etiquetes i altres característiques
        email: Se t'enviarà un correu electrònic de confirmació
-        fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil
        header: PNG, GIF o JPG de com a màxim %{size}. S'escalarà a %{dimensions}px
        inbox_url: Copia l'URL de la pàgina principal del relay que vols usar
        irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@ -32,7 +32,6 @@ ckb:
        current_username: بۆ دڵنیابوون، تکایە ناوی بەکارهێنەری ئەم هەژمارەیە بنووسە
        digest: تەنیا دوای ماوەیەکی زۆر لە بێ چالاکیدەنێردرێت و تەنیا ئەگەر نامەیەکی کەسیت بۆ نووسرابێت
        email: ئیمەیڵێکی پشتڕاستکردنەوەت بۆ دەنێردرێت
-        fields: دەتوانیت تا ٤بڕگەت هەبێت کە وەک خشتەیەک لەسەر پرۆفایلەکەت پیشان بدرێت
        header: PNG, GIF یان JPG. لە زۆربەی %{size}. دەبێتە ئەندازەیەکی کەمکراوە بۆ %{dimensions}پیکسێڵ
        inbox_url: نیشانەی پەڕەی سەرەکی ئەو رێڵە کە هەرەکتە بەکاریببەیت ڕوونووس دەکات
        irreversible: توتە فلتەرکراوەکە بە شێوەیەکی نەگەڕاو فرەدەدرێن، تەنانەت ئەگەر فلتەردواتر لاببرێت
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@ -30,7 +30,6 @@ co:
        current_username: Per cunfirmà, entrate u cugnome di questu contu
        digest: Solu mandatu dopu à una longa perioda d’inattività, è solu s’elli ci sò novi missaghji diretti
        email: Avete da riceve un'e-mail di cunfirmazione
-        fields: Pudete avè fin’à 4 elementi mustrati cum’un tavulone nant’à u vostru prufile
        header: Furmatu PNG, GIF o JPG. %{size} o menu. Sarà ridottu à %{dimensions}px
        inbox_url: Cupiate l'URL di a pagina d'accolta di u ripetitore chì vulete utilizà
        irreversible: I statuti filtrati saranu sguassati di manera irreversibile, ancu s'ellu hè toltu u filtru
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@ -39,7 +39,6 @@ cs:
        digest: Odesíláno pouze po dlouhé době nečinnosti a pouze, pokud jste během své nepřítomnosti obdrželi osobní zprávy
        discoverable: Umožnit, aby mohli váš účet objevit neznámí lidé pomocí doporučení, trendů a dalších funkcí
        email: Bude vám poslán potvrzovací e-mail
-        fields: Na svém profilu můžete mít zobrazeny až 4 položky jako tabulku
        header: PNG, GIF či JPG. Maximálně %{size}. Bude zmenšen na %{dimensions} px
        inbox_url: Zkopírujte URL z hlavní stránky mostu, který chcete použít
        irreversible: Filtrované příspěvky nenávratně zmizí, i pokud bude filtr později odstraněn
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@ -39,7 +39,6 @@ cy:
        digest: Ond yn cael eu hanfon ar ôl cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
        discoverable: Caniatáu i'ch cyfrif gael ei ddarganfod gan ddieithriaid trwy argymhellion, pynciau llosg a nodweddion eraill
        email: Byddwch yn derbyn e-bost cadarnhau
-        fields: Mae modd i chi ddangos hyd at 4 eitem fel tabl ar eich proffil
        header: PNG, GIF neu JPG. %{size} ar y mwyaf. Bydd yn cael ei israddio i %{dimensions}px
        inbox_url: Copïwch yr URL o dudalen flaen y relái yr ydych am ei ddefnyddio
        irreversible: Bydd postiadau wedi'u hidlo'n diflannu'n ddiwrthdro, hyd yn oed os caiff yr hidlydd ei dynnu'n ddiweddarach
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@ -39,7 +39,6 @@ da:
        digest: Sendes kun efter en lang inaktivitetsperiode, og kun hvis du har modtaget personlige beskeder under fraværet
        discoverable: Tillad kontoen at blive fundet af fremmede via anbefalinger og øvrige funktioner
        email: En bekræftelses-e-mail fremsendes
-        fields: Profilen kan have op til 4 elementer vist som en tabel
        header: PNG, GIF eller JPG. Maks. %{size}. Auto-nedskaleres til %{dimensions}px
        inbox_url: Kopiér URL'en fra forsiden af den videreformidler, der skal anvendes
        irreversible: Filtrerede indlæg forsvinder permanent, selv hvis filteret senere fjernes
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@ -39,7 +39,6 @@ de:
        digest: Wenn du eine längere Zeit inaktiv bist oder du in deiner Abwesenheit eine Direktnachricht erhalten hast
        discoverable: Erlaube deinem Konto, durch Empfehlungen, Trends und andere Funktionen von Fremden entdeckt zu werden
        email: Du wirst eine E-Mail zur Verifizierung dieser E-Mail-Adresse erhalten
-        fields: Du kannst bis zu vier Metadaten auf deinem Profil anzeigen lassen, die als Tabelle dargestellt werden
        header: PNG, GIF oder JPG. Höchstens %{size} groß. Wird auf %{dimensions} px verkleinert
        inbox_url: Kopiere die URL von der Startseite des gewünschten Relays
        irreversible: Bereinigte Beiträge verschwinden unwiderruflich für dich, auch dann, wenn dieser Filter zu einem späteren wieder entfernt wird
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@ -39,7 +39,6 @@ el:
        digest: Αποστέλλεται μόνο μετά από μακρά περίοδο αδράνειας και μόνο αν έχεις λάβει προσωπικά μηνύματα κατά την απουσία σου
        discoverable: Επέτρεψε στον λογαριασμό σου να ανακαλυφθεί από αγνώστους μέσω συστάσεων, τάσεων και άλλων χαρακτηριστικών
        email: Θα σου σταλεί email επιβεβαίωσης
-        fields: Μπορείς να έχεις έως 4 σημειώσεις σε μορφή πίνακα στο προφίλ σου
        header: PNG, GIF ή JPG. Έως %{size}. Θα περιοριστεί σε διάσταση %{dimensions}px
        inbox_url: Αντέγραψε το URL της αρχικής σελίδας του ανταποκριτή που θέλεις να χρησιμοποιήσεις
        irreversible: Οι φιλτραρισμένες αναρτήσεις θα εξαφανιστούν αμετάκλητα, ακόμα και αν το φίλτρο αργότερα αφαιρεθεί
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@ -39,7 +39,6 @@ en-GB:
        digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
        email: You will be sent a confirmation e-mail
-        fields: You can have up to 4 items displayed as a table on your profile
        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
        inbox_url: Copy the URL from the frontpage of the relay you want to use
        irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@ -2,6 +2,10 @@
 en:
  simple_form:
    hints:
+      account:
+        display_name: Your full name or your fun name.
+        fields: Your homepage, pronouns, age, anything you want.
+        note: 'You can @mention other people or #hashtags.'
      account_alias:
        acct: Specify the username@domain of the account you want to move from
      account_migration:
@ -39,7 +43,6 @@ en:
        digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
        discoverable: Allow your account to be discovered by strangers through recommendations, trends and other features
        email: You will be sent a confirmation e-mail
-        fields: You can have up to 4 items displayed as a table on your profile
        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
        inbox_url: Copy the URL from the frontpage of the relay you want to use
        irreversible: Filtered posts will disappear irreversibly, even if filter is later removed
@ -167,7 +170,7 @@ en:
        text: Explain why this decision should be reversed
      defaults:
        autofollow: Invite to follow your account
-        avatar: Avatar
+        avatar: Profile picture
        bot: This is an automated account
        chosen_languages: Filter languages
        confirm_new_password: Confirm new password
@ -179,8 +182,8 @@ en:
        display_name: Display name
        email: E-mail address
        expires_in: Expire after
-        fields: Profile metadata
-        header: Header
+        fields: Extra fields
+        header: Header picture
        honeypot: "%{label} (do not fill in)"
        inbox_url: URL of the relay inbox
        irreversible: Drop instead of hide
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@ -39,7 +39,6 @@ eo:
        digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaĝon en via foresto
        discoverable: Permesi vian konton esti malkovrita de fremduloj per rekomendoj, tendencoj kaj aliaj funkcioj
        email: Vi ricevos konfirman retpoŝton
-        fields: Vi povas havi ĝis 4 tabelajn elementojn en via profilo
        header: Formato PNG, GIF aŭ JPG. Ĝis %{size}. Estos malgrandigita al %{dimensions}px
        inbox_url: Kopiu la URL de la ĉefpaĝo de la ripetilo, kiun vi volas uzi
        irreversible: La filtritaj mesaĝoj malaperos por eterne, eĉ se la filtrilo poste estas forigita
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@ -39,7 +39,6 @@ es-AR:
        digest: Sólo enviado tras un largo periodo de inactividad, y sólo si recibiste mensajes personales en tu ausencia
        discoverable: Permití que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras funciones
        email: Se te enviará un correo electrónico de confirmación
-        fields: Podés tener hasta 4 elementos mostrados en una tabla en tu perfil
        header: 'PNG, GIF o JPG. Máximo: %{size}. Será subescalado a %{dimensions} píxeles.'
        inbox_url: Copiá la dirección web desde la página principal del relé que querés usar
        irreversible: Los mensajes filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado después
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@ -39,7 +39,6 @@ es-MX:
        digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
        email: Se le enviará un correo de confirmación
-        fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
        inbox_url: Copia la URL de la página principal del relés que quieres utilizar
        irreversible: Los toots filtrados desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@ -39,7 +39,6 @@ es:
        digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
        discoverable: Permite que tu cuenta sea descubierta por extraños a través de recomendaciones, tendencias y otras características
        email: Se le enviará un correo de confirmación
-        fields: Puedes tener hasta 4 elementos mostrándose como una tabla en tu perfil
        header: PNG, GIF o JPG. Máximo %{size}. Será escalado a %{dimensions}px
        inbox_url: Copia la URL de la página principal del relés que quieres utilizar
        irreversible: Las publicaciones filtradas desaparecerán irreversiblemente, incluso si este filtro es eliminado más adelante
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@ -39,7 +39,6 @@ et:
        digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
        discoverable: Konto on leitav võhivõõraste jaoks soovituste ja trendide sirvimise teel vm sarnaste vahenditega
        email: Sulle saadetakse e-posti teel kinnituskiri
-        fields: Saad oma profiilil tabelina kuvada kuni 4 asja
        header: PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
        inbox_url: Kopeeri soovitud vahendaja avalehe URL
        irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@ -39,7 +39,6 @@ eu:
        digest: Jarduerarik gabeko epe luze bat eta gero mezu pertsonalen bat jaso baduzu, besterik ez
        discoverable: Baimendu zure kontua ezezagunek aurkitu ahal izatea gomendio, joera eta beste ezaugarrien bidez
        email: Baieztapen e-mail bat bidaliko zaizu
-        fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
        header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
        inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
        irreversible: Iragazitako tootak betirako galduko dira, geroago iragazkia kentzen baduzu ere
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@ -39,7 +39,6 @@ fa:
        digest: تنها وقتی فرستاده می‌شود که مدتی طولانی فعالیتی نداشته باشید و در این مدت برای شما پیغام خصوصی‌ای نوشته شده باشد
        discoverable: اجازه دهید حساب‌تان از طریق پیشنهادها، پرطرفدارها و سایر قابلیت‌ها، توسط افراد غریبه قابل کشف باشد
        email: به شما ایمیل تأییدی فرستاده خواهد شد
-        fields: شما می‌توانید تا چهار مورد را در یک جدول در نمایهٔ خود نمایش دهید
        header: یکی از قالب‌های PNG یا  GIF یا JPG. بیشترین اندازه %{size}. تصویر به اندازهٔ %{dimensions} پیکسل تبدیل خواهد شد
        inbox_url: نشانی صفحهٔ اصلی رله‌ای را که می‌خواهید به کار ببرید کپی کنید
        irreversible: فرسته‌های پالوده به طور برگشت‌ناپذیری ناپدید می‌شوند، حتا اگر بعدها پالایه برداشته شود
--- a/Show more
+++ b/Show more