Merge remote-tracking branch 'parent/main' into upstream-20241006

2024-10-05 09:10:58 +09:00 · 2024-10-05 09:10:58 +09:00 · 66bed31dbe
commit 66bed31dbe
parent 294acdfd94 c40ab43dc7
226 changed files with 2688 additions and 1846 deletions
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@ -68,8 +68,8 @@ ignore_unused:
  - 'admin_mailer.*.subject'
  - 'user_mailer.*.subject'
  - 'notification_mailer.*'
-  - 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
-  - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html'
+  - 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html.*'
+  - 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks,lists}_html.*'
  - 'mail_subscriptions.unsubscribe.emails.*'
  - 'preferences.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
  - 'edit_profile.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@ -9,16 +9,9 @@ Doorkeeper.configure do
    current_user || redirect_to(new_user_session_url)
  end

-  resource_owner_from_credentials do |_routes|
-    user   = User.authenticate_with_ldap(email: request.params[:username], password: request.params[:password]) if Devise.ldap_authentication
-    user ||= User.authenticate_with_pam(email: request.params[:username], password: request.params[:password]) if Devise.pam_authentication
-
-    if user.nil?
-      user = User.find_by(email: request.params[:username])
-      user = nil unless user&.valid_password?(request.params[:password])
-    end
-
-    user unless user&.otp_required_for_login?
+  # Disable Resource Owner Password Credentials Grant Flow
+  resource_owner_from_credentials do
+    nil
  end

  # Doorkeeper provides some administrative interfaces for managing OAuth
@ -171,7 +164,7 @@ Doorkeeper.configure do
  #   http://tools.ietf.org/html/rfc6819#section-4.4.3
  #

-  grant_flows %w(authorization_code password client_credentials)
+  grant_flows %w(authorization_code client_credentials)

  # Under some circumstances you might want to have applications auto-approved,
  # so that the user skips the authorization step.
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -446,6 +446,7 @@ ca:
        title: Blocar el nou domini de correu-e
      no_email_domain_block_selected: No s'han canviat els bloqueigs de domini perquè no se n'ha seleccionat cap
      not_permitted: No permés
+      resolved_dns_records_hint_html: El nom del domini resol als següents dominis MX, que són els responsables finals per a acceptar els correus. Blocar un domini MX blocarà els registres des de qualsevol adreça de correu que utilitzi el mateix domini MX, encara que el nom visible sigui diferent. <strong>Vigileu de no blocar els grans proveïdors de correu.</strong>
      resolved_through_html: Resolt mitjançant %{domain}
      title: Dominis de correu-e blocats
    export_domain_allows:
@ -800,6 +801,7 @@ ca:
      destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
    software_updates:
      critical_update: Crítica - si us plau, actualitza ràpidament
+      description: Es recomana de mantenir actualizada la instal·lació de Mastodon per a beneficiar-se de les darreres correccions i característiques. A més, de vegades és fonamental actualitzar-la per a evitar problemes de seguretat. Per això Mastodon comprova si hi ha actualitzacions cada 30 minuts i us notificarà d'acord amb les preferències de notificacions de correu electrònic.
      documentation_link: Més informació
      release_notes: Notes de llançament
      title: Actualitzacions disponibles
@ -1155,6 +1157,7 @@ ca:
      account_status: Estat del compte
      confirming: Esperant que es completi la confirmació del correu-e.
      functional: El teu compte està completament operatiu.
+      pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan s'aprovi.
      redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
      self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
      view_strikes: Veure accions del passat contra el teu compte
@ -1202,6 +1205,9 @@ ca:
      before: 'Abans de procedir, llegiu amb cura aquestes notes:'
      caches: El contingut que ha estat memoritzat en la memòria cau per altres servidors pot persistir
      data_removal: Els teus tuts i altres dades seran permanentment eliminades
+      email_change_html: Podeu <a href="%{path}">canviar l'adreça de correu </a> sense eliminar el vostre compte
+      email_contact_html: Si encara no arriba, podeu enviar un correu-e a <a href="mailto:%{email}">%{email}</a> per a demanar ajuda
+      email_reconfirmation_html: Si no rebeu el correu electrònic de confirmació <a href="%{path}">, podeu tornar-lo a demanar</a>
      irreversible: No seràs capaç de restaurar o reactivar el teu compte
      more_details_html: Per a més detalls, llegeix la <a href="%{terms_path}">política de privadesa</a>.
      username_available: El teu nom d'usuari esdevindrà altre cop disponible
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@ -931,6 +931,9 @@ cy:
        message_html: Nid ydych wedi diffinio unrhyw reolau gweinydd.
      sidekiq_process_check:
        message_html: Does dim proses Sidekiq yn rhedeg ar gyfer y ciw(iau) %{value}. Adolygwch eich ffurfweddiad Sidekiq
+      software_version_check:
+        action: Gweld y diweddariadau sydd ar gael
+        message_html: Mae diweddariad Mastodon ar gael.
      software_version_critical_check:
        action: Gweld y diweddariadau sydd ar gael
        message_html: Mae diweddariad hanfodol Mastodon ar gael, diweddarwch cyn gynted â phosibl.
@ -1796,6 +1799,7 @@ cy:
    delete: Dileu cyfrif
    development: Datblygu
    edit_profile: Golygu proffil
+    export: Allforio
    featured_tags: Prif hashnodau
    import: Mewnforio
    import_and_export: Mewnforio ac allforio
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -79,7 +79,7 @@ de:
      invite_request_text: Begründung für das Beitreten
      invited_by: Eingeladen von
      ip: IP-Adresse
