Merge branch 'main' into glitch-soc/merge-upstream

2022-04-25 17:09:32 +02:00 · 2022-04-25 17:09:32 +02:00 · 0069bebafe
parent 7b26b12378 1ae83e0796
commit 0069bebafe
61 changed files with 538 additions and 320 deletions
--- a/6
+++ b/6
@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1'

 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.10.3', require: false
+gem 'bootsnap', '~> 1.11.1', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.2'
@ -79,7 +79,7 @@ gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.6'
 gem 'sidekiq', '~> 6.4'
-gem 'sidekiq-scheduler', '~> 3.1'
+gem 'sidekiq-scheduler', '~> 3.2'
 gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.3'
@ -134,7 +134,7 @@ group :development do
  gem 'letter_opener', '~> 1.8'
  gem 'letter_opener_web', '~> 2.0'
  gem 'memory_profiler'
-  gem 'rubocop', '~> 1.26', require: false
+  gem 'rubocop', '~> 1.27', require: false
  gem 'rubocop-rails', '~> 2.14', require: false
  gem 'brakeman', '~> 5.2', require: false
  gem 'bundler-audit', '~> 0.9', require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -114,9 +114,9 @@ GEM
      debug_inspector (>= 0.0.1)
    blurhash (0.1.6)
      ffi (~> 1.14)
-    bootsnap (1.10.3)
+    bootsnap (1.11.1)
      msgpack (~> 1.2)
-    brakeman (5.2.1)
+    brakeman (5.2.2)
    browser (4.2.0)
    brpoplpush-redis_script (0.1.2)
      concurrent-ruby (~> 1.0, >= 1.0.5)
@ -216,7 +216,7 @@ GEM
      multi_json
    encryptor (3.0.0)
    erubi (1.10.0)
-    et-orbi (1.2.6)
+    et-orbi (1.2.7)
      tzinfo
    excon (0.76.0)
    fabrication (2.28.0)
@ -264,8 +264,8 @@ GEM
      fog-json (>= 1.0)
      ipaddress (>= 0.8)
    formatador (0.2.5)
-    fugit (1.5.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
      raabro (~> 1.4)
    fuubar (2.5.1)
      rspec-core (~> 3.0)
@ -399,7 +399,7 @@ GEM
    mini_mime (1.1.2)
    mini_portile2 (2.8.0)
    minitest (5.15.0)
-    msgpack (1.4.4)
+    msgpack (1.5.1)
    multi_json (1.15.0)
    multipart-post (2.1.1)
    net-ldap (0.17.0)
@ -478,7 +478,7 @@ GEM
    raabro (1.4.0)
    racc (1.6.0)
    rack (2.2.3)
-    rack-attack (6.6.0)
+    rack-attack (6.6.1)
      rack (>= 1.0, < 3)
    rack-cors (1.1.1)
      rack (>= 2.0.0)
@ -537,7 +537,7 @@ GEM
    redis (4.5.1)
    redis-namespace (1.8.2)
      redis (>= 3.0.4)
-    regexp_parser (2.2.1)
+    regexp_parser (2.3.0)
    request_store (1.5.1)
      rack (>= 1.4)
    responders (3.0.1)
@ -572,7 +572,7 @@ GEM
    rspec-support (3.11.0)
    rspec_junit_formatter (0.5.1)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.26.1)
+    rubocop (1.27.0)
      parallel (~> 1.10)
      parser (>= 3.1.0.0)
      rainbow (>= 2.2.2, < 4.0)
@ -581,7 +581,7 @@ GEM
      rubocop-ast (>= 1.16.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.17.0)
      parser (>= 3.1.1.0)
    rubocop-rails (2.14.2)
      activesupport (>= 4.2.0)
@ -610,14 +610,14 @@ GEM
      redis (>= 4.2.0)
    sidekiq-bulk (0.2.0)
      sidekiq
-    sidekiq-scheduler (3.1.1)
+    sidekiq-scheduler (3.2.0)
      e2mmap
      redis (>= 3, < 5)
      rufus-scheduler (~> 3.2)
      sidekiq (>= 3)
      thwait
      tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.16)
+    sidekiq-unique-jobs (7.1.19)
      brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
      concurrent-ruby (~> 1.0, >= 1.0.5)
      sidekiq (>= 5.0, < 8.0)
@ -741,7 +741,7 @@ DEPENDENCIES
  better_errors (~> 2.9)
  binding_of_caller (~> 1.0)
  blurhash (~> 0.1)
-  bootsnap (~> 1.10.3)
+  bootsnap (~> 1.11.1)
  brakeman (~> 5.2)
  browser
  bullet (~> 7.0)
@ -830,14 +830,14 @@ DEPENDENCIES
  rspec-rails (~> 5.1)
  rspec-sidekiq (~> 3.1)
  rspec_junit_formatter (~> 0.5)
-  rubocop (~> 1.26)
+  rubocop (~> 1.27)
  rubocop-rails (~> 2.14)
  ruby-progressbar (~> 1.11)
  sanitize (~> 6.0)
  scenic (~> 1.6)
  sidekiq (~> 6.4)
  sidekiq-bulk (~> 0.2.0)
-  sidekiq-scheduler (~> 3.1)
+  sidekiq-scheduler (~> 3.2)
  sidekiq-unique-jobs (~> 7.1)
  simple-navigation (~> 4.3)
  simple_form (~> 5.1)
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@ -55,6 +55,11 @@ class StatusesIndex < Chewy::Index
    data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
  end

+  crutch :votes do |collection|
+    data = ::PollVote.joins(:poll).where(poll: { status_id: collection.map(&:id) }).where(account: Account.local).pluck(:status_id, :account_id)
+    data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
+  end
+
  root date_detection: false do
    field :id, type: 'long'
    field :account_id, type: 'long'
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -309,7 +309,7 @@
  "navigation_bar.preferences": "التفضيلات",
  "navigation_bar.public_timeline": "الخيط العام الموحد",
  "navigation_bar.security": "الأمان",
-  "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up": "أنشأ {name} حسابًا",
  "notification.favourite": "أُعجِب {name} بمنشورك",
  "notification.follow": "{name} يتابعك",
  "notification.follow_request": "لقد طلب {name} متابعتك",
@ -318,7 +318,7 @@
  "notification.poll": "لقد انتهى استطلاع رأي شاركتَ فيه",
  "notification.reblog": "قام {name} بمشاركة منشورك",
  "notification.status": "{name} نشر للتو",
-  "notification.update": "{name} edited a post",
+  "notification.update": "عدّلَ {name} منشورًا",
  "notifications.clear": "امسح الإخطارات",
  "notifications.clear_confirmation": "أمتأكد من أنك تود مسح جل الإخطارات الخاصة بك و المتلقاة إلى حد الآن ؟",
  "notifications.column_settings.admin.sign_up": "التسجيلات الجديدة:",
@ -408,8 +408,8 @@
  "report.placeholder": "تعليقات إضافية",
  "report.reasons.dislike": "لايعجبني",
  "report.reasons.dislike_description": "ألا ترغب برؤيته",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.other": "شيء آخر",
+  "report.reasons.other_description": "لا تندرج هذه المشكلة ضمن فئات أخرى",
  "report.reasons.spam": "إنها رسالة مزعجة",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "ينتهك قواعد الخادم",
@ -456,8 +456,8 @@
  "status.embed": "إدماج",
  "status.favourite": "أضف إلى المفضلة",
  "status.filtered": "مُصفّى",
-  "status.history.created": "{name} created {date}",
-  "status.history.edited": "{name} edited {date}",
+  "status.history.created": "أنشأه {name} {date}",
+  "status.history.edited": "عدله {name} {date}",
  "status.load_more": "حمّل المزيد",
  "status.media_hidden": "الصورة مستترة",
  "status.mention": "أذكُر @{name}",
@ -515,7 +515,7 @@
  "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
  "upload_form.audio_description": "وصف للأشخاص ذي قِصر السمع",
  "upload_form.description": "وصف للمعاقين بصريا",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "لم يُضف وصف",
  "upload_form.edit": "تعديل",
  "upload_form.thumbnail": "غيّر الصورة المصغرة",
  "upload_form.undo": "حذف",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -404,7 +404,7 @@
  "report.forward_hint": "La cuenta ye d'otru sirvidor. ¿Quies unviar ellí tamién una copia anónima del informe?",
  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.next": "Siguiente",
  "report.placeholder": "Comentarios adicionales",
  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
@ -412,7 +412,7 @@
  "report.reasons.other_description": "The issue does not fit into other categories",
  "report.reasons.spam": "It's spam",
  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
-  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation": "Incumple les regles del sirvidor",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
  "report.rules.subtitle": "Select all that apply",
  "report.rules.title": "Which rules are being violated?",
@ -420,7 +420,7 @@
  "report.statuses.title": "Are there any posts that back up this report?",
  "report.submit": "Unviar",
  "report.target": "Report {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action": "Equí tan les opciones pa controlar qué ver en Mastodon:",
  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
  "report.thanks.title": "Don't want to see this?",
  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -8,10 +8,10 @@
  "account.blocked": "Bloquejat",
  "account.browse_more_on_origin_server": "Navega més en el perfil original",
  "account.cancel_follow_request": "Anul·la la sol·licitud de seguiment",
-  "account.direct": "Missatge directe @{name}",
+  "account.direct": "Enviar missatge directe a @{name}",
  "account.disable_notifications": "Deixa de notificar-me les publicacions de @{name}",
  "account.domain_blocked": "Domini bloquejat",
-  "account.edit_profile": "Edita el perfil",
+  "account.edit_profile": "Editar el perfil",
  "account.enable_notifications": "Notifica’m les publicacions de @{name}",
  "account.endorse": "Recomana en el teu perfil",
  "account.follow": "Segueix",
@ -38,7 +38,7 @@
  "account.requested": "Esperant aprovació. Clic per a cancel·lar la petició de seguiment",
  "account.share": "Comparteix el perfil de @{name}",
  "account.show_reblogs": "Mostra els impulsos de @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Tut} other {{counter} Tuts}}",
+  "account.statuses_counter": "{count, plural, one {{counter} Publicació} other {{counter} Publicacions}}",
  "account.unblock": "Desbloqueja @{name}",
  "account.unblock_domain": "Desbloqueja el domini {domain}",
  "account.unblock_short": "Desbloqueja",
@ -144,7 +144,7 @@
  "directory.local": "Només de {domain}",
  "directory.new_arrivals": "Arribades noves",
  "directory.recently_active": "Recentment actius",
-  "embed.instructions": "Incrusta aquest tut al lloc web copiant el codi a continuació.",
+  "embed.instructions": "Incrusta aquesta publicació a la teva pàgina web copiant el codi següent.",
  "embed.preview": "Aquí està quin aspecte tindrà:",
  "emoji_button.activity": "Activitat",
  "emoji_button.custom": "Personalitzat",
@ -204,7 +204,7 @@
  "getting_started.directory": "Directori de perfils",
  "getting_started.documentation": "Documentació",
  "getting_started.heading": "Primeres passes",
-  "getting_started.invite": "Convida gent",
+  "getting_started.invite": "Convidar gent",
  "getting_started.open_source_notice": "Mastodon és un programari de codi obert. Pots contribuir-hi o informar de problemes a GitHub a {github}.",
  "getting_started.security": "Configuració del compte",
  "getting_started.terms": "Termes del servei",
@ -233,7 +233,7 @@
  "keyboard_shortcuts.description": "Descripció",
  "keyboard_shortcuts.direct": "Obre la columna de missatges directes",
  "keyboard_shortcuts.down": "Baixar en la llista",
-  "keyboard_shortcuts.enter": "Obre publicació",
+  "keyboard_shortcuts.enter": "Obrir publicació",
  "keyboard_shortcuts.favourite": "Afavorir publicació",
  "keyboard_shortcuts.favourites": "Obre la llista de favorits",
  "keyboard_shortcuts.federated": "Obre la línia de temps federada",
@ -247,7 +247,7 @@
  "keyboard_shortcuts.my_profile": "Obre el teu perfil",
  "keyboard_shortcuts.notifications": "Obre la columna de notificacions",
  "keyboard_shortcuts.open_media": "Obre mèdia",
-  "keyboard_shortcuts.pinned": "Obre la llista de publicacions fixades",
+  "keyboard_shortcuts.pinned": "Obrir la llista de publicacions fixades",
  "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
  "keyboard_shortcuts.reply": "Respon publicació",
  "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
@ -256,7 +256,7 @@
  "keyboard_shortcuts.start": "Obre la columna \"Primeres passes\"",
  "keyboard_shortcuts.toggle_hidden": "Mostra/oculta el text marcat com a sensible",
  "keyboard_shortcuts.toggle_sensitivity": "Mostra/amaga contingut multimèdia",
-  "keyboard_shortcuts.toot": "per a començar un tut nou de trinca",
+  "keyboard_shortcuts.toot": "Iniciar una nova publicació",
  "keyboard_shortcuts.unfocus": "Descentra l'àrea de composició de text/cerca",
  "keyboard_shortcuts.up": "Moure amunt en la llista",
  "lightbox.close": "Tanca",
@ -289,7 +289,7 @@
  "navigation_bar.blocks": "Usuaris bloquejats",
  "navigation_bar.bookmarks": "Marcadors",
  "navigation_bar.community_timeline": "Línia de temps Local",
-  "navigation_bar.compose": "Redacta una nova publicació",
+  "navigation_bar.compose": "Redactar una nova publicació",
  "navigation_bar.direct": "Missatges directes",
  "navigation_bar.discover": "Descobrir",
  "navigation_bar.domain_blocks": "Dominis bloquejats",
@ -441,7 +441,7 @@
  "search_results.statuses_fts_disabled": "La cerca de publicacions pel seu contingut no està habilitada en aquest servidor Mastodon.",
  "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
  "status.admin_account": "Obre l'interfície de moderació per a @{name}",
-  "status.admin_status": "Obre aquesta publicació a la interfície de moderació",
+  "status.admin_status": "Obrir aquesta publicació a la interfície de moderació",
  "status.block": "Bloqueja @{name}",
  "status.bookmark": "Marcador",
  "status.cancel_reblog_private": "Desfer l'impuls",
@ -502,7 +502,7 @@
  "timeline_hint.remote_resource_not_displayed": "{resource} dels altres servidors no son mostrats.",
  "timeline_hint.resources.followers": "Seguidors",
  "timeline_hint.resources.follows": "Seguiments",
-  "timeline_hint.resources.statuses": "Tuts més antics",
+  "timeline_hint.resources.statuses": "Publicacions més antigues",
  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} parlant-hi",
  "trends.trending_now": "Ara en tendència",
  "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -13,22 +13,22 @@
  "account.domain_blocked": "Domain versteckt",
  "account.edit_profile": "Profil bearbeiten",
  "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
-  "account.endorse": "Auf Profil hervorheben",
+  "account.endorse": "Im Profil anzeigen",
  "account.follow": "Folgen",
  "account.followers": "Follower",
-  "account.followers.empty": "Diesem Profil folgt noch niemand.",
+  "account.followers.empty": "Diesem Profil folgt bislang niemand.",
  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
  "account.following": "Folgt",
-  "account.following_counter": "{count, plural, one {{counter} Folgender} other {{counter} Folgende}}",
+  "account.following_counter": "{count, plural, one {{counter} Folgt} other {{counter} Folgt}}",
  "account.follows.empty": "Dieses Profil folgt noch niemandem.",
  "account.follows_you": "Folgt dir",
  "account.hide_reblogs": "Geteilte Beiträge von @{name} verbergen",
  "account.joined": "Beigetreten am {date}",
  "account.link_verified_on": "Besitz dieses Links wurde geprüft am {date}",
