Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream

.github/workflows/test-ruby.yml

@@ -332,6 +332,21 @@ jobs:
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
 
+      - name: Cache Playwright Chromium browser
+        id: playwright-cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-browsers-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+
+      - name: Install Playwright Chromium browser (with deps)
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        run: yarn run playwright install --with-deps chromium
+
+      - name: Install Playwright Chromium browser deps
+        if: steps.playwright-cache.outputs.cache-hit == 'true'
+        run: yarn run playwright install-deps chromium
+
       - run: bin/rspec spec/system --tag streaming --tag js
 
       - name: Archive logs

.rubocop_todo.yml

@@ -38,15 +38,3 @@ Style/FetchEnvVar:
 # Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Enabled: false
-
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'app/lib/admin/system_check/message.rb'
-    - 'app/lib/request.rb'
-    - 'app/lib/webfinger.rb'
-    - 'app/services/block_domain_service.rb'
-    - 'app/services/fetch_resource_service.rb'
-    - 'app/workers/domain_block_worker.rb'
-    - 'app/workers/unfollow_follow_worker.rb'

Dockerfile

@@ -186,7 +186,7 @@ FROM build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
-ARG VIPS_VERSION=8.16.1
+ARG VIPS_VERSION=8.17.0
 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 

Gemfile

@@ -53,7 +53,7 @@ gem 'fastimage'
 gem 'hiredis', '~> 0.6'
 gem 'hiredis-client'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 5.2.0'
+gem 'http', '~> 5.3.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 1.7.0', require: false
 gem 'i18n'
@@ -137,7 +137,7 @@ group :test do
 
   # Browser integration testing
   gem 'capybara', '~> 3.39'
-  gem 'selenium-webdriver'
+  gem 'capybara-playwright-driver'
 
   # Used to reset the database between system tests
   gem 'database_cleaner-active_record'

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     azure-blob (0.5.8)
       rexml
-    base64 (0.2.0)
+    base64 (0.3.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
     benchmark (0.4.0)
@@ -142,6 +142,10 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    capybara-playwright-driver (0.5.6)
+      addressable
+      capybara
+      playwright-ruby-client (>= 1.16.0)
     case_transform (0.2)
       activesupport
     cbor (0.5.9.8)
@@ -297,9 +301,8 @@ GEM
       redis-client (= 0.24.0)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (5.2.0)
+    http (5.3.1)
       addressable (~> 2.8)
-      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
@@ -604,6 +607,9 @@ GEM
     pg (1.5.9)
     pghero (3.7.0)
       activerecord (>= 7.1)
+    playwright-ruby-client (1.52.0)
+      concurrent-ruby (>= 1.1.6)
+      mime-types (>= 3.0)
     pp (0.6.2)
       prettyprint
     premailer (1.27.0)
@@ -692,7 +698,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rdf (3.3.2)
       bcp47_spec (~> 0.2)
       bigdecimal (~> 3.1, >= 3.1.5)
@@ -751,7 +757,7 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.3)
-    rubocop (1.76.0)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -762,7 +768,7 @@ GEM
       rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -809,12 +815,6 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     securerandom (0.4.1)
-    selenium-webdriver (4.33.0)
-      base64 (~> 0.2)
-      logger (~> 1.4)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     sidekiq (7.3.9)
@@ -928,7 +928,6 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket (1.2.11)
     websocket-driver (0.7.7)
       base64
       websocket-extensions (>= 0.1.0)
@@ -956,6 +955,7 @@ DEPENDENCIES
   browser
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
+  capybara-playwright-driver
   charlock_holmes (~> 0.7.7)
   chewy (~> 7.3)
   climate_control
@@ -987,7 +987,7 @@ DEPENDENCIES
   hiredis (~> 0.6)
   hiredis-client
   htmlentities (~> 4.3)
-  http (~> 5.2.0)
+  http (~> 5.3.0)
   http_accept_language (~> 2.1)
   httplog (~> 1.7.0)
   i18n
@@ -1071,7 +1071,6 @@ DEPENDENCIES
   rubyzip (~> 2.3)
   sanitize (~> 7.0)
   scenic (~> 1.7)
-  selenium-webdriver
   shoulda-matchers
   sidekiq (< 8)
   sidekiq-bulk (~> 0.2.0)

app/helpers/json_ld_helper.rb

@@ -26,6 +26,8 @@ module JsonLdHelper
   # The url attribute can be a string, an array of strings, or an array of objects.
   # The objects could include a mimeType. Not-included mimeType means it's text/html.
   def url_to_href(value, preferred_type = nil)
+    value = [value] if value.is_a?(Hash)
+
     single_value = if value.is_a?(Array) && !value.first.is_a?(String)
                      value.find { |link| preferred_type.nil? || ((link['mimeType'].presence || 'text/html') == preferred_type) }
                    elsif value.is_a?(Array)
@@ -41,6 +43,15 @@ module JsonLdHelper
     end
   end
 
+  def url_to_media_type(value, preferred_type = nil)
+    value = [value] if value.is_a?(Hash)
+    return unless value.is_a?(Array) && !value.first.is_a?(String)
+
+    single_value = value.find { |link| preferred_type.nil? || ((link['mimeType'].presence || 'text/html') == preferred_type) }
+
+    single_value['mediaType'] unless single_value.nil?
+  end
+
   def as_array(value)
     if value.nil?
       []

app/javascript/mastodon/features/about/components/rules.tsx

@@ -29,7 +29,7 @@ interface BaseRule {
 
 interface Rule extends BaseRule {
   id: string;
-  translations: Record<string, BaseRule>;
+  translations?: Record<string, BaseRule>;
 }
 
 export const RulesSection: FC<RulesSectionProps> = ({ isLoading = false }) => {
@@ -113,15 +113,23 @@ const rulesSelector = createSelector(
   (rules, locale): Rule[] => {
     return rules.map((rule) => {
       const translations = rule.translations;
-      if (translations[locale]) {
+
-        rule.text = translations[locale].text;
+      // Handle cached responses from earlier versions
-        rule.hint = translations[locale].hint;
+      if (!translations) {
+        return rule;
       }
+
       const partialLocale = locale.split('-')[0];
       if (partialLocale && translations[partialLocale]) {
         rule.text = translations[partialLocale].text;
         rule.hint = translations[partialLocale].hint;
       }
+
+      if (translations[locale]) {
+        rule.text = translations[locale].text;
+        rule.hint = translations[locale].hint;
+      }
+
       return rule;
     });
   },

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

@@ -135,7 +135,7 @@ class AccountTimeline extends ImmutablePureComponent {
   };
 
   render () {
-    const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props;
+    const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl, params: { tagged } } = this.props;
 
     if (isLoading && statusIds.isEmpty()) {
       return (
@@ -172,8 +172,8 @@ class AccountTimeline extends ImmutablePureComponent {
         <StatusList
           prepend={
             <>
-              <AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={this.props.params.tagged} />
+              <AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={tagged} />
-              {!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} />}
+              {!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} tagged={tagged} />}
             </>
         }
           alwaysPrepend

app/javascript/mastodon/features/explore/components/story.jsx

@@ -66,7 +66,7 @@ export const Story = ({
       <a className='story__thumbnail' href={url} target='blank' rel='noopener'>
         {thumbnail ? (
           <>
-            <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
+            {!thumbnailLoaded && <Blurhash hash={blurhash} className='story__thumbnail__preview' />}
             <img src={thumbnail} onLoad={handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
           </>
         ) : <Skeleton />}

app/javascript/mastodon/locales/ca.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Vegeu més publicacions a {domain}",
   "hints.threads.replies_may_be_missing": "Es poden haver perdut respostes d'altres servidors.",
   "hints.threads.see_more": "Vegeu més respostes a {domain}",
+  "home.column_settings.show_quotes": "Mostrar les cites",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",

app/javascript/mastodon/locales/da.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
   "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
   "hints.threads.see_more": "Se flere svar på {domain}",
+  "home.column_settings.show_quotes": "Vis citater",
   "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",

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

@@ -30,6 +30,12 @@
   "account.edit_profile": "Edit profile",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
+  "account.familiar_followers_many": "Followed by {name1}, {name2}, and {othersCount, plural, one {one other you know} other {# others you know}}",
+  "account.familiar_followers_one": "Followed by {name1}",
+  "account.familiar_followers_two": "Followed by {name1} and {name2}",
+  "account.featured": "Featured",
+  "account.featured.accounts": "Profiles",
+  "account.featured.hashtags": "Hashtags",
   "account.featured_tags.last_status_at": "Last post on {date}",
   "account.featured_tags.last_status_never": "No posts",
   "account.follow": "Follow",
@@ -37,9 +43,11 @@
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} followers}}",
+  "account.followers_you_know_counter": "{counter} you know",
   "account.following": "Following",
   "account.following_counter": "{count, plural, one {{counter} following} other {{counter} following}}",
   "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
   "account.in_memoriam": "In Memoriam.",
@@ -54,18 +62,23 @@
   "account.mute_notifications_short": "Mute notifications",
   "account.mute_short": "Mute",
   "account.muted": "Muted",
+  "account.muting": "Muting",
+  "account.mutual": "You follow each other",
   "account.no_bio": "No description provided.",
   "account.open_original_page": "Open original page",
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts and replies",
+  "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
   "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.requested_follow": "{name} has requested to follow you",
+  "account.requests_to_follow_you": "Requests to follow you",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Show boosts from @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "account.unblock": "Unblock @{name}",
   "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_domain_short": "Unblock",
   "account.unblock_short": "Unblock",
   "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Unfollow",
@@ -227,6 +240,9 @@
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.redraft.title": "Delete & redraft post?",
+  "confirmations.remove_from_followers.confirm": "Remove follower",
+  "confirmations.remove_from_followers.message": "{name} will stop following you. Are you sure you want to proceed?",
+  "confirmations.remove_from_followers.title": "Remove follower?",
   "confirmations.reply.confirm": "Reply",
   "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
   "confirmations.reply.title": "Overwrite post?",
@@ -294,6 +310,9 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_featured.me": "You have not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured.other": "{acct} has not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured_other.unknown": "This account has not featured anything yet.",
   "empty_column.account_hides_collections": "This user has chosen to not make this information available",
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No posts here!",
@@ -326,6 +345,11 @@
   "explore.trending_links": "News",
   "explore.trending_statuses": "Posts",
   "explore.trending_tags": "Hashtags",
+  "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
+  "featured_carousel.next": "Next",
+  "featured_carousel.post": "Post",
+  "featured_carousel.previous": "Previous",
+  "featured_carousel.slide": "{index} of {total}",
   "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
   "filter_modal.added.context_mismatch_title": "Context mismatch!",
   "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
@@ -378,6 +402,8 @@
   "generic.saved": "Saved",
   "getting_started.heading": "Getting started",
   "hashtag.admin_moderation": "Open moderation interface for #{name}",
+  "hashtag.browse": "Browse posts in #{hashtag}",
+  "hashtag.browse_from_account": "Browse posts from @{name} in #{hashtag}",
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
@@ -390,7 +416,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} Following} other {{counter} Following}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} post} other {{counter} posts}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} post} other {{counter} posts}} today",
+  "hashtag.feature": "Feature on profile",
   "hashtag.follow": "Follow hashtag",