-      joined: Beigetreten
+      joined: Mitglied seit
      location:
        all: Alle
        local: Lokal
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@ -60,6 +60,7 @@ el:
      error:
        title: Εμφανίστηκε σφάλμα
      new:
+        prompt_html: Το %{client_name} επιθυμεί το δικαίωμα πρόσβασης στον λογαριασμό σας. <strong>Εγκρίνετε αυτό το αίτημα μόνο αν αναγνωρίζετε και εμπιστεύεστε αυτήν την πηγή.</strong>
        review_permissions: Ανασκόπηση δικαιωμάτων
        title: Απαιτείται έγκριση
      show:
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@ -69,7 +69,7 @@ gl:
      buttons:
        revoke: Retirar autorización
      confirmations:
-        revoke: Estás segura?
+        revoke: Tes certeza?
      index:
        authorized_at: Autorizada o %{date}
        description_html: Estas aplicacións poden acceder á túa conta usando a API. Se ves aplicacións que non recoñeces, ou hai comportamentos non consentidos dalgunha delas, podes revogar o acceso.
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -953,6 +953,7 @@ el:
        used_by_over_week:
          one: Χρησιμοποιήθηκε από ένα άτομο την τελευταία εβδομάδα
          other: Χρησιμοποιήθηκε από %{count} άτομα την τελευταία εβδομάδα
+      title: Προτάσεις και τάσεις
      trending: Τάσεις
    warning_presets:
      add_new: Πρόσθεση νέου
@ -1037,7 +1038,9 @@ el:
      guide_link_text: Μπορεί να συνεισφέρει ο οποιοσδήποτε.
    sensitive_content: Ευαίσθητο περιεχόμενο
  application_mailer:
+    notification_preferences: Αλλαγή προτιμήσεων email
    salutation: "%{name},"
+    settings: 'Αλλαγή προτιμήσεων email: %{link}'
    unsubscribe: Κατάργηση εγγραφής
    view: 'Προβολή:'
    view_profile: Προβολή προφίλ
@ -1084,6 +1087,7 @@ el:
    or_log_in_with: Ή συνδέσου με
    privacy_policy_agreement_html: Έχω διαβάσει και συμφωνώ με την <a href="%{privacy_policy_path}" target="_blank">πολιτική απορρήτου</a>
    progress:
+      confirm: Επιβεβαίωση email
      details: Τα στοιχεία σας
      review: Η αξιολόγησή μας
      rules: Αποδοχή κανόνων
@ -1123,6 +1127,8 @@ el:
      view_strikes: Προβολή προηγούμενων ποινών εναντίον του λογαριασμού σας
    too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
    use_security_key: Χρήση κλειδιού ασφαλείας
+  author_attribution:
+    example_title: Δείγμα κειμένου
  challenge:
    confirm: Συνέχεια
    hint_html: "<strong>Συμβουλή:</strong> Δεν θα σου ζητήσουμε τον κωδικό ασφαλείας σου ξανά για την επόμενη ώρα."
@ -1342,7 +1348,10 @@ el:
    time_started: Ξεκίνησε στις
    titles:
      blocking: Εισαγωγή αποκλεισμένων λογαριασμών
+      bookmarks: Εισαγωγή σελιδοδεικτών
+      domain_blocking: Εισαγωγή αποκλεισμένων τομέων
      following: Εισαγωγή λογαριασμών που ακολουθείτε
+      lists: Εισαγωγή λιστών
    type: Τύπος εισαγωγής
    type_groups:
      destructive: Μπλοκ & σίγαση
@ -1351,6 +1360,7 @@ el:
      bookmarks: Σελιδοδείκτες
      domain_blocking: Λίστα αποκλεισμένων τομέων
      following: Λίστα ατόμων που ακολουθείτε
+      lists: Λίστες
      muting: Λίστα αποσιωπήσεων
    upload: Μεταμόρφωση
  invites:
@ -1365,6 +1375,7 @@ el:
      '86400': 1 μέρα
    expires_in_prompt: Ποτέ
    generate: Δημιουργία συνδέσμου πρόσκλησης
+    invalid: Αυτή η πρόσκληση δεν είναι έγκυρη
    invited_by: 'Σε προσκάλεσε ο/η:'
    max_uses:
      one: 1 χρήσης
@ -1388,6 +1399,11 @@ el:
    failed_sign_in_html: Αποτυχημένη προσπάθεια σύνδεσης με %{method} από %{ip} (%{browser})
    successful_sign_in_html: Επιτυχής σύνδεση με %{method} από %{ip} (%{browser})
    title: Ιστορικό ελέγχου ταυτότητας
+  mail_subscriptions:
+    unsubscribe:
+      action: Ναι, κατάργηση συνδρομής
+      complete: Η συνδρομή καταργήθηκε
+      title: Κατάργηση συνδρομής
  media_attachments:
    validations:
      images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ανάρτηση που ήδη περιέχει εικόνες
@ -1467,6 +1483,7 @@ el:
    update:
      subject: "%{name} επεξεργάστηκε μια ανάρτηση"
  notifications:
+    email_events: Συμβάντα για ειδοποιήσεις μέσω email
    email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
  number:
    human:
@ -1507,12 +1524,18 @@ el:
    other: Άλλες
    posting_defaults: Προεπιλογές ανάρτησης
    public_timelines: Δημόσιες ροές
+  privacy:
+    privacy: Απόρρητο
+    search: Αναζήτηση
  privacy_policy:
    title: Πολιτική Απορρήτου
  reactions:
    errors:
      limit_reached: Το όριο διαφορετικών αντιδράσεων ξεπεράστηκε
      unrecognized_emoji: δεν είναι ένα αναγνωρισμένο emoji