-  "account.locked_info": "Der Privatsphärenstatus dieses Accounts wurde auf gesperrt gesetzt. Die Person bestimmt manuell wer ihm/ihr folgen darf.",
+  "account.locked_info": "Der Privatsphärenstatus dieses Accounts wurde auf „gesperrt“ gesetzt. Die Person bestimmt manuell, wer ihm/ihr folgen darf.",
  "account.media": "Medien",
  "account.mention": "@{name} erwähnen",
-  "account.moved_to": "{name} ist umgezogen auf:",
+  "account.moved_to": "{name} ist umgezogen nach:",
  "account.mute": "@{name} stummschalten",
  "account.mute_notifications": "Benachrichtigungen von @{name} stummschalten",
  "account.muted": "Stummgeschaltet",
@ -39,26 +39,26 @@
  "account.share": "Profil von @{name} teilen",
  "account.show_reblogs": "Von @{name} geteilte Beiträge anzeigen",
  "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "@{name} entblocken",
+  "account.unblock": "Blockierung von @{name} aufheben",
  "account.unblock_domain": "{domain} wieder anzeigen",
  "account.unblock_short": "Blockierung aufheben",
-  "account.unendorse": "Nicht auf Profil hervorheben",
+  "account.unendorse": "Nicht mehr im Profil anzeigen",
  "account.unfollow": "Entfolgen",
-  "account.unmute": "@{name} nicht mehr stummschalten",
+  "account.unmute": "Stummschaltung von @{name} aufheben",
  "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
-  "account.unmute_short": "Nicht mehr stummschalten",
+  "account.unmute_short": "Stummschaltung aufheben",
  "account_note.placeholder": "Notiz durch Klicken hinzufügen",
  "admin.dashboard.daily_retention": "Benutzerverbleibrate nach Tag nach Anmeldung",
  "admin.dashboard.monthly_retention": "Benutzerverbleibrate nach Monat nach Anmeldung",
  "admin.dashboard.retention.average": "Durchschnitt",
-  "admin.dashboard.retention.cohort": "Anmeldemonat",
+  "admin.dashboard.retention.cohort": "Monat der Anmeldung",
  "admin.dashboard.retention.cohort_size": "Neue Benutzer",
-  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
  "alert.rate_limited.title": "Anfragelimit überschritten",
  "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
  "alert.unexpected.title": "Hoppla!",
  "announcement.announcement": "Ankündigung",
-  "attachments_list.unprocessed": "(unverarbeitet)",
+  "attachments_list.unprocessed": "(ausstehend)",
  "autosuggest_hashtag.per_week": "{count} pro Woche",
  "boost_modal.combo": "Drücke {combo}, um dieses Fenster zu überspringen",
  "bundle_column_error.body": "Etwas ist beim Laden schiefgelaufen.",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -1,54 +1,54 @@
 {
-  "account.account_note_header": "Your note for @{name}",
-  "account.add_or_remove_from_list": "Add or Remove from lists",
-  "account.badges.bot": "Bot",
-  "account.badges.group": "Group",
-  "account.block": "Block @{name}",
-  "account.block_domain": "Hide everything from {domain}",
-  "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Cancel follow request",
-  "account.direct": "Direct message @{name}",
-  "account.disable_notifications": "Stop notifying me when @{name} posts",
-  "account.domain_blocked": "Domain hidden",
-  "account.edit_profile": "Edit profile",
-  "account.enable_notifications": "Notify me when @{name} posts",
-  "account.endorse": "Feature on profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.followers.empty": "No one follows this user yet.",
-  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
-  "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.hide_reblogs": "Hide boosts from @{name}",
-  "account.joined": "Joined {date}",
+  "account.account_note_header": "Nóta",
+  "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
+  "account.badges.bot": "Bota",
+  "account.badges.group": "Grúpa",
+  "account.block": "Bac @{name}",
+  "account.block_domain": "Bac ainm fearainn {domain}",
+  "account.blocked": "Bactha",
+  "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
+  "account.cancel_follow_request": "Cealaigh iarratas leanúnaí",
+  "account.direct": "Cuir teachtaireacht dhíreach ar @{name}",
+  "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
+  "account.domain_blocked": "Ainm fearainn bactha",
+  "account.edit_profile": "Cuir an phróifíl in eagar",
+  "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
+  "account.endorse": "Cuir ar an phróifíl mar ghné",
+  "account.follow": "Lean",
+  "account.followers": "Leantóirí",
+  "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
+  "account.followers_counter": "{count, plural, one {Leantóir amháin} other {{counter} Leantóir}}",
+  "account.following": "Ag leanúint",
+  "account.following_counter": "{count, plural, one {Ag leanúint cúntas amháin} other {Ag leanúint {counter} cúntas}}",
+  "account.follows.empty": "Ní leanann an t-úsáideoir seo duine ar bith fós.",
+  "account.follows_you": "Do do leanúint",
+  "account.hide_reblogs": "Folaigh athphostálacha ó @{name}",
+  "account.joined": "Ina bhall ó {date}",
  "account.link_verified_on": "Ownership of this link was checked on {date}",
-  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
-  "account.media": "Media",
-  "account.mention": "Mention @{name}",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Mute @{name}",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unhide {domain}",
-  "account.unblock_short": "Unblock",
-  "account.unendorse": "Don't feature on profile",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account.unmute_short": "Unmute",
-  "account_note.placeholder": "No comment provided",
-  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "account.locked_info": "Tá an socrú príobháideachais don cuntas seo curtha go 'faoi ghlas'. Déanann an t-úinéir léirmheas ar cén daoine atá ceadaithe an cuntas leanúint.",
+  "account.media": "Ábhair",
+  "account.mention": "Luaigh @{name}",
+  "account.moved_to": "Tá {name} bogtha go:",
+  "account.mute": "Ciúnaigh @{name}",
+  "account.mute_notifications": "Ciúnaigh fógraí ó @{name}",
+  "account.muted": "Ciúnaithe",
+  "account.posts": "Postálacha",
+  "account.posts_with_replies": "Postálacha agus freagraí",
+  "account.report": "Gearán @{name}",
+  "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
+  "account.share": "Roinn próifíl @{name}",
+  "account.show_reblogs": "Taispeáin athphostálacha ó @{name}",
+  "account.statuses_counter": "{count, plural, one {Postáil amháin} other {{counter} Postáil}}",
+  "account.unblock": "Bain bac de @{name}",
+  "account.unblock_domain": "Bain bac den ainm fearainn {domain}",
+  "account.unblock_short": "Bain bac de",
+  "account.unendorse": "Ná chuir ar an phróifíl mar ghné",
+  "account.unfollow": "Ná lean a thuilleadh",
+  "account.unmute": "Díchiúnaigh @{name}",
+  "account.unmute_notifications": "Díchiúnaigh fógraí ó @{name}",
+  "account.unmute_short": "Díchiúnaigh",
+  "account_note.placeholder": "Cliceáil chun nóta a chuir leis",
+  "admin.dashboard.daily_retention": "Ráta coinneála an úsáideora de réir an lae tar éis clárú",
  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
  "admin.dashboard.retention.average": "Average",
  "admin.dashboard.retention.cohort": "Sign-up month",
@ -72,7 +72,7 @@
  "column.community": "Local timeline",
  "column.direct": "Direct messages",
  "column.directory": "Browse profiles",
-  "column.domain_blocks": "Hidden domains",
+  "column.domain_blocks": "Blocked domains",
  "column.favourites": "Favourites",
  "column.follow_requests": "Follow requests",
  "column.home": "Home",
@ -121,8 +121,8 @@
  "confirmations.delete.message": "Are you sure you want to delete this status?",
  "confirmations.delete_list.confirm": "Delete",
  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "Faigh réidh de",
+  "confirmations.discard_edit_media.message": "Tá athruithe neamhshlánaithe don tuarascáil gné nó réamhamharc agat, faigh réidh dóibh ar aon nós?",
  "confirmations.domain_block.confirm": "Hide entire domain",
  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
  "confirmations.logout.confirm": "Log out",
@ -152,7 +152,7 @@
  "emoji_button.food": "Food & Drink",
  "emoji_button.label": "Insert emoji",
  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No emojos!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "No matching emojis found",
  "emoji_button.objects": "Objects",
  "emoji_button.people": "People",
  "emoji_button.recent": "Frequently used",
@ -167,19 +167,19 @@
  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
-  "empty_column.domain_blocks": "There are no hidden domains yet.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
  "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
  "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
  "empty_column.hashtag": "There is nothing in this hashtag yet.",
-  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
  "empty_column.home.suggestions": "See some suggestions",
  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
  "empty_column.mutes": "You haven't muted any users yet.",
-  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
@ -267,8 +267,8 @@
  "lists.account.add": "Add to list",
  "lists.account.remove": "Remove from list",
  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
+  "lists.edit": "Cuir an liosta in eagar",
+  "lists.edit.submit": "Athraigh teideal",
  "lists.new.create": "Add list",
  "lists.new.title_placeholder": "New list title",
  "lists.replies_policy.followed": "Any followed user",
@ -279,7 +279,7 @@
  "lists.subheading": "Your lists",
  "load_pending": "{count, plural, one {# new item} other {# new items}}",
  "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Hide media",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
  "missing_indicator.label": "Not found",
  "missing_indicator.sublabel": "This resource could not be found",
  "mute_modal.duration": "Duration",
@ -293,12 +293,12 @@
  "navigation_bar.direct": "Direct messages",
  "navigation_bar.discover": "Discover",
  "navigation_bar.domain_blocks": "Hidden domains",
-  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
  "navigation_bar.explore": "Explore",
  "navigation_bar.favourites": "Favourites",
  "navigation_bar.filters": "Muted words",
  "navigation_bar.follow_requests": "Follow requests",
-  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.follows_and_followers": "Ag leanúint agus do do leanúint",
  "navigation_bar.info": "About this server",
  "navigation_bar.keyboard_shortcuts": "Hotkeys",
  "navigation_bar.lists": "Lists",
@ -311,14 +311,14 @@
  "navigation_bar.security": "Security",
  "notification.admin.sign_up": "{name} signed up",
  "notification.favourite": "{name} favourited your status",
-  "notification.follow": "{name} followed you",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow": "Lean {name} thú",
+  "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
  "notification.mention": "{name} mentioned you",
  "notification.own_poll": "Your poll has ended",
  "notification.poll": "A poll you have voted in has ended",
  "notification.reblog": "{name} boosted your status",
  "notification.status": "{name} just posted",
-  "notification.update": "{name} edited a post",
+  "notification.update": "Chuir {name} postáil in eagar",
  "notifications.clear": "Clear notifications",
  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
  "notifications.column_settings.admin.sign_up": "New sign-ups:",
@ -327,8 +327,8 @@
  "notifications.column_settings.filter_bar.advanced": "Display all categories",
  "notifications.column_settings.filter_bar.category": "Quick filter bar",
  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
-  "notifications.column_settings.follow": "New followers:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow": "Leantóirí nua:",
+  "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
  "notifications.column_settings.mention": "Mentions:",
  "notifications.column_settings.poll": "Poll results:",
  "notifications.column_settings.push": "Push notifications",
@ -338,7 +338,7 @@
  "notifications.column_settings.status": "New toots:",
  "notifications.column_settings.unread_notifications.category": "Unread notifications",
  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Eagair:",
  "notifications.filter.all": "All",
  "notifications.filter.boosts": "Boosts",
  "notifications.filter.favourites": "Favourites",
@ -366,13 +366,13 @@
  "poll_button.add_poll": "Add a poll",
  "poll_button.remove_poll": "Remove poll",
  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to mentioned users only",
+  "privacy.direct.long": "Visible for mentioned users only",
  "privacy.direct.short": "Direct",
-  "privacy.private.long": "Post to followers only",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Post to public timelines",
+  "privacy.private.long": "Sofheicthe do Leantóirí amháin",
+  "privacy.private.short": "Leantóirí amháin",
+  "privacy.public.long": "Visible for all, shown in public timelines",
  "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
  "privacy.unlisted.short": "Unlisted",
  "refresh": "Refresh",
  "regeneration_indicator.label": "Loading…",
@ -405,20 +405,20 @@
  "report.mute": "Mute",
  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
  "report.next": "Next",
-  "report.placeholder": "Additional comments",
+  "report.placeholder": "Type or paste additional comments",
  "report.reasons.dislike": "I don't like it",
  "report.reasons.dislike_description": "It is not something you want to see",
  "report.reasons.other": "It's something else",
  "report.reasons.other_description": "The issue does not fit into other categories",
  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetetive replies",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
  "report.reasons.violation": "It violates server rules",
  "report.reasons.violation_description": "You are aware that it breaks specific rules",
  "report.rules.subtitle": "Select all that apply",
  "report.rules.title": "Which rules are being violated?",
  "report.statuses.subtitle": "Select all that apply",
  "report.statuses.title": "Are there any posts that back up this report?",
-  "report.submit": "Submit",
+  "report.submit": "Submit report",
  "report.target": "Report {target}",
  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
@ -450,14 +450,14 @@
  "status.delete": "Delete",
  "status.detailed_status": "Detailed conversation view",
  "status.direct": "Direct message @{name}",
-  "status.edit": "Edit",
-  "status.edited": "Edited {date}",
-  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.edit": "Cuir in eagar",
+  "status.edited": "Curtha in eagar in {date}",
+  "status.edited_x_times": "Curtha in eagar {count, plural, one {{count} uair amháin} two {{count} uair} few {{count} uair} many {{count} uair} other {{count} uair}}",
  "status.embed": "Embed",
  "status.favourite": "Favourite",
  "status.filtered": "Filtered",
  "status.history.created": "{name} created {date}",
-  "status.history.edited": "{name} edited {date}",
+  "status.history.edited": "Curtha in eagar ag {name} in {date}",
  "status.load_more": "Load more",
  "status.media_hidden": "Media hidden",
  "status.mention": "Mention @{name}",
@ -500,7 +500,7 @@
  "time_remaining.moments": "Moments remaining",
  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.followers": "Leantóirí",
  "timeline_hint.resources.follows": "Follows",
  "timeline_hint.resources.statuses": "Older toots",
  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
@ -510,13 +510,13 @@
  "units.short.million": "{count}M",
  "units.short.thousand": "{count}K",
  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media ({formats})",
+  "upload_button.label": "Add images, a video or an audio file",
  "upload_error.limit": "File upload limit exceeded.",
  "upload_error.poll": "File upload not allowed with polls.",
  "upload_form.audio_description": "Describe for people with hearing loss",
  "upload_form.description": "Describe for the visually impaired",
  "upload_form.description_missing": "No description added",
-  "upload_form.edit": "Edit",
+  "upload_form.edit": "Cuir in eagar",
  "upload_form.thumbnail": "Change thumbnail",
  "upload_form.undo": "Delete",
  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
@ -526,19 +526,19 @@
  "upload_modal.choose_image": "Choose image",
  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
+  "upload_modal.edit_media": "Cuir gné in eagar",
  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
  "upload_modal.preparing_ocr": "Preparing OCR…",
  "upload_modal.preview_label": "Preview ({ratio})",
-  "upload_progress.label": "Uploading...",
+  "upload_progress.label": "Uploading…",
  "video.close": "Close video",
  "video.download": "Download file",
  "video.exit_fullscreen": "Exit full screen",
  "video.expand": "Expand video",
  "video.fullscreen": "Full screen",
  "video.hide": "Hide video",
-  "video.mute": "Mute sound",
-  "video.pause": "Pause",
-  "video.play": "Play",
-  "video.unmute": "Unmute sound"
+  "video.mute": "Ciúnaigh fuaim",
+  "video.pause": "Cuir ar sos",
+  "video.play": "Cuir ar siúl",
+  "video.unmute": "Díchiúnaigh fuaim"
 }
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -520,7 +520,7 @@
  "upload_error.poll": "アンケートではファイルをアップロードできません。",
  "upload_form.audio_description": "聴取が難しいユーザーへの説明",
  "upload_form.description": "閲覧が難しいユーザーへの説明",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "説明を追加していません",
  "upload_form.edit": "編集",
  "upload_form.thumbnail": "サムネイルを変更",
  "upload_form.undo": "削除",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -140,7 +140,7 @@
  "conversation.mark_as_read": "읽은 상태로 표시",
  "conversation.open": "대화 보기",
  "conversation.with": "{names} 님과",