+  "hashtag.mute": "Mute #{hashtag}",
+  "hashtag.unfeature": "Don't feature on profile",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
   "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",
@@ -401,6 +430,7 @@
   "hints.profiles.see_more_posts": "See more posts on {domain}",
   "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
   "hints.threads.see_more": "See more replies on {domain}",
+  "home.column_settings.show_quotes": "Show quotes",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -841,6 +871,13 @@
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
+  "status.quote_error.filtered": "Hidden due to one of your filters",
+  "status.quote_error.not_found": "This post cannot be displayed.",
+  "status.quote_error.pending_approval": "This post is pending approval from the original author.",
+  "status.quote_error.rejected": "This post cannot be displayed as the original author does not allow it to be quoted.",
+  "status.quote_error.removed": "This post was removed by its author.",
+  "status.quote_error.unauthorized": "This post cannot be displayed as you are not authorised",
+  "status.quote_post_author": "Post by {name}",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost with original visibility",
@@ -871,7 +908,9 @@
   "subscribed_languages.target": "Change subscribed languages for {target}",
   "tabs_bar.home": "Home",
   "tabs_bar.notifications": "Notifications",
+  "terms_of_service.effective_as_of": "Effective as of {date}",
   "terms_of_service.title": "Terms of Service",
+  "terms_of_service.upcoming_changes_on": "Upcoming changes on {date}",
   "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
   "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
@@ -902,6 +941,12 @@
   "video.expand": "Expand video",
   "video.fullscreen": "Full screen",
   "video.hide": "Hide video",
+  "video.mute": "Mute",
   "video.pause": "Pause",
-  "video.play": "Play"
+  "video.play": "Play",
+  "video.skip_backward": "Skip backward",
+  "video.skip_forward": "Skip forward",
+  "video.unmute": "Unmute",
+  "video.volume_down": "Volume down",
+  "video.volume_up": "Volume up"
 }

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

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
   "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
   "hints.threads.see_more": "Ver más respuestas en {domain}",
+  "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",

app/javascript/mastodon/locales/es.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
   "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
   "hints.threads.see_more": "Ver más respuestas en {domain}",
+  "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar comunicaciones",

app/javascript/mastodon/locales/et.json

@@ -28,6 +28,12 @@
   "account.edit_profile": "Muuda profiili",
   "account.enable_notifications": "Teavita mind @{name} postitustest",
   "account.endorse": "Too profiilil esile",
+  "account.familiar_followers_many": "Jälgijateks {name1}, {name2} ja veel {othersCount, plural, one {üks kasutaja, keda tead} other {# kasutajat, keda tead}}",
+  "account.familiar_followers_one": "Jälgijaks {name1}",
+  "account.familiar_followers_two": "Jälgijateks {name1} ja {name2}",
+  "account.featured": "Esiletõstetud",
+  "account.featured.accounts": "Profiilid",
+  "account.featured.hashtags": "Sildid",
   "account.featured_tags.last_status_at": "Viimane postitus {date}",
   "account.featured_tags.last_status_never": "Postitusi pole",
   "account.follow": "Jälgi",
@@ -38,6 +44,7 @@
   "account.following": "Jälgib",
   "account.following_counter": "{count, plural, one {{counter} jälgib} other {{counter} jälgib}}",
   "account.follows.empty": "See kasutaja ei jälgi veel kedagi.",
+  "account.follows_you": "Jälgib sind",
   "account.go_to_profile": "Mine profiilile",
   "account.hide_reblogs": "Peida @{name} jagamised",
   "account.in_memoriam": "In Memoriam.",
@@ -52,18 +59,22 @@
   "account.mute_notifications_short": "Vaigista teavitused",
   "account.mute_short": "Vaigista",
   "account.muted": "Vaigistatud",
+  "account.mutual": "Te jälgite teineteist",
   "account.no_bio": "Kirjeldust pole lisatud.",
   "account.open_original_page": "Ava algne leht",
   "account.posts": "Postitused",
   "account.posts_with_replies": "Postitused ja vastused",
+  "account.remove_from_followers": "Eemalda {name} jälgijate seast",
   "account.report": "Raporteeri @{name}",
   "account.requested": "Ootab kinnitust. Klõpsa jälgimise soovi tühistamiseks",
   "account.requested_follow": "{name} on taodelnud sinu jälgimist",
+  "account.requests_to_follow_you": "soovib sind jälgida",
   "account.share": "Jaga @{name} profiili",
   "account.show_reblogs": "Näita @{name} jagamisi",
   "account.statuses_counter": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
   "account.unblock": "Eemalda blokeering @{name}",
   "account.unblock_domain": "Tee {domain} nähtavaks",
+  "account.unblock_domain_short": "Lõpeta blokeerimine",
   "account.unblock_short": "Eemalda blokeering",
   "account.unendorse": "Ära kuva profiilil",
   "account.unfollow": "Jälgid",
@@ -225,6 +236,9 @@
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.redraft.title": "Kustudada ja luua postituse mustand?",
+  "confirmations.remove_from_followers.confirm": "Eemalda jälgija",
+  "confirmations.remove_from_followers.message": "{name} lõpetab sellega sinu jälgimise. Kas oled kindel, et soovid jätkata?",
+  "confirmations.remove_from_followers.title": "Kas eemaldame jälgija?",
   "confirmations.reply.confirm": "Vasta",
   "confirmations.reply.message": "Praegu vastamine kirjutab hetkel koostatava sõnumi üle. Oled kindel, et soovid jätkata?",
   "confirmations.reply.title": "Kirjutada postitus üle?",
@@ -292,6 +306,9 @@
   "emoji_button.search_results": "Otsitulemused",
   "emoji_button.symbols": "Sümbolid",
   "emoji_button.travel": "Reisimine & kohad",
+  "empty_column.account_featured.me": "Sa pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid silte või või sõbra kasutajakontot?",
+  "empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid silte või või sõbra kasutajakontot?",
+  "empty_column.account_featured_other.unknown": "See kasutajakonto pole veel midagi esile tõstnud.",
   "empty_column.account_hides_collections": "See kasutaja otsustas mitte teha seda infot saadavaks",
   "empty_column.account_suspended": "Konto kustutatud",
   "empty_column.account_timeline": "Siin postitusi ei ole!",
@@ -324,8 +341,10 @@
   "explore.trending_links": "Uudised",
   "explore.trending_statuses": "Postitused",
   "explore.trending_tags": "Sildid",
+  "featured_carousel.header": "{count, plural, one {Esiletõstetud postitus} other {Esiletõstetud postitust}}",
   "featured_carousel.next": "Järgmine",
   "featured_carousel.previous": "Eelmine",
+  "featured_carousel.slide": "{index} / {total}",
   "filter_modal.added.context_mismatch_explanation": "See filtrikategooria ei rakendu kontekstis, kuidas postituseni jõudsid. Kui tahad postitust ka selles kontekstis filtreerida, pead muutma filtrit.",
   "filter_modal.added.context_mismatch_title": "Konteksti mittesobivus!",
   "filter_modal.added.expired_explanation": "Selle filtri kategooria on aegunud. pead muutma aegumiskuupäeva, kui tahad, et filter kehtiks.",
@@ -378,6 +397,8 @@
   "generic.saved": "Salvestatud",
   "getting_started.heading": "Alustamine",
   "hashtag.admin_moderation": "Ava modereerimisliides #{name} jaoks",
+  "hashtag.browse": "Sirvi #{hashtag} sildiga postitusi",
+  "hashtag.browse_from_account": "Sirvi @{name} kasutaja #{hashtag} sildiga postitusi",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "või {additional}",
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
@@ -390,8 +411,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} osalejaga} other {{counter} osalejaga}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} postitusega} other {{counter} postitusega}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postitust} other {{counter} postitust}} täna",
+  "hashtag.feature": "Tõsta profiilis esile",
   "hashtag.follow": "Jälgi silti",
   "hashtag.mute": "Vaigista @#{hashtag}",
+  "hashtag.unfeature": "Ära tõsta profiilis esile",
   "hashtag.unfollow": "Lõpeta sildi jälgimine",
   "hashtags.and_other": "…ja {count, plural, one {}other {# veel}}",
   "hints.profiles.followers_may_be_missing": "Selle profiili jälgijaid võib olla puudu.",