+  redirects:
+    prompt: Αν εμπιστεύεστε αυτόν τον σύνδεσμο, κάντε κλικ σε αυτόν για να συνεχίσετε.
+    title: Αποχωρείτε από το %{instance}.
  relationships:
    activity: Δραστηριότητα λογαριασμού
    confirm_follow_selected_followers: Είσαι βέβαιος ότι θες να ακολουθήσεις τους επιλεγμένους ακόλουθους;
@ -1548,6 +1571,9 @@ el:
    over_daily_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων για εκείνη τη μέρα
    over_total_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων
    too_soon: Η προγραμματισμένη ημερομηνία πρέπει να είναι στο μέλλον
+  self_destruct:
+    lead_html: Δυστυχώς, το <strong>%{domain}</strong> κλείνει οριστικά. Αν είχατε λογαριασμό εκεί, δεν θα μπορείτε να συνεχίσετε τη χρήση του, αλλά μπορείτε ακόμα να ζητήσετε ένα αντίγραφο ασφαλείας των δεδομένων σας.
+    title: Αυτός ο διακομιστής κλείνει οριστικά
  sessions:
    activity: Τελευταία δραστηριότητα
    browser: Φυλλομετρητής
@ -1604,10 +1630,12 @@ el:
    delete: Διαγραφή λογαριασμού
    development: Ανάπτυξη
    edit_profile: Επεξεργασία προφίλ
+    export: Εξαγωγή
    featured_tags: Παρεχόμενες ετικέτες
    import: Εισαγωγή
    import_and_export: Εισαγωγή και εξαγωγή
    migrate: Μετακόμιση λογαριασμού
+    notifications: Ειδοποιήσεις μέσω email
    preferences: Προτιμήσεις
    profile: Προφίλ
    relationships: Ακολουθείς και σε ακολουθούν
@ -1615,6 +1643,12 @@ el:
    strikes: Παραπτώματα από ομάδα συντονισμού
    two_factor_authentication: Πιστοποίηση 2 παραγόντων
    webauthn_authentication: Κλειδιά ασφαλείας
+  severed_relationships:
+    download: Λήψη (%{count})
+    event_type:
+      account_suspension: Αναστολή λογαριασμού (%{target_name})
+      domain_block: Αναστολή διακομιστή (%{target_name})
+    type: Συμβάν
  statuses:
    attached:
      audio:
@ -1697,11 +1731,13 @@ el:
    contrast: Mastodon (Υψηλή αντίθεση)
    default: Mastodon (Σκοτεινό)
    mastodon-light: Mastodon (Ανοιχτόχρωμο)
+    system: Αυτόματο (θέμα συστήματος)
  time:
    formats:
      default: "%b %d, %Y, %H:%M"
      month: "%b %Y"
      time: "%H:%M"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
  two_factor_authentication:
    add: Προσθήκη
    disable: Απενεργοποίηση 2FA
@ -1789,6 +1825,10 @@ el:
      feature_action: Μάθε περισσότερα
      feature_audience: Το Mastodon σού παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σού επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
      feature_audience_title: Χτίσε το κοινό σου με σιγουριά
+      post_action: Σύνθεση
+      share_action: Κοινοποίηση
+      share_title: Μοιραστείτε το προφίλ σας στο Mastodon
+      sign_in_action: Σύνδεση
      subject: Καλώς ήρθες στο Mastodon
      title: Καλώς όρισες, %{name}!
  users:
@ -1798,7 +1838,10 @@ el:
    otp_lost_help_html: Αν χάσεις πρόσβαση και στα δύο, μπορείς να επικοινωνήσεις με %{email}
    signed_in_as: 'Έχεις συνδεθεί ως:'
  verification:
+    here_is_how: Δείτε πώς
    verification: Πιστοποίηση
+    verified_links: Οι επαληθευμένοι σύνδεσμοι σας
+    website_verification: Επαλήθευση ιστοτόπου
  webauthn_credentials:
    add: Προσθήκη νέου κλειδιού ασφαλείας
    create:
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1696,19 +1696,43 @@ en:
      overwrite: Overwrite
      overwrite_long: Replace current records with the new ones
    overwrite_preambles:
-      blocking_html: You are about to <strong>replace your block list</strong> with up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong>.
-      bookmarks_html: You are about to <strong>replace your bookmarks</strong> with up to <strong>%{total_items} posts</strong> from <strong>%{filename}</strong>.
-      domain_blocking_html: You are about to <strong>replace your domain block list</strong> with up to <strong>%{total_items} domains</strong> from <strong>%{filename}</strong>.
-      following_html: You are about to <strong>follow</strong> up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong> and <strong>stop following anyone else</strong>.
-      lists_html: You are about to <strong>replace your lists</strong> with contents of <strong>%{filename}</strong>. Up to <strong>%{total_items} accounts</strong> will be added to new lists.
-      muting_html: You are about to <strong>replace your list of muted accounts</strong> with up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong>.
+      blocking_html:
+        one: You are about to <strong>replace your block list</strong> with up to <strong>%{count} account</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>replace your block list</strong> with up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong>.
+      bookmarks_html:
+        one: You are about to <strong>replace your bookmarks</strong> with up to <strong>%{count} post</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>replace your bookmarks</strong> with up to <strong>%{count} posts</strong> from <strong>%{filename}</strong>.
+      domain_blocking_html:
+        one: You are about to <strong>replace your domain block list</strong> with up to <strong>%{count} domain</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>replace your domain block list</strong> with up to <strong>%{count} domains</strong> from <strong>%{filename}</strong>.
+      following_html:
+        one: You are about to <strong>follow</strong> up to <strong>%{count} account</strong> from <strong>%{filename}</strong> and <strong>stop following anyone else</strong>.
+        other: You are about to <strong>follow</strong> up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong> and <strong>stop following anyone else</strong>.
+      lists_html:
+        one: You are about to <strong>replace your lists</strong> with contents of <strong>%{filename}</strong>. Up to <strong>%{count} account</strong> will be added to new lists.
+        other: You are about to <strong>replace your lists</strong> with contents of <strong>%{filename}</strong>. Up to <strong>%{count} accounts</strong> will be added to new lists.
+      muting_html:
+        one: You are about to <strong>replace your list of muted account</strong> with up to <strong>%{count} account</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>replace your list of muted accounts</strong> with up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong>.
    preambles:
-      blocking_html: You are about to <strong>block</strong> up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong>.
-      bookmarks_html: You are about to add up to <strong>%{total_items} posts</strong> from <strong>%{filename}</strong> to your <strong>bookmarks</strong>.
-      domain_blocking_html: You are about to <strong>block</strong> up to <strong>%{total_items} domains</strong> from <strong>%{filename}</strong>.
-      following_html: You are about to <strong>follow</strong> up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong>.
-      lists_html: You are about to add up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong> to your <strong>lists</strong>. New lists will be created if there is no list to add to.
-      muting_html: You are about to <strong>mute</strong> up to <strong>%{total_items} accounts</strong> from <strong>%{filename}</strong>.
+      blocking_html:
+        one: You are about to <strong>block</strong> up to <strong>%{count} account</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>block</strong> up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong>.
+      bookmarks_html:
+        one: You are about to add up to <strong>%{count} post</strong> from <strong>%{filename}</strong> to your <strong>bookmarks</strong>.
+        other: You are about to add up to <strong>%{count} posts</strong> from <strong>%{filename}</strong> to your <strong>bookmarks</strong>.
+      domain_blocking_html:
+        one: You are about to <strong>block</strong> up to <strong>%{count} domain</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>block</strong> up to <strong>%{count} domains</strong> from <strong>%{filename}</strong>.
+      following_html:
+        one: You are about to <strong>follow</strong> up to <strong>%{count} account</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>follow</strong> up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong>.
+      lists_html:
+        one: You are about to add up to <strong>%{count} account</strong> from <strong>%{filename}</strong> to your <strong>lists</strong>. New lists will be created if there is no list to add to.
+        other: You are about to add up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong> to your <strong>lists</strong>. New lists will be created if there is no list to add to.
+      muting_html:
+        one: You are about to <strong>mute</strong> up to <strong>%{count} account</strong> from <strong>%{filename}</strong>.
+        other: You are about to <strong>mute</strong> up to <strong>%{count} accounts</strong> from <strong>%{filename}</strong>.
    preface: You can import data that you have exported from another server, such as a list of the people you are following or blocking.
    recent_imports: Recent imports
    states:
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -218,18 +218,22 @@ eo:
        update_custom_emoji: Ĝisdatigi proprajn emoĝiojn
        update_domain_block: Ĝigdatigi domajnan blokadon
        update_ip_block: Krei IP-regulon
+        update_report: Ĝisdatigo de Raporto
        update_status: Ĝisdatigi afiŝon
        update_user_role: Ĝisdatigi rolon
      actions:
        approve_appeal_html: "%{name} aprobis apelacion kontraŭ moderiga decido de %{target}"
        approve_user_html: "%{name} aprobis registriĝon de %{target}"
        assigned_to_self_report_html: "%{name} asignis signalon %{target} al si mem"
+        change_email_user_html: "%{name} ŝanĝis retadreson de uzanto %{target}"
        change_role_user_html: "%{name} ŝanĝis rolon de %{target}"
+        confirm_user_html: "%{name} konfirmis retadreson de uzanto %{target}"
        create_account_warning_html: "%{name} sendis averton al %{target}"
        create_announcement_html: "%{name} kreis novan anoncon %{target}"
        create_custom_emoji_html: "%{name} alŝutis novan emoĝion %{target}"
        create_domain_allow_html: "%{name} aldonis domajnon %{target} al la blanka listo"
        create_domain_block_html: "%{name} blokis domajnon %{target}"
+        create_email_domain_block_html: "%{name} blokis retpoŝtan domajnon %{target}"
        create_ip_block_html: "%{name} kreis regulon por IP %{target}"
        create_unavailable_domain_html: "%{name} ĉesis sendon al domajno %{target}"
        create_user_role_html: "%{name} kreis rolon de %{target}"
@ -238,6 +242,7 @@ eo:
        destroy_custom_emoji_html: "%{name} forigis emoĝion %{target}"
        destroy_domain_allow_html: "%{name} forigis domajnon %{target} el la blanka listo"
        destroy_domain_block_html: "%{name} malblokis domajnon %{target}"
+        destroy_email_domain_block_html: "%{name} malblokis retpoŝtan domajnon %{target}"
        destroy_instance_html: "%{name} forigis domajnon %{target}"
        destroy_ip_block_html: "%{name} forigis regulon por IP %{target}"
        destroy_status_html: "%{name} forigis mesaĝojn de %{target}"
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@ -903,6 +903,9 @@ gd:
        message_html: Cha do mhìnich thu riaghailtean an fhrithealaiche fhathast.
      sidekiq_process_check:
        message_html: Chan eil pròiseas Sidekiq sam bith a ruith dhan chiutha/dha na ciuthan %{value}. Thoir sùil air an rèiteachadh Sidekiq agad