-  "directory.federated": "알려진 별무리로부터",
+  "directory.federated": "알려진 연합우주로부터",
  "directory.local": "{domain}에서만",
  "directory.new_arrivals": "새로운 사람들",
  "directory.recently_active": "최근 활동",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -515,7 +515,7 @@
  "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
  "upload_form.audio_description": "Descrever para deficientes auditivos",
  "upload_form.description": "Descrever para deficientes visuais",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Nenhuma descrição adicionada",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Alterar miniatura",
  "upload_form.undo": "Excluir",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -9,11 +9,11 @@
  "account.browse_more_on_origin_server": "Orijinal profilde daha fazlasına göz atın",
  "account.cancel_follow_request": "Takip isteğini iptal et",
  "account.direct": "@{name} adlı kişiye mesaj gönder",
-  "account.disable_notifications": "@{name} gönderi atınca bana bildirmeyi durdur",
+  "account.disable_notifications": "@{name} kişisinin gönderi bildirimlerini kapat",
  "account.domain_blocked": "Alan adı engellendi",
  "account.edit_profile": "Profili düzenle",
-  "account.enable_notifications": "@{name} gönderi atınca bana bildir",
-  "account.endorse": "Profildeki özellik",
+  "account.enable_notifications": "@{name} kişisinin gönderi bildirimlerini aç",
+  "account.endorse": "Profilimde öne çıkar",
  "account.follow": "Takip et",
  "account.followers": "Takipçi",
  "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
@ -42,7 +42,7 @@
  "account.unblock": "@{name} adlı kişinin engelini kaldır",
  "account.unblock_domain": "{domain} alan adının engelini kaldır",
  "account.unblock_short": "Engeli kaldır",
-  "account.unendorse": "Profilde gösterme",
+  "account.unendorse": "Profilimde öne çıkarma",
  "account.unfollow": "Takibi bırak",
  "account.unmute": "@{name} adlı kişinin sesini aç",
  "account.unmute_notifications": "@{name} adlı kişinin bildirimlerini aç",
@ -507,8 +507,8 @@
  "trends.trending_now": "Şu an gündemde",
  "ui.beforeunload": "Mastodon'u terk ederseniz taslağınız kaybolacak.",
  "units.short.billion": "{count}Mr",
-  "units.short.million": "{count}Mn",
-  "units.short.thousand": "{count}Mn",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}Bin",
  "upload_area.title": "Karşıya yükleme için sürükle bırak yapınız",
  "upload_button.label": "Resim, video veya ses dosyası ekleyin",
  "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@ -1,7 +1,7 @@
 {
  "account.account_note_header": "Ghi chú",
  "account.add_or_remove_from_list": "Thêm hoặc Xóa khỏi danh sách",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "người máy",
  "account.badges.group": "Nhóm",
  "account.block": "Chặn @{name}",
  "account.block_domain": "Ẩn mọi thứ từ {domain}",
@ -22,7 +22,7 @@
  "account.following_counter": "{count, plural, one {{counter} Theo dõi} other {{counter} Theo dõi}}",
  "account.follows.empty": "Người này chưa theo dõi ai.",
  "account.follows_you": "Đang theo dõi bạn",
-  "account.hide_reblogs": "Ẩn tút do @{name} đăng lại",
+  "account.hide_reblogs": "Ẩn tút @{name} đăng lại",
  "account.joined": "Đã tham gia {date}",
  "account.link_verified_on": "Liên kết này đã được xác thực vào {date}",
  "account.locked_info": "Đây là tài khoản riêng tư. Họ sẽ tự mình xét duyệt các yêu cầu theo dõi.",
@ -414,9 +414,9 @@
  "report.reasons.spam_description": "Liên kết độc hại, tạo tương tác giả hoặc trả lời lặp đi lặp lại",
  "report.reasons.violation": "Vi phạm quy tắc máy chủ",
  "report.reasons.violation_description": "Bạn nhận thấy nó vi phạm quy tắc máy chủ",
-  "report.rules.subtitle": "Chọn tất cả những áp dụng",
+  "report.rules.subtitle": "Chọn tất cả những gì phù hợp",
  "report.rules.title": "Vi phạm quy tắc nào?",
-  "report.statuses.subtitle": "Chọn tất cả những áp dụng",
+  "report.statuses.subtitle": "Chọn tất cả những gì phù hợp",
  "report.statuses.title": "Bạn muốn gửi tút nào kèm báo cáo này?",
  "report.submit": "Gửi đi",
  "report.target": "Báo cáo {target}",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -198,7 +198,7 @@
  "follow_recommendations.lead": "你关注的人的嘟文将按时间顺序在你的主页上显示。 别担心，你可以随时取消关注！",
  "follow_request.authorize": "同意",
  "follow_request.reject": "拒绝",
-  "follow_requests.unlocked_explanation": "虽说你没有锁嘟，但是 {domain} 的工作人员觉得你可能想手工审核关注请求。",
+  "follow_requests.unlocked_explanation": "虽说你没有锁嘟，但是 {domain} 的工作人员觉得你可能想手工审核这些账号的关注请求。",
  "generic.saved": "已保存",
  "getting_started.developers": "开发",
  "getting_started.directory": "用户目录",
@ -206,7 +206,7 @@
  "getting_started.heading": "开始使用",
  "getting_started.invite": "邀请用户",
  "getting_started.open_source_notice": "Mastodon 是开源软件。欢迎前往 GitHub（{github}）贡献代码或反馈问题。",
-  "getting_started.security": "帐户安全",
+  "getting_started.security": "账户安全设置",
  "getting_started.terms": "使用条款",
  "hashtag.column_header.tag_mode.all": "以及 {additional}",
  "hashtag.column_header.tag_mode.any": "或是 {additional}",
@ -308,7 +308,7 @@
  "navigation_bar.pins": "置顶嘟文",
  "navigation_bar.preferences": "首选项",
  "navigation_bar.public_timeline": "跨站公共时间轴",
-  "navigation_bar.security": "安全",
+  "navigation_bar.security": "安全性",
  "notification.admin.sign_up": "{name} 注册了",
  "notification.favourite": "{name} 喜欢了你的嘟文",
  "notification.follow": "{name} 开始关注你",
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -150,11 +150,13 @@ class Status < ApplicationRecord
      ids += favourites.where(account: Account.local).pluck(:account_id)
      ids += reblogs.where(account: Account.local).pluck(:account_id)
      ids += bookmarks.where(account: Account.local).pluck(:account_id)
+      ids += poll.votes.where(account: Account.local).pluck(:account_id) if poll.present?
    else
      ids += preloaded.mentions[id] || []
      ids += preloaded.favourites[id] || []
      ids += preloaded.reblogs[id] || []
      ids += preloaded.bookmarks[id] || []
+      ids += preloaded.votes[id] || []
    end

    ids.uniq
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@ -34,6 +34,6 @@ class Web::NotificationSerializer < ActiveModel::Serializer

  def body
    str = strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note)
-    truncate(HTMLEntities.new.decode(str.to_str), length: 140) # Do not encode entities, since this value will not be used in HTML
+    truncate(HTMLEntities.new.decode(str.to_str), length: 140, escape: false) # Do not encode entities, since this value will not be used in HTML
  end
 end
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -42,7 +42,7 @@ Rails.application.configure do
  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX

  # Allow to specify public IP of reverse proxy if it's needed