@@ -402,6 +425,7 @@
   "hints.profiles.see_more_posts": "Vaata rohkem postitusi kohas {domain}",
   "hints.threads.replies_may_be_missing": "Vastuseid teistest serveritest võib olla puudu.",
   "hints.threads.see_more": "Vaata rohkem vastuseid kohas {domain}",
+  "home.column_settings.show_quotes": "Näita tsiteeritut",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
   "home.hide_announcements": "Peida teadaanded",
@@ -710,6 +734,8 @@
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
   "refresh": "Värskenda",
+  "regeneration_indicator.please_stand_by": "Palun oota.",
+  "regeneration_indicator.preparing_your_home_feed": "Valmistan ette sinu avalehe lõime…",
   "relative_time.days": "{number}p",
   "relative_time.full.days": "{number, plural, one {# päev} other {# päeva}} tagasi",
   "relative_time.full.hours": "{number, plural, one {# tund} other {# tundi}} tagasi",
@@ -763,7 +789,7 @@
   "report.thanks.title": "Ei taha seda näha?",
   "report.thanks.title_actionable": "Täname teavitamise eest, uurime seda.",
   "report.unfollow": "Lõpeta @{name} jälgimine",
-  "report.unfollow_explanation": "Jälgid seda kontot. Et mitte näha tema postitusi oma koduvoos, lõpeta ta jälgimine.",
+  "report.unfollow_explanation": "Jälgid seda kontot. Et mitte näha tema postitusi oma avalehe lõimes, lõpeta ta jälgimine.",
   "report_notification.attached_statuses": "{count, plural, one {{count} postitus} other {{count} postitust}} listatud",
   "report_notification.categories.legal": "Õiguslik",
   "report_notification.categories.legal_sentence": "ebaseaduslik sisu",
@@ -793,8 +819,11 @@
   "search_results.accounts": "Profiilid",
   "search_results.all": "Kõik",
   "search_results.hashtags": "Sildid",
+  "search_results.no_results": "Tulemusi pole.",
+  "search_results.no_search_yet": "Proovi otsida postitusi, profiile või silte.",
   "search_results.see_all": "Vaata kõiki",
   "search_results.statuses": "Postitused",
+  "search_results.title": "Otsi märksõna: {q}",
   "server_banner.about_active_users": "Inimesed, kes kasutavad seda serverit viimase 30 päeva jooksul (kuu aktiivsed kasutajad)",
   "server_banner.active_users": "aktiivsed kasutajad",
   "server_banner.administered_by": "Administraator:",
@@ -837,6 +866,13 @@
   "status.mute_conversation": "Vaigista vestlus",
   "status.open": "Laienda postitus",
   "status.pin": "Kinnita profiilile",
+  "status.quote_error.filtered": "Peidetud mõne kasutatud filtri tõttu",
+  "status.quote_error.not_found": "Seda postitust ei saa näidata.",
+  "status.quote_error.pending_approval": "See postitus on algse autori kinnituse ootel.",
+  "status.quote_error.rejected": "Seda postitust ei saa näidata, kuina algne autor ei luba teda tsiteerida.",
+  "status.quote_error.removed": "Autor kustutas selle postituse.",
+  "status.quote_error.unauthorized": "Kuna sul pole luba selle postituse nägemiseks, siis seda ei saa kuvada.",
+  "status.quote_post_author": "Postitajaks {name}",
   "status.read_more": "Loe veel",
   "status.reblog": "Jaga",
   "status.reblog_private": "Jaga algse nähtavusega",
@@ -845,6 +881,7 @@
   "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
+  "status.remove_favourite": "Eemalda lemmikute seast",
   "status.replied_in_thread": "Vastatud lõimes",
   "status.replied_to": "Vastas kasutajale {name}",
   "status.reply": "Vasta",
@@ -866,7 +903,9 @@
   "subscribed_languages.target": "Muuda tellitud keeli {target} jaoks",
   "tabs_bar.home": "Kodu",
   "tabs_bar.notifications": "Teated",
+  "terms_of_service.effective_as_of": "Kehtib alates {date}",
   "terms_of_service.title": "Teenuse tingimused",
+  "terms_of_service.upcoming_changes_on": "Muudatused alates {date}",
   "time_remaining.days": "{number, plural, one {# päev} other {# päeva}} jäänud",
   "time_remaining.hours": "{number, plural, one {# tund} other {# tundi}} jäänud",
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} jäänud",
@@ -900,5 +939,9 @@
   "video.mute": "Vaigista",
   "video.pause": "Paus",
   "video.play": "Mängi",
-  "video.unmute": "Lõpeta vaigistamine"
+  "video.skip_backward": "Keri tagasi",
+  "video.skip_forward": "Keri edasi",
+  "video.unmute": "Lõpeta vaigistamine",
+  "video.volume_down": "Heli vaiksemaks",
+  "video.volume_up": "Heli valjemaks"
 }

app/javascript/mastodon/locales/he.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "צפיה בעוד פרסומים בשרת {domain}",
   "hints.threads.replies_may_be_missing": "תגובות משרתים אחרים עלולות להיות חסרות.",
   "hints.threads.see_more": "צפיה בעוד תגובות משרת {domain}",
+  "home.column_settings.show_quotes": "הצגת ציטוטים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
   "home.hide_announcements": "הסתר הכרזות",

app/javascript/mastodon/locales/lv.json

@@ -399,6 +399,7 @@
   "hints.profiles.see_more_posts": "Skatīt vairāk ierakstu {domain}",
   "hints.threads.replies_may_be_missing": "Var trūkt atbilžu no citiem serveriem.",
   "hints.threads.see_more": "Skatīt vairāk atbilžu {domain}",
+  "home.column_settings.show_quotes": "Rādīt citātus",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
   "home.hide_announcements": "Slēpt paziņojumus",

app/javascript/mastodon/locales/nan.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "佇 {domain} 看koh khah tsē ê PO文",
   "hints.threads.replies_may_be_missing": "Tuì其他ê服侍器來ê回應可能有phah m̄見。",
   "hints.threads.see_more": "佇 {domain} 看koh khah tsē ê回應",
+  "home.column_settings.show_quotes": "顯示引用",
   "home.column_settings.show_reblogs": "顯示轉PO",
   "home.column_settings.show_replies": "顯示回應",
   "home.hide_announcements": "Khàm掉公告",

app/javascript/mastodon/locales/nn.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Sjå fleire innlegg på {domain}",
   "hints.threads.replies_may_be_missing": "Svar frå andre tenarar manglar kanskje.",
   "hints.threads.see_more": "Sjå fleire svar på {domain}",
+  "home.column_settings.show_quotes": "Vis sitat",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjeringar",

app/javascript/mastodon/locales/no.json

@@ -277,6 +277,7 @@
   "domain_block_modal.they_cant_follow": "Ingen fra denne serveren kan følge deg.",
   "domain_block_modal.they_wont_know": "De kommer ikke til å få vite at du har valgt å blokkere dem.",
   "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_num_followers": "Du kommer til å miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} du følger} other {{followingCountDisplay} du følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Du vil miste alle følgere og folk du følger fra denne serveren.",
   "domain_block_modal.you_wont_see_posts": "Du vil ikke se innlegg eller få varsler fra brukere på denne serveren.",
   "domain_pill.activitypub_lets_connect": "Den lar deg koble til og samhandle med folk ikke bare på Mastodon, men også på tvers av forskjellige sosiale apper.",
@@ -309,6 +310,9 @@
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
+  "empty_column.account_featured.me": "Du har ikke fremhevet noe ennå. Visste du at du kan fremheve emneknaggene du bruker mest, eller til og med dine venners profilsider?",
+  "empty_column.account_featured.other": "{acct} har ikke fremhevet noe ennå. Visste du at du kan fremheve emneknaggene du bruker mest, eller til og med dine venners profilsider?",
+  "empty_column.account_featured_other.unknown": "Denne kontoen har ikke fremhevet noe ennå.",
   "empty_column.account_hides_collections": "Denne brukeren har valgt å ikke gjøre denne informasjonen tilgjengelig",
   "empty_column.account_suspended": "Kontoen er suspendert",
   "empty_column.account_timeline": "Ingen innlegg her!",
@@ -341,6 +345,7 @@
   "explore.trending_links": "Nyheter",
   "explore.trending_statuses": "Innlegg",
   "explore.trending_tags": "Emneknagger",
+  "featured_carousel.header": "{count, plural, one {{counter} festet innlegg} other {{counter} festede innlegg}}",
   "featured_carousel.next": "Neste",
   "featured_carousel.post": "Innlegg",
   "featured_carousel.previous": "Forrige",
@@ -410,8 +415,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltaker} other {{counter} deltakere}}",
   "hashtag.counter_by_uses": "{count, plural, one {ett innlegg} other {{counter} innlegg}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {ett innlegg} other {{counter} innlegg}} i dag",
+  "hashtag.feature": "Fremhev på din profil",
   "hashtag.follow": "Følg emneknagg",
   "hashtag.mute": "Demp #{hashtag}",
+  "hashtag.unfeature": "Ikke fremhev på din profil",
   "hashtag.unfollow": "Slutt å følge emneknagg",
   "hashtags.and_other": "…og {count, plural, one{en til} other {# til}}",
   "hints.profiles.followers_may_be_missing": "Følgere for denne profilen mangler kanskje.",
@@ -422,6 +429,7 @@
   "hints.profiles.see_more_posts": "Se flere innlegg på {domain}",
   "hints.threads.replies_may_be_missing": "Svar fra andre servere mangler kanskje.",
   "hints.threads.see_more": "Se flere svar på {domain}",
+  "home.column_settings.show_quotes": "Vis sitater",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul kunngjøring",
@@ -441,6 +449,7 @@
   "ignore_notifications_modal.not_following_title": "Overse varsler fra folk du ikke følger?",
   "ignore_notifications_modal.private_mentions_title": "Overse varsler fra uoppfordrede private omtaler?",
   "info_button.label": "Hjelp",