+      software_version_check:
+        action: Faic na h-ùrachaidhean a tha ri fhaighinn
+        message_html: Tha ùrachadh Mastodon ri fhaighinn.
      software_version_critical_check:
        action: Faic na h-ùrachaidhean a tha ri fhaighinn
        message_html: Tha ùrachadh èiginneach air Mastodon ri fhaighinn, ùraich cho luath ’s a ghabhas.
@ -1021,7 +1024,7 @@ gd:
      delete: Sguab às
      edit_preset: Deasaich rabhadh ro-shuidhichte
      empty: Cha do mhìnich thu ro-sheataichean rabhaidhean fhathast.
-      title: Ro-sheataichean rabhaidhean
+      title: Rabhaidhean ro-shocraichte
    webhooks:
      add_new: Cuir puing-dheiridh ris
      delete: Sguab às
@ -1744,6 +1747,7 @@ gd:
    delete: Sguabadh às cunntais
    development: Leasachadh
    edit_profile: Deasaich a’ phròifil
+    export: Às-phortadh
    featured_tags: Tagaichean hais brosnaichte
    import: Ion-phortadh
    import_and_export: Ion-phortadh ⁊ às-phortadh
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -903,6 +903,9 @@ he:
        message_html: לא הוגדרו שום כללי שרת.
      sidekiq_process_check:
        message_html: שום הליכי Sidekiq לא רצים עבור %{value} תור(ות). בחנו בבקשה את הגדרות Sidekiq
+      software_version_check:
+        action: ראו עדכונים זמינים
+        message_html: עדכון מסטודון זמין כעת.
      software_version_critical_check:
        action: ראו עדכונים זמינים
        message_html: יצא עדכון קריטי למסטודון, נא לעדכן את תוכנת מסטודון בהקדם האפשרי.
@ -1744,6 +1747,7 @@ he:
    delete: מחיקת חשבון
    development: פיתוח
    edit_profile: עריכת פרופיל
+    export: ייצוא
    featured_tags: תגיות נבחרות
    import: יבוא
    import_and_export: יבוא ויצוא
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@ -264,6 +264,8 @@ kab:
      domain: Taɣult
      new:
        create: Rnu taɣult
+    export_domain_allows:
+      no_file: Ula d yiwen ufaylu ma yettwafran
    export_domain_blocks:
      no_file: Ulac afaylu yettwafernen
    follow_recommendations:
@ -529,6 +531,10 @@ kab:
      account_status: Addad n umiḍan
      functional: Amiḍan-inek·inem yetteddu s lekmal-is.
    use_security_key: Seqdec tasarut n teɣlist
+  author_attribution:
+    example_title: Amedya n weḍris
+    more_from_html: Ugar s ɣur %{name}
+    s_blog: Ablug n %{name}
  challenge:
    confirm: Kemmel
    invalid_password: Yir awal uffir
@ -685,6 +691,9 @@ kab:
      subject: Yuder-ik·ikem-id %{name}
    reblog:
      subject: "%{name} yesselha addad-ik·im"
+      title: Azuzer amaynut
+    status:
+      subject: "%{name} akken i d-y·t·essufeɣ"
  number:
    human:
      decimal_units:
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -34,6 +34,7 @@ lv:
      created_msg: Moderācijas piezīme ir veiksmīgi izveidota!
      destroyed_msg: Moderācijas piezīme ir veiksmīgi iznīcināta!
    accounts:
+      add_email_domain_block: Liegt e-pasta domēnu
      approve: Apstiprināt
      approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
      are_you_sure: Vai esi pārliecināts?
@ -61,6 +62,7 @@ lv:
      demote: Pazemināt
      destroyed_msg: Lietotāja %{username} dati tagad ievietoti rindā, lai tos nekavējoties izdzēstu
      disable: Iesaldēt
+      disable_sign_in_token_auth: Atspējot autentificēšanos ar e-pasta pilnvaru
      disable_two_factor_authentication: Atspējot 2FA
      disabled: Iesaldēts
      display_name: Parādāmais vārds
@ -69,6 +71,7 @@ lv:
      email: E-pasts
      email_status: E-pasta statuss
      enable: Atsaldēt
+      enable_sign_in_token_auth: Iespējot autentificēšanos ar e-pasta pilnvaru
      enabled: Iespējots
      enabled_msg: Veiksmīgi atsaldēts %{username} konts
      followers: Sekotāji
@ -180,17 +183,21 @@ lv:
        confirm_user: Apstiprināt lietotāju
        create_account_warning: Izveidot Brīdinājumu
        create_announcement: Izveidot Paziņojumu
+        create_canonical_email_block: Izveidot e-pasta liegumu
        create_custom_emoji: Izveidot pielāgotu emocijzīmi
        create_domain_allow: Izveidot Domēna Atļauju
        create_domain_block: Izveidot Domēna Bloku
+        create_email_domain_block: Izveidot e-pasta domēna liegumu
        create_ip_block: Izveidot IP noteikumu
        create_unavailable_domain: Izveidot Nepieejamu Domēnu
        create_user_role: Izveidot lomu
        demote_user: Pazemināt Lietotāju
        destroy_announcement: Dzēst Paziņojumu
+        destroy_canonical_email_block: Izdzēst e-pasta liegumu
        destroy_custom_emoji: Dzēst pielāgoto emocijzīmi
        destroy_domain_allow: Dzēst Domēna Atļauju
        destroy_domain_block: Dzēst Domēna Bloku