-  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split.map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
+  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split(/(?:\s*,\s*|\s+)/).map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?

  config.force_ssl = true
  config.ssl_options = {
--- a/config/locales/activerecord.ga.yml
+++ b/config/locales/activerecord.ga.yml
@ -0,0 +1 @@
+ga:
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@ -26,6 +26,8 @@ ar:
      هذا الحساب هو ممثل افتراضي يستخدم لتمثيل الخادم نفسه وليس أي مستخدم فردي.
      يستخدم لأغراض الاتحاد ولا ينبغي حظره إلا إذا كنت ترغب في حظر مثيل الخادم بأكمله، في هذه الحالة يجب عليك استخدام أداة حظر النطاق.
    learn_more: تعلم المزيد
+    logged_in_as_html: أنت متصل حالياً كـ %{username}.
+    logout_before_registering: أنت متصل سلفًا.
    privacy_policy: سياسة الخصوصية
    rules: قوانين الخادم
    rules_html: 'فيما يلي ملخص للقوانين التي تحتاج إلى اتباعها إذا كنت تريد أن يكون لديك حساب على هذا الخادم من ماستدون:'
@ -178,6 +180,7 @@ ar:
      not_subscribed: غير مشترك
      pending: في انتظار المراجعة
      perform_full_suspension: تعليق الحساب
+      previous_strikes: العقوبات السابقة
      promote: ترقية
      protocol: البروتوكول
      public: عمومي
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@ -93,6 +93,7 @@ ast:
      not_permitted: Nun tienes permisu pa facer esta aición
      update_failed_msg: Nun pudo anovase esi fustaxe
    dashboard:
+      interactions: interaiciones
      media_storage: Almacenamientu multimedia
      software: Software
      top_languages: Les llingües más actives
@ -278,6 +279,7 @@ ast:
      following: Llista de siguidores
      muting: Llista de xente silenciao
    upload: Xubir
+  in_memoriam_html: N'alcordanza.
  invites:
    delete: Desactivar
    expired: Caducó
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -1,7 +1,7 @@
 ---
 ca:
  about:
-    about_hashtag_html: Aquests són publicacions públiques etiquetades amb <strong>#%{hashtag}</strong>. Pots interactuar amb elles si tens un compte a qualsevol lloc del fedivers.
+    about_hashtag_html: Aquestes són publicacions públiques etiquetades amb <strong>#%{hashtag}</strong>. Pots interactuar amb elles si tens un compte a qualsevol lloc del fedivers.
    about_mastodon_html: 'La xarxa social del futur: sense anuncis, sense vigilància corporativa, disseny ètic i descentralització. Posseeix les teves dades amb Mastodon!'
    about_this: Quant a
    active_count_after: actiu
@ -43,7 +43,7 @@ ca:
    unavailable_content: Servidors moderats
    unavailable_content_description:
      domain: Servidor
-      reason: Raó
+      reason: Motiu
      rejecting_media: 'Els arxius multimèdia d''aquests servidors no seran processats o emmagatzemats i cap miniatura serà mostrada, requerint clic manual a través de l''arxiu original:'
      rejecting_media_title: Mèdia filtrat
      silenced: 'Les publicacions d''aquests servidors seran amagades en les línies de temps públiques i en les converses, i cap notificació serà generada de les interaccions dels seus usuaris, llevat que estiguis seguint-los:'
@ -67,7 +67,7 @@ ca:
    following: Seguint
    instance_actor_flash: Aquest compte és un actor virtual usat per a representar el mateix servidor i no cap usuari individual. Es fa servir per a federar i no s'hauria d'esborrar.
    joined: Unit des de %{date}
-    last_active: darrer actiu
+    last_active: última activitat
    link_verified_on: La propietat d'aquest enllaç s'ha verificat el %{date}
    media: Mèdia
    moved_html: "%{name} s'ha mogut a %{new_profile_link}:"
@ -207,7 +207,7 @@ ca:
        targeted_reports: Informes realitzats per altres
      silence: Silenci
      silenced: Silenciat
-      statuses: Tuts
+      statuses: Publicacions
      strikes: Accions anteriors
      subscribe: Subscriu
      suspend: Suspèn
@ -252,7 +252,7 @@ ca:
        destroy_email_domain_block: Esborra el bloqueig de domini de l'adreça de correu
        destroy_instance: Purga Domini
        destroy_ip_block: Eliminar regla IP
-        destroy_status: Esborra el tut
+        destroy_status: Esborrar la publicació
        destroy_unavailable_domain: Esborra domini no disponible
        disable_2fa_user: Desactiva 2FA
        disable_custom_emoji: Desactiva l'emoji personalitzat
@ -303,7 +303,7 @@ ca:
        destroy_email_domain_block_html: "%{name} ha desbloquejat el domini de correu electrònic %{target}"
        destroy_instance_html: "%{name} ha purgat el domini %{target}"
        destroy_ip_block_html: "%{name} ha esborrat la regla per a l'IP %{target}"
-        destroy_status_html: "%{name} ha eliminat el tut de %{target}"
+        destroy_status_html: "%{name} ha eliminat la publicació de %{target}"
        destroy_unavailable_domain_html: "%{name} ha représ el lliurament delivery al domini %{target}"
        disable_2fa_user_html: "%{name} ha desactivat el requisit de dos factors per a l'usuari %{target}"
        disable_custom_emoji_html: "%{name} ha desactivat l'emoji %{target}"
@ -332,7 +332,7 @@ ca:
        update_custom_emoji_html: "%{name} ha actualitzat l'emoji %{target}"
        update_domain_block_html: "%{name} ha actualitzat el bloqueig de domini per a %{target}"
        update_status_html: "%{name} ha actualitzat l'estat de %{target}"
-      deleted_status: "(tut esborrat)"
+      deleted_status: "(publicació esborrada)"
      empty: No s’han trobat registres.
      filter_by_action: Filtra per acció
      filter_by_user: Filtra per usuari
@ -503,7 +503,7 @@ ca:
          silence: Límit
          suspend: Suspèn
        policy: Política
-        reason: Raó pública
+        reason: Motiu públic
        title: Polítiques de contingut
      dashboard:
        instance_accounts_dimension: Comptes més seguits
@ -517,6 +517,7 @@ ca:
      delivery:
        all: Totes
        clear: Neteja els errors de lliurament
+        failing: Fallant
        restart: Reinicia el lliurament
        stop: Atura el lliurament
        unavailable: No disponible
@ -550,7 +551,7 @@ ca:
        available: Disponible
        expired: Caducat
        title: Filtre
-      title: Convida
+      title: Invitacions
    ip_blocks:
      add_new: Crear regla
      created_msg: S’ha afegit amb èxit la nova regla IP
@ -571,11 +572,11 @@ ca:
    relays:
      add_new: Afegiu un nou relay
      delete: Esborra
-      description_html: Un <strong>relay de federació</strong> és un servidor intermediari que intercanvia grans volums de tuts públics entre servidors que es subscriuen i publiquen en ell. <strong>Pot ajudar a servidors petits i mitjans a descobrir contingut del fedivers</strong>, no fent necessari que els usuaris locals manualment segueixin altres persones de servidors remots.
+      description_html: Un <strong>relay de federació</strong> és un servidor intermediari que intercanvia grans volums de publicacions públiques entre servidors que se subscriuen i publiquen en ell. <strong>Pot ajudar a servidors petits i mitjans a descobrir contingut del fedivers</strong>, no fent necessari que els usuaris locals manualment segueixin altres persones de servidors remots.
      disable: Inhabilita
      disabled: Desactivat
      enable: Activat
-      enable_hint: Una vegada habilitat, el teu servidor es subscriurà a tots els tuts públics d'aquest relay i començarà a enviar-hi tots els tuts públics d'aquest servidor.
+      enable_hint: Una vegada habilitat, el teu servidor se subscriurà a totes les publicacions públiques d'aquest relay i començarà a enviar-hi totes les publicacions públiques d'aquest servidor.
      enabled: Activat
      inbox_url: URL del Relay
      pending: S'està esperant l'aprovació del relay
@ -609,7 +610,7 @@ ca:
      assigned: Moderador assignat
      by_target_domain: Domini del compte reportat
      category: Categoria
-      category_description_html: La raó que aquest compte o contingut ha estat reportat serà citat en la comunicació amb el compte reportat
+      category_description_html: El motiu pel qual aquest compte o contingut ha estat reportat serà citat en la comunicació amb el compte reportat
      comment:
        none: Cap
      comment_description_html: 'Per a donar més informació, %{name} ha escrit:'
@ -656,7 +657,7 @@ ca:
      title: Normes del servidor
    settings:
      activity_api_enabled:
-        desc_html: Nombre de tuts publicats localment, usuaris actius i registres nous en períodes setmanals
+        desc_html: Nombre de publicacions publicades localment, usuaris actius i registres nous en períodes setmanals
        title: Publica estadístiques agregades sobre l'activitat de l'usuari
      bootstrap_timeline_accounts:
        desc_html: Separa diversos noms d'usuari amb comes. Només funcionaran els comptes locals i desblocats. El valor predeterminat quan està buit és tots els administradors locals.
@ -901,7 +902,7 @@ ca:
      guide_link: https://crowdin.com/project/mastodon
      guide_link_text: Tothom hi pot contribuir.
    sensitive_content: Contingut sensible
-    toot_layout: Disseny del tut
+    toot_layout: Disseny de la publicació
  application_mailer:
    notification_preferences: Canvia les preferències de correu
    salutation: "%{name},"
@ -1075,7 +1076,7 @@ ca:
    archive_takeout:
      date: Data
      download: Baixa l’arxiu
-      hint_html: Pots sol·licitar un arxiu dels teus <strong>tuts i dels fitxers multimèdia pujats</strong>. Les dades exportades tindran el format ActivityPub, llegible per qualsevol programari compatible. Pots sol·licitar un arxiu cada 7 dies.
+      hint_html: Pots sol·licitar un arxiu de les teves <strong>publicacions i dels fitxers multimèdia pujats</strong>. Les dades exportades tindran el format ActivityPub, llegible per qualsevol programari compatible. Pots sol·licitar un arxiu cada 7 dies.
      in_progress: S'està compilant el teu arxiu...
      request: Sol·licitar el teu arxiu
      size: Mida
@ -1167,7 +1168,7 @@ ca:
    table:
      expires_at: Caduca
      uses: Usos
-    title: Convida persones
+    title: Convidar persones
  lists:
    errors:
      limit: Has assolit la quantitat màxima de llistes
@ -1321,7 +1322,7 @@ ca:
    followers: Seguidors
    following: Seguint
    invited: Convidat
-    last_active: Darrer actiu
+    last_active: Última activitat
    most_recent: Més recent
    moved: Mogut
    mutual: Mútua
@ -1341,19 +1342,19 @@ ca:
  remote_interaction:
    favourite:
      proceed: Procedir a afavorir
-      prompt: 'Vols marcar com a favorit aquest tut:'
+      prompt: 'Vols marcar com a favorit aquesta publicació:'
    reblog:
      proceed: Procedir a impulsar
-      prompt: 'Vols impulsar aquest tut:'
+      prompt: 'Vols impulsar aquesta publicació:'
    reply:
      proceed: Procedir a respondre
-      prompt: 'Vols respondre a aquest tut:'
+      prompt: 'Vols respondre a aquesta publicació:'
  reports:
    errors:
      invalid_rules: no fa referència a normes vàlides
  scheduled_statuses:
-    over_daily_limit: Has superat el límit de %{limit} tuts programats per a aquell dia
-    over_total_limit: Has superat el limit de %{limit} tuts programats
+    over_daily_limit: Has superat el límit de %{limit} publicacions programades per a avui
+    over_total_limit: Has superat el límit de %{limit} publicacions programades
    too_soon: La data programada ha de ser futura
  sessions:
    activity: Última activitat
@ -1403,7 +1404,7 @@ ca:
    aliases: Àlies de compte
    appearance: Aparença
    authorized_apps: Aplicacions autoritzades
-    back: Torna a Mastodon
+    back: Tornar a Mastodon
    delete: Eliminació del compte
    development: Desenvolupament
    edit_profile: Edita el perfil
@ -1440,13 +1441,13 @@ ca:
      other: 'conté les etiquetes no permeses: %{tags}'
    edited_at_html: Editat %{date}
    errors:
-      in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
+      in_reply_not_found: La publicació a la qual intentes respondre sembla que no existeix.
    open_in_web: Obre en la web
    over_character_limit: Límit de caràcters de %{max} superat
    pin_errors:
      direct: Les publicacions que només son visibles per els usuaris mencionats no poden ser fixades
-      limit: Ja has fixat el màxim nombre de tuts
-      ownership: No es pot fixar el tut d'algú altre
+      limit: Ja has fixat el màxim nombre de publicacions
+      ownership: No es pot fixar la publicació d'algú altre
      reblog: No es pot fixar un impuls
    poll:
      total_people:
@ -1506,7 +1507,7 @@ ca:
    min_reblogs: Mantenir les publicacions impulsades més de
    min_reblogs_hint: No suprimeix cap de les teves publicacions que s'hagin impulsat més que aquest número de vegades. Deixa-ho en blanc per suprimir les publicacions independentment del nombre d'impulsos que tinguin
  stream_entries:
-    pinned: Tut fixat
+    pinned: Publicació fixada
    reblogged: ha impulsat
    sensitive_content: Contingut sensible
  tags:
@ -1652,7 +1653,7 @@ ca:
        sensitive: A partir d'ara, tots els mèdia pujats seran marcats com a sensibles i ocultats darrera un avís.
        silence: Encara pots fer servir el teu compte però només la gent que ja t'està seguint veuran les teves publicacions en aquest servidor i tu podries ser exclòs de les diverses opcions de descobriment. De totes maneres altres podrien encara seguir-te manualment.
        suspend: Ja no pots utilitzar el teu compte i el teu perfil i altres dades ja no son accessibles. Encara pots iniciar sessió per a demanar una copia de les teves dades fins que siguin totalment eliminades als 30 dies però es mantindran les dades bàsiques per evitar que esquivis la suspensió.
-      reason: 'Raó:'
+      reason: 'Motiu:'
      statuses: 'Publicacions citades:'
      subject:
        delete_statuses: Les teves publicacions de %{acct} han estat esborrades
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -500,10 +500,10 @@ cs:
    instances:
      availability:
        description_html:
-          few: Pokud doručování na doménu selhává nepřerušeně ve <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
-          many: Pokud doručování na doménu selhává nepřerušeně v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
-          one: Pokud doručování na doménu selhává nepřerušeně <strong>%{count} den</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
-          other: Pokud doručování na doménu selhává nepřerušeně v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          few: Pokud doručování na doménu selže ve <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          many: Pokud doručování na doménu selže v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          one: Pokud doručování na doménu selže <strong>%{count} den</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
+          other: Pokud doručování na doménu selže v <strong>%{count} různých dnech</strong>, nebudou činěny žádné další pokusy o doručení, dokud nedorazí doručení <em>od</em> domény.
        failure_threshold_reached: Prahu selhání dosaženo %{date}.
        failures_recorded:
          few: Neúspěšné pokusy ve %{count} různých dnech.
@ -514,7 +514,7 @@ cs:
        title: Dostupnost
        warning: Poslední pokus o připojení k tomuto serveru byl neúspěšný
      back_to_all: Vše
-      back_to_limited: Omezený
+      back_to_limited: Omezená
      back_to_warning: Varování
      by_domain: Doména
      confirm_purge: Jste si jisti, že chcete nevratně smazat data z této domény?
@ -541,9 +541,10 @@ cs:
      delivery:
        all: Vše
        clear: Vymazat chyby doručení
+        failing: Selhává
        restart: Restartovat doručování
        stop: Zastavit doručování
-        unavailable: Nedostupný
+        unavailable: Nedostupná
      delivery_available: Doručení je k dispozici
      delivery_error_days: Dny chybného doručování
      delivery_error_hint: Není-li možné doručení po dobu %{count} dnů, bude automaticky označen za nedoručitelný.
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -165,6 +165,9 @@ de:
      pending: In Warteschlange
      perform_full_suspension: Verbannen
      previous_strikes: Vorherige Strikes
+      previous_strikes_description_html:
+        one: Dieses Konto hat <strong>einen</strong> Strike.
+        other: Dieses Konto hat <strong>%{count}</strong> Strikes.
      promote: Befördern
      protocol: Protokoll
      public: Öffentlich
@ -220,7 +223,7 @@ de:
      undo_suspension: Verbannung aufheben
      unsilenced_msg: "%{username}'s Konto erfolgreich freigegeben"
      unsubscribe: Abbestellen
-      unsuspended_msg: "%{username}'s Konto erfolgreich freigegeben"
+      unsuspended_msg: Konto von %{username} erfolgreich freigegeben
      username: Profilname
      view_domain: Übersicht für Domain anzeigen
      warn: Warnen
@ -1232,6 +1235,9 @@ de:
      new_followers_summary:
        one: Außerdem ist dir seit du weg warst ein weiteres Wesen gefolgt! Juhu!
        other: Außerdem sind dir seit du weg warst %{count} weitere Wesen gefolgt! Großartig!
+      subject:
+        one: "1 neue Mitteilung seit deinem letzten Besuch 🐘"
+        other: "%{count} neue Mitteilungen seit deinem letzten Besuch 🐘"
      title: In deiner Abwesenheit...
    favourite:
      body: 'Dein Beitrag wurde von %{name} favorisiert:'
@ -1628,6 +1634,13 @@ de:
      explanation: Du hast ein vollständiges Backup von deinem Mastodon-Konto angefragt. Es kann jetzt heruntergeladen werden!
      subject: Dein Archiv ist bereit zum Download
      title: Archiv-Download
+    suspicious_sign_in:
+      change_password: dein Passwort zu ändern
+      details: 'Hier sind die Details des Versuchs:'
+      explanation: Wir haben eine Anmeldung zu deinem Konto von einer neuen IP-Adresse festgestellt.
+      further_actions_html: Wenn du das nicht warst, empfehlen wir dir, %{action} und die Zwei-Faktor-Authentifizierung zu aktivieren, um dein Konto sicher zu halten.
+      subject: Es wurde auf dein Konto von einer neuen IP-Adresse zugegriffen
+      title: Eine neue Anmeldung
    warning:
      appeal: Einspruch einsenden
      appeal_description: Wenn du glaubst, dass dies ein Fehler ist, kannst du einen Einspruch an die Mitarbeiter von %{instance} senden.
@ -1664,7 +1677,7 @@ de:
      edit_profile_step: Du kannst dein Profil anpassen, indem du einen Avatar oder ein Titelbild hochlädst oder deinen Anzeigenamen änderst und mehr. Wenn du deine Folgenden vorher überprüfen möchtest, bevor sie dir folgen können, dann kannst du dein Profil sperren.
      explanation: Hier sind ein paar Tipps, um loszulegen
      final_action: Fang an zu posten
-      final_step: 'Fang an zu posten! Selbst ohne Follower werden deine öffentlichen Beitrage von anderen gesehen, zum Beispiel auf der lokalen Zeitleiste oder in Hashtags. Vielleicht möchtest du dich vorstellen mit dem #introductions-Hashtag.'
+      final_step: 'Fang an zu posten! Selbst ohne Follower werden deine öffentlichen Beiträge von anderen gesehen, zum Beispiel auf der lokalen Zeitleiste oder in Hashtags. Vielleicht möchtest du dich vorstellen mit dem #introductions-Hashtag.'
      full_handle: Dein vollständiger Benutzername
      full_handle_hint: Dies ist was du deinen Freunden sagen kannst, damit sie dich anschreiben oder von einem anderen Server folgen können.
      review_preferences_action: Einstellungen ändern
--- a/config/locales/devise.ga.yml
+++ b/config/locales/devise.ga.yml
@ -0,0 +1 @@
+ga:
--- a/config/locales/devise.tr.yml
+++ b/config/locales/devise.tr.yml
@ -11,7 +11,7 @@ tr:
      invalid: Geçersiz %{authentication_keys} ya da şifre.
      last_attempt: Hesabınız kilitlenmeden önce bir kez daha denemeniz gerekir.
      locked: Hesabınız kilitlendi.
-      not_found_in_database: Geçersiz %{authentication_keys} ya da şifre.
+      not_found_in_database: Geçersiz %{authentication_keys} ya da parola.
      pending: Hesabınız hala inceleniyor.
      timeout: Oturum süreniz sona erdi. Lütfen devam etmek için tekrar giriş yapınız.
      unauthenticated: Devam etmeden önce oturum açmanız veya kayıt olmanız gerek.
@ -33,19 +33,19 @@ tr:
      password_change:
        explanation: Hesabınızın şifresi değiştirildi.
        extra: Parolanızı değiştirmediyseniz, büyük olasılıkla birileri hesabınıza erişmiş olabilir. Lütfen derhal parolanızı değiştirin veya hesabınız kilitlendiyse sunucu yöneticisine başvurun.
-        subject: 'Mastodon: Şifre değiştirildi'
-        title: Şifre değiştirildi
+        subject: 'Mastodon: Parola değiştirildi'
+        title: Parola değiştirildi
      reconfirmation_instructions:
        explanation: E-postanızı değiştirmek için yeni adresi onaylayın.
        extra: Bu değişiklik sizin tarafınızdan başlatılmadıysa, lütfen bu e-postayı dikkate almayın. Mastodon hesabının e-posta adresi, yukarıdaki bağlantıya erişene kadar değişmez.
        subject: 'Mastodon: %{instance} için e-postayı onayla'
        title: E-posta adresinizi doğrulayın
      reset_password_instructions:
-        action: Şifreyi değiştir
-        explanation: Hesabınız için yeni bir şifre istediniz.
+        action: Parolayı değiştir
+        explanation: Hesabınız için yeni bir parola istediniz.
        extra: Bunu siz yapmadıysanız, lütfen bu e-postayı dikkate almayın. Parolanız yukarıdaki bağlantıya erişene ve yeni bir tane oluşturuncaya kadar değişmez.
-        subject: 'Mastodon: Şifre sıfırlama talimatları'
-        title: Şifre sıfırlama
+        subject: 'Mastodon: Parola sıfırlama talimatları'
+        title: Parola sıfırlama
      two_factor_disabled:
        explanation: Hesabınız için iki-adımlı kimlik doğrulama devre dışı bırakıldı. Şimdi sadece e-posta adresi ve parola kullanarak giriş yapabilirsiniz.
        subject: 'Mastodon: İki-adımlı kimlik doğrulama devre dışı bırakıldı'
--- a/config/locales/doorkeeper.ar.yml
+++ b/config/locales/doorkeeper.ar.yml
@ -71,6 +71,7 @@ ar:
        revoke: متأكد ؟
      index:
        authorized_at: تاريخ التخويل %{date}
+        description_html: يمكن لهذه التطبيقات الوصول إلى حسابك من باستخدام الـ API. إذا وجدت تطبيقات لا تتعرف عليها أو لا تعمل بشكل طبيعي ، فيمكنك إبطال وصولها لحسابك.
        last_used_at: آخر استخدام في %{date}
        never_used: لم يُستخدَم قط
        scopes: الصلاحيات
--- a/config/locales/doorkeeper.ca.yml
+++ b/config/locales/doorkeeper.ca.yml
@ -174,7 +174,7 @@ ca:
      write:blocks: bloqueja comptes i dominis
      write:bookmarks: publicacions a marcadors
      write:conversations: silencia i esborra converses
-      write:favourites: afavoreix publicacions
+      write:favourites: afavorir publicacions
      write:filters: crear filtres
      write:follows: seguir usuaris
      write:lists: crear llistes
--- a/config/locales/doorkeeper.ga.yml
+++ b/config/locales/doorkeeper.ga.yml
@ -0,0 +1 @@
+ga:
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@ -60,6 +60,8 @@ ja:
      error:
        title: エラーが発生しました
      new:
+        prompt_html: "%{client_name} があなたのアカウントにアクセスする許可を求めています。<strong>心当たりが無い場合はアクセス許可しないでください。</strong>"
+        review_permissions: アクセス許可を確認
        title: 認証が必要です
      show:
        title: 認証コードをコピーしてアプリに貼り付けて下さい。
@ -70,9 +72,11 @@ ja:
        revoke: 本当に取り消しますか？
      index:
        authorized_at: "%{date} に承認されました"
+        description_html: これらは、APIを使用してアカウントにアクセスできるアプリケーションです。ここに見覚えのないアプリケーションがある場合、またはアプリケーションの動作がおかしい場合、そのアクセスを取り消すことができます。
        last_used_at: 最終使用日 %{date}
        never_used: 使用されていない
        scopes: 権限
+        superapp: 内部
        title: 認証済みアプリ
    errors:
      messages:
@ -115,13 +119,18 @@ ja:
        write: 書き込み専用アクセス
      title:
        accounts: アカウント
+        admin/accounts: アカウント管理
+        admin/all: すべての管理機能
+        admin/reports: 通報の管理
        all: すべて
        blocks: ブロック
        bookmarks: ブックマーク
+        conversations: 会話
        crypto: エンドツーエンド暗号化
        favourites: お気に入り
        filters: フィルター
        follow: フォロー・フォロワー
+        follows: フォロー
        lists: リスト
        media: メディアの添付
        mutes: ミュート
@ -164,6 +173,7 @@ ja:
      write:accounts: プロフィールの変更
      write:blocks: ユーザーのブロックやドメインの非表示
      write:bookmarks: 投稿のブックマーク登録
+      write:conversations: 会話のミュートと削除
      write:favourites: 投稿のお気に入り登録
      write:filters: フィルターの変更
      write:follows: あなたの代わりにフォロー、アンフォロー
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -380,6 +380,8 @@ el:
    instances:
      by_domain: Τομέας
      confirm_purge: Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα τα δεδομένα από αυτόν τον τομέα;
+      delivery:
+        failing: Αποτυγχάνει
      delivery_available: Διαθέσιμη παράδοση
      destroyed_msg: Τα δεδομένα από το %{domain} βρίσκονται σε αναμονή για επικείμενη διαγραφή.
      empty: Δεν βρέθηκαν τομείς.
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -517,6 +517,7 @@ en:
      delivery:
        all: All
        clear: Clear delivery errors
+        failing: Failing
        restart: Restart delivery
        stop: Stop delivery
        unavailable: Unavailable
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@ -517,6 +517,7 @@ es-AR:
      delivery:
        all: Todos
        clear: Limpiar errores de entrega
+        failing: Fallo
        restart: Reiniciar entrega
        stop: Detener entrega
        unavailable: No disponible
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@ -1235,6 +1235,9 @@ es-MX:
      new_followers_summary:
        one: "¡Ademas, has adquirido un nuevo seguidor mientras no estabas! ¡Hurra!"
        other: "¡Ademas, has adquirido %{count} nuevos seguidores mientras no estabas! ¡Genial!"
+      subject:
+        one: "1 nueva notificación desde tu última visita 🐘"
+        other: "%{count} nuevas notificaciones desde tu última visita 🐘"
      title: En tu ausencia…
    favourite:
      body: 'Tu estado fue marcado como favorito por %{name}:'
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -517,6 +517,7 @@ es:
      delivery:
        all: Todos
        clear: Limpiar errores de entrega
+        failing: Fallando
        restart: Reiniciar entrega
        stop: Detener entrega
        unavailable: No disponible
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -479,6 +479,9 @@ fr:
      unsuppress: Rétablir les recommandations d'abonnement
    instances:
      availability:
+        description_html:
+          one: Si la livraison au domaine échoue pendant <strong>%{count} jour</strong> sans succès, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine soit reçue.
+          other: Si la livraison au domaine échoue pendant <strong>%{count} jours différents</strong> sans succès, aucune autre tentative de livraison ne sera faite à moins qu'une livraison <em>depuis</em> le domaine soit reçue.
        failure_threshold_reached: Le seuil de défaillance a été atteint le %{date}.
        failures_recorded:
          one: Tentative échouée pendant %{count} jour.
@ -514,6 +517,7 @@ fr:
      delivery:
        all: Tout
        clear: Effacer les erreurs de livraison
+        failing: Échouant
        restart: Redémarrer la livraison
        stop: Arrêter la livraison
        unavailable: Indisponible
@ -1232,6 +1236,9 @@ fr:
      new_followers_summary:
        one: De plus, vous avez un·e nouvel·le abonné·e ! Youpi !
        other: De plus, vous avez %{count} abonné·e·s de plus ! Incroyable !
+      subject:
+        one: "Une nouvelle notification depuis votre dernière visite 🐘"
+        other: "%{count} nouvelles notifications depuis votre dernière visite 🐘"
      title: Pendant votre absence…
    favourite:
      body: "%{name} a ajouté votre message à ses favoris :"
@ -1628,8 +1635,10 @@ fr:
      title: Récupération de l’archive
    suspicious_sign_in:
      change_password: changer votre mot de passe
+      details: 'Voici les détails de la connexion :'
      explanation: Nous avons détecté une connexion à votre compte à partir d’une nouvelle adresse IP.
      further_actions_html: Si ce n’était pas vous, nous vous recommandons de %{action} immédiatement et d’activer l’authentification à deux facteurs afin de garder votre compte sécurisé.
+      subject: Votre compte a été accédé à partir d'une nouvelle adresse IP
      title: Une nouvelle connexion
    warning:
      appeal: Faire appel
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@ -1,4 +1,12 @@
 ---
 ga:
-  about:
-    about_hashtag_html: Is toots phoiblí iad seo atá clibáilte le <strong>#%{hashtag}</strong>. Is féidir leat idirghníomhú leo má tá cuntas agat áit ar bith sa fediverse.
+  errors:
+    '400': The request you submitted was invalid or malformed.
+    '403': You don't have permission to view this page.
+    '404': The page you are looking for isn't here.
+    '406': This page is not available in the requested format.
+    '410': The page you were looking for doesn't exist here anymore.
+    '422': 
+    '429': Too many requests
+    '500': 
+    '503': The page could not be served due to a temporary server failure.
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -517,6 +517,7 @@ gl:
      delivery:
        all: Todo
        clear: Eliminar erros na entrega
+        failing: Con fallos
        restart: Restablecer a entrega
        stop: Deter a entrega
        unavailable: Non dispoñible
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -519,6 +519,7 @@ hu:
      delivery:
        all: Mind
        clear: Kézbesítési hibák törlése
+        failing: Sikertelen
        restart: Kézbesítés újraindítása
        stop: Kézbesítés leállítása
        unavailable: Nem elérhető
@ -1237,6 +1238,9 @@ hu:
      new_followers_summary:
        one: Sőt, egy új követőd is lett, amióta nem jártál itt. Hurrá!
        other: Sőt, %{count} új követőd is lett, amióta nem jártál itt. Hihetetlen!
+      subject:
+        one: "1 új értesítés az utolsó látogatásod óta 🐘"
+        other: "%{count} új értesítés az utolsó látogatásod óta 🐘"
      title: Amíg távol voltál…
    favourite:
      body: 'A bejegyzésedet kedvencnek jelölte %{name}:'
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@ -503,6 +503,7 @@ id:
      delivery:
        all: Semua
        clear: Hapus galat pengiriman
+        failing: Gagal
        restart: Mulai ulang pengiriman
        stop: Setop pengiriman
        unavailable: Tidak tersedia
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@ -517,6 +517,7 @@ is:
      delivery:
        all: Allt
        clear: Hreinsa afhendingarvillur
+        failing: Mistekst
        restart: Endurræsa afhendingu
        stop: Stöðva afhendingu
        unavailable: Ekki tiltækt
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -517,6 +517,7 @@ it:
      delivery:
        all: Tutto
        clear: Cancella errori di consegna
+        failing: Con errori
        restart: Riavvia la consegna
        stop: Interrompi consegna
        unavailable: Non disponibile
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -158,6 +158,9 @@ ja:
      not_subscribed: 購読していない
      pending: 承認待ち
      perform_full_suspension: 活動を完全に停止させる
+      previous_strikes: 以前のストライク
+      previous_strikes_description_html:
+        other: "<strong>%{count}</strong> ストライクがあります。"
      promote: 昇格
      protocol: プロトコル
      public: パブリック
@ -198,6 +201,7 @@ ja:
      silence: サイレンス
      silenced: サイレンス済み
      statuses: 投稿数
+      strikes: 前回のストライク
      subscribe: 購読する
      suspend: サスペンド
      suspended: 停止済み
@ -437,6 +441,8 @@ ja:
      view: ドメインブロックを表示
    email_domain_blocks:
      add_new: 新規追加
+      attempts_over_week:
+        other: 先週は%{count}回サインアップが試みられました
      created_msg: メールドメインブロックに追加しました
      delete: 消去
      dns:
@ -447,6 +453,9 @@ ja:
        create: ドメインを追加
        resolve: ドメイン解決
        title: 新規メールドメインブロック
+      no_email_domain_block_selected: 何も選択されていないためメールドメインブロックを変更しませんでした
+      resolved_dns_records_hint_html: ドメイン名はDNSでMXドメインに名前解決され、最終的にメールを受け付ける役割を担います。目に見えるドメイン名が異なっていても、同じMXドメインを使用するメールアドレスからのアカウント登録がブロックされます。<strong>主要なメールプロバイダーをブロックしないように注意して下さい。</strong>
+      resolved_through_html: "%{domain} を通して解決しました"
      title: メールドメインブロック
    follow_recommendations:
      description_html: "<strong>おすすめフォローは、新規ユーザーが興味のあるコンテンツをすばやく見つけるのに役立ちます。</strong>ユーザーが他のユーザーとの交流を十分にしていない場合、パーソナライズされたおすすめフォローを生成する代わりに、これらのアカウントが表示されます。最近のエンゲージメントが最も高いアカウントと、特定の言語のローカルフォロワー数が最も多いアカウントを組み合わせて､毎日再計算されます。"
@ -457,14 +466,40 @@ ja:
      title: おすすめフォロー
      unsuppress: おすすめフォローを復元
    instances:
+      availability:
+        failure_threshold_reached: "%{date} に失敗のしきい値に達しました。"
+        failures_recorded:
+          other: "%{count}日間試行に失敗しました。"
+        no_failures_recorded: 失敗は記録されていません。
+        title: 可用性
+        warning: このサーバーへの最後の接続試行に失敗しました
      back_to_all: すべて
      back_to_limited: 制限あり
      back_to_warning: 警告あり
      by_domain: ドメイン
      confirm_purge: このドメインを完全にブロックしてもよろしいですか？
+      content_policies:
+        comment: 内部メモ
+        description_html: このドメインとそのサブドメインのすべてのアカウントに適用されるコンテンツポリシーを定義できます。
+        policies:
+          reject_media: メディアを拒否する
+          reject_reports: 通報を拒否
+          silence: 制限
+          suspend: サスペンド
+        policy: ポリシー
+        reason: 公開理由
+        title: コンテンツ ポリシー
+      dashboard:
+        instance_accounts_dimension: 最もフォローされているアカウント
+        instance_accounts_measure: 保存されたアカウント
+        instance_languages_dimension: 人気の言語
+        instance_media_attachments_measure: 保存されたメディア
+        instance_reports_measure: 通報
+        instance_statuses_measure: 保存された投稿
      delivery:
        all: すべて
        clear: 配送エラーをクリア
+        failing: 配送失敗
        restart: 配送を再開
        stop: 配送を停止
        unavailable: 配送不可
@ -473,6 +508,8 @@ ja:
      delivery_error_hint: "%{count} 日間配送ができない場合は、自動的に配送不可としてマークされます。"
      destroyed_msg: "%{domain} からのデータは、すぐに削除されるように、キューに追加されました。"
      empty: ドメインが見つかりませんでした。
+      known_accounts:
+        other: 既知のアカウント数 %{count}
      moderation:
        all: すべて
        limited: 制限あり
@ -480,6 +517,7 @@ ja:
      private_comment: コメント (非公開)
      public_comment: コメント (公開)
      purge: パージ
+      purge_description_html: このドメインがオフラインであると思われる場合は、このドメインのすべてのアカウント記録と関連するデータをストレージから削除できます。 これは時間がかかることがあります。
      title: 既知のサーバー
      total_blocked_by_us: ブロック合計
      total_followed_by_them: 被フォロー合計
@ -537,6 +575,14 @@ ja:
          other: "%{count} 件のメモ"
      action_log: 監査ログ
      action_taken_by: 通報処理者
+      actions:
+        delete_description_html: 報告された投稿は削除され、ストライクが記録されます。同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
+        mark_as_sensitive_description_html: 報告された投稿のメディアは閲覧注意となり、ストライクが記録され、同じアカウントによる今後の違反行為のエスカレーションに役立てられます。
+        other_description_html: アカウントの動作を制御するためのオプションや、報告されたアカウントへの通信をカスタマイズするためのオプションを確認してください。
+        resolve_description_html: 報告されたアカウントに対していかなる措置も取られず、ストライクも記録されず、報告は終了します。
+        silence_description_html: 既にフォローしている人、または自分で参照した人にのみ表示されるため、プロフィールが届く範囲が大きく制限されます。いつでも元に戻すことができます。
+        suspend_description_html: プロフィールとすべてのコンテンツは、最終的に削除されるまでアクセスできなくなります。アカウントとのやり取りは不可能です。30日以内に取り消し可能です。
+      actions_description_html: このレポートを解決するために取るアクションを決定します。 報告されたアカウントに対して懲罰的な措置を取った場合、メール通知が送信されます <strong>スパム</strong> カテゴリが選択されている場合を除きます。
      add_to_report: 通報にさらに追加
      are_you_sure: 本当に実行しますか？
      assign_to_self: 担当になる
@ -546,6 +592,7 @@ ja:
      category_description_html: 選択した理由は通報されたアカウントへの連絡時に引用されます
      comment:
        none: なし
+      comment_description_html: "%{name} からの詳細情報:"
      created_at: 通報日時
      delete_and_resolve: 投稿を削除
      forwarded: 転送済み
@ -692,13 +739,23 @@ ja:
      with_media: メディアあり
    strikes:
      actions:
+        delete_statuses: "%{name} さんが %{target} さんの投稿を削除しました"
+        disable: "%{name}さんが%{target}さんを凍結しました"
        mark_statuses_as_sensitive: "%{name} さんが %{target} さんの投稿を閲覧注意としてマークしました"
+        none: "%{name} が %{target} に警告を送信しました"
        sensitive: "%{name} さんが %{target} さんのアカウントを閲覧注意としてマークしました"
+        silence: "%{name}さんが%{target}さんを制限しました"
+        suspend: "%{name} さんが %{target} さんのアカウントを停止しました"
      appeal_approved: 抗議済み
      appeal_pending: 保留中の抗議
    system_checks:
      database_schema_check:
        message_html: 未実行のデータベースマイグレーションがあります。実行して正常に動作するようにしてください。
+      elasticsearch_running_check:
+        message_html: Elasticsearchに接続できませんでした。Elasticsearchが実行されていることを確認するか、全文検索を無効にしてください。
+      elasticsearch_version_check:
+        message_html: '互換性のない Elasticsearch バージョン: %{value}'
+        version_comparison: Elasticsearch %{running_version} が実行されていますが、 %{required_version} が必要です
      rules_check:
        action: サーバーのルールを管理
        message_html: サーバーのルールを定義していません。
@ -715,13 +772,17 @@ ja:
      links:
        allow: リンクの許可
        allow_provider: 発行者の承認
+        description_html: これらは、多くのユーザーに共有されているリンクです。あなたのユーザーが世の中の動きを知るのに役立ちます。あなたが公開者を承認するまで、リンクは一般に表示されません。また、個別のリンクの許可・拒否も可能です。
        disallow: リンクの拒否
        disallow_provider: 発行者の拒否
+        shared_by_over_week:
+          other: 先週%{count}人に共有されました
        title: トレンドリンク
        usage_comparison: 今日は %{today} 回、昨日は %{yesterday} 回共有されました
      pending_review: 保留中
      preview_card_providers:
        allowed: この発行者からのリンクを許可
+        description_html: これらは、よく共有されるリンク元のドメインです。リンク先のドメインが承認されない限り、リンクは公開されません。承認（または拒否）はサブドメインにも及びます。
        rejected: この発行者からのリンクを拒否
        title: 発行者
      rejected: 拒否
@ -739,6 +800,7 @@ ja:
          tag_servers_dimension: 人気のサーバー
          tag_servers_measure: その他のサーバー
          tag_uses_measure: 合計利用数
+        description_html: これらは、多くの投稿に使用されているハッシュタグです。あなたのユーザーが、人々が今一番話題にしていることを知るのに役立ちます。あなたが承認するまで、ハッシュタグは一般に表示されません。
        listable: おすすめに表示する
        not_listable: おすすめに表示しない
        not_trendable: トレンドに表示しない
@ -749,6 +811,8 @@ ja:
        trending_rank: '人気: %{rank} 位'
        usable: 使用を許可
        usage_comparison: 今日は %{today} 回、昨日は %{yesterday} 回使用されました。
+        used_by_over_week:
+          other: 先週%{count}人に使用されました
      title: トレンド
    warning_presets:
      add_new: 追加
@ -759,8 +823,15 @@ ja:
  admin_mailer:
    new_appeal:
      actions:
+        delete_statuses: 投稿を削除する
+        disable: アカウントを無効にする
+        mark_statuses_as_sensitive: 閲覧注意としてマーク
        none: 警告
        sensitive: アカウントを閲覧注意にする
+        silence: アカウントを制限する
+        suspend: アカウントを停止する
+      next_steps: モデレーションの決定を取り消すために申し立てを承認するか、無視することができます。
+      subject: "%{instance} で %{username} からモデレーションへの申し立てが届きました。"
    new_pending_account:
      body: 新しいアカウントの詳細は以下の通りです。この申請を承認または却下することができます。
      subject: "%{instance} で新しいアカウント (%{username}) が承認待ちです"
@ -769,12 +840,17 @@ ja:
      body_remote: "%{domain} の誰かが %{target} を通報しました"
      subject: "%{instance} の新しい通報 (#%{id})"
    new_trends:
+      body: 以下の項目は、公開する前に審査が必要です。
      new_trending_links:
+        no_approved_links: 承認されたトレンドリンクはありません。
        title: トレンドリンク
      new_trending_statuses:
+        no_approved_statuses: 承認されたトレンド投稿はありません。
        title: トレンド投稿
      new_trending_tags:
+        no_approved_tags: 承認されたトレンドハッシュタグはありません。
        title: トレンドハッシュタグ
+      subject: "%{instance} で新しいトレンド が審査待ちです"
  aliases:
    add_new: エイリアスを作成
    created_msg: エイリアスを作成しました。これで以前のアカウントから引っ越しを開始できます。
@ -848,8 +924,10 @@ ja:
    status:
      account_status: アカウントの状態
      confirming: メールアドレスの確認が完了するのを待っています。
+      functional: アカウントは完全に機能しています。
      pending: あなたの申請は現在サーバー管理者による審査待ちです。これにはしばらくかかります。申請が承認されるとメールが届きます。
      redirecting_to: アカウントは %{acct} に引っ越し設定されているため非アクティブになっています。
+      view_strikes: 過去のストライクを表示
    too_fast: フォームの送信が速すぎます。もう一度やり直してください。
    trouble_logging_in: ログインできませんか？
    use_security_key: セキュリティキーを使用
@ -917,12 +995,18 @@ ja:
    strikes:
      action_taken: 取られた措置
      appeal: 抗議
+      appeal_approved: このストライクは申し立てが承認され、有効ではありません。
+      appeal_rejected: 申し立ては拒否されました
      appeal_submitted_at: 抗議が送信されました
+      appealed_msg: 申し立てが送信されました。承認されると通知されます。
      appeals:
        submit: 抗議を送信
      associated_report: 関連する通報
      created_at: 日時
+      description_html: これらは、%{instance} のスタッフがあなたのアカウントに対して行った措置や、あなたに送られた警告です。
      recipient: 送信元
+      status: '投稿 #%{id}'
+      status_removed: 既に削除されています
      title: "%{date}に%{action}"
      title_actions:
        delete_statuses: 投稿の削除
@ -932,6 +1016,9 @@ ja:
        sensitive: アカウントを閲覧注意としてマーク
        silence: アカウントの制限
        suspend: アカウントの一時停止
+      your_appeal_approved: 申し立てが承認されました
+      your_appeal_pending: 申し立てを送信しました
+      your_appeal_rejected: 申し立ては拒否されました
  domain_validator:
    invalid_domain: は無効なドメイン名です
  errors:
@ -1113,6 +1200,8 @@ ja:
      mention: "%{name} さんがあなたに返信しました:"
      new_followers_summary:
        other: また、離れている間に%{count} 人の新たなフォロワーを獲得しました！
+      subject:
+        other: "前回の訪問から%{count} 件の新しい通知 🐘"
      title: 不在の間に…
    favourite:
      body: "%{name} さんにお気に入り登録された、あなたの投稿があります:"
@ -1223,6 +1312,9 @@ ja:
    reply:
      proceed: 返信する
      prompt: '返信しようとしています:'
+  reports:
+    errors:
+      invalid_rules: 有効なルールを参照していません
  scheduled_statuses:
    over_daily_limit: その日予約できる投稿数 %{limit} を超えています
    over_total_limit: 予約できる投稿数 %{limit} を超えています
@ -1289,6 +1381,7 @@ ja:
    profile: プロフィール
    relationships: フォロー・フォロワー
    statuses_cleanup: 投稿の自動削除
+    strikes: モデレーションストライク
    two_factor_authentication: 二段階認証
    webauthn_authentication: セキュリティキー
  statuses:
@ -1484,24 +1577,43 @@ ja:
    recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。<strong>リカバリーコードは大切に保全してください。</strong>たとえば印刷してほかの重要な書類と一緒に保管することができます。
    webauthn: セキュリティキー
  user_mailer:
+    appeal_approved:
+      action: アカウントへ
+      explanation: "%{strike_date} のストライクに対して、あなたが %{appeal_date} に行った申し立ては承認されました。アカウントは正常な状態に戻りました。"
+      subject: "%{date} の申し立てが承認されました"
+      title: 申し立てが承認されました。
    appeal_rejected:
+      explanation: "%{strike_date} のストライクに対して、あなたが %{appeal_date} に行った申し立ては却下されました。"
+      subject: "%{date} の申し立てが拒否されました"
      title: 却下された抗議
    backup_ready:
      explanation: Mastodonアカウントのアーカイブを受け付けました。今すぐダウンロードできます！
      subject: アーカイブの準備ができました
      title: アーカイブの取り出し
+    suspicious_sign_in:
+      change_password: パスワードを変更する
+      details: 'ログインの詳細は以下のとおりです:'
+      explanation: 新しいIPアドレスからあなたのアカウントへのサインインが検出されました。
+      further_actions_html: あなたがログインしていない場合は、すぐに %{action} し、アカウントを安全に保つために二段階認証を有効にすることをお勧めします。
+      subject: 新しいIPアドレスからのアクセスがありました
+      title: 新しいサインイン
    warning:
      appeal: 抗議を送信
+      appeal_description: これが間違いだと思われる場合は、 %{instance} のスタッフに申し立てすることができます。
      categories:
        spam: スパム
        violation: コンテンツは以下のコミュニティガイドラインに違反しています
      explanation:
+        delete_statuses: あなたの投稿のいくつかは、1つ以上のコミュニティガイドラインに違反していることが判明し、%{instance} のモデレータによって削除されました。
        disable: アカウントは使用できませんが、プロフィールやその他のデータはそのまま残ります。 データのバックアップをリクエストしたり、アカウント設定を変更したり、アカウントを削除したりできます。
        mark_statuses_as_sensitive: あなたのいくつかの投稿は、 %{instance} のモデレータによって閲覧注意としてマークされています。これは、プレビューが表示される前にユーザが投稿内のメディアをタップする必要があることを意味します。あなたは将来投稿する際に自分自身でメディアを閲覧注意としてマークすることができます。
        sensitive: 今後、アップロードされたすべてのメディアファイルは閲覧注意としてマークされ、クリック解除式の警告で覆われるようになります。
        silence: アカウントが制限されています。このサーバーでは既にフォローしている人だけがあなたの投稿を見ることができます。 様々な発見機能から除外されるかもしれません。他の人があなたを手動でフォローすることは可能です。
+        suspend: アカウントは使用できなくなり、プロフィールなどのデータにもアクセスできなくなります。約30日後にデータが完全に削除されるまでは、ログインしてデータのバックアップを要求することができますが、アカウントの停止回避を防ぐために一部の基本データを保持します。
      reason: '理由:'
+      statuses: '投稿:'
      subject:
+        delete_statuses: "%{acct} の投稿が削除されました"
        disable: あなたのアカウント %{acct} は凍結されました
        mark_statuses_as_sensitive: あなたの %{acct} の投稿は閲覧注意としてマークされました
        none: "%{acct} に対する警告"
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -49,7 +49,7 @@ ko:
      silenced_title: 침묵 된 서버들
      suspended: 이 서버의 아무도 팔로우 할 수 없으며, 어떤 데이터도 처리되거나 저장 되지 않고 데이터가 교환 되지도 않습니다.
      suspended_title: 금지된 서버들
-    unavailable_content_html: 마스토돈은 일반적으로 별무리에 있는 어떤 서버의 유저와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.
+    unavailable_content_html: 마스토돈은 일반적으로 연합우주에 있는 어떤 서버의 유저와도 게시물을 보고 응답을 할 수 있도록 허용합니다. 다음 항목들은 특정한 서버에 대해 만들어 진 예외사항입니다.
    user_count_after:
      other: 명
    user_count_before: 사용자 수
@ -507,6 +507,7 @@ ko:
      delivery:
        all: 전체
        clear: 전달 에러 초기화
+        failing: 실패중
        restart: 전달 재시작
        stop: 전달 중지
        unavailable: 사용불가
@ -560,7 +561,7 @@ ko:
    relays:
      add_new: 릴레이 추가
      delete: 삭제
-      description_html: "<strong>연합 릴레이</strong>는 서버들 사이에서 많은 양의 공개 게시물을 구독하고 중개하는 서버입니다. <strong>이것은 중소 규모의 서버에서 별무리를 발견하는 데에 도움을 줄 수 있습니다</strong>, 이제 로컬 유저들이 다른 서버의 유저들을 수동으로 팔로우 하지 않아도 됩니다."
+      description_html: "<strong>연합 릴레이</strong>는 서버들 사이에서 많은 양의 공개 게시물을 구독하고 중개하는 서버입니다. <strong>이것은 중소 규모의 서버에서 연합우주를 발견하는 데에 도움을 줄 수 있습니다</strong>, 이제 로컬 유저들이 다른 서버의 유저들을 수동으로 팔로우 하지 않아도 됩니다."
      disable: 비활성화
      disabled: 비활성화 됨
      enable: 활성화
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@ -519,6 +519,7 @@ ku:
      delivery:
        all: Hemû
        clear: Çewtiyên gihandinê paqij bike
+        failing: Têkçûn
        restart: Gihandinê nû va bike
        stop: Gehandinê rawestîne
        unavailable: Nederbasdar
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -529,6 +529,7 @@ lv:
      delivery:
        all: Visas
        clear: Notīrīt piegādes kļūdas
+        failing: Neizdošanās
        restart: Pārstartēt piegādi
        stop: Apturēt piegādi
        unavailable: Nav pieejams
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -496,6 +496,7 @@ ru:
      delivery:
        all: Все
        clear: Очистить ошибки доставки
+        failing: Неудача
        restart: Перезапустить доставку
        stop: Остановить доставку
        unavailable: Недоступные
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@ -74,7 +74,7 @@ ast:
        setting_use_pending_items: Mou lentu
        severity: Severidá
        sign_in_token_attempt: Códigu de seguranza
-        type: Triba de la importación
+        type: Tipu de la importación
        username: Nome d'usuariu
        username_or_email: Nome d'usuariu o corréu
        whole_word: La pallabra entera
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@ -10,7 +10,7 @@ ca:
        text: Pots utilitzar totes les sintaxi com ara URL, etiquetes i mencions
        title: Opcional. No és visible per al destinatari
      admin_account_action:
-        include_statuses: L'usuari veurà quins tuts han causat l'acció de moderació o avís
+        include_statuses: L'usuari veurà quines publicacions han causat l'acció de moderació o avís
        send_email_notification: L'usuari rebrà una explicació del que ha passat amb el seu compte
        text_html: Opcional. Pots utilitzar tota la sintaxi. Pots <a href="%{path}">afegir configuracions predefinides d'avís</a> per a estalviar temps
        type_html: Tria què fer amb <strong>%{acct}</strong>
@ -18,7 +18,7 @@ ca:
          disable: Evita que l'usuari faci ús del seu compte però no li esborra o amaga els seus continguts.
          none: Fes servir això per a enviar un avís al usuari sense desencadenar cap altre acció.
          sensitive: Obliga a marcar tots els fitxers multi mèdia adjunts com a sensibles.
-          silence: Evita que l'usuari sigui capaç de publicar amb visibilitat publica, amaga els tuts i notificacions de usuaris que no el segueixen.
+          silence: Evitar que l'usuari sigui capaç de publicar amb visibilitat pública, amagar les seves publicacions i notificacions d'usuaris que no el segueixen.
          suspend: Evita qualsevol interacció de o a aquest compte i esborra els seus continguts. Reversible en un termini de 30 dies.
        warning_preset_id: Opcional. Encara pots afegir text personalitzat al final de la configuració predefinida
      announcement:
@ -26,7 +26,7 @@ ca:
        ends_at: Opcional. En aquest moment, l’anunci deixarà automàticament d'estar publicat
        scheduled_at: Deixa-ho en blanc per a publicar l’anunci immediatament
        starts_at: Opcional. En el cas que el teu anunci estigui vinculat a un interval de temps específic
-        text: Pots utilitzar sintaxi d'un tut. Tingues en compte l’espai que l’anunci ocuparà a la pantalla de l’usuari
+        text: Pots utilitzar la sintaxi de publicacions. Tingues en compte l’espai que l’anunci ocuparà a la pantalla de l’usuari
      appeal:
        text: Només pots emetre una apel·lació per cada acció
      defaults:
@ -42,11 +42,11 @@ ca:
        fields: Pots tenir fins a 4 elements que es mostren com a taula al teu perfil
        header: PNG, GIF o JPG. Màxim %{size}. S'escalarà a %{dimensions}px
        inbox_url: Copia l'URL des de la pàgina principal del relay que vols utilitzar
-        irreversible: Els tuts filtrats desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
+        irreversible: Les publicacions filtrades desapareixeran de manera irreversible, fins i tot si el filtre es retira més tard
        locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
        locked: Requereix que aprovis manualment els seguidors
        password: Utilitza com a mínim 8 caràcters
-        phrase: Es combinarà independentment del format en el text o l'avís de contingut del tut
+        phrase: Es combinarà independentment del format en el text o l'avís de contingut de la publicació
        scopes: A quines API es permetrà a l'aplicació accedir. Si selecciones un àmbit d'alt nivell, no cal que seleccionis un d'individual.
        setting_aggregate_reblogs: No mostrar els nous impulsos de les publicacions que ja s'han impulsat recentment (només afecta els impulsos nous rebuts)
        setting_always_send_emails: Normalment, les notificacions per correu electrònic no s'enviaran si estàs fent servir activament Mastodon
@ -90,7 +90,7 @@ ca:
      tag:
        name: Només pots canviar la caixa de les lletres, per exemple, per fer-la més llegible
      user:
-        chosen_languages: Quan estigui marcat, només es mostraran els tuts de les llengües seleccionades en les línies de temps públiques
+        chosen_languages: Quan estigui marcat, només es mostraran les publicacions en les llengües seleccionades en les línies de temps públiques
    labels:
      account:
        fields:
@ -104,7 +104,7 @@ ca:
        text: Text predefinit
        title: Títol
      admin_account_action:
-        include_statuses: Inclou tuts reportats en el correu electrònic
+        include_statuses: Inclou les publicacions reportades en el correu electrònic
        send_email_notification: Notifica l'usuari per correu electrònic
        text: Avís personalitzat
        type: Acció
@ -124,7 +124,7 @@ ca:
      appeal:
        text: Explica perquè aquesta decisió hauria de ser revertida
      defaults:
-        autofollow: Convida a seguir el teu compte
+        autofollow: Convidar a seguir el teu compte
        avatar: Avatar
        bot: Aquest compte és un bot
        chosen_languages: Filtrar llengües
@ -155,17 +155,17 @@ ca:
        setting_always_send_emails: Envia sempre notificacions per correu electrònic
        setting_auto_play_gif: Reproduir automàticament els GIFs animats
        setting_boost_modal: Mostrar la finestra de confirmació abans d'impulsar
-        setting_crop_images: Retalla les imatges en tuts no ampliats a 16x9
+        setting_crop_images: Retalla les imatges en publicacions no ampliades a 16x9
        setting_default_language: Idioma de les publicacions
        setting_default_privacy: Privacitat de les publicacions
        setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
-        setting_delete_modal: Mostrar la finestra de confirmació abans d'esborrar un tut
+        setting_delete_modal: Mostrar la finestra de confirmació abans d'esborrar una publicació
        setting_disable_swiping: Desactivar les animacions
        setting_display_media: Visualització multimèdia
        setting_display_media_default: Per defecte
        setting_display_media_hide_all: Amaga-ho tot
        setting_display_media_show_all: Mostra-ho tot
-        setting_expand_spoilers: Sempre ampliar els tuts marcats amb advertències de contingut
+        setting_expand_spoilers: Sempre ampliar les publicacions marcades amb advertències de contingut
        setting_hide_network: Amagar la teva xarxa
        setting_noindex: Desactivar la indexació dels motors de cerca
        setting_reduce_motion: Reduir el moviment de les animacions
@ -218,7 +218,7 @@ ca:
        listable: Permet que aquesta etiqueta aparegui en les cerques i en el directori de perfils
        name: Etiqueta
        trendable: Permet que aquesta etiqueta aparegui en les tendències
-        usable: Permet als tuts emprar aquesta etiqueta
+        usable: Permetre a les publicacions emprar aquesta etiqueta
    'no': 'No'
    recommended: Recomanat
    required:
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@ -49,6 +49,7 @@ de:
        phrase: Wird schreibungsunabhängig mit dem Text und Inhaltswarnung eines Beitrags verglichen
        scopes: Welche Schnittstellen der Applikation erlaubt sind. Wenn du einen Top-Level-Scope auswählst, dann musst du nicht jeden einzelnen darunter auswählen.
        setting_aggregate_reblogs: Zeige denselben Beitrag nicht nochmal an, wenn er erneut geteilt wurde (dies betrifft nur neulich erhaltene erneut geteilte Beiträge)
+        setting_always_send_emails: Normalerweise werden E-Mail-Benachrichtigungen nicht gesendet, wenn du Mastodon aktiv verwendest
        setting_default_sensitive: NSFW-Medien werden erst nach einem Klick sichtbar
        setting_display_media_default: Verstecke Medien, die als NSFW markiert sind
        setting_display_media_hide_all: Alle Medien immer verstecken
@ -151,6 +152,7 @@ de:
        phrase: Schlagwort oder Satz
        setting_advanced_layout: Fortgeschrittene Benutzeroberfläche benutzen
        setting_aggregate_reblogs: Gruppiere erneut geteilte Beiträge auf der Startseite
+        setting_always_send_emails: E-Mail-Benachrichtigungen immer senden
        setting_auto_play_gif: Animierte GIFs automatisch abspielen
        setting_boost_modal: Bestätigungsdialog anzeigen, bevor ein Beitrag geteilt wird
        setting_crop_images: Bilder in nicht ausgeklappten Beiträgen auf 16:9 zuschneiden
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@ -0,0 +1 @@
+ga:
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@ -37,6 +37,7 @@ ja:
        current_password: 現在のアカウントのパスワードを入力してください
        current_username: 確認のため、現在のアカウントのユーザー名を入力してください
        digest: 長期間使用していない場合と不在時に返信を受けた場合のみ送信されます
+        discoverable: レコメンド、トレンド、その他の機能により、あなたのアカウントを他の人から見つけられるようにします
        email: 確認のメールが送信されます
        fields: プロフィールに表として4つまでの項目を表示することができます
        header: "%{size}までのPNG、GIF、JPGが利用可能です。 %{dimensions}pxまで縮小されます"
@ -48,6 +49,7 @@ ja:
        phrase: 投稿内容の大文字小文字や閲覧注意に関係なく一致
        scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
        setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響)