+  "info_button.what_is_alt_text": "<h1>Hva er alternativ tekst?</h1> <p>Alternativ tekst gir en bildebeskrivelse til folk med nedsatt syn, lav båndbredde eller de som vil ha mer kontekst.</p> <p>Du kan forbedre tilgjengeligheten og forståelsen for alle ved å skive en tydelig, konsis og objektiv alternativ tekst.</p> <ul> <li>Få med deg viktige elementer</li> <li>Summér tekst i bilder</li> <li>Bruk vanlige setningsstrukturer</li> <li>Unngå overflødig informasjon</li> <li>Fokuser på trender og viktige funn i komplekse grafiske fremstillinger (som diagram og kart)</li> </ul>",
   "interaction_modal.action.favourite": "Favoriser fra din konto for å fortsette.",
   "interaction_modal.action.follow": "Følg fra din konto for å fortsette.",
   "interaction_modal.action.reply": "Svar fra kontoen din for å fortsette.",

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

@@ -2,9 +2,9 @@
   "about.blocks": "Servidores moderados",
   "about.contact": "Contacto:",
   "about.default_locale": "Padrão",
-  "about.disclaimer": "O Mastodon é um software livre, de código aberto e uma marca registada de Mastodon gGmbH.",
+  "about.disclaimer": "O Mastodon é um ‘software’ livre, de código aberto e uma marca registada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Motivo não disponível",
-  "about.domain_blocks.preamble": "O Mastodon geralmente permite ver e interagir com o conteúdo de utilizadores de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.",
+  "about.domain_blocks.preamble": "O Mastodon ver e interagir com o conteúdo de utilizadores de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.",
   "about.domain_blocks.silenced.explanation": "Normalmente não verás perfis e conteúdos deste servidor, a não ser que os procures explicitamente ou optes por segui-los.",
   "about.domain_blocks.silenced.title": "Limitados",
   "about.domain_blocks.suspended.explanation": "Nenhum dado deste servidor será processado, armazenado ou trocado, tornando impossível qualquer interação ou comunicação com os utilizadores a partir deste servidor.",
@@ -132,8 +132,8 @@
   "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a tua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As publicações públicas podem continuar a ser visíveis para utilizadores não autenticados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
-  "block_modal.they_cant_mention": "Ele não te pode mencionar nem seguir.",
+  "block_modal.they_cant_mention": "Ele não o pode mencionar nem seguir.",
-  "block_modal.they_cant_see_posts": "Não verás as publicações dele e ele não poderá ver as tuas publicações.",
+  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
   "block_modal.they_will_know": "Ele pode ver que o bloqueaste.",
   "block_modal.title": "Bloquear utilizador?",
   "block_modal.you_wont_see_mentions": "Não verás publicações que mencionem este utilizador.",
@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
   "hints.threads.replies_may_be_missing": "É possível que não estejam a ser mostradas todas as respostas de outros servidores.",
   "hints.threads.see_more": "Ver mais respostas em {domain}",
+  "home.column_settings.show_quotes": "Mostrar citações",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar mensagens de manutenção",

app/javascript/mastodon/locales/tok.json

@@ -264,6 +264,7 @@
   "dismissable_banner.explore_links": "tenpo poka la jan pi kulupu ale li toki e ijo sin ni. ijo sin pi jan ante mute li sewi lon lipu ni.",
   "dismissable_banner.explore_statuses": "tenpo poka la jan pi kulupu ale li toki e ijo ni. ijo sin pi jan ante mute li sewi lon lipu ni.",
   "dismissable_banner.explore_tags": "tenpo poka la jan pi kulupu ale li toki e ijo ni. ijo sin pi jan ante mute li sewi lon lipu ni.",
+  "dismissable_banner.public_timeline": "toki ni li sin. jan li pali e toki ni la jan ante mute pi ma {domain} li kute e jan ni.",
   "domain_block_modal.block": "o len e ma",
   "domain_block_modal.block_account_instead": "o len e @{name} a",
   "domain_block_modal.they_can_interact_with_old_posts": "jan pi ma ni li ken ijo e toki sina.",
@@ -330,12 +331,14 @@
   "filter_modal.added.settings_link": "lipu lawa",
   "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
+  "filtered_notifications_banner.pending_requests": "ni li tan {count, plural, =0 {jan sina ala} other {jan sina #}}",
   "firehose.all": "ale",
   "firehose.local": "kulupu ni",
   "firehose.remote": "kulupu ante",
   "follow_request.authorize": "o ken",
-  "follow_request.reject": "o ala",
+  "follow_request.reject": "o weka kute",
   "follow_suggestions.dismiss": "mi wile lukin sin ala e ni",
+  "follow_suggestions.friends_of_friends_longer": "ni li suli tawa kulupu jan ni: sina kute e ona",
   "follow_suggestions.hints.friends_of_friends": "jan kute sina li lukin mute e toki pi jan ni.",
   "follow_suggestions.hints.most_followed": "jan mute lon ma {domain} li kute e jan ni.",
   "follow_suggestions.hints.most_interactions": "tenpo poka la jan mute pi ma {domain} li lukin mute e toki pi jan ni.",
@@ -366,58 +369,85 @@
   "hashtag.follow": "o kute e kulupu lipu",
   "hashtag.mute": "o kute ala e kulupu #{hashtag}",
   "hashtag.unfollow": "o kute ala e kulupu lipu",
-  "home.column_settings.show_reblogs": "lukin e wawa",
+  "hints.profiles.followers_may_be_missing": "jan kute li ken weka.",
+  "hints.profiles.see_more_posts": "o lukin e toki ante lon ma {domain}",
+  "hints.threads.see_more": "o lukin e toki ante lon ma {domain}",
+  "home.column_settings.show_reblogs": "o lukin e wawa toki",
+  "home.hide_announcements": "o lukin ala e toki lawa suli",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
+  "home.show_announcements": "o lukin e toki lawa suli",
   "info_button.label": "sona",
-  "interaction_modal.go": "o tawa ma ni",
+  "interaction_modal.go": "o tawa",
+  "interaction_modal.no_account_yet": "sina jo ala e sijelo anu seme?",
   "interaction_modal.on_another_server": "lon ma ante",
   "interaction_modal.on_this_server": "lon ma ni",
-  "interaction_modal.title.favourite": "o suli e toki {name}",
+  "interaction_modal.title.favourite": "o pona tawa {name}",
   "interaction_modal.title.follow": "o kute e {name}",
-  "interaction_modal.title.reblog": "o wawa e toki {name}",
+  "interaction_modal.title.reblog": "o pana wawa e toki tan {name}",
-  "interaction_modal.title.reply": "o toki lon toki pi jan {name}",
+  "interaction_modal.title.reply": "o toki lon lipu tawa {name}",
-  "interaction_modal.title.vote": "o pana tawa wile sona pi jan {name}",
+  "interaction_modal.title.vote": "o pana e sona wile tawa {name}",
   "interaction_modal.username_prompt": "ni li sama ni: {example}",
-  "intervals.full.days": "{number, plural, other {suni #}}",
+  "intervals.full.days": "ni li pini lon {number, plural, other {tenpo suno #}}",
-  "intervals.full.hours": "{number, plural, other {tenpo suli #}}",
+  "intervals.full.hours": "ni li pini lon {number, plural, other {tenpo ilo #}}",
+  "intervals.full.minutes": "ni li pini lon {number, plural, other {tenpo ilo lili #}}",
+  "keyboard_shortcuts.back": "o tawa pini",
   "keyboard_shortcuts.blocked": "o lukin e lipu pi len sina",
   "keyboard_shortcuts.boost": "o pana sin e toki",
   "keyboard_shortcuts.down": "o tawa anpa lon lipu",
   "keyboard_shortcuts.enter": "o lukin e toki",
   "keyboard_shortcuts.favourite": "o sitelen pona e toki",
   "keyboard_shortcuts.favourites": "o lukin e lipu sina pi toki suli",
+  "keyboard_shortcuts.federated": "o lukin e linja toki pi ma ale",
   "keyboard_shortcuts.muted": "o lukin e lipu sina pi jan len",
   "keyboard_shortcuts.my_profile": "o lukin e lipu sina",
   "keyboard_shortcuts.open_media": "o lukin e sitelen",
   "keyboard_shortcuts.pinned": "o lukin pi lipu sina pi toki sewi",
   "keyboard_shortcuts.reply": "o toki lon ijo ni",
-  "keyboard_shortcuts.toggle_sensitivity": "o ante e ken lukin",
+  "keyboard_shortcuts.toggle_hidden": "o lukin ala lukin e toki len",
-  "keyboard_shortcuts.toot": "o toki",
+  "keyboard_shortcuts.toggle_sensitivity": "o lukin ala lukin e sitelen",
+  "keyboard_shortcuts.toot": "o toki sin",
+  "keyboard_shortcuts.translate": "o ante e toki lipu",
   "keyboard_shortcuts.up": "o tawa sewi lon lipu",
   "lightbox.close": "o pini",
   "lightbox.next": "sinpin",
   "lightbox.previous": "monsi",
   "link_preview.author": "tan {name}",
+  "link_preview.shares": "{count, plural, other {toki {counter}}}",
+  "lists.add_member": "o pana",
+  "lists.add_to_list": "o pana tawa kulupu jan",
+  "lists.add_to_lists": "o pana e {name} tawa kulupu jan",
   "lists.create": "o lipu e kulupu jan",
+  "lists.create_a_list_to_organize": "o lipu e kulupu tawa nasin pi ilo sina",
+  "lists.create_list": "o lipu e kulupu jan",
   "lists.delete": "o weka e kulupu lipu",
   "lists.done": "ale li pini",
   "lists.edit": "o ante e kulupu lipu",