+        destroy_email_domain_block: Izdzēst e-pasta domēna liegumu
        destroy_instance: Attīrīt domēnu
        destroy_ip_block: Dzēst IP noteikumu
        destroy_status: Izdzēst Rakstu
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -1,7 +1,7 @@
 ---
 nn:
  about:
-    about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig idéane dine med Mastodon!'
+    about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig dataene dine med Mastodon!'
    contact_missing: Ikkje sett
    contact_unavailable: I/T
    hosted_on: "%{domain} er vert for Mastodon"
@ -39,7 +39,7 @@ nn:
      avatar: Bilete
      by_domain: Domene
      change_email:
-        changed_msg: Konto-e-posten er endra!
+        changed_msg: E-post for konto er endra!
        current_email: Noverande e-post
        label: Byt e-post
        new_email: Ny e-post
@ -62,7 +62,7 @@ nn:
      disable: Slå av
      disable_sign_in_token_auth: Slå av e-post-token-autentisering
      disable_two_factor_authentication: Slå av 2FA
-      disabled: Slege av
+      disabled: Inaktiv
      display_name: Synleg namn
      domain: Domene
      edit: Rediger
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -1888,7 +1888,7 @@ pt-BR:
        none: Aviso
        sensitive: Conta marcada como sensível
        silence: Conta silenciada
-        suspend: Conta banida
+        suspend: Conta suspensa
    welcome:
      apps_android_action: Disponível no Google Play
      apps_ios_action: Disponível na App Store
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@ -30,17 +30,25 @@ sc:
      created_msg: As creadu una nota de moderatzione.
      destroyed_msg: As cantzelladu una nota de moderatzione.
    accounts:
+      add_email_domain_block: Bloca domìniu de posta eletrònica
      approve: Aprova
      approved_msg: Sa dimanda de registru de %{username} est istada aprovada
      are_you_sure: Seguru?
      avatar: Immàgine de profilu
      by_domain: Domìniu
      change_email:
+        changed_msg: Indiritzu eletrònicu de su contu modificadu!
        current_email: Indiritzu eletrònicu atuale
        label: Muda s'indiritzu eletrònicu
        new_email: Indiritzu eletrònicu nou
        submit: Muda s'indiritzu eletrònicu
        title: Muda s'indiritzu eletrònicu de %{username}
+      change_role:
+        changed_msg: Ruolu modificadu.
+        edit_roles: Gesti is ruolos de utente
+        label: Modifica su ruolu
+        no_role: Nissunu ruolu
+        title: Modifica su ruolu de %{username}
      confirm: Cunfirma
      confirmed: Cunfirmadu
      confirming: Cunfirmende
@ -91,6 +99,7 @@ sc:
      most_recent_ip: IP prus reghente
      no_account_selected: Perunu contu est istadu mudadu, dae chi non nd'as seletzionadu
      no_limits_imposed: Sena lìmites
+      no_role_assigned: Nissunu ruolu assignadu
      not_subscribed: Sena sutiscritzione
      pending: De revisionare
      perform_full_suspension: Suspèndidu
@ -108,12 +117,19 @@ sc:
      removed_header_msg: S'immàgine de intestatzione de %{username} est istada bogada
      resend_confirmation:
        already_confirmed: Custa persone est giai cunfirmada
+        send: Torra a imbiare su ligòngiu de cunfirmatzione
+        success: Ligòngiu de cunfirmatzione imbiadu.
      reset: Reseta
      reset_password: Reseta sa crae
      resubscribe: Torra a sutascrìere
+      role: Ruolu
      search: Chirca
+      search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
      search_same_ip: Àteras persones cun sa pròpiu IP
      security: Seguresa
+      security_measures:
+        only_password: Crae isceti
+        password_and_2fa: Crae e 2FA
      sensitive: Sensìbile
      sensitized: Marcadu comente sensìbile
      shared_inbox_url: URL de intrada cumpartzida
@ -129,6 +145,8 @@ sc:
      suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversìbile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
      suspension_reversible_hint_html: Su contu est istadu suspèndidu, e is datos ant a èssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fàghere inoghe in bassu.
      title: Contos
+      unblock_email: Isbloca s'indiritzu de posta eletrònica
+      unblocked_email_msg: Posta eletrònica de %{username} isblocada
      unconfirmed_email: Posta eletrònica sena cunfirmare
      undo_sensitized: Boga sa marcadura comente sensìbile
      undo_silenced: Non pòngias a sa muda
@ -143,21 +161,31 @@ sc:
      whitelisted: Federatzione permìtida
    action_logs:
      action_types:
+        approve_user: Aprova s'utente
        assigned_to_self_report: Assigna s'informe
+        change_email_user: Muda s'indiritzu eletrònicu pro s'utente
+        change_role_user: Muda su ruolu de s'utente
        confirm_user: Cunfirma s'utente
        create_account_warning: Crea un'avisu
        create_announcement: Crea un'annùntziu
+        create_canonical_email_block: Crea unu blocu de posta eletrònica
        create_custom_emoji: Crea un'emoji personalizadu
        create_domain_allow: Crea unu domìniu permìtidu
        create_domain_block: Crea unu blocu de domìniu
+        create_email_domain_block: Crea unu blocu de domìniu de posta eletrònica
        create_ip_block: Crea una règula IP
+        create_unavailable_domain: Crea unu domìniu no a disponimentu
+        create_user_role: Crea unu ruolu
        demote_user: Degrada s'utente
        destroy_announcement: Cantzella s'annùntziu
+        destroy_canonical_email_block: Cantzella su blocu de posta eletrònica
        destroy_custom_emoji: Cantzella s'emoji personalizadu
        destroy_domain_allow: Cantzella su domìniu permìtidu
        destroy_domain_block: Cantzella su blocu de domìniu
+        destroy_email_domain_block: Cantzella su blocu de domìniu de posta eletrònica
        destroy_ip_block: Cantzella sa règula IP
        destroy_status: Cantzella s'istadu
+        destroy_unavailable_domain: Cantzella su domìniu no a disponimentu
        disable_2fa_user: Disativa 2FA
        disable_custom_emoji: Disativa s'emoji personalizadu
        disable_user: Disativa utente
@ -165,23 +193,33 @@ sc:
        enable_user: Ativa utente
        memorialize_account: Torra in unu contu de regordu
        promote_user: Promove utente
+        reject_user: Refuda s'utente
        remove_avatar_user: Cantzella immàgine de profilu
        reopen_report: Torra a abèrrere s'informe
+        resend_user: Torra a imbiare messàgiu eletrònicu de cunfirmatzione
        reset_password_user: Reseta sa crae
        resolve_report: Isorve s'informe
        sensitive_account: Marca is cuntenutos multimediales in su contu tuo comente sensìbiles
        silence_account: Pone custu contu a sa muda
        suspend_account: Suspende custu contu
        unassigned_report: Boga s'assignatzione de custu informe
+        unblock_email_account: Isbloca s'indiritzu de posta eletrònica
        unsensitive_account: Boga sa marcadura "sensìbiles" a is elementos multimediales in su contu tuo
        unsilence_account: Boga custu contu de is contos a sa muda
        unsuspend_account: Boga custu contu de is contos suspèndidos
        update_announcement: Atualiza s'annùntziu
        update_custom_emoji: Atualiza s'emoji personalizadu
        update_domain_block: Atualiza blocu de domìniu
+        update_ip_block: Atualiza sa règula IP
+        update_report: Atualiza s'informe
        update_status: Atualiza s'istadu
+        update_user_role: Atualiza su ruolu
      actions:
+        approve_user_html: "%{name} at aprovadu su registru de %{target}"
        assigned_to_self_report_html: "%{name} s'est auto-assignadu s'informe %{target}"
+        change_email_user_html: "%{name} at mudadu s'indiritzu de posta eletrònica de s'utente %{target}"
+        change_role_user_html: "%{name} at mudadu su ruolu de %{target}"
+        confirm_user_html: "%{name} at cunfirmadu s'indiritzu de posta eletrònica de s'utente %{target}"
        create_account_warning_html: "%{name} at imbiadu un'avisu a %{target}"
        create_announcement_html: "%{name} at creadu un'annùntziu nou %{target}"
        create_custom_emoji_html: "%{name} at carrigadu un'emoji nou %{target}"
@ -291,6 +329,8 @@ sc:
      confirm_suspension:
        cancel: Annulla
        confirm: Suspende
+        remove_all_data: Custu at a cantzellare totu su cuntenutu, elementos multimediales e datos de profilu pro is contos de custu domìniu dae su serbidore tuo.
+        stop_communication: Su serbidore tuo at a tzessare sa comunicatzione cun custos serbidores.
        title: Cunfirma su blocu de domìniu de %{domain}
      created_msg: Protzessende su blocu de domìniu
      destroyed_msg: Su blocu de domìniu est istadu iscontzadu
@ -361,9 +401,12 @@ sc:
      dashboard:
        instance_accounts_dimension: Contos prus sighidos
        instance_accounts_measure: contos sarvados
+        instance_languages_dimension: Limbas printzipales
        instance_reports_measure: informes a subra de àtere
+        instance_statuses_measure: publicatziones sarvadas
      delivery:
        all: Totus
+        unavailable: No a disponimentu
      delivery_available: Sa cunsigna est a disponimentu
      empty: Perunu domìniu agatadu.
      known_accounts:
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@ -86,6 +86,7 @@ lv:
        custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
        favicon: WEBP, PNG, GIF vai JPG. Aizstāj noklusējuma Mastodon favikonu ar pielāgotu.
        mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
+        media_cache_retention_period: Informācijas nesēju datnes no ierakstiem, kurus ir veikuši attālie lietotāji, tiek kešoti šajā serverī. Kad ir iestatīta apstiprinoša vērtība, informācijas nesēji tiks izdzēsti pēc norādītā dienu skaita. Ja informācijas nesēju dati tiks pieprasīti pēc tam, kad tie tika izdzēsti, tie tiks atkārtoti lejupielādēti, ja avota saturs joprojām būs pieejams. Saišu priekšskatījuma karšu vaicājumu biežuma ierobežojumu dēļ ir ieteicams iestatīt šo vērtību vismaz 14 dienas vai saišu priekšskatījuma kartes netiks atjauninātas pēc pieprasījuma pirms tā laika.
        peers_api_enabled: Domēna vārdu saraksts, ar kuriem šis serveris ir saskāries fediversā. Šeit nav iekļauti dati par to, vai tu veic federāciju ar noteiktu serveri, tikai tavs serveris par to zina. To izmanto dienesti, kas apkopo statistiku par federāciju vispārīgā nozīmē.
        profile_directory: Profilu direktorijā ir uzskaitīti visi lietotāji, kuri ir izvēlējušies būt atklājami.
        require_invite_text: 'Ja pierakstīšanai nepieciešama manuāla apstiprināšana, izdari tā, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis opcionāla'
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -8,10 +8,10 @@ sk:
    title: Ohľadom
  accounts:
    followers:
-      few: Sledovateľov
+      few: Sledujúcich
      many: Sledovateľov
      one: Sledujúci
-      other: Sledovatelia
+      other: Sledujúci
    following: Nasledujem
    instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
    last_active: naposledy aktívny
@ -1167,7 +1167,7 @@ sk:
    dormant: Spiace
    follow_failure: Nemožno nasledovať niektoré z vybraných účtov.
    follow_selected_followers: Následuj označených sledovatelov
-    followers: Následovatelia
+    followers: Sledovatelia
    following: Nasledovaní
    invited: Pozvaný/á
    last_active: Naposledy aktívny
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -1,7 +1,7 @@
 ---
 tr:
  about:
-    about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
+    about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezi olmayan</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir!
    contact_missing: Ayarlanmadı
    contact_unavailable: Bulunamadı
    hosted_on: Mastodon %{domain} üzerinde barındırılıyor
--- a/config/navigation.rb
+++ b/config/navigation.rb
@ -30,18 +30,18 @@ SimpleNavigation::Configuration.run do |navigation|
    n.item :filters, safe_join([material_symbol('filter_alt'), t('filters.index.title')]), filters_path, highlights_on: %r{/filters}, if: -> { current_user.functional? && !self_destruct }
    n.item :statuses_cleanup, safe_join([material_symbol('history'), t('settings.statuses_cleanup')]), statuses_cleanup_path, if: -> { current_user.functional_or_moved? && !self_destruct }

-    n.item :security, safe_join([material_symbol('lock'), t('settings.account')]), edit_user_registration_path do |s|
-      s.item :password, safe_join([material_symbol('lock'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{/auth/edit|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
+    n.item :security, safe_join([material_symbol('account_circle'), t('settings.account')]), edit_user_registration_path do |s|
+      s.item :password, safe_join([material_symbol('lock'), t('settings.account_settings')]), edit_user_registration_path, highlights_on: %r{^/auth|/settings/delete|/settings/migration|/settings/aliases|/settings/login_activities|^/disputes}
      s.item :two_factor_authentication, safe_join([material_symbol('safety_check'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_methods_path, highlights_on: %r{/settings/two_factor_authentication|/settings/otp_authentication|/settings/security_keys}
      s.item :authorized_apps, safe_join([material_symbol('list_alt'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct }
    end

    n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.import_and_export')]), settings_export_path do |s|
-      s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, if: -> { current_user.functional? && !self_destruct }
+      s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct }
      s.item :export, safe_join([material_symbol('cloud_download'), t('settings.export')]), settings_export_path
    end

-    n.item :invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
+    n.item :user_invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }
    n.item :development, safe_join([material_symbol('code'), t('settings.development')]), settings_applications_path, highlights_on: %r{/settings/applications}, if: -> { current_user.functional? && !self_destruct }

    n.item :trends, safe_join([material_symbol('trending_up'), t('admin.trends.title')]), admin_trends_statuses_path, if: -> { current_user.can?(:manage_taxonomies) && !self_destruct } do |s|
@ -62,7 +62,9 @@ SimpleNavigation::Configuration.run do |navigation|
      s.item :ng_rules, safe_join([material_symbol('edit'), t('admin.ng_rules.title')]), admin_ng_rules_path, highlights_on: %r{/admin/(ng_rules|ng_rule_histories)}, if: -> { current_user.can?(:manage_ng_words) }
      s.item :sensitive_words, safe_join([material_symbol('list'), t('admin.sensitive_words.title')]), admin_sensitive_words_path, highlights_on: %r{/admin/sensitive_words}, if: -> { current_user.can?(:manage_sensitive_words) }
      s.item :invites, safe_join([material_symbol('person_add'), t('admin.invites.title')]), admin_invites_path, if: -> { current_user.can?(:manage_invites) }
-      s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows}, if: -> { current_user.can?(:manage_federation) }
+      s.item :instances, safe_join([material_symbol('cloud'), t('admin.instances.title')]), admin_instances_path(limited: limited_federation_mode? ? nil : '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks|/admin/domain_allows|/admin/export_domain_blocks}, if: lambda {
+        current_user.can?(:manage_federation)
+      }
      s.item :special_instances, safe_join([material_symbol('list'), t('admin.special_instances.title')]), admin_special_instances_path, highlights_on: %r{/admin/special_instances}, if: -> { current_user.can?(:manage_federation) }
      s.item :special_domains, safe_join([material_symbol('link'), t('admin.special_domains.title')]), admin_special_domains_path, highlights_on: %r{/admin/special_domains}, if: -> { current_user.can?(:manage_federation) }
      s.item :email_domain_blocks, safe_join([material_symbol('mail'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
--- a/config/routes.rb
+++ b/config/routes.rb
@ -74,7 +74,7 @@ Rails.application.routes.draw do
  scope path: '.well-known' do
    scope module: :well_known do
      get 'oauth-authorization-server', to: 'oauth_metadata#show', as: :oauth_metadata, defaults: { format: 'json' }
-      get 'host-meta', to: 'host_meta#show', as: :host_meta, defaults: { format: 'xml' }
+      get 'host-meta', to: 'host_meta#show', as: :host_meta
      get 'nodeinfo', to: 'node_info#index', as: :nodeinfo, defaults: { format: 'json' }
      get 'webfinger', to: 'webfinger#show', as: :webfinger
    end
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@ -178,8 +178,10 @@ namespace :admin do
  end

  resources :users, only: [] do
-    resource :two_factor_authentication, only: [:destroy], controller: 'users/two_factor_authentications'
-    resource :role, only: [:show, :update], controller: 'users/roles'
+    scope module: :users do
+      resource :two_factor_authentication, only: [:destroy]
+      resource :role, only: [:show, :update]
+    end
  end

  resources :custom_emojis, only: [:index, :new, :create, :edit, :update] do