+        setting_always_send_emails: 通常、Mastodon からメール通知は行われません。
        setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
        setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
        setting_display_media_hide_all: メディアを常に隠す
@ -62,6 +64,7 @@ ja:
      domain_allow:
        domain: 登録するとこのサーバーからデータを受信したり、このドメインから受信するデータを処理して保存できるようになります
      email_domain_block:
+        domain: 電子メールアドレスのドメイン名、または使用されるMXレコードを指定できます。新規登録時にチェックされます。
        with_dns_records: 指定したドメインのDNSレコードを取得し、その結果もメールドメインブロックに登録されます
      featured_tag:
        name: 'これらを使うといいかもしれません:'
@ -149,6 +152,7 @@ ja:
        phrase: キーワードまたはフレーズ
        setting_advanced_layout: 上級者向け UI を有効にする
        setting_aggregate_reblogs: ブーストをまとめる
+        setting_always_send_emails: 常にメール通知を送信する
        setting_auto_play_gif: アニメーションGIFを自動再生する
        setting_boost_modal: ブーストする前に確認ダイアログを表示する
        setting_crop_images: 投稿の詳細以外では画像を16:9に切り抜く
@ -198,7 +202,7 @@ ja:
          sign_up_requires_approval: 登録を制限
        severity: ルール
      notification_emails:
-        appeal: モデレーターの判断に異議申し立てが行われました
+        appeal: モデレーターの判断に異議申し立てが行われた時
        digest: タイムラインからピックアップしてメールで通知する
        favourite: お気に入り登録された時
        follow: フォローされた時
@ -206,8 +210,8 @@ ja:
        mention: 返信が来た時
        pending_account: 新しいアカウントの承認が必要な時
        reblog: 投稿がブーストされた時
-        report: 新しいレポートが送信されました
-        trending_tag: 新しいトレンドタグにはレビューが必要です
+        report: 新しい通報が送信された時
+        trending_tag: 新しいトレンドのレビューをする必要がある時
      rule:
        text: ルール
      tag:
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@ -3,9 +3,9 @@ tr:
  simple_form:
    hints:
      account_alias:
-        acct: Taşımak istediğiniz hesabın kullanıcıadı@alanadını belirtin
+        acct: Taşıyacağınız hesabı kullanıcıadı@alanadı şeklinde belirtin
      account_migration:
-        acct: Taşımak istediğiniz hesabın kullanıcıadı@alanadını belirtin
+        acct: Yeni hesabınızı kullanıcıadı@alanadını şeklinde belirtin
      account_warning_preset:
        text: URL'ler, etiketler ve bahsedenler gibi toot sözdizimini kullanabilirsiniz
        title: İsteğe bağlı. Alıcıya görünmez