+  "lists.find_users_to_add": "o alasa e jan",
   "lists.list_members_count": "{count, plural, other {jan #}}",
   "lists.list_name": "nimi kulupu",
   "lists.new_list_name": "nimi pi kulupu sin",
   "lists.no_lists_yet": "kulupu li lon ala.",
+  "lists.no_members_yet": "jan ala li lon.",
+  "lists.no_results_found": "jan ala li lon.",
   "lists.remove_member": "o weka",
   "lists.replies_policy.followed": "jan kute ale",
   "lists.replies_policy.list": "jan pi kulupu ni taso",
   "lists.replies_policy.none": "jan ala",
+  "lists.save": "o awen",
   "lists.search": "o alasa",
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
+  "media_gallery.hide": "o len",
+  "moved_to_account_banner.text": "sina ante e sijelo tawa sijelo {movedToAccount}. ni la sijelo {disabledAccount} li pini.",
+  "mute_modal.hide_from_notifications": "o len tan mu",
+  "mute_modal.indefinite": "ni li pini ala",
   "mute_modal.title": "sina wile ala wile kute e jan ni?",
   "navigation_bar.about": "sona",
   "navigation_bar.blocks": "jan len",
   "navigation_bar.compose": "o pali e toki sin",
+  "navigation_bar.discover": "o alasa",
   "navigation_bar.domain_blocks": "ma len",
+  "navigation_bar.explore": "o alasa",
   "navigation_bar.favourites": "ijo pona",
   "navigation_bar.filters": "nimi len",
   "navigation_bar.lists": "kulupu lipu",

app/javascript/mastodon/locales/tr.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "{domain} adresinde daha fazla gönderi gör",
   "hints.threads.replies_may_be_missing": "Diğer sunuculardan yanıtlar eksik olabilir.",
   "hints.threads.see_more": "{domain} adresinde daha fazla yanıt gör",
+  "home.column_settings.show_quotes": "Alıntıları göster",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
   "home.hide_announcements": "Duyuruları gizle",

app/javascript/mastodon/locales/vi.json

@@ -430,6 +430,7 @@
   "hints.profiles.see_more_posts": "Xem thêm tút ở {domain}",
   "hints.threads.replies_may_be_missing": "Lượt trả lời từ máy chủ khác có thể không đầy đủ.",
   "hints.threads.see_more": "Xem thêm ở {domain}",
+  "home.column_settings.show_quotes": "Hiện các trích dẫn",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
   "home.hide_announcements": "Ẩn thông báo máy chủ",

app/javascript/mastodon/locales/zh-CN.json

@@ -341,6 +341,8 @@
   "explore.trending_links": "新闻",
   "explore.trending_statuses": "嘟文",
   "explore.trending_tags": "话题",
+  "featured_carousel.next": "下一步",
+  "featured_carousel.previous": "上一步",
   "filter_modal.added.context_mismatch_explanation": "这条过滤规则不适用于你当前访问此嘟文的场景。要在此场景下过滤嘟文，你必须编辑此过滤规则。",
   "filter_modal.added.context_mismatch_title": "场景不匹配！",
   "filter_modal.added.expired_explanation": "此过滤规则类别已过期，你需要修改到期日期才能应用。",
@@ -418,6 +420,7 @@
   "hints.profiles.see_more_posts": "在 {domain} 查看更多嘟文",
   "hints.threads.replies_may_be_missing": "来自其它实例的回复可能没有完全显示。",
   "hints.threads.see_more": "在 {domain} 查看更多回复",
+  "home.column_settings.show_quotes": "显示引用",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
   "home.hide_announcements": "隐藏公告",

app/javascript/styles/mastodon/_functions.scss

@@ -1,4 +1,6 @@
 @use 'sass:color';
+@use 'sass:string';
+@use 'sass:meta';
 
 $darken-multiplier: -1 !default;
 $lighten-multiplier: 1 !default;
@@ -19,3 +21,11 @@ $lighten-multiplier: 1 !default;
     $space: hsl
   );
 }
+
+@function hex-color($color) {
+  @if meta.type-of($color) == 'color' {
+    $color: string.slice(color.ie-hex-str($color), 4);
+  }
+
+  @return '%23' + string.unquote($color);
+}

app/javascript/styles/mastodon/basics.scss

@@ -1,14 +1,6 @@
 @use 'variables' as *;
 @use 'functions' as *;
 
-@function hex-color($color) {
-  @if type-of($color) == 'color' {
-    $color: str-slice(ie-hex-str($color), 4);
-  }
-
-  @return '%23' + unquote($color);
-}
-
 body {
   font-family: $font-sans-serif, sans-serif;
   background: var(--background-color);

app/javascript/styles/mastodon/components.scss

@@ -5819,7 +5819,9 @@ a.status-card {
 
   .picture-in-picture__footer {
     border-radius: 0;
+    border: none;
     background: transparent;
+    backdrop-filter: none;
     padding: 16px;
 
     .icon-button {

app/lib/activitypub/parser/media_attachment_parser.rb

@@ -15,7 +15,7 @@ class ActivityPub::Parser::MediaAttachmentParser
   end
 
   def remote_url
-    url = Addressable::URI.parse(@json['url'])&.normalize&.to_s
+    url = Addressable::URI.parse(url_to_href(@json['url']))&.normalize&.to_s
     url unless unsupported_uri_scheme?(url)
   rescue Addressable::URI::InvalidURIError
     nil
@@ -43,7 +43,7 @@ class ActivityPub::Parser::MediaAttachmentParser
   end
 
   def file_content_type
-    @json['mediaType']
+    @json['mediaType'] || url_to_media_type(@json['url'])
   end
 
   private

app/lib/admin/system_check/media_privacy_check.rb

@@ -13,7 +13,7 @@ class Admin::SystemCheck::MediaPrivacyCheck < Admin::SystemCheck::BaseCheck
   end
 
   def message
-    Admin::SystemCheck::Message.new(@failure_message, @failure_value, @failure_action, true)
+    Admin::SystemCheck::Message.new(@failure_message, @failure_value, @failure_action, critical: true)
   end
 
   private

app/lib/admin/system_check/message.rb

@@ -3,7 +3,7 @@
 class Admin::SystemCheck::Message
   attr_reader :key, :value, :action, :critical
 
-  def initialize(key, value = nil, action = nil, critical = false)
+  def initialize(key, value = nil, action = nil, critical: false)
     @key      = key
     @value    = value
     @action   = action

app/lib/admin/system_check/software_version_check.rb

@@ -13,7 +13,7 @@ class Admin::SystemCheck::SoftwareVersionCheck < Admin::SystemCheck::BaseCheck
 
   def message
     if software_updates.any?(&:urgent?)
-      Admin::SystemCheck::Message.new(:software_version_critical_check, nil, admin_software_updates_path, true)
+      Admin::SystemCheck::Message.new(:software_version_critical_check, nil, admin_software_updates_path, critical: true)
     elsif software_updates.any?(&:patch_type?)
       Admin::SystemCheck::Message.new(:software_version_patch_check, nil, admin_software_updates_path)
     else

app/lib/request.rb

@@ -20,7 +20,7 @@ class PerOperationWithDeadline < HTTP::Timeout::PerOperation
     @read_deadline = options.fetch(:read_deadline, READ_DEADLINE)
   end
 
-  def connect(socket_class, host, port, nodelay = false)
+  def connect(socket_class, host, port, nodelay = false) # rubocop:disable Style/OptionalBooleanParameter
     @socket = socket_class.open(host, port)
     @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
   end

app/lib/webfinger.rb

@@ -65,7 +65,7 @@ class Webfinger
 
   private
 
-  def body_from_webfinger(url = standard_url, use_fallback = true)
+  def body_from_webfinger(url = standard_url, use_fallback: true)
     webfinger_request(url).perform do |res|
       if res.code == 200
         body = res.body_with_limit
@@ -85,7 +85,7 @@ class Webfinger
   def body_from_host_meta
     host_meta_request.perform do |res|
       if res.code == 200
-        body_from_webfinger(url_from_template(res.body_with_limit), false)
+        body_from_webfinger(url_from_template(res.body_with_limit), use_fallback: false)
       else
         raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
       end

app/services/block_domain_service.rb

@@ -3,7 +3,7 @@
 class BlockDomainService < BaseService
   attr_reader :domain_block
 
-  def call(domain_block, update = false)
+  def call(domain_block, update: false)
     @domain_block = domain_block
     @domain_block_event = nil
 

app/services/fetch_resource_service.rb

@@ -22,7 +22,7 @@ class FetchResourceService < BaseService
   def process(url, terminal: false)
     @url = url
 
-    perform_request { |response| process_response(response, terminal) }
+    perform_request { |response| process_response(response, terminal:) }
   end
 
   def perform_request(&block)
@@ -40,7 +40,7 @@ class FetchResourceService < BaseService
     end.perform(&block)
   end
 
-  def process_response(response, terminal = false)
+  def process_response(response, terminal: false)
     @response_code = response.code
     return nil if response.code != 200
 

app/views/user_mailer/welcome.html.haml

@@ -28,7 +28,6 @@
       = render 'application/mailer/checklist', key: 'edit_profile', checked: @has_account_fields, button_text: t('user_mailer.welcome.edit_profile_action'), button_url: web_url('start/profile')
       = render 'application/mailer/checklist', key: 'follow', checked: @has_active_relationships, button_text: t('user_mailer.welcome.follow_action'), button_url: web_url('start/follows')
       = render 'application/mailer/checklist', key: 'post', checked: @has_statuses, button_text: t('user_mailer.welcome.post_action'), button_url: web_url
-      = render 'application/mailer/checklist', key: 'share', checked: false, button_text: t('user_mailer.welcome.share_action'), button_url: web_url('start/share')
       = render 'application/mailer/checklist', key: 'apps', checked: false, show_apps_buttons: true
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr

app/views/user_mailer/welcome.text.erb

@@ -24,11 +24,7 @@
    <%= t('user_mailer.welcome.post_step') %>
    * <%= web_url %>
 
-4. <%= t('user_mailer.welcome.share_title') %>
+4. <%= t('user_mailer.welcome.apps_title') %>
-   <%= t('user_mailer.welcome.share_step') %>
-   * <%= web_url('start/share') %>
-
-5. <%= t('user_mailer.welcome.apps_title') %>
    <%= t('user_mailer.welcome.apps_step') %>
    * iOS: <%= app_store_url_ios %>
    * Android: <%= app_store_url_android %>

app/workers/domain_block_worker.rb

@@ -3,10 +3,10 @@
 class DomainBlockWorker
   include Sidekiq::Worker
 
-  def perform(domain_block_id, update = false)
+  def perform(domain_block_id, update = false) # rubocop:disable Style/OptionalBooleanParameter
     domain_block = DomainBlock.find_by(id: domain_block_id)
     return true if domain_block.nil?
 
-    BlockDomainService.new.call(domain_block, update)
+    BlockDomainService.new.call(domain_block, update:)
   end
 end

app/workers/unfollow_follow_worker.rb

@@ -5,7 +5,7 @@ class UnfollowFollowWorker
 
   sidekiq_options queue: 'pull'
 
-  def perform(follower_account_id, old_target_account_id, new_target_account_id, bypass_locked = false)
+  def perform(follower_account_id, old_target_account_id, new_target_account_id, bypass_locked = false) # rubocop:disable Style/OptionalBooleanParameter
     follower_account   = Account.find(follower_account_id)
     old_target_account = Account.find(old_target_account_id)
     new_target_account = Account.find(new_target_account_id)

config/locales/ar.yml

@@ -1942,7 +1942,6 @@ ar:
       post_action: إنشاء
       post_step: قل مرحبا للعالَم عبر نصّ أو صور أو فيديوهات أو استطلاعات رأي.
       post_title: قم بإنشاء منشورك الأول
-      share_action: شارِك
       share_step: أخبر أصدقائك بكيفية العثور عليك على مَستُدون.
       share_title: شارك مِلَفّ مَستُدون التعريفي الخاص بك
       sign_in_action: تسجيل الدخول

config/locales/be.yml

@@ -1974,7 +1974,6 @@ be:
       post_action: Стварыць
       post_step: Скажыце ўсім прывітанне з дапамогай тэксту, фатаграфій, відэа і апытанняў.
       post_title: Стварыце свой першы допіс
-      share_action: Абагуліць
       share_step: Няхай вашыя сябры ведаюць, як знайсці вас у Mastodon.
       share_title: Абагульце ваш профіль у Mastodon
       sign_in_action: Увайсці

config/locales/bg.yml

@@ -2031,7 +2031,6 @@ bg:
       post_action: Съставяне
       post_step: Поздравете света с текст, снимки, видео или анкети.
       post_title: Направете първата си публикация
-      share_action: Споделяне
       share_step: Позволете на приятелите си да знаят как да ви намират в Mastodon.
       share_title: Споделете профила си в Mastodon
       sign_in_action: Вход

config/locales/br.yml

@@ -607,7 +607,6 @@ br:
       edit_profile_title: Personelaat ho profil
       feature_action: Gouzout hiroc'h
       follow_action: Heuliañ
-      share_action: Rannañ
       sign_in_action: Kevreañ
       subject: Donemat e Mastodon
       title: Degemer mat e bourzh, %{name}!

config/locales/ca.yml

@@ -2043,7 +2043,6 @@ ca:
       post_action: Redacteu
       post_step: Saludeu el món amb text, fotos, vídeos o enquestes.
       post_title: Feu la primera publicació
-      share_action: Compartiu
       share_step: Permeteu als vostres amics de saber com trobar-vos a Mastodon.
       share_title: Compartiu el perfil
       sign_in_action: Inicieu sessió

config/locales/cs.yml

@@ -2156,7 +2156,6 @@ cs:
       post_action: Sepsat
       post_step: Řekněte světu ahoj pomocí textu, fotografií, videí nebo anket.
       post_title: Vytvořte svůj první příspěvek
-      share_action: Sdílet
       share_step: Dejte přátelům vědět, jak vás mohou na Mastodonu najít.
       share_title: Sdílejte svůj Mastodon profil
       sign_in_action: Přihlásit se

config/locales/cy.yml

@@ -2244,7 +2244,6 @@ cy:
       post_action: Creu
       post_step: Dywedwch helo wrth y byd gyda thestun, lluniau, fideos neu arolygon barn.
       post_title: Creu'ch postiad cyntaf
-      share_action: Rhannu
       share_step: Gadewch i'ch ffrindiau wybod sut i ddod o hyd i chi ar Mastodon.
       share_title: Rhannwch eich proffil Mastodon
       sign_in_action: Mewngofnodi

config/locales/da.yml

@@ -2068,7 +2068,6 @@ da:
       post_action: Skriv
       post_step: Sig hej til verden med tekst, fotos, videoer eller afstemninger.
       post_title: Opret det første indlæg
-      share_action: Del
       share_step: Lad vennerne vide, hvor man kan findes på Mastodon.
       share_title: Del Mastodon-profilen
       sign_in_action: Log ind

config/locales/de.yml

@@ -2068,7 +2068,6 @@ de:
       post_action: Verfassen
       post_step: Begrüße die Welt mit Text, Fotos, Videos oder Umfragen.
       post_title: Erstelle deinen ersten Beitrag
-      share_action: Teilen
       share_step: Lass deine Freund*innen wissen, wie sie dich auf Mastodon finden können.
       share_title: Teile dein Mastodon-Profil
       sign_in_action: Anmelden

config/locales/el.yml

@@ -2047,7 +2047,6 @@ el:
       post_action: Σύνθεση
       post_step: Πες γεια στον κόσμο με κείμενο, φωτογραφίες, βίντεο ή δημοσκοπήσεις.
       post_title: Κάνε την πρώτη σου ανάρτηση
-      share_action: Κοινοποίηση
       share_step: Πες στους φίλους σου πώς να σε βρουν στο Mastodon.
       share_title: Μοιραστείτε το προφίλ σας στο Mastodon
       sign_in_action: Σύνδεση

config/locales/en-GB.yml

@@ -2005,7 +2005,6 @@ en-GB:
       post_action: Compose
       post_step: Say hello to the world with text, photos, videos, or polls.
       post_title: Make your first post
-      share_action: Share
       share_step: Let your friends know how to find you on Mastodon.
       share_title: Share your Mastodon profile
       sign_in_action: Sign in

config/locales/en.yml

@@ -2069,7 +2069,6 @@ en:
       post_action: Compose
       post_step: Say hello to the world with text, photos, videos, or polls.
       post_title: Make your first post
-      share_action: Share
       share_step: Let your friends know how to find you on Mastodon.
       share_title: Share your Mastodon profile
       sign_in_action: Sign in

config/locales/eo.yml

@@ -2055,7 +2055,6 @@ eo:
       post_action: Redakti
       post_step: Salutu la mondon per teksto, fotoj, filmetoj aŭ balotenketoj.
       post_title: Faru vian unuan afiŝon
-      share_action: Kundividi
       share_step: Sciigu viajn amikojn kiel trovi vin sur Mastodon.
       share_title: Kunhavigu vian Mastodon-profilon
       sign_in_action: Ensaluti

config/locales/es-AR.yml

@@ -2068,7 +2068,6 @@ es-AR:
       post_action: Redactar
       post_step: Decile "Hola" al mundo con textos, fotos, videos o encuestas.
       post_title: Escribí tu primer mensaje
-      share_action: Compartir
       share_step: Hacé que tus amistades sepan cómo encontrarte en Mastodon.
       share_title: Compartí tu perfil de Mastodon
       sign_in_action: Iniciá sesión

config/locales/es-MX.yml

@@ -2068,7 +2068,6 @@ es-MX:
       post_action: Redacta
       post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
       post_title: Haz tu primera publicación
-      share_action: Comparte
       share_step: Dile a tus amigos cómo encontrarte en Mastodon.
       share_title: Comparte tu perfil de Mastodon
       sign_in_action: Regístrate

config/locales/es.yml

@@ -2068,7 +2068,6 @@ es:
       post_action: Redactar
       post_step: Di hola al mundo con texto, fotos, vídeos o encuestas.
       post_title: Escribe tu primera publicación
-      share_action: Compartir
       share_step: Dile a tus amigos cómo encontrarte en Mastodon.
       share_title: Comparte tu perfil de Mastodon
       sign_in_action: Regístrate

config/locales/et.yml

@@ -1997,7 +1997,6 @@ et:
       post_action: Postita
       post_step: Tervita maailma teksti, fotode, videote või küsitlustega.
       post_title: Tee oma esimene postitus
-      share_action: Jaga
       share_step: Anna sõpradele teada, kuidas Sind Mastodonis leida.
       share_title: Jaga oma Mastodoni profiili
       sign_in_action: Sisene

config/locales/eu.yml

@@ -1814,7 +1814,6 @@ eu:
       post_action: Idatzi
       post_step: Agurtu munduari testu, argazki, bideo zein inkesta batekin.
       post_title: Idatzi zeure lehen argitalpena
-      share_action: Partekatu
       share_step: Esaiezu lagunei nola aurki zaitzaketen Mastodon-en.
       share_title: Partekatu Mastodon profila
       sign_in_action: Hasi saioa

config/locales/fa.yml

@@ -2058,7 +2058,6 @@ fa:
       post_action: ایجاد
       post_step: سلام کردن به جهان با متن، عکس، ویدیو یا نظرسنجی.
       post_title: ساخت نخستین نظرسنجیتان
-      share_action: هم‌رسانی
       share_step: بگذارید دوستانتان بدانند چگونه روی ماستودون بیابندتان.
       share_title: هم‌رسانی نمایهٔ ماستودونتان
       sign_in_action: ورود

config/locales/fi.yml

@@ -2066,7 +2066,6 @@ fi:
       post_action: Kirjoita
       post_step: Tervehdi maailmaa sanoin, kuvin, videoin ja äänestyksin.
       post_title: Tee ensimmäinen julkaisusi
-      share_action: Jaa
       share_step: Kerro ystävillesi, kuinka sinut voi löytää Mastodonista.
       share_title: Jaa Mastodon-profiilisi
       sign_in_action: Kirjaudu sisään

config/locales/fo.yml

@@ -2063,7 +2063,6 @@ fo:
       post_action: Skriva
       post_step: Sig hey við verðina við teksti, myndum, video ella spurnarkanningum.
       post_title: Stovna tín fyrsta post
-      share_action: Deil
       share_step: Lat vinir tínar vita, hvussu tey finna teg á Mastodon.
       share_title: Deil tín Mastodon vanga
       sign_in_action: Rita inn

config/locales/fr-CA.yml

@@ -2032,7 +2032,6 @@ fr-CA:
       post_action: Rédiger
       post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
       post_title: Rédiger votre premier message
-      share_action: Partager
       share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
       share_title: Partager votre profil Mastodon
       sign_in_action: Se connecter

config/locales/fr.yml

@@ -2032,7 +2032,6 @@ fr:
       post_action: Rédiger
       post_step: Dites bonjour au monde avec du texte, des photos, des vidéos ou des sondages.
       post_title: Rédiger votre premier message
-      share_action: Partager
       share_step: Faites savoir à vos ami·e·s comment vous trouver sur Mastodon.
       share_title: Partager votre profil Mastodon
       sign_in_action: Se connecter

config/locales/fy.yml

@@ -2049,7 +2049,6 @@ fy:
       post_action: Opstelle
       post_step: Sis hallo tsjin de wrâld mei tekst, foto’s, fideo’s of peilingen.
       post_title: Jo earste berjocht meitsje
-      share_action: Diele
       share_step: Lit jo freonen witte hoe’t jo te finen binne op Mastodon.
       share_title: Jo Mastodon-profyl diele
       sign_in_action: Oanmelde

config/locales/ga.yml

@@ -2200,7 +2200,6 @@ ga:
       post_action: Cum
       post_step: Abair hello leis an domhan le téacs, grianghraif, físeáin, nó pobalbhreith.
       post_title: Déan do chéad phostáil
-      share_action: Comhroinn
       share_step: Cuir in iúl do do chairde conas tú a aimsiú ar Mastodon.
       share_title: Roinn do phróifíl Mastodon
       sign_in_action: Sínigh isteach

config/locales/gd.yml

@@ -2156,7 +2156,6 @@ gd:
       post_action: Sgrìobh
       post_step: Cuir an aithne air an t-saoghal le teacsa, dealbhan, videothan no cunntasan-bheachd.
       post_title: Cruthaich a’ chiad phost agad
-      share_action: Co-roinn
       share_step: Leig fios dha do charaidean mar a gheibh iad grèim ort air Mastodon.
       share_title: Co-roinn a’ phròifil Mastodon agad
       sign_in_action: Clàraich a-steach

config/locales/gl.yml

@@ -2068,7 +2068,6 @@ gl:
       post_action: Escribir
       post_step: Saúda a todo o mundo con texto, fotos, vídeos ou enquisas.
       post_title: Escribe a túa primeira publicación
-      share_action: Compartir
       share_step: Dille ás amizades como poden atoparte en Mastodon.
       share_title: Comparte o teu perfil en Mastodon
       sign_in_action: Acceder

config/locales/he.yml

@@ -2156,7 +2156,6 @@ he:
       post_action: חיבור הודעה
       post_step: ברכו לשלום את העולם עם מלל, תמונות, חוזי או משאלים.
       post_title: כתבו את הפוסט הראשון שלכםן
-      share_action: שיתוף
       share_step: ספרו לחברים איך למצוא אתכם במסטודון.
       share_title: שיתוף פרופיל מסטודון
       sign_in_action: התחברות

config/locales/hu.yml

@@ -2068,7 +2068,6 @@ hu:
       post_action: Bejegyzés írása
       post_step: Köszöntsd a világot szöveggel, fotókkal, videókkal vagy szavazásokkal.
       post_title: Az első bejegyzés létrehozása
-      share_action: Megosztás
       share_step: Tudasd az ismerőseiddel, hogyan találhatnak meg a Mastodonon.
       share_title: Oszd meg a Mastodon profilodat
       sign_in_action: Bejelentkezés

config/locales/ia.yml

@@ -2032,7 +2032,6 @@ ia:
       post_action: Scriber
       post_step: Saluta le mundo con texto, photos, videos o sondages.
       post_title: Face tu prime message
-      share_action: Compartir
       share_step: Face saper a tu amicos como trovar te sur Mastodon.
       share_title: Compartir tu profilo de Mastodon
       sign_in_action: Initiar session

config/locales/ie.yml

@@ -1797,7 +1797,6 @@ ie:
       post_action: Composir
       post_step: Saluta li munde con textu, images, videos o balotationes.
       post_title: Crear tui unesim posta
-      share_action: Compartir
       share_step: Informar tui amics qualmen trovar te che Mastodon.
       share_title: Partir tui profil Mastodon
       sign_in_action: Intrar

config/locales/is.yml

@@ -2072,7 +2072,6 @@ is:
       post_action: Skrifa
       post_step: Heilsaðu heiminum með texta, ljósmyndum, myndskeiðum eða könnunum.
       post_title: Gerðu fyrstu færsluna þína
-      share_action: Deila
       share_step: Láttu vini þína vita hvernig þeir geta fundið þig á Mastodon.
       share_title: Deildu notandasniðinu þínu
       sign_in_action: Skrá inn

config/locales/it.yml

@@ -2070,7 +2070,6 @@ it:
       post_action: Scrivi
       post_step: Salutate il mondo con testo, foto, video o sondaggi.
       post_title: Scrivi il tuo primo post
-      share_action: Condividi
       share_step: Fai sapere ai tuoi amici come trovarti su Mastodon.
       share_title: Condividi il tuo profilo Mastodon
       sign_in_action: Accedi

config/locales/ja.yml

@@ -2024,7 +2024,6 @@ ja:
       post_action: 作成
       post_step: 試しになにか書いてみましょう。写真、ビデオ、アンケートなど、なんでも大丈夫です.
       post_title: はじめての投稿
-      share_action: 共有
       share_step: Mastodon アカウントをほかの人に紹介しましょう。
       share_title: プロフィールをシェアする
       sign_in_action: ログイン

config/locales/kab.yml

@@ -908,7 +908,6 @@ kab:
       hashtags_view_more: Sken-d ugar n yihacṭagen mucaɛen
       post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
       post_title: Aru tasuffeɣt-inek·inem tamezwarut
-      share_action: Bḍu
       share_step: Init-asen i yimeddukal-nwen amek ara ken-id-afen deg Mastodon.
       share_title: Bḍu amaɣnu-inek·inem n Mastodon
       sign_in_action: Qqen

config/locales/ko.yml

@@ -2025,7 +2025,6 @@ ko:
       post_action: 작성
       post_step: 글, 사진, 영상, 또는 투표로 세상에 인사해보세요.
       post_title: 첫번째 게시물 쓰기
-      share_action: 공유
       share_step: 친구에게 마스토돈에서 나를 찾을 수 있는 방법을 알려주세요.
       share_title: 마스토돈 프로필을 공유하세요
       sign_in_action: 로그인

config/locales/lad.yml

@@ -1888,7 +1888,6 @@ lad:
       post_action: Eskrive
       post_step: Puedes introdusirte al mundo kon teksto, fotos, videos o anketas.
       post_title: Eskrive tu primera publikasyon
-      share_action: Partaja
       share_step: Informa a tus amigos komo toparte en Mastodon.
       share_title: Partaja tu profil de Mastodon
       sign_in_action: Konektate

config/locales/lt.yml

@@ -1300,7 +1300,6 @@ lt:
       post_action: Sukurti
       post_step: Sakyk labas pasauliui tekstu, nuotraukomis, vaizdo įrašais arba apklausomis.
       post_title: Sukūrk savo pirmąjį įrašą
-      share_action: Bendrinti
       share_step: Leisk draugams sužinoti, kaip tave rasti Mastodon.
       share_title: Bendrink savo Mastodon profilį
       sign_in_action: Prisijungti

config/locales/lv.yml

@@ -2100,7 +2100,6 @@ lv:
       post_action: Rakstīt
       post_step: Pasveicini pasauli ar tekstu, fotoattēliem, video vai aptaujām!
       post_title: Izveido savu pirmo ierakstu
-      share_action: Kopīgot
       share_step: Dari saviem draugiem zināmu, kā Tevi atrast Mastodon!
       share_title: Kopīgo savu Mastodon profilu
       sign_in_action: Pieteikties

config/locales/nan.yml

@@ -151,11 +151,15 @@ nan:
       subscribe: 訂
       suspend: 中止權限
       suspended: 權限中止ah
+      suspension_irreversible: Tsit ê口座ê資料已經thâi掉，bē當回復。Lí ē當取消停止tsit ê口座ê權限，予伊ē當使用，但是bē當回復任何khah早ê資料。
+      title: 口座
+      unblock_email: 取消封鎖電子phue ê地址
       unblocked_email_msg: 成功取消封鎖 %{username} ê電子phue地址
       unconfirmed_email: 無驗證ê電子phue
       undo_sensitized: 取消強制標做敏感ê
       undo_silenced: 取消限制
       undo_suspension: 取消停止權限
+      unsilenced_msg: 成功kā %{username} ê口座取消限制
       unsubscribe: 取消訂
       unsuspended_msg: 成功kā %{username} ê口座取消停止權限
       username: 用者ê名
@@ -179,6 +183,11 @@ nan:
         create_domain_block: 加添封鎖ê域名
         create_email_domain_block: 加添電子phue域名ê封鎖
         create_ip_block: 加添IP規則
+        create_relay: 建立中繼
+        create_unavailable_domain: 建立bē當用ê域名
+        create_user_role: 建立角色
+        demote_user: Kā用者降級
+        destroy_announcement: Thâi掉公告
         remove_avatar_user: Thâi掉標頭
       actions:
         remove_avatar_user_html: "%{name} thâi掉 %{target} ê標頭"

config/locales/nl.yml

@@ -2068,7 +2068,6 @@ nl:
       post_action: Opstellen
       post_step: Zeg hallo tegen de wereld met tekst, foto's, video's of peilingen.
       post_title: Je eerste bericht schrijven
-      share_action: Delen
       share_step: Laat je vrienden weten waar je op Mastodon bent te vinden.
       share_title: Je Mastodonprofiel delen
       sign_in_action: Inloggen

config/locales/nn.yml

@@ -2068,7 +2068,6 @@ nn:
       post_action: Skriv
       post_step: Sei hei til verda med tekst, bilete, filmar eller meiningsmålingar.
       post_title: Skriv ditt fyrste innlegg
-      share_action: Del
       share_step: Fortel venene dine korleis dei finn deg på Mastodon.
       share_title: Del Mastodon-profilen din
       sign_in_action: Logg inn

config/locales/no.yml

@@ -1788,7 +1788,6 @@
       post_action: Sett sammen
       post_step: Si hallo til verdenen med tekst, bilder, videoer, eller meningsmålinger.
       post_title: Lag ditt første innlegg
-      share_action: Del
       share_step: La vennene dine vite hvordan finne deg på Mastodon.
       share_title: Del Mastadon-profilen din
       sign_in_action: Logg inn

config/locales/pl.yml

@@ -2093,7 +2093,6 @@ pl:
       post_action: Utwórz wpis
       post_step: Przywitaj się ze światem.
       post_title: Utwórz swój pierwszy post
-      share_action: Udostępnij
       share_step: Poinformuj swoich przyjaciół jak znaleźć cię na Mastodonie.
       share_title: Udostępnij swój profil
       sign_in_action: Zaloguj się

config/locales/pt-BR.yml

@@ -2068,7 +2068,6 @@ pt-BR:
       post_action: Escrever
       post_step: Diga olá para o mundo com texto, fotos, vídeos ou enquetes.
       post_title: Crie sua primeira publicação
-      share_action: Compartilhar
       share_step: Deixe seus amigos saberem como te encontrar no Mastodon.
       share_title: Compartilhe seu perfil do Mastodon
       sign_in_action: Entrar

config/locales/pt-PT.yml

@@ -2068,7 +2068,6 @@ pt-PT:
       post_action: Compor
       post_step: Diz olá para o mundo com texto, fotos, vídeos ou sondagens.
       post_title: Faz a tua primeira publicação
-      share_action: Partilhar
       share_step: Diz aos teus amigos como te podem encontrar no Mastodon.
       share_title: Partilha o teu perfil de Mastodon
       sign_in_action: Iniciar sessão

config/locales/ru.yml

@@ -2112,7 +2112,6 @@ ru:
       post_action: Составить
       post_step: Поприветствуйте мир с помощью текста, фотографий, видео или опросов.
       post_title: Сделайте свой первый пост
-      share_action: Поделиться
       share_step: Пусть ваши друзья знают, как найти вас на Mastodon.
       share_title: Поделитесь информацией о компании Mastodon
       sign_in_action: Зарегистрироваться

config/locales/sc.yml

@@ -1242,7 +1242,6 @@ sc:
       follow_title: Personaliza s'ischermu printzipale
       post_action: Iscrie
       post_title: Pùblica pro sa primu borta
-      share_action: Cumpartzi
       share_title: Cumpartzi su profilu tuo de Mastodon
       sign_in_action: Intra
       subject: Ti donamus su benebènnidu a Mastodon

config/locales/simple_form.et.yml

@@ -3,6 +3,7 @@ et:
   simple_form:
     hints:
       account:
+        attribution_domains: Üks rea kohta. See kaitseb pahatahtlike viidete eest.
         discoverable: Su profiili ja avalikke postitusi võidakse Mastodoni erinevates piirkondades esile tõsta või soovitada ning su profiili soovitada teistele kasutajatele.
         display_name: Su täisnimi või naljanimi.
         fields: Su koduleht, sugu, vanus. Mistahes, mida soovid.

config/locales/sk.yml

@@ -1373,7 +1373,6 @@ sk:
       follow_title: Prispôsob svoj domáci kanál
       follows_title: Koho nasledovať
       post_title: Vytvor svoj prvý príspevok
-      share_action: Zdieľaj
       sign_in_action: Prihlás sa
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!

config/locales/sl.yml

@@ -2104,7 +2104,6 @@ sl:
       post_action: Sestavi
       post_step: Pozdravite cel svet z besedilom, fotografijami, videoposnetki ali anketami.
       post_title: Ustvarite svojo prvo objavo
-      share_action: Delite
       share_step: Naj prijatelji izvejo, kako vas najdejo na Mastodonu.
       share_title: Delite svoj profil Mastodon z drugimi
       sign_in_action: Prijava

config/locales/sq.yml

@@ -2058,7 +2058,6 @@ sq:
       post_action: Hartoni
       post_step: Përshëndetni botën me tekst, foto, video, ose pyetësorë.
       post_title: Shkruani postimin tuaj të parë
-      share_action: Ndajeni me të tjerë
       share_step: Bëjuni të ditur shokëve si t’ju gjejnë në Mastodon.
       share_title: Ndani me të tjerët profilin tuaj Mastodon
       sign_in_action: Hyni

config/locales/sr-Latn.yml

@@ -1831,7 +1831,6 @@ sr-Latn:
       post_action: Napišite
       post_step: Pozdravite svet tekstom, fotografijama, video zapisima ili anketama.
       post_title: Napišite svoju prvu objavu
-      share_action: Podelite
       share_step: Neka vaši prijatelji znaju kako da vas pronađu na Mastodon-u.
       share_title: Podelite svoj Mastodon profil
       sign_in_action: Prijavite se

config/locales/sr.yml

@@ -1861,7 +1861,6 @@ sr:
       post_action: Напишите
       post_step: Поздравите свет текстом, фотографијама, видео записима или анкетама.
       post_title: Напишите своју прву објаву
-      share_action: Поделите
       share_step: Нека ваши пријатељи знају како да вас пронађу на Mastodon-у.
       share_title: Поделите свој Mastodon профил
       sign_in_action: Пријавите се

config/locales/sv.yml

@@ -2066,7 +2066,6 @@ sv:
       post_action: Skriv
       post_step: Säg hej till världen med text, foton, videor eller omröstningar.
       post_title: Skapa ditt första inlägg
-      share_action: Dela
       share_step: Låt dina vänner veta hur de hittar dig på Mastodon.
       share_title: Dela din Mastodon-profil
       sign_in_action: Logga in

config/locales/th.yml

@@ -1949,7 +1949,6 @@ th:
       post_action: เขียน
       post_step: กล่าวสวัสดีชาวโลกด้วยข้อความ, รูปภาพ, วิดีโอ หรือการสำรวจความคิดเห็น
       post_title: สร้างโพสต์แรกของคุณ
-      share_action: แชร์
       share_step: แจ้งให้เพื่อน ๆ ของคุณทราบวิธีค้นหาคุณใน Mastodon
       share_title: แชร์โปรไฟล์ Mastodon ของคุณ
       sign_in_action: ลงชื่อเข้า

config/locales/tr.yml

@@ -2068,7 +2068,6 @@ tr:
       post_action: Oluştur
       post_step: Dünyaya metin, fotoğraf, video ve anketlerle merhaba deyin.
       post_title: İlk gönderinizi oluşturun
-      share_action: Paylaş
       share_step: Arkadaşlarınıza Mastodon'da size nasıl ulaşabileceklerini söyleyin.
       share_title: Mastodon profilinizi paylaşın
       sign_in_action: Oturum aç

config/locales/uk.yml

@@ -2038,7 +2038,6 @@ uk:
       post_action: Створити
       post_step: Привітайтеся зі світом, з текстом, світлинами, відео та опитуваннями.
       post_title: Напишіть свій перший допис
-      share_action: Поділитися
       share_step: Розкажіть друзям, як знайти вас на Mastodon.
       share_title: Поділіться своїм профілем Mastodon
       sign_in_action: Увійти

config/locales/vi.yml

@@ -2024,7 +2024,6 @@ vi:
       post_action: Soạn tút
       post_step: Chào cộng đồng bằng lời nói, ảnh hoặc video.
       post_title: Đăng tút đầu tiên
-      share_action: Chia sẻ
       share_step: Hãy để bạn bè của bạn biết cách tìm thấy bạn trên Mastodon.
       share_title: Chia sẻ hồ sơ Mastodon của bạn
       sign_in_action: Đăng nhập

config/locales/zh-CN.yml

@@ -2019,7 +2019,6 @@ zh-CN:
       post_action: 撰写
       post_step: 向世界打个招呼吧。
       post_title: 发布你的第一条嘟文
-      share_action: 分享
       share_step: 让你的朋友知道如何在 Mastodon 找到你。
       share_title: 分享你的 Mastodon 个人资料
       sign_in_action: 登录