@ -128,10 +128,10 @@ tr:
        avatar: Profil resmi
        bot: Bu bir bot hesabı
        chosen_languages: Dilleri filtrele
-        confirm_new_password: Yeni şifreyi onayla
-        confirm_password: Şifreyi onayla
+        confirm_new_password: Yeni parolayı onayla
+        confirm_password: Parolayı doğrula
        context: İçeriği filtrele
-        current_password: Geçerli şifre
+        current_password: Güncel parola
        data: Veri
        discoverable: Bu hesabı dizinde listele
        display_name: Görünen isim
@ -141,14 +141,14 @@ tr:
        header: Kapak resmi
        honeypot: "%{label} (doldurmayın)"
        inbox_url: Aktarıcı gelen kutusunun URL'si
-        irreversible: Gizlemek yerine bırak
+        irreversible: Gizlemek yerine benim için sil
        locale: Arayüz dili
        locked: Hesabı kilitle
        max_uses: Maksimum kullanım sayısı
-        new_password: Yeni şifre
+        new_password: Yeni parola
        note: Kişisel bilgiler
        otp_attempt: İki adımlı doğrulama kodu
-        password: Şifre
+        password: Parola
        phrase: Anahtar kelime veya kelime öbeği
        setting_advanced_layout: Gelişmiş web arayüzünü etkinleştir
        setting_aggregate_reblogs: Zaman çizelgesindeki boostları grupla
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@ -1,7 +1,7 @@
 ---
 th:
  about:
-    about_hashtag_html: มีการแท็กโพสต์สาธารณะเหล่านี้ด้วย <strong>#%{hashtag}</strong> คุณสามารถโต้ตอบกับโพสต์ได้หากคุณมีบัญชีที่ใดก็ตามในจักรวาลสหพันธ์
+    about_hashtag_html: นี่คือโพสต์สาธารณะที่ได้รับการแท็กด้วย <strong>#%{hashtag}</strong> คุณสามารถโต้ตอบกับโพสต์ได้หากคุณมีบัญชีที่ใดก็ตามในจักรวาลสหพันธ์
    about_mastodon_html: 'เครือข่ายสังคมแห่งอนาคต: ไม่มีโฆษณา ไม่มีการสอดแนมโดยองค์กร การออกแบบตามหลักจริยธรรม และการกระจายศูนย์! เป็นเจ้าของข้อมูลของคุณด้วย Mastodon!'
    about_this: เกี่ยวกับ
    active_count_after: ใช้งานอยู่
@ -481,6 +481,7 @@ th:
      delivery:
        all: ทั้งหมด
        clear: ล้างข้อผิดพลาดการจัดส่ง
+        failing: ล้มเหลว
        restart: เริ่มการจัดส่งใหม่
        stop: หยุดการจัดส่ง
        unavailable: ไม่พร้อมใช้งาน
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -185,7 +185,7 @@ tr:
        send: Doğrulama epostasını yeniden gönder
        success: Onay e-postası başarıyla gönderildi!
      reset: Sıfırla
-      reset_password: Şifreyi sıfırla
+      reset_password: Parolayı sıfırla
      resubscribe: Yeniden abone ol
      role: İzinler
      roles:
@ -517,6 +517,7 @@ tr:
      delivery:
        all: Tümü
        clear: Teslimat hatalarını temizle
+        failing: Hata
        restart: Teslimatı yeniden başlat
        stop: Teslimatı durdur
        unavailable: Mevcut Değil
@ -597,6 +598,7 @@ tr:
      action_taken_by: tarafından gerçekleştirilen eylem
      actions:
        delete_description_html: Bildirilen gönderiler silinecek ve aynı hesapla ileride yaşabileceğiniz etkileşimlerde çoğaltmanız için bir eylem kaydedilecek.
+        mark_as_sensitive_description_html: Bildirilen gönderilerdeki medya dosyaları hassas olarak işaretlenecek ve aynı hesabın gelecekteki ihlallerinde daha yetkili makamlara bildirmenize yardımcı olmak için bir eylem kaydedilecek.
        other_description_html: Hesabın davranışını denetlemek ve bildirilen hesabın iletişimini yapılandırmak için daha fazla seçenek görün.
        resolve_description_html: Bildirilen hesap için bir şey yapılmayacak, eylem kaydedilmeyecek ve bildirim kapatılacak.
        silence_description_html: Profil sadece halihazırda takip edenler ve elle bakanlarca görünecek, böylece erişimi ciddi bir şekilde kısıtlanacak. Her zaman geri alınabilir.
@ -918,7 +920,7 @@ tr:
    your_token: Erişim belirteciniz
  auth:
    apply_for_account: Davet et
-    change_password: Şifre
+    change_password: Parola
    checkbox_agreement_html: <a href="%{rules_path}" target="_blank">Sunucu kurallarını</a> ve <a href="%{terms_path}" target="_blank">hizmet şartlarını</a> kabul ediyorum
    checkbox_agreement_without_rules_html: <a href="%{terms_path}" target="_blank">Hizmet şartlarını</a> kabul ediyorum
    delete_account: Hesabı sil
@ -929,7 +931,7 @@ tr:
      suffix: Bir hesapla, kişileri takip edebilir, güncellemeler gönderebilir, herhangi bir Mastodon sunucusundan kullanıcılarla mesaj alışverişinde bulunabilir ve daha birçok şey yapabilirsin!
    didnt_get_confirmation: Doğrulama talimatlarını almadınız mı?
    dont_have_your_security_key: Güvenlik anahtarınız yok mu?
-    forgot_password: Şifrenizi mi unuttunuz?
+    forgot_password: Parolanızı mı unuttunuz?
    invalid_reset_password_token: Parola sıfırlama belirteci geçersiz veya süresi dolmuş. Lütfen yeni bir tane talep edin.
    link_to_otp: Telefonunuzdan iki adımlı bir kod veya bir kurtarma kodu girin
    link_to_webauth: Güvenlik anahtarı cihazınızı kullanın
@ -945,9 +947,9 @@ tr:
    register: Kaydol
    registration_closed: "%{instance} yeni üyeler kabul etmemektedir"
    resend_confirmation: Onaylama talimatlarını tekrar gönder
-    reset_password: Şifreyi sıfırla
+    reset_password: Parolayı sıfırla
    security: Güvenlik
-    set_new_password: Yeni şifre belirle
+    set_new_password: Yeni parola belirle
    setup:
      email_below_hint_html: Eğer aşağıdaki e-posta adresi yanlışsa, onu burada değiştirebilir ve yeni bir doğrulama e-postası alabilirsiniz.
      email_settings_hint_html: Onaylama e-postası %{email} adresine gönderildi. Eğer bu e-posta adresi doğru değilse, hesap ayarlarından değiştirebilirsiniz.
@ -977,8 +979,8 @@ tr:
  challenge:
    confirm: Devam et
    hint_html: "<strong>İpucu:</strong> Önümüzdeki saat boyunca sana parolanı sormayacağız."
-    invalid_password: Geçersiz şifre
-    prompt: Devam etmek için şifreyi doğrulayın
+    invalid_password: Geçersiz parola
+    prompt: Devam etmek için parolanızı doğrulayın
  crypto:
    errors:
      invalid_key: geçerli bir Ed25519 veya Curve25519 anahtarı değil
@ -1002,7 +1004,7 @@ tr:
      x_months: "%{count}ay"
      x_seconds: "%{count}sn"
  deletes:
-    challenge_not_passed: Girdiğiniz bilgi doğru değildi
+    challenge_not_passed: Girdiğiniz bilgi hatalı
    confirm_password: Kimliğinizi doğrulamak için mevcut parolanızı girin
    confirm_username: Prosedürü doğrulamak için kullanıcı adınızı girin
    proceed: Hesabı sil
@ -1278,7 +1280,7 @@ tr:
          billion: Mr
          million: Mn
          quadrillion: Kn
-          thousand: Bn
+          thousand: Bin
          trillion: Tn
  otp_authentication:
    code_hint: Onaylamak için authenticator uygulamanız tarafından oluşturulan kodu girin
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@ -489,6 +489,7 @@ uk:
      delivery:
        all: Усі
        clear: Очистити помилки доставляння
+        failing: Невдалі
        restart: Перезапустити доставляння
        stop: Припинити доставляння
        unavailable: Недоступно
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -51,7 +51,7 @@ vi:
    user_count_after:
      other: người dùng
    user_count_before: Nhà của
-    what_is_mastodon: Mastodon
+    what_is_mastodon: Mastodon là gì?
  accounts:
    choices_html: "%{name} tôn vinh:"
    endorsements_hint: Bạn có thể tôn vinh những người bạn theo dõi và họ sẽ hiển thị ở giao diện web.
@ -263,12 +263,12 @@ vi:
        reset_password_user: Đặt lại mật khẩu
        resolve_report: Xử lý báo cáo
        sensitive_account: Áp đặt nhạy cảm
-        silence_account: Áp đặt hạn chế
+        silence_account: Áp đặt ẩn
        suspend_account: Áp đặt vô hiệu hóa
        unassigned_report: Báo cáo chưa xử lý
        unblock_email_account: Mở khóa địa chỉ email
        unsensitive_account: Bỏ nhạy cảm
-        unsilence_account: Bỏ hạn chế
+        unsilence_account: Bỏ ẩn
        unsuspend_account: Bỏ vô hiệu hóa
        update_announcement: Cập nhật thông báo
        update_custom_emoji: Cập nhật emoji
@ -503,6 +503,7 @@ vi:
      delivery:
        all: Toàn bộ
        clear: Xóa phân phối lỗi
+        failing: Mất kết nối
        restart: Khởi động lại phân phối
        stop: Ngưng phân phối
        unavailable: Không khả dụng
@ -968,7 +969,7 @@ vi:
  date:
    formats:
      default: "%-d %B, %Y"
-      with_month_name: "%B %d, %Y"
+      with_month_name: "%-d tháng %-m, %Y"
  datetime:
    distance_in_words:
      about_x_hours: "%{count} giờ"
@ -1538,7 +1539,7 @@ vi:
    mastodon-light: Mastodon (Sáng)
  time:
    formats:
-      default: "%d.%m.%Y %H:%M"
+      default: "%-d.%m.%Y %H:%M"
      month: "%B %Y"
      time: "%H:%M"
  two_factor_authentication:
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@ -930,7 +930,7 @@ zh-CN:
    registration_closed: "%{instance} 目前不接收新成员"
    resend_confirmation: 重新发送确认邮件
    reset_password: 重置密码
-    security: 帐户安全
+    security: 账户安全
    set_new_password: 设置新密码
    setup:
      email_below_hint_html: 如果下面的电子邮箱地址是错误的，你可以在这里修改并重新发送新的确认邮件。
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -505,6 +505,7 @@ zh-TW:
      delivery:
        all: 所有
        clear: 清除遞送錯誤
+        failing: 發送失敗
        restart: 重新啟動遞送
        stop: 停止遞送
        unavailable: 無法使用
--- a/package.json
+++ b/package.json
@ -64,12 +64,12 @@
  "private": true,
  "dependencies": {
    "@babel/core": "^7.17.9",
-    "@babel/plugin-proposal-decorators": "^7.17.8",
+    "@babel/plugin-proposal-decorators": "^7.17.9",
    "@babel/plugin-transform-react-inline-elements": "^7.16.7",
    "@babel/plugin-transform-runtime": "^7.17.0",
    "@babel/preset-env": "^7.16.11",
    "@babel/preset-react": "^7.16.7",
-    "@babel/runtime": "^7.17.8",
+    "@babel/runtime": "^7.17.9",
    "@gamestdio/websocket": "^0.3.2",
    "@github/webauthn-json": "^0.5.7",
    "@rails/ujs": "^6.1.5",
@ -143,7 +143,7 @@
    "react-redux-loading-bar": "^4.0.8",
    "react-router-dom": "^4.1.1",
    "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^5.2.2",
+    "react-select": "^5.3.0",
    "react-sparklines": "^1.7.0",
    "react-swipeable-views": "^0.14.0",
    "react-textarea-autosize": "^8.3.3",
@ -157,7 +157,7 @@
    "requestidlecallback": "^0.3.0",
    "reselect": "^4.1.5",
    "rimraf": "^3.0.2",
-    "sass": "^1.49.11",
+    "sass": "^1.50.0",
    "sass-loader": "^10.2.0",
    "stacktrace-js": "^2.0.2",
    "stringz": "^2.1.0",
@ -177,12 +177,12 @@
    "ws": "^8.5.0"
  },
  "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.3",
-    "@testing-library/react": "^12.1.4",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^12.1.5",
    "babel-eslint": "^10.1.0",
    "babel-jest": "^27.5.1",
    "eslint": "^7.32.0",
-    "eslint-plugin-import": "~2.25.4",
+    "eslint-plugin-import": "~2.26.0",
    "eslint-plugin-jsx-a11y": "~6.5.1",
    "eslint-plugin-promise": "~6.0.0",
    "eslint-plugin-react": "~7.29.4",
--- a/streaming/index.js
+++ b/streaming/index.js
@ -146,7 +146,7 @@ const startWorker = async (workerId) => {

  const app = express();

-  app.set('trusted proxy', process.env.TRUSTED_PROXY_IP || 'loopback,uniquelocal');
+  app.set('trust proxy', process.env.TRUSTED_PROXY_IP ? process.env.TRUSTED_PROXY_IP.split(/(?:\s*,\s*|\s+)/) : 'loopback,uniquelocal');

  const pgPool = new pg.Pool(Object.assign(pgConfigs[env], dbUrlToConfig(process.env.DATABASE_URL)));
  const server = http.createServer(app);
--- a/yarn.lock
+++ b/yarn.lock
@ -96,15 +96,15 @@
    browserslist "^4.17.5"
    semver "^6.3.0"

-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
-  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
+  integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
  dependencies:
    "@babel/helper-annotate-as-pure" "^7.16.7"
    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
    "@babel/helper-optimise-call-expression" "^7.16.7"
    "@babel/helper-replace-supers" "^7.16.7"
    "@babel/helper-split-export-declaration" "^7.16.7"
@ -197,6 +197,13 @@
  dependencies:
    "@babel/types" "^7.16.7"

+"@babel/helper-member-expression-to-functions@^7.17.7":
+  version "7.17.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
+  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+  dependencies:
+    "@babel/types" "^7.17.0"
+
 "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
  version "7.16.7"
  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
@ -377,14 +384,15 @@
    "@babel/helper-plugin-utils" "^7.16.7"
    "@babel/plugin-syntax-class-static-block" "^7.14.5"

-"@babel/plugin-proposal-decorators@^7.17.8":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz#4f0444e896bee85d35cf714a006fc5418f87ff00"
-  integrity sha512-U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA==
+"@babel/plugin-proposal-decorators@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz#67a1653be9c77ce5b6c318aa90c8287b87831619"
+  integrity sha512-EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA==
  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
+    "@babel/helper-create-class-features-plugin" "^7.17.9"
    "@babel/helper-plugin-utils" "^7.16.7"
    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
    "@babel/plugin-syntax-decorators" "^7.17.0"
    charcodes "^0.2.0"

@ -1044,10 +1052,10 @@
  dependencies:
    regenerator-runtime "^0.12.0"

-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
-  integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.9", "@babel/runtime@^7.2.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
+  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
  dependencies:
    regenerator-runtime "^0.13.4"

@ -1498,10 +1506,10 @@
    lz-string "^1.4.4"
    pretty-format "^27.0.2"

-"@testing-library/jest-dom@^5.16.3":
-  version "5.16.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.3.tgz#b76851a909586113c20486f1679ffb4d8ec27bfa"
-  integrity sha512-u5DfKj4wfSt6akfndfu1eG06jsdyA/IUrlX2n3pyq5UXgXMhXY+NJb8eNK/7pqPWAhCKsCGWDdDO0zKMKAYkEA==
+"@testing-library/jest-dom@^5.16.4":
+  version "5.16.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.4.tgz#938302d7b8b483963a3ae821f1c0808f872245cd"
+  integrity sha512-Gy+IoFutbMQcky0k+bqqumXZ1cTGswLsFqmNLzNdSKkU9KGV2u9oXhukCbbJ9/LRPKiqwxEE8VpV/+YZlfkPUA==
  dependencies:
    "@babel/runtime" "^7.9.2"
    "@types/testing-library__jest-dom" "^5.9.1"
@ -1513,14 +1521,14 @@
    lodash "^4.17.15"
    redent "^3.0.0"

-"@testing-library/react@^12.1.4":
-  version "12.1.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.4.tgz#09674b117e550af713db3f4ec4c0942aa8bbf2c0"
-  integrity sha512-jiPKOm7vyUw311Hn/HlNQ9P8/lHNtArAx0PisXyFixDDvfl8DbD6EUdbshK5eqauvBSvzZd19itqQ9j3nferJA==
+"@testing-library/react@^12.1.5":
+  version "12.1.5"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-12.1.5.tgz#bb248f72f02a5ac9d949dea07279095fa577963b"
+  integrity sha512-OfTXCJUFgjd/digLUuPxa0+/3ZxsQmE7ub9kcbW/wi96Bh3o/p5vrETcBGfP17NWPGqeYYl5LTRpwyGoMC4ysg==
  dependencies:
    "@babel/runtime" "^7.12.5"
    "@testing-library/dom" "^8.0.0"
-    "@types/react-dom" "*"
+    "@types/react-dom" "<18.0.0"

 "@tootallnate/once@1":
  version "1.1.2"
@ -1681,12 +1689,12 @@
  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
  integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==

-"@types/react-dom@*":
-  version "17.0.11"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.11.tgz#e1eadc3c5e86bdb5f7684e00274ae228e7bcc466"
-  integrity sha512-f96K3k+24RaLGVu/Y2Ng3e1EbZ8/cVJvypZWd7cy0ofCBaf2lcM46xNhycMZ2xGwbBjRql7hOlZ+e2WlJ5MH3Q==
+"@types/react-dom@<18.0.0":
+  version "17.0.15"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.15.tgz#f2c8efde11521a4b7991e076cb9c70ba3bb0d156"
+  integrity sha512-Tr9VU9DvNoHDWlmecmcsE5ZZiUkYx+nKBzum4Oxe1K0yJVyBlfbq7H3eXjxXqJczBKqPGq3EgfTru4MgKb9+Yw==
  dependencies:
-    "@types/react" "*"
+    "@types/react" "^17"

 "@types/react-redux@^7.1.20":
  version "7.1.20"
@ -1714,6 +1722,15 @@
    "@types/scheduler" "*"
    csstype "^3.0.2"

+"@types/react@^17":
+  version "17.0.44"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.44.tgz#c3714bd34dd551ab20b8015d9d0dbec812a51ec7"
+  integrity sha512-Ye0nlw09GeMp2Suh8qoOv0odfgCoowfM/9MG6WeRD60Gq9wS90bdkdRtYbRkNhXOpG4H+YXGvj4wOWhAC0LJ1g==
+  dependencies:
+    "@types/prop-types" "*"
+    "@types/scheduler" "*"
+    csstype "^3.0.2"
+
 "@types/scheduler@*":
  version "0.16.1"
  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
@ -2297,9 +2314,9 @@ async-limiter@~1.0.0:
  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==

 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
  dependencies:
    lodash "^4.17.14"

@ -4350,32 +4367,32 @@ eslint-import-resolver-node@^0.3.6:
    debug "^3.2.7"
    resolve "^1.20.0"

-eslint-module-utils@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
-  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
+eslint-module-utils@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
  dependencies:
    debug "^3.2.7"
    find-up "^2.1.0"

-eslint-plugin-import@~2.25.4:
-  version "2.25.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
-  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
+eslint-plugin-import@~2.26.0:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
  dependencies:
    array-includes "^3.1.4"
    array.prototype.flat "^1.2.5"
    debug "^2.6.9"
    doctrine "^2.1.0"
    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.2"
+    eslint-module-utils "^2.7.3"
    has "^1.0.3"
-    is-core-module "^2.8.0"
+    is-core-module "^2.8.1"
    is-glob "^4.0.3"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
    object.values "^1.1.5"
-    resolve "^1.20.0"
-    tsconfig-paths "^3.12.0"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"

 eslint-plugin-jsx-a11y@~6.5.1:
  version "6.5.1"
@ -5927,14 +5944,7 @@ is-color-stop@^1.0.0:
    rgb-regex "^1.0.1"
    rgba-regex "^1.0.0"

-is-core-module@^2.2.0, is-core-module@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.8.1:
+is-core-module@^2.2.0, is-core-module@^2.8.1:
  version "2.8.1"
  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
@ -7346,6 +7356,11 @@ minimist@^1.2.0, minimist@^1.2.5:
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==

+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 minipass-collect@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@ -9072,10 +9087,10 @@ react-router@^4.3.1:
    prop-types "^15.6.1"
    warning "^4.0.1"

-react-select@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.2.2.tgz#3d5edf0a60f1276fd5f29f9f90a305f0a25a5189"
-  integrity sha512-miGS2rT1XbFNjduMZT+V73xbJEeMzVkJOz727F6MeAr2hKE0uUSA8Ff7vD44H32x2PD3SRB6OXTY/L+fTV3z9w==
+react-select@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.3.0.tgz#dc77c1f95e1037ec4cb01c5e5d6272d80be8d3f6"
+  integrity sha512-GM6Fbv1+X+kb3e5Fc4oNeyOJkCIesY/D4NBiReKlGY4RxoeztFYm3J0KREgwMaIKQqwTiuLqTlpUBY3SYw5goQ==
  dependencies:
    "@babel/runtime" "^7.12.0"
    "@emotion/cache" "^11.4.0"
@ -9486,7 +9501,7 @@ resolve.exports@^1.1.0:
  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==

-resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0:
+resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
  version "1.22.0"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@ -9632,10 +9647,10 @@ sass-loader@^10.2.0:
    schema-utils "^3.0.0"
    semver "^7.3.2"

-sass@^1.49.11:
-  version "1.49.11"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.11.tgz#1ffeb77faeed8b806a2a1e021d7c9fd3fc322cb7"
-  integrity sha512-wvS/geXgHUGs6A/4ud5BFIWKO1nKd7wYIGimDk4q4GFkJicILActpv9ueMT4eRGSsp1BdKHuw1WwAHXbhsJELQ==
+sass@^1.50.0:
+  version "1.50.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.50.0.tgz#3e407e2ebc53b12f1e35ce45efb226ea6063c7c8"
+  integrity sha512-cLsD6MEZ5URXHStxApajEh7gW189kkjn4Rc8DQweMyF+o5HF5nfEz8QYLMlPsTOD88DknatTmBWkOcw5/LnJLQ==
  dependencies:
    chokidar ">=3.0.0 <4.0.0"
    immutable "^4.0.0"
@ -10727,14 +10742,14 @@ ts-essentials@^2.0.3:
  resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
  integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==

-tsconfig-paths@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
-  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
  dependencies:
    "@types/json5" "^0.0.29"
    json5 "^1.0.1"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
    strip-bom "^3.0.0"

 tslib@^1.9.0: