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

Gemfile

@@ -16,7 +16,7 @@ gem 'hamlit-rails', '~> 0.2'
 gem 'pg', '~> 1.4'
 gem 'makara', '~> 0.5'
 gem 'pghero', '~> 2.8'
-gem 'dotenv-rails', '~> 2.7'
+gem 'dotenv-rails', '~> 2.8'
 
 gem 'aws-sdk-s3', '~> 1.114', require: false
 gem 'fog-core', '<= 2.1.0'
@@ -26,7 +26,7 @@ gem 'blurhash', '~> 0.1'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
-gem 'bootsnap', '~> 1.12.0', require: false
+gem 'bootsnap', '~> 1.13.0', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.2'
@@ -101,7 +101,7 @@ gem 'rdf-normalize', '~> 0.5'
 gem 'redcarpet', '~> 3.5'
 
 group :development, :test do
-  gem 'fabrication', '~> 2.29'
+  gem 'fabrication', '~> 2.30'
   gem 'fuubar', '~> 2.5'
   gem 'i18n-tasks', '~> 1.0', require: false
   gem 'pry-byebug', '~> 3.9'
@@ -116,7 +116,7 @@ end
 group :test do
   gem 'capybara', '~> 3.37'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 2.21'
+  gem 'faker', '~> 2.22'
   gem 'microformats', '~> 4.4'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.1'

Gemfile.lock

@@ -114,7 +114,7 @@ GEM
       debug_inspector (>= 0.0.1)
     blurhash (0.1.6)
       ffi (~> 1.14)
-    bootsnap (1.12.0)
+    bootsnap (1.13.0)
       msgpack (~> 1.2)
     brakeman (5.2.3)
     browser (4.2.0)
@@ -200,9 +200,9 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.5.4)
       railties (>= 5)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
-    dotenv-rails (2.7.6)
+    dotenv-rails (2.8.1)
-      dotenv (= 2.7.6)
+      dotenv (= 2.8.1)
       railties (>= 3.2)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
@@ -219,8 +219,8 @@ GEM
     et-orbi (1.2.7)
       tzinfo
     excon (0.76.0)
-    fabrication (2.29.0)
+    fabrication (2.30.0)
-    faker (2.21.0)
+    faker (2.22.0)
       i18n (>= 1.8.11, < 2)
     faraday (1.9.3)
       faraday-em_http (~> 1.0)
@@ -307,7 +307,7 @@ GEM
     httplog (1.5.0)
       rack (>= 1.0)
       rainbow (>= 2.0.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.11)
       activesupport (>= 4.0.2)
@@ -398,8 +398,8 @@ GEM
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.16.0)
+    minitest (5.16.2)
-    msgpack (1.5.2)
+    msgpack (1.5.4)
     multi_json (1.15.0)
     multipart-post (2.1.1)
     net-ldap (0.17.1)
@@ -407,7 +407,7 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.7)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     nsa (0.2.8)
@@ -415,7 +415,7 @@ GEM
       concurrent-ruby (~> 1.0, >= 1.0.2)
       sidekiq (>= 3.5)
       statsd-ruby (~> 1.4, >= 1.4.0)
-    oj (3.13.17)
+    oj (3.13.18)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -449,7 +449,7 @@ GEM
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.4.1)
+    pg (1.4.2)
     pghero (2.8.3)
       activerecord (>= 5)
     pkg-config (1.4.7)
@@ -490,8 +490,8 @@ GEM
       rack (>= 2.1.0)
     rack-proxy (0.7.0)
       rack
-    rack-test (1.1.0)
+    rack-test (2.0.2)
-      rack (>= 1.0, < 3)
+      rack (>= 1.3)
     rails (6.1.6)
       actioncable (= 6.1.6)
       actionmailbox (= 6.1.6)
@@ -546,7 +546,7 @@ GEM
     rexml (3.2.5)
     rotp (6.2.0)
     rpam2 (4.0.2)
-    rqrcode (2.1.1)
+    rqrcode (2.1.2)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
@@ -615,7 +615,7 @@ GEM
       rufus-scheduler (~> 3.2)
       sidekiq (>= 4)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (7.1.25)
+    sidekiq-unique-jobs (7.1.26)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 5.0, < 8.0)
@@ -642,7 +642,7 @@ GEM
     sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    stackprof (0.2.19)
+    stackprof (0.2.20)
     statsd-ruby (1.5.0)
     stoplight (3.0.0)
     strong_migrations (0.7.9)
@@ -674,7 +674,7 @@ GEM
     twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
@@ -737,7 +737,7 @@ DEPENDENCIES
   better_errors (~> 2.9)
   binding_of_caller (~> 1.0)
   blurhash (~> 0.1)
-  bootsnap (~> 1.12.0)
+  bootsnap (~> 1.13.0)
   brakeman (~> 5.2)
   browser
   bullet (~> 7.0)
@@ -759,10 +759,10 @@ DEPENDENCIES
   devise_pam_authenticatable2 (~> 9.2)
   discard (~> 1.2)
   doorkeeper (~> 5.5)
-  dotenv-rails (~> 2.7)
+  dotenv-rails (~> 2.8)
   ed25519 (~> 1.3)
-  fabrication (~> 2.29)
+  fabrication (~> 2.30)
-  faker (~> 2.21)
+  faker (~> 2.22)
   fast_blank (~> 1.0)
   fastimage
   fog-core (<= 2.1.0)

app/javascript/mastodon/locales/af.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ar.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "أي كان مِن هذه",
   "hashtag.column_settings.tag_mode.none": "لا شيء مِن هذه",
   "hashtag.column_settings.tag_toggle": "إدراج الوسوم الإضافية لهذا العمود",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "اعرض الترقيات",
   "home.column_settings.show_replies": "اعرض الردود",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "المتابِعون",
   "timeline_hint.resources.follows": "المتابَعون",
   "timeline_hint.resources.statuses": "المنشورات القديمة",
-  "trends.counter_by_accounts": "{count,plural,zero{} one{{counter} شخص} two{{counter} شخصين} few{{counter} أشخاص } many{{counter} شخص} other{{counter} شخص}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "المتداولة الآن",
   "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",
   "units.short.billion": "{count} مليار",

app/javascript/mastodon/locales/ast.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualesquiera d'estes",
   "hashtag.column_settings.tag_mode.none": "Nenguna d'estes",
   "hashtag.column_settings.tag_toggle": "Incluyir les etiquetes adicionales d'esta columna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Amosar rempuestes",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older posts",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "En tendencia",
   "ui.beforeunload": "El borrador va perdese si coles de Mastodon.",
   "units.short.billion": "{count} B",

app/javascript/mastodon/locales/bg.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Някое от тези",
   "hashtag.column_settings.tag_mode.none": "Никое от тези",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Показване на споделяния",
   "home.column_settings.show_replies": "Показване на отговори",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Последователи",
   "timeline_hint.resources.follows": "Последвани",
   "timeline_hint.resources.statuses": "По-стари публикации",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} човек} other {{counter} човека}} говорят",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Налагащи се сега",
   "ui.beforeunload": "Черновата ви ще бъде загубена, ако излезете от Mastodon.",
   "units.short.billion": "{count}млрд",

app/javascript/mastodon/locales/bn.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "এর ভেতরে যেকোনোটা",
   "hashtag.column_settings.tag_mode.none": "এগুলোর একটাও না",
   "hashtag.column_settings.tag_toggle": "আরো ট্যাগ এই কলামে যুক্ত করতে",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "অনুসরকারীরা",
   "timeline_hint.resources.follows": "অনুসরণ করে",
   "timeline_hint.resources.statuses": "পুরনো টুটগুলি",
-  "trends.counter_by_accounts": "{count, plural,one {{counter} জন ব্যক্তি} other {{counter} জন লোক}} কথা বলছে",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "বর্তমানে জনপ্রিয়",
   "ui.beforeunload": "যে পর্যন্ত এটা লেখা হয়েছে, মাস্টাডন থেকে চলে গেলে এটা মুছে যাবে।",
   "units.short.billion": "{count}বিলিয়ন",

app/javascript/mastodon/locales/br.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
   "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
   "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Diazez",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Heulier·ezed·ien",
   "timeline_hint.resources.follows": "Heuliañ",
   "timeline_hint.resources.statuses": "Toudoù koshoc'h",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} den} other {{counter} a zud}} a zo o komz",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Kollet e vo ho prell ma kuitit Mastodon.",
   "units.short.billion": "{count}miliard",

app/javascript/mastodon/locales/ca.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Qualsevol d’aquests",
   "hashtag.column_settings.tag_mode.none": "Cap d’aquests",
   "hashtag.column_settings.tag_toggle": "Inclou etiquetes addicionals per a aquesta columna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Seguiments",
   "timeline_hint.resources.statuses": "Publicacions més antigues",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} parlant-ne",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "En tendència",
   "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ckb.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "هەر کام لەمانە",
   "hashtag.column_settings.tag_mode.none": "هیچ کام لەمانە",
   "hashtag.column_settings.tag_toggle": "تاگی زیادە ی ئەم ستوونە لەخۆ بنووسە",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "بنەڕەتی",
   "home.column_settings.show_reblogs": "پیشاندانی بەهێزکردن",
   "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "شوێنکەوتوو",
   "timeline_hint.resources.follows": "شوێنکەوتن",
   "timeline_hint.resources.statuses": "نێردراوی کۆن",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} کەس} other {{counter} کەس}} گفتوگۆ دەکا",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "ڕۆژەڤ",
   "ui.beforeunload": "ڕەشنووسەکەت لەدەست دەچێت ئەگەر ماستۆدۆن جێ بهێڵیت.",
   "units.short.billion": "{count} ملیار",

app/javascript/mastodon/locales/co.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Unu di quessi",
   "hashtag.column_settings.tag_mode.none": "Nisunu di quessi",
   "hashtag.column_settings.tag_toggle": "Inchjude tag addiziunali per sta colonna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Abbunati",
   "timeline_hint.resources.follows": "Abbunamenti",
   "timeline_hint.resources.statuses": "Statuti più anziani",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona chì parla} other {{counter} persone chì parlanu}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tindenze d'avà",
   "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
   "units.short.billion": "{count}G",

app/javascript/mastodon/locales/cs.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Jakékoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádné z těchto",
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci dodatečné tagy",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sledující",
   "timeline_hint.resources.follows": "Sledovaní",
   "timeline_hint.resources.statuses": "Starší příspěvky",
-  "trends.counter_by_accounts": "zmiňuje {count, plural, one {{counter} člověk} few {{counter} lidé} many {{counter} lidí} other {{counter} lidí}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Právě populární",
   "ui.beforeunload": "Pokud Mastodon opustíte, váš koncept se ztratí.",
   "units.short.billion": "{count} mld.",

app/javascript/mastodon/locales/cy.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
   "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos ymatebion",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Dilynwyr",
   "timeline_hint.resources.follows": "Yn dilyn",
   "timeline_hint.resources.statuses": "Postiadau hŷn",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} berson} other {{counter} o bobl}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Yn tueddu nawr",
   "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
   "units.short.billion": "{count}biliwn",

app/javascript/mastodon/locales/da.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
   "hashtag.column_settings.tag_toggle": "Inkludér ekstra tags for denne kolonne",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Samlet volumen {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Følgere",
   "timeline_hint.resources.follows": "Følger",
   "timeline_hint.resources.statuses": "Ældre indlæg",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} taler",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Hot lige nu",
   "ui.beforeunload": "Dit udkast går tabt, hvis du lukker Mastodon.",
   "units.short.billion": "{count} mia.",

app/javascript/mastodon/locales/de.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Eins von diesen",
   "hashtag.column_settings.tag_mode.none": "Keins von diesen",
   "hashtag.column_settings.tag_toggle": "Zusätzliche Hashtags für diese Spalte einfügen",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Gesamtes Aufkommen {days, plural, one {am letzten Tag} other {in den letzten {days} Tagen}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Einfach",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
@@ -314,7 +317,7 @@
   "navigation_bar.preferences": "Einstellungen",
   "navigation_bar.public_timeline": "Föderierte Zeitleiste",
   "navigation_bar.security": "Sicherheit",
-  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.report": "{target} wurde von {name} gemeldet",
   "notification.admin.sign_up": "{name} hat sich registriert",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
   "notification.follow": "{name} folgt dir",
@@ -327,7 +330,7 @@
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notifications.clear": "Mitteilungen löschen",
   "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen löschen möchtest?",
-  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.report": "Neue Meldungen:",
   "notifications.column_settings.admin.sign_up": "Neue Anmeldungen:",
   "notifications.column_settings.alert": "Desktop-Benachrichtigungen",
   "notifications.column_settings.favourite": "Favorisierungen:",
@@ -433,11 +436,11 @@
   "report.thanks.title_actionable": "Vielen Dank für die Meldung, wir werden uns das ansehen.",
   "report.unfollow": "@{name} entfolgen",
   "report.unfollow_explanation": "Du folgst diesem Konto. Um die Beiträge nicht mehr auf deiner Startseite zu sehen, entfolge dem Konto.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} angehangener Beitrag} other {{count} angehängte Beiträge}}",
-  "report_notification.categories.other": "Other",
+  "report_notification.categories.other": "Nicht Aufgelistet",
   "report_notification.categories.spam": "Spam",
-  "report_notification.categories.violation": "Rule violation",
+  "report_notification.categories.violation": "Regelbruch",
-  "report_notification.open": "Open report",
+  "report_notification.open": "Meldung öffnen",
   "search.placeholder": "Suche",
   "search_popout.search_format": "Fortgeschrittenes Suchformat",
   "search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
@@ -468,7 +471,7 @@
   "status.embed": "Einbetten",
   "status.favourite": "Favorisieren",
   "status.filtered": "Gefiltert",
-  "status.hide": "Hide toot",
+  "status.hide": "Tröt verbergen",
   "status.history.created": "{name} erstellte {date}",
   "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Weitere laden",
@@ -492,7 +495,7 @@
   "status.report": "@{name} melden",
   "status.sensitive_warning": "NSFW",
   "status.share": "Teilen",
-  "status.show_filter_reason": "Show anyway",
+  "status.show_filter_reason": "Trotzdem anzeigen",
   "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alle Inhaltswarnungen zuklappen",
   "status.show_more": "Mehr anzeigen",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Follower",
   "timeline_hint.resources.follows": "Folgt",
   "timeline_hint.resources.statuses": "Ältere Beiträge",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} Person redet darüber} other {{counter} Personen reden darüber}}",
+  "trends.counter_by_accounts": "{count, plural, one {{count} Person} other {{count} Personen}} {days, plural, one {am vergangenen Tag} other {in den vergangenen {days} Tagen}}",
   "trends.trending_now": "In den Trends",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/defaultMessages.json

@@ -2124,6 +2124,14 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Follow hashtag",
+        "id": "hashtag.follow"
+      },
+      {
+        "defaultMessage": "Unfollow hashtag",
+        "id": "hashtag.unfollow"
+      },
       {
         "defaultMessage": "or {additional}",
         "id": "hashtag.column_header.tag_mode.any"

app/javascript/mastodon/locales/el.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Οποιοδήποτε από αυτά",
   "hashtag.column_settings.tag_mode.none": "Κανένα από αυτά",
   "hashtag.column_settings.tag_toggle": "Προσθήκη επιπλέον ταμπελών για την κολώνα",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Συνολικός όγκος κατά την τελευταία {days, plural, one {ημέρα} other {{days} ημέρες}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Ακόλουθοι",
   "timeline_hint.resources.follows": "Ακολουθεί",
   "timeline_hint.resources.statuses": "Παλαιότερα τουτ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο μιλάει} other {{counter} άτομα μιλάνε}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άνθρωποι}} στο παρελθόν {days, plural, one {ημέρα} other {{days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
   "units.short.billion": "{count}Δ",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older posts",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/en.json

@@ -224,7 +224,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags for this column",
+  "hashtag.follow": "Follow hashtag",
   "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",

app/javascript/mastodon/locales/eo.json

@@ -123,7 +123,7 @@
   "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun mesaĝon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
-  "confirmations.discard_edit_media.confirm": "Forlasi",
+  "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ de la antaŭmontro de la aŭdovidaĵo, ĉu vi forlasu ilin ĉiuokaze?",
   "confirmations.domain_block.confirm": "Bloki la tutan domajnon",
   "confirmations.domain_block.message": "Ĉu vi vere, vere certas, ke vi volas tute bloki {domain}? Plej ofte, trafa blokado kaj silentigado sufiĉas kaj preferindas. Vi ne vidos enhavon de tiu domajno en publika templinio aŭ en viaj sciigoj. Viaj sekvantoj de tiu domajno estos forigitaj.",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Iu ajn",
   "hashtag.column_settings.tag_mode.none": "Neniu",
   "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri plusendojn",
   "home.column_settings.show_replies": "Montri respondojn",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sekvantoj",
   "timeline_hint.resources.follows": "Sekvatoj",
   "timeline_hint.resources.statuses": "Pli malnovaj mesaĝoj",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} parolante",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Nunaj furoraĵoj",
   "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",
   "units.short.billion": "{count}Md",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estas",
   "hashtag.column_settings.tag_mode.none": "Ninguna de estas",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales para esta columna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Volumen total en el/los último/s {days, plural, one {día} other {{days} días}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Tus seguidores",
   "timeline_hint.resources.follows": "Las cuentas que seguís",
   "timeline_hint.resources.statuses": "Mensajes más antiguos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en el/los pasado/s {days, plural, one {día} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",
   "units.short.billion": "{count}MM",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -468,7 +471,7 @@
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
-  "status.hide": "Hide toot",
+  "status.hide": "Ocultar publicación",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
@@ -492,7 +495,7 @@
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Show anyway",
+  "status.show_filter_reason": "Mostrar de todos modos",
   "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
   "status.show_more": "Mostrar más",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
   "timeline_hint.resources.statuses": "Toots más antiguos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
   "units.short.billion": "{count} MM",

app/javascript/mastodon/locales/es.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
   "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Volumen total en los últimos {days, plural, one {día} other {{days} días}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguidos",
   "timeline_hint.resources.statuses": "Publicaciones más antiguas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} hablando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
   "units.short.billion": "{count} MM",

app/javascript/mastodon/locales/et.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Mõni neist",
   "hashtag.column_settings.tag_mode.none": "Mitte ükski neist",
   "hashtag.column_settings.tag_toggle": "Kaasa lisamärked selle tulba jaoks",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita upitusi",
   "home.column_settings.show_replies": "Näita vastuseid",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Hetkel populaarne",
   "ui.beforeunload": "Teie mustand läheb kaotsi, kui lahkute Mastodonist.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/eu.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Hautako edozein",
   "hashtag.column_settings.tag_mode.none": "Hauetako bat ere ez",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Jarraitzaileak",
   "timeline_hint.resources.follows": "Jarraitzen",
   "timeline_hint.resources.statuses": "Bidalketa zaharragoak",
-  "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} hizketan",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Joera orain",
   "ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/fa.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "هرکدام از این‌ها",
   "hashtag.column_settings.tag_mode.none": "هیچ‌کدام از این‌ها",
   "hashtag.column_settings.tag_toggle": "افزودن برچسب‌هایی بیشتر به این ستون",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "پایه‌ای",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "پیگیرندگان",
   "timeline_hint.resources.follows": "پی‌گرفتگان",
   "timeline_hint.resources.statuses": "فرسته‌های قدیمی‌تر",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} نفر} other {{counter} نفر}} صحبت می‌کنند",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "پرطرفدار",
   "ui.beforeunload": "اگر از ماستودون خارج شوید پیش‌نویس شما از دست خواهد رفت.",
   "units.short.billion": "{count}میلیارد",

app/javascript/mastodon/locales/fi.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Mikä tahansa näistä",
   "hashtag.column_settings.tag_mode.none": "Ei mitään näistä",
   "hashtag.column_settings.tag_toggle": "Sisällytä lisätunnisteet tähän sarakkeeseen",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seuraajat",
   "timeline_hint.resources.follows": "Seuraa",
   "timeline_hint.resources.statuses": "Vanhemmat julkaisut",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} henkilö} other {{counter} henkilöä}} puhuu",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
   "units.short.billion": "{count} mrd.",

app/javascript/mastodon/locales/fr.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Au moins un de ces éléments",
   "hashtag.column_settings.tag_mode.none": "Aucun de ces éléments",
   "hashtag.column_settings.tag_toggle": "Inclure des hashtags additionnels pour cette colonne",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Volume total {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
@@ -433,7 +436,7 @@
   "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
   "report.unfollow": "Ne plus suivre @{name}",
   "report.unfollow_explanation": "Vous suivez ce compte. Désabonnez-vous pour ne plus en voir les messages sur votre fil principal.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.other": "Autre",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Les abonnés",
   "timeline_hint.resources.follows": "Les abonnements",
   "timeline_hint.resources.statuses": "Messages plus anciens",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} personne en parle} other {{counter} personnes en parlent}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "units.short.billion": "{count}Md",

app/javascript/mastodon/locales/fy.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Folgers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Aldere berjochten",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoan is} other {{counter} persoanen binne}} yn petear",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ga.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Taispeáin treisithe",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Leantóirí",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older posts",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/gd.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Gin sam bith dhiubh",
   "hashtag.column_settings.tag_mode.none": "Às aonais gin sam bith dhiubh",
   "hashtag.column_settings.tag_toggle": "Gabh a-steach barrachd tagaichean sa cholbh seo",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bunasach",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Luchd-leantainn",
   "timeline_hint.resources.follows": "A’ leantainn air",
   "timeline_hint.resources.statuses": "Postaichean nas sine",
-  "trends.counter_by_accounts": "{count, plural, one {Tha {counter} neach} two {Tha {counter} neach} few {Tha {counter} daoine} other {Tha {counter} duine}} a’ bruidhinn",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "A’ treandadh an-dràsta",
   "ui.beforeunload": "Caillidh tu an dreachd agad ma dh’fhàgas tu Mastodon an-dràsta.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/gl.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Calquera destes",
   "hashtag.column_settings.tag_mode.none": "Ningún destes",
   "hashtag.column_settings.tag_toggle": "Incluír cancelos adicionais para esta columna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Cantidade total {days, plural, one {no último día} other {nos {days} últimos días}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidoras",
   "timeline_hint.resources.follows": "Seguindo",
   "timeline_hint.resources.statuses": "Publicacións antigas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} comentando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} nos últimos {days, plural, one {día} other {{days} días}}",
   "trends.trending_now": "Tendencias actuais",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/he.json

@@ -5,7 +5,7 @@
   "account.badges.group": "קבוצה",
   "account.block": "חסמי את @{name}",
   "account.block_domain": "חסמו את קהילת {domain}",
-  "account.blocked": "חסום",
+  "account.blocked": "לחסום",
   "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
   "account.cancel_follow_request": "בטל בקשת מעקב",
   "account.direct": "הודעה ישירה ל@{name}",
@@ -38,7 +38,7 @@
   "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
   "account.share": "שתף את הפרופיל של @{name}",
   "account.show_reblogs": "הצג הדהודים מאת @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
+  "account.statuses_counter": "{count, plural, one {{counter} פוסט} two {{counter} פוסטים} many {{counter} פוסטים} other {{counter} פוסטים}}",
   "account.unblock": "הסר את החסימה של @{name}",
   "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
   "account.unblock_short": "הסר חסימה",
@@ -77,7 +77,7 @@
   "column.follow_requests": "בקשות מעקב",
   "column.home": "פיד הבית",
   "column.lists": "רשימות",
-  "column.mutes": "השתקות",
+  "column.mutes": "משתמשים בהשתקה",
   "column.notifications": "התראות",
   "column.pins": "פווסטים נעוצים",
   "column.public": "פיד כללי (כל השרתים)",
@@ -99,7 +99,7 @@
   "compose_form.hashtag_warning": "פוסט זה לא יירשם תחת תגי הקבצה (האשטאגים) היות והנראות שלו היא 'לא רשום'. רק פוסטים ציבוריים יכולים להימצא באמצעות תגי הקבצה.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
-  "compose_form.placeholder": "מה עובר לך בראש?",
+  "compose_form.placeholder": "על מה את/ה חושב/ת ?",
   "compose_form.poll.add_option": "הוסיפו בחירה",
   "compose_form.poll.duration": "משך הסקר",
   "compose_form.poll.option_placeholder": "אפשרות מספר {number}",
@@ -131,12 +131,12 @@
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
   "confirmations.mute.explanation": "זה יסתיר פוסטים שלהם ופוסטים שמאזכרים אותם, אבל עדיין יתיר להם לראות פוסטים שלך ולעקוב אחריך.",
-  "confirmations.mute.message": "להשתיק את {name}?",
+  "confirmations.mute.message": "בטוח/ה שברצונך להשתיק את {name}?",
-  "confirmations.redraft.confirm": "מחק וערוך מחדש",
+  "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "בטוחה שאת רוצה למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות לפוסט המקורי ישארו יתומות.",
-  "confirmations.reply.confirm": "הגב",
+  "confirmations.reply.confirm": "תגובה",
   "confirmations.reply.message": "תגובה עכשיו תדרוס את ההודעה שכבר התחלתים לכתוב. האם אתם בטוחים שברצונכם להמשיך?",
-  "confirmations.unfollow.confirm": "להפסיק מעקב",
+  "confirmations.unfollow.confirm": "הפסקת מעקב",
   "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
   "conversation.delete": "מחיקת שיחה",
   "conversation.mark_as_read": "סמן כנקרא",
@@ -146,17 +146,17 @@
   "directory.local": "מ- {domain} בלבד",
   "directory.new_arrivals": "חדשים כאן",
   "directory.recently_active": "פעילים לאחרונה",
-  "embed.instructions": "ניתן להטמיע את ההודעה באתרך ע\"י העתקת הקוד שלהלן.",
+  "embed.instructions": "ניתן להטמיע את הפוסט הזה באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
   "emoji_button.clear": "ניקוי",
-  "emoji_button.custom": "מיוחדים",
+  "emoji_button.custom": "בהתאמה אישית",
   "emoji_button.flags": "דגלים",
   "emoji_button.food": "אוכל ושתיה",
   "emoji_button.label": "הוספת אמוג'י",
   "emoji_button.nature": "טבע",
-  "emoji_button.not_found": "רגישון לא נמצא!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "לא נמצאו סמלונים מתאימים",
-  "emoji_button.objects": "חפצים",
+  "emoji_button.objects": "אובייקטים",
   "emoji_button.people": "אנשים",
   "emoji_button.recent": "בשימוש תדיר",
   "emoji_button.search": "חיפוש...",
@@ -167,7 +167,7 @@
   "empty_column.account_timeline": "אין עדיין אף פוסט!",
   "empty_column.account_unavailable": "פרופיל לא זמין",
   "empty_column.blocks": "עדיין לא חסמתם משתמשים אחרים.",
-  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
+  "empty_column.bookmarked_statuses": "אין עדיין פוסטים שחיבבת. כשתחבב את הראשון, הוא יופיע כאן.",
   "empty_column.community": "פיד השרת המקומי ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
   "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.",
   "empty_column.domain_blocks": "אין עדיין קהילות מוסתרות.",
@@ -177,7 +177,7 @@
   "empty_column.follow_recommendations": "נראה שלא ניתן לייצר המלצות עבורך. נסה/י להשתמש בחיפוש כדי למצוא אנשים מוכרים או לבדוק את הנושאים החמים.",
   "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.",
   "empty_column.hashtag": "אין כלום בהאשתג הזה עדיין.",
-  "empty_column.home": "אף אחד לא במעקב עדיין. אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר חצוצרנים אחרים. {suggestions}",
+  "empty_column.home": "פיד הבית ריק ! אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר משתמשים/ות אחרים/ות. {suggestions}",
   "empty_column.home.suggestions": "ראה/י כמה הצעות",
   "empty_column.list": "אין עדיין פריטים ברשימה. כאשר חברים ברשימה הזאת יפרסמו פוסטים חדשים, הם יופיעו פה.",
   "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "כל אלה",
   "hashtag.column_settings.tag_mode.none": "אף אחד מאלה",
   "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
@@ -240,10 +243,10 @@
   "keyboard_shortcuts.favourite": "לחבב",
   "keyboard_shortcuts.favourites": "פתיחת רשימת מועדפים",
   "keyboard_shortcuts.federated": "פתיחת ציר זמן בין-קהילתי",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.heading": "מקשי קיצור במקלדת",
   "keyboard_shortcuts.home": "פתיחת ציר זמן אישי",
   "keyboard_shortcuts.hotkey": "מקש קיצור",
-  "keyboard_shortcuts.legend": "להציג את הפירוש",
+  "keyboard_shortcuts.legend": "הצגת מקרא",
   "keyboard_shortcuts.local": "פתיחת ציר זמן קהילתי",
   "keyboard_shortcuts.mention": "לאזכר את המחבר(ת)",
   "keyboard_shortcuts.muted": "פתיחת רשימת משתמשים מושתקים",
@@ -252,11 +255,11 @@
   "keyboard_shortcuts.open_media": "פתיחת מדיה",
   "keyboard_shortcuts.pinned": "פתיחת רשימת חצרותים מוצמדים",
   "keyboard_shortcuts.profile": "פתח את פרופיל המשתמש",
-  "keyboard_shortcuts.reply": "לענות",
+  "keyboard_shortcuts.reply": "תגובה לפוסט",
   "keyboard_shortcuts.requests": "פתיחת רשימת בקשות מעקב",
   "keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
   "keyboard_shortcuts.spoilers": "הצגת/הסתרת שדה אזהרת תוכן (CW)",
-  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.start": "לפתוח את הטור \"בואו נתחיל\"",
   "keyboard_shortcuts.toggle_hidden": "הצגת/הסתרת טקסט מוסתר מאחורי אזהרת תוכן",
   "keyboard_shortcuts.toggle_sensitivity": "הצגת/הסתרת מדיה",
   "keyboard_shortcuts.toot": "להתחיל פוסט חדש",
@@ -265,7 +268,7 @@
   "lightbox.close": "סגירה",
   "lightbox.compress": "דחיסת קופסת צפייה בתמונה",
   "lightbox.expand": "הרחבת קופסת צפייה בתמונה",
-  "lightbox.next": "הלאה",
+  "lightbox.next": "הבא",
   "lightbox.previous": "הקודם",
   "limited_account_hint.action": "הצג חשבון בכל זאת",
   "limited_account_hint.title": "פרופיל זה הוסתר ע\"י מנהלי השרת שלך.",
@@ -284,7 +287,7 @@
   "lists.subheading": "הרשימות שלך",
   "load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
   "loading_indicator.label": "טוען...",
-  "media_gallery.toggle_visible": "נראה\\בלתי נראה",
+  "media_gallery.toggle_visible": "{number, plural, one {להסתיר תמונה} two {Hide images} many {להסתיר תמונות} other {Hide תמונות}}",
   "missing_indicator.label": "לא נמצא",
   "missing_indicator.sublabel": "לא ניתן היה למצוא את המשאב",
   "mute_modal.duration": "משך הזמן",
@@ -308,15 +311,15 @@
   "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת",
   "navigation_bar.lists": "רשימות",
   "navigation_bar.logout": "התנתקות",
-  "navigation_bar.mutes": "השתקות",
+  "navigation_bar.mutes": "משתמשים בהשתקה",
   "navigation_bar.personal": "אישי",
   "navigation_bar.pins": "פוסטים נעוצים",
   "navigation_bar.preferences": "העדפות",
-  "navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
+  "navigation_bar.public_timeline": "פיד כללי (כל השרתים)",
   "navigation_bar.security": "אבטחה",
-  "notification.admin.report": "{name} reported {target}",
+  "notification.admin.report": "{name} דיווח.ה על {target}",
   "notification.admin.sign_up": "{name} נרשמו",
-  "notification.favourite": "חצרוצך חובב על ידי {name}",
+  "notification.favourite": "{name} חיבב/ה את הפוסט שלך",
   "notification.follow": "{name} במעקב אחרייך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.mention": "אוזכרת על ידי {name}",
@@ -326,8 +329,8 @@
   "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו פוסט",
   "notifications.clear": "הסרת התראות",
-  "notifications.clear_confirmation": "להסיר את כל ההתראות? בטוח?",
+  "notifications.clear_confirmation": "להסיר את כל ההתראות לצמיתות ? ",
-  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.report": "דו\"חות חדשים",
   "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "מחובבים:",
@@ -338,7 +341,7 @@
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
   "notifications.column_settings.poll": "תוצאות סקר:",
-  "notifications.column_settings.push": "הודעות בדחיפה",
+  "notifications.column_settings.push": "התראות בדחיפה",
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
@@ -433,24 +436,24 @@
   "report.thanks.title_actionable": "תודה על הדיווח, נבדוק את העניין.",
   "report.unfollow": "הפסיקו לעקוב אחרי @{name}",
   "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריהם.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
+  "report_notification.attached_statuses": "{count, plural, one {{count} פוסט} two {{count} posts} many {{count} פוסטים} other {{count} פוסטים}} מצורפים",
-  "report_notification.categories.other": "Other",
+  "report_notification.categories.other": "שונות",
-  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam": "ספאם (דואר זבל)",
-  "report_notification.categories.violation": "Rule violation",
+  "report_notification.categories.violation": "הפרת כלל",
-  "report_notification.open": "Open report",
+  "report_notification.open": "פתח דו\"ח",
   "search.placeholder": "חיפוש",
   "search_popout.search_format": "מבנה חיפוש מתקדם",
-  "search_popout.tips.full_text": "Simple text returns statuses you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "search_popout.tips.full_text": "טקסט פשוט מחזיר פוסטים שכתבת, חיבבת, הידהדת או שאוזכרת בהם, כמו גם שמות משתמשים, שמות להצגה ותגיות מתאימים.",
   "search_popout.tips.hashtag": "האשתג",
-  "search_popout.tips.status": "status",
+  "search_popout.tips.status": "פוסט",
   "search_popout.tips.text": "טקסט פשוט מחזיר כינויים, שמות משתמש והאשתגים",
   "search_popout.tips.user": "משתמש(ת)",
   "search_results.accounts": "אנשים",
   "search_results.all": "כל התוצאות",
   "search_results.hashtags": "האשתגיות",
   "search_results.nothing_found": "לא נמצא דבר עבור תנאי חיפוש אלה",
-  "search_results.statuses": "Toots",
+  "search_results.statuses": "פוסטים",
-  "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
+  "search_results.statuses_fts_disabled": "חיפוש פוסטים לפי תוכן לא מאופשר בשרת מסטודון זה.",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
   "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
   "status.admin_status": "Open this status in the moderation interface",
@@ -468,7 +471,7 @@
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
   "status.filtered": "סונן",
-  "status.hide": "Hide toot",
+  "status.hide": "הסתר פוסט",
   "status.history.created": "{name} יצר/ה {date}",
   "status.history.edited": "{name} ערך/ה {date}",
   "status.load_more": "עוד",
@@ -479,7 +482,7 @@
   "status.mute_conversation": "השתקת שיחה",
   "status.open": "הרחבת פוסט זה",
   "status.pin": "הצמדה לפרופיל שלי",
-  "status.pinned": "Pinned toot",
+  "status.pinned": "פוסט נעוץ",
   "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
   "status.reblog_private": "להדהד ברמת הנראות המקורית",
@@ -492,7 +495,7 @@
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
-  "status.show_filter_reason": "Show anyway",
+  "status.show_filter_reason": "הראה בכל זאת",
   "status.show_less": "הראה פחות",
   "status.show_less_all": "להציג פחות מהכל",
   "status.show_more": "הראה יותר",
@@ -516,8 +519,8 @@
   "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
   "timeline_hint.resources.followers": "עוקבים",
   "timeline_hint.resources.follows": "נעקבים",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.statuses": "פוסטים ישנים יותר",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} אחד/ת מדבר/ת} other {{counter} אנשים מדברים}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
   "units.short.billion": "{count} מליארד",

app/javascript/mastodon/locales/hi.json

@@ -92,10 +92,10 @@
   "community.column_settings.local_only": "स्थानीय ही",
   "community.column_settings.media_only": "सिर्फ़ मीडिया",
   "community.column_settings.remote_only": "केवल सुदूर",
-  "compose.language.change": "Change language",
+  "compose.language.change": "भाषा बदलें",
-  "compose.language.search": "Search languages...",
+  "compose.language.search": "भाषाएँ खोजें...",
   "compose_form.direct_message_warning_learn_more": "और जानें",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "compose_form.encryption_warning": "मास्टोडॉन पर पोस्ट एन्ड-टू-एन्ड एन्क्रिप्टेड नहीं है। कोई भी व्यक्तिगत जानकारी मास्टोडॉन पर मत भेजें।",
   "compose_form.hashtag_warning": "यह टूट् किसी भी हैशटैग के तहत सूचीबद्ध नहीं होगा क्योंकि यह अनलिस्टेड है। हैशटैग द्वारा केवल सार्वजनिक टूट्स खोजे जा सकते हैं।",
   "compose_form.lock_disclaimer": "आपका खाता {locked} नहीं है। आपको केवल फॉलोवर्स को दिखाई दिए जाने वाले पोस्ट देखने के लिए कोई भी फॉलो कर सकता है।",
   "compose_form.lock_disclaimer.lock": "लॉक्ड",
@@ -149,7 +149,7 @@
   "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
   "embed.preview": "यह ऐसा दिखेगा :",
   "emoji_button.activity": "गतिविधि",
-  "emoji_button.clear": "Clear",
+  "emoji_button.clear": "मिटा दें",
   "emoji_button.custom": "निजीकृत",
   "emoji_button.flags": "झंडे",
   "emoji_button.food": "भोजन एवं पेय",
@@ -191,7 +191,7 @@
   "errors.unexpected_crash.copy_stacktrace": "स्टैकट्रेस को क्लिपबोर्ड पर कॉपी करें",
   "errors.unexpected_crash.report_issue": "समस्या सूचित करें",
   "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
+  "explore.suggested_follows": "आपके लिए",
   "explore.title": "Explore",
   "explore.trending_links": "News",
   "explore.trending_statuses": "Posts",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "इनमें से कोई भी",
   "hashtag.column_settings.tag_mode.none": "इनमें से कोई भी नहीं",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "बुनियादी",
   "home.column_settings.show_reblogs": "बूस्ट दिखाए",
   "home.column_settings.show_replies": "जवाबों को दिखाए",
@@ -387,17 +390,17 @@
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",
-  "relative_time.full.just_now": "just now",
+  "relative_time.full.just_now": "अभी-अभी",
-  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.minutes": "{number, plural, one {# मिनट} other {# मिनट}} पहले",
-  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# सेकंड} other {# सेकंड}} पहले",
-  "relative_time.hours": "{number}h",
+  "relative_time.hours": "{number} घंटे",
   "relative_time.just_now": "अभी",
-  "relative_time.minutes": "{number}m",
+  "relative_time.minutes": "{number} मिनट",
-  "relative_time.seconds": "{number}s",
+  "relative_time.seconds": "{number} सेकंड",
-  "relative_time.today": "today",
+  "relative_time.today": "आज",
   "reply_indicator.cancel": "रद्द करें",
   "report.block": "Block",
-  "report.block_explanation": "You will not see their posts. They will not be able to see your posts or follow you. They will be able to tell that they are blocked.",
+  "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।",
   "report.categories.other": "Other",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Content violates one or more server rules",
@@ -413,9 +416,9 @@
   "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": "Type or paste additional comments",
-  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike": "मुझे यह पसंद नहीं है",
   "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
+  "report.reasons.other": "कुछ और है।",
   "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",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/hr.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Bilo koji navedeni",
   "hashtag.column_settings.tag_mode.none": "Nijedan navedeni",
   "hashtag.column_settings.tag_toggle": "Uključi dodatne oznake za ovaj stupac",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Pratitelji",
   "timeline_hint.resources.follows": "Praćenja",
   "timeline_hint.resources.statuses": "Stariji tootovi",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Popularno",
   "ui.beforeunload": "Vaša skica bit će izgubljena ako napustite Mastodon.",
   "units.short.billion": "{count} mlrd.",

app/javascript/mastodon/locales/hu.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Bármelyik",
   "hashtag.column_settings.tag_mode.none": "Egyik sem",
   "hashtag.column_settings.tag_toggle": "Új címkék felvétele ehhez az oszlophoz",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Teljes mennyiség az elmúlt {days, plural, one {napban} other {{days} napban}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Alapvető",
   "home.column_settings.show_reblogs": "Megtolások mutatása",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Követő",
   "timeline_hint.resources.follows": "Követett",
   "timeline_hint.resources.statuses": "Régi bejegyzések",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} személy} other {{counter} személy}} beszélget",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}",
   "trends.trending_now": "Most felkapott",
   "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.",
   "units.short.billion": "{count}Mrd",

app/javascript/mastodon/locales/hy.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Ցանկացածը",
   "hashtag.column_settings.tag_mode.none": "Ոչ մեկը",
   "hashtag.column_settings.tag_toggle": "Ներառել լրացուցիչ պիտակները այս սիւնակում ",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Հետեւորդ",
   "timeline_hint.resources.follows": "Հետեւել",
   "timeline_hint.resources.statuses": "Հին գրառումներ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} մարդ} other {{counter} մարդիկ}} խօսում են",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կը կորի, եթէ լքես Մաստոդոնը։",
   "units.short.billion": "{count}մլրդ",

app/javascript/mastodon/locales/id.json

@@ -1,9 +1,9 @@
 {
   "account.account_note_header": "Catatan",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "בוט",
   "account.badges.group": "Grup",
-  "account.block": "Blokir @{name}",
+  "account.block": "{name}לחסום את ",
   "account.block_domain": "Blokir domain {domain}",
   "account.blocked": "Terblokir",
   "account.browse_more_on_origin_server": "Lihat lebih lanjut diprofil asli",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Semua ini",
   "hashtag.column_settings.tag_mode.none": "Tak satu pun",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Pengikut",
   "timeline_hint.resources.follows": "Ikuti",
   "timeline_hint.resources.statuses": "Toot lama",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} berbicara",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Sedang tren sekarang",
   "ui.beforeunload": "Naskah anda akan hilang jika anda keluar dari Mastodon.",
   "units.short.billion": "{count}M",

app/javascript/mastodon/locales/io.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Irga co",
   "hashtag.column_settings.tag_mode.none": "Nula co",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Sumo en antea {days, plural,one {dio} other {{days} dii}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sequanti",
   "timeline_hint.resources.follows": "Sequati",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personi}} parolas",
+  "trends.counter_by_accounts": "{count, plural,one {{counter} persono} other {{counter} personi}} en antea {days, plural,one {dio} other {{days} dii}}",
   "trends.trending_now": "Tendencigas nun",
   "ui.beforeunload": "Vua skisato perdesos se vu ekiras Mastodon.",
   "units.short.billion": "{count}G",

app/javascript/mastodon/locales/is.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Hvað sem er af þessu",
   "hashtag.column_settings.tag_mode.none": "Ekkert af þessu",
   "hashtag.column_settings.tag_toggle": "Taka með viðbótarmerki fyrir þennan dálk",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Einfalt",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Fylgjendur",
   "timeline_hint.resources.follows": "Fylgist með",
   "timeline_hint.resources.statuses": "Eldri færslur",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} aðilar}} tala",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Í umræðunni núna",
   "ui.beforeunload": "Drögin tapast ef þú ferð út úr Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/it.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Uno o più di questi",
   "hashtag.column_settings.tag_mode.none": "Nessuno di questi",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Volume totale {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Semplice",
   "home.column_settings.show_reblogs": "Mostra condivisioni",
   "home.column_settings.show_replies": "Mostra risposte",
@@ -513,11 +516,11 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} left",
   "time_remaining.moments": "Restano pochi istanti",
   "time_remaining.seconds": "{number, plural, one {# secondo} other {# secondi}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource] da altri server non sono mostrati.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} da altri server non sono mostrati.",
   "timeline_hint.resources.followers": "Follower",
   "timeline_hint.resources.follows": "Segue",
   "timeline_hint.resources.statuses": "Post meno recenti",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persone}} ne parlano",
+  "trends.counter_by_accounts": "{count, plural, one {{count} persona} other {{count} persone}} {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
   "trends.trending_now": "Di tendenza ora",
   "ui.beforeunload": "La bozza andrà persa se esci da Mastodon.",
   "units.short.billion": "{count}G",

app/javascript/mastodon/locales/ja.json

@@ -224,6 +224,9 @@
   "hashtag.column_settings.tag_mode.any": "いずれかを含む",
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
@@ -522,7 +525,7 @@
   "timeline_hint.resources.followers": "フォロワー",
   "timeline_hint.resources.follows": "フォロー",
   "timeline_hint.resources.statuses": "以前の投稿",
-  "trends.counter_by_accounts": "{counter}人が投稿",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "トレンドタグ",
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ka.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "თქვენი დრაფტი გაუქმდება თუ დატოვებთ მასტოდონს.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/kab.json

@@ -19,7 +19,7 @@
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{count} n umeḍfar} other {{count} n imeḍfaren}}",
   "account.following": "Following",
-  "account.following_counter": "{count, plural, one {{counter} yeṭṭafaren} aḍfar {{counter} wayeḍ}}",
+  "account.following_counter": "{count, plural, one {{counter} yeṭṭafaren} other {{counter} wayeḍ}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
   "account.follows_you": "Yeṭṭafaṛ-ik",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Yiwen seg-sen",
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Igejdanen",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Imeḍfaṛen",
   "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Tijewwaqin tiqdimin",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} amdan} imdanen {{counter} wiyaḍ}} yettmeslayen",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/kk.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Осылардың біреуін",
   "hashtag.column_settings.tag_mode.none": "Бұлардың ешқайсысын",
   "hashtag.column_settings.tag_toggle": "Осы бағанға қосымша тегтерді қосыңыз",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Оқырман",
   "timeline_hint.resources.follows": "Жазылым",
   "timeline_hint.resources.statuses": "Ескі посттары",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} адам} other {{counter} адам}} айтып жатыр",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Тренд тақырыптар",
   "ui.beforeunload": "Mastodon желісінен шықсаңыз, нобайыңыз сақталмайды.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/kn.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ko.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "아무것이든",
   "hashtag.column_settings.tag_mode.none": "이것들을 제외하고",
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "최근 {days}일 동안의 총 사용량",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "기본",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "팔로워",
   "timeline_hint.resources.follows": "팔로우",
   "timeline_hint.resources.statuses": "이전 게시물",
-  "trends.counter_by_accounts": "{counter} 명이 말하는 중",
+  "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ku.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Yek ji van",
   "hashtag.column_settings.tag_mode.none": "Ne yek ji van",
   "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Tevahiya giraniyê dawîn di {days, plural, one {roj} other {{days} roj}} de",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bingehîn",
   "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
   "home.column_settings.show_replies": "Bersivan nîşan bide",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Şopîner",
   "timeline_hint.resources.follows": "Dişopîne",
   "timeline_hint.resources.statuses": "Şandiyên kevn",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} diaxivin",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} berî {days, plural, one {roj} other {{days} roj}}",
   "trends.trending_now": "Rojev",
   "ui.beforeunload": "Ger ji Mastodonê veketi wê reşnivîsa te jî winda bibe.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/kw.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Pynag a'n re ma",
   "hashtag.column_settings.tag_mode.none": "Travyth a'n re ma",
   "hashtag.column_settings.tag_toggle": "Yssynsi taggys ynwedhek rag an goloven ma",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Selyek",
   "home.column_settings.show_reblogs": "Diskwedhes kenerthow",
   "home.column_settings.show_replies": "Diskwedhes gorthebow",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Holyoryon",
   "timeline_hint.resources.follows": "Holyansow",
   "timeline_hint.resources.statuses": "Kottha postow",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} den} other {{counter} a dus}} ow kewsel",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tuedhegus lemmyn",
   "ui.beforeunload": "Agas kysnkrif a vydh kellys mar kwrewgh diberth a Mastodon.",
   "units.short.billion": "{count}Mek",

app/javascript/mastodon/locales/lt.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/lv.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Kāds no šiem",
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
   "hashtag.column_settings.tag_toggle": "Iekļaut šai kolonnai papildu tagus",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Kopējais apjoms par {days, plural, one {dienu} other {{days} dienām}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Pamata",
   "home.column_settings.show_reblogs": "Rādīt palielinājumus",
   "home.column_settings.show_replies": "Rādīt atbildes",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sekotāji",
   "timeline_hint.resources.follows": "Seko",
   "timeline_hint.resources.statuses": "Vecākas ziņas",
-  "trends.counter_by_accounts": "Sarunājas {count, plural, one {{counter} persona} other {{counter} cilvēki}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} cilvēki}} par {days, plural, one {dienu} other {{days} dienām}}",
   "trends.trending_now": "Šobrīd tendences",
   "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",
   "units.short.billion": "{count}M",

app/javascript/mastodon/locales/mk.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Било кои",
   "hashtag.column_settings.tag_mode.none": "Никои",
   "hashtag.column_settings.tag_toggle": "Стави додатни тагови за оваа колона",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи бустирања",
   "home.column_settings.show_replies": "Прикажи одговори",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ml.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "അടിസ്ഥാനം",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "പിന്തുടരുന്നവർ",
   "timeline_hint.resources.follows": "പിന്തുടരുന്നു",
   "timeline_hint.resources.statuses": "പഴയ ടൂട്ടുകൾ",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "ഇപ്പോൾ ട്രെൻഡിംഗ്",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/mr.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ms.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Mana-mana daripada yang ini",
   "hashtag.column_settings.tag_mode.none": "Tiada apa pun daripada yang ini",
   "hashtag.column_settings.tag_toggle": "Sertakan tag tambahan untuk lajur ini",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Asas",
   "home.column_settings.show_reblogs": "Tunjukkan galakan",
   "home.column_settings.show_replies": "Tunjukkan balasan",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Pengikut",
   "timeline_hint.resources.follows": "Ikutan",
   "timeline_hint.resources.statuses": "Hantaran lebih lama",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} bercakap",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Sohor kini",
   "ui.beforeunload": "Rangka anda akan terhapus jika anda meninggalkan Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/nl.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Een van deze",
   "hashtag.column_settings.tag_mode.none": "Geen van deze",
   "hashtag.column_settings.tag_toggle": "Additionele tags aan deze kolom toevoegen",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Volgers",
   "timeline_hint.resources.follows": "Volgend",
   "timeline_hint.resources.statuses": "Oudere berichten",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} personen}} zijn aan het praten",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Huidige trends",
   "ui.beforeunload": "Je concept gaat verloren wanneer je Mastodon verlaat.",
   "units.short.billion": "{count} mrd.",

app/javascript/mastodon/locales/nn.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Kva som helst av desse",
   "hashtag.column_settings.tag_mode.none": "Ikkje nokon av disse",
   "hashtag.column_settings.tag_toggle": "Inkluder ekstra emneknaggar for denne kolonna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Fylgjarar",
   "timeline_hint.resources.follows": "Fylgjer",
   "timeline_hint.resources.statuses": "Eldre tut",
-  "trends.counter_by_accounts": "Pratas om av {count, plural, one {{counter} person} other {{counter} folk}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Populært no",
   "ui.beforeunload": "Kladden din forsvinn om du forlèt Mastodon no.",
   "units.short.billion": "{count}m.ard",

app/javascript/mastodon/locales/no.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Enhver av disse",
   "hashtag.column_settings.tag_mode.none": "Ingen av disse",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Enkelt",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Følgere",
   "timeline_hint.resources.follows": "Følger",
   "timeline_hint.resources.statuses": "Eldre tuter",
-  "trends.counter_by_accounts": "Snakkes om av {count, plural, one {{counter} person} other {{counter} personer}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trender nå",
   "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.",
   "units.short.billion": "{count}m.ard",

app/javascript/mastodon/locales/oc.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Un d’aquestes",
   "hashtag.column_settings.tag_mode.none": "Cap d’aquestes",
   "hashtag.column_settings.tag_toggle": "Inclure las etiquetas suplementàrias dins aquesta colomna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidors",
   "timeline_hint.resources.follows": "Abonaments",
   "timeline_hint.resources.statuses": "Tuts mai ancians",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persona ne parla} other {{counter} personas ne parlan}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Tendéncia del moment",
   "ui.beforeunload": "Vòstre brolhon serà perdut se quitatz Mastodon.",
   "units.short.billion": "{count}Md",

app/javascript/mastodon/locales/pa.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/pl.json

@@ -224,6 +224,9 @@
   "hashtag.column_settings.tag_mode.any": "Dowolne",
   "hashtag.column_settings.tag_mode.none": "Żadne",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Całkowity wolumen w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
@@ -456,7 +459,7 @@
   "search_results.nothing_found": "Nie znaleziono innych wyników dla tego wyszukania",
   "search_results.statuses": "Wpisy",
   "search_results.statuses_fts_disabled": "Szukanie wpisów przy pomocy ich zawartości nie jest włączone na tym serwerze Mastodona.",
-  "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
+  "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} other {wyników}}",
   "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}",
   "status.admin_status": "Otwórz ten wpis w interfejsie moderacyjnym",
   "status.block": "Zablokuj @{name}",
@@ -522,7 +525,7 @@
   "timeline_hint.resources.followers": "Śledzący",
   "timeline_hint.resources.follows": "Śledzeni",
   "timeline_hint.resources.statuses": "Starsze wpisy",
-  "trends.counter_by_accounts": "rozmawiają: {count, plural, one {{counter} osoba} few {{counter} osoby} many {{counter} osób} other {{counter} osoby}}",
+  "trends.counter_by_accounts": "{count, plural, one {jedna osoba} few {{count} osoby} many {{count} osób} other {{counter} ludzie}} w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
   "units.short.billion": "{count} mld",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Qualquer uma",
   "hashtag.column_settings.tag_mode.none": "Nenhuma",
   "hashtag.column_settings.tag_toggle": "Adicionar mais hashtags aqui",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Segue",
   "timeline_hint.resources.statuses": "Toots anteriores",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} falando",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Em alta agora",
   "ui.beforeunload": "Seu rascunho será perdido se sair do Mastodon.",
   "units.short.billion": "{count} bi",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Qualquer destes",
   "hashtag.column_settings.tag_mode.none": "Nenhum destes",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionais para esta coluna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Volume total {days, plural, one {no último dia} other {nos últimos {days} dias}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -366,7 +369,7 @@
   "poll.closed": "Fechado",
   "poll.refresh": "Recarregar",
   "poll.total_people": "{count, plural, one {# pessoa} other {# pessoas}}",
-  "poll.total_votes": "{contar, plural, um {# vote} outro {# votes}}",
+  "poll.total_votes": "{count, plural, one {# voto} other {# votos}}",
   "poll.vote": "Votar",
   "poll.voted": "Votaste nesta resposta",
   "poll.votes": "{votes, plural, one {# voto } other {# votos}}",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Seguidores",
   "timeline_hint.resources.follows": "Seguindo",
   "timeline_hint.resources.statuses": "Toots antigos",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} a conversar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
   "trends.trending_now": "Tendências atuais",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
   "units.short.billion": "{count}MM",

app/javascript/mastodon/locales/ro.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Oricare din acestea",
   "hashtag.column_settings.tag_mode.none": "Niciuna dintre acestea",
   "hashtag.column_settings.tag_toggle": "Adaugă etichete suplimentare pentru această coloană",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Afișează distribuirile",
   "home.column_settings.show_replies": "Afișează răspunsurile",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Urmăritori",
   "timeline_hint.resources.follows": "Urmăriri",
   "timeline_hint.resources.statuses": "Postări mai vechi",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persoană postează} other {{counter} persoane postează}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "În tendință acum",
   "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.",
   "units.short.billion": "{count}Mld",

app/javascript/mastodon/locales/ru.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Любой из списка",
   "hashtag.column_settings.tag_mode.none": "Ни один из списка",
   "hashtag.column_settings.tag_toggle": "Включить дополнительные теги для этой колонки",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Общий объем за {days, plural, =1 {последний день} one {последний {days} день} few {последних {days} дня} many {последних {days} дней} other {последних {days} дней}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "подписчиков",
   "timeline_hint.resources.follows": "подписки",
   "timeline_hint.resources.statuses": "прошлые посты",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} человек обсуждает} few {{counter} человека обсуждают} many {{counter} человек обсуждают} other {{counter} человека обсуждает}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} человек} few {{counter} человека} many {{counter} человек} other {{counter} человека}} на протяжении {days, plural, =1 {последнего дня} one {последнего {days} дня} few {последних {days} дней} many {последних {days} дней} other {последних {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
   "units.short.billion": "{count} млрд",

app/javascript/mastodon/locales/sa.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/sc.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cale si siat de custos",
   "hashtag.column_settings.tag_mode.none": "Perunu de custos",
   "hashtag.column_settings.tag_toggle": "Include etichetas additzionales pro custa colunna",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bàsicu",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sighiduras",
   "timeline_hint.resources.follows": "Sighende",
   "timeline_hint.resources.statuses": "Publicatziones prus betzas",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} chistionende",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Est tendèntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a èssere pèrdidu si essis dae Mastodon.",
   "units.short.billion": "{count}Mrd",

app/javascript/mastodon/locales/si.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "ඇතුළත් එකක්",
   "hashtag.column_settings.tag_mode.none": "මේ කිසිවක් නැත",
   "hashtag.column_settings.tag_toggle": "මෙම තීරුවේ අමතර ටැග් ඇතුළත් කරන්න",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "මූලික",
   "home.column_settings.show_reblogs": "බූස්ට් පෙන්වන්න",
   "home.column_settings.show_replies": "ප්රතිචාර පෙන්වන්න",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "අනුගාමිකයින්",
   "timeline_hint.resources.follows": "පහත සඳහන්",
   "timeline_hint.resources.statuses": "පැරණි දත්",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} පුද්ගලයා} other {{counter} මහජන}} කතා කරනවා",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "දැන් ප්‍රවණතාවය",
   "ui.beforeunload": "ඔබ Mastodon හැර ගියහොත් ඔබේ කෙටුම්පත නැති වනු ඇත.",
   "units.short.billion": "{count}බී",

app/javascript/mastodon/locales/sk.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Hociktorý z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
   "hashtag.column_settings.tag_toggle": "Vlož dodatočné haštagy pre tento stĺpec",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Ukáž vyzdvihnuté",
   "home.column_settings.show_replies": "Ukáž odpovede",
@@ -234,7 +237,7 @@
   "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
   "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
   "keyboard_shortcuts.description": "Popis",
-  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.direct": "pre otvorenie panelu priamých správ",
   "keyboard_shortcuts.down": "posunúť sa dole v zozname",
   "keyboard_shortcuts.enter": "Otvor príspevok",
   "keyboard_shortcuts.favourite": "pridaj do obľúbených",
@@ -327,7 +330,7 @@
   "notification.update": "{name} upravil/a príspevok",
   "notifications.clear": "Vyčisti oboznámenia",
   "notifications.clear_confirmation": "Naozaj chceš nenávratne prečistiť všetky tvoje oboznámenia?",
-  "notifications.column_settings.admin.report": "New reports:",
+  "notifications.column_settings.admin.report": "Nové hlásenia:",
   "notifications.column_settings.admin.sign_up": "Nové registrácie:",
   "notifications.column_settings.alert": "Oboznámenia na ploche",
   "notifications.column_settings.favourite": "Obľúbené:",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Sledujúci",
   "timeline_hint.resources.follows": "Následuje",
   "timeline_hint.resources.statuses": "Staršie príspevky",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} človek rozpráva} few {{counter} ľudia rozprávajú} many {{counter} ľudia rozprávajú} other {{counter} ľudí rozpráva}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Teraz populárne",
   "ui.beforeunload": "Čo máš rozpísané sa stratí, ak opustíš Mastodon.",
   "units.short.billion": "{count}mld.",

app/javascript/mastodon/locales/sl.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Karkoli od naštetega",
   "hashtag.column_settings.tag_mode.none": "Nič od naštetega",
   "hashtag.column_settings.tag_toggle": "Za ta stolpec vključi dodatne oznake",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Skupen obseg v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "sledilcev",
   "timeline_hint.resources.follows": "Sledi",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{count} oseba govori} two {{count} osebi govorita} few {{count} osebe govorijo} other {{count} oseb govori}}",
+  "trends.counter_by_accounts": "{count, plural, one {{count} oseba} two {{count} osebi} few {{count} osebe} other {{count} oseb}} v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
   "trends.trending_now": "Zdaj v trendu",
   "ui.beforeunload": "Vaš osnutek bo izgubljen, če zapustite Mastodona.",
   "units.short.billion": "{count} milijard",

app/javascript/mastodon/locales/sq.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Cilindo prej këtyre",
   "hashtag.column_settings.tag_mode.none": "Asnjë prej këtyre",
   "hashtag.column_settings.tag_toggle": "Përfshi etiketa shtesë për këtë shtyllë",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Vëllim gjithsej {days, plural, një {day} other {{days} ditët}} e fundit",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Ndjekës",
   "timeline_hint.resources.follows": "Ndjekje",
   "timeline_hint.resources.statuses": "Mesazhe të vjetër",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} vetë}} duke folur",
+  "trends.counter_by_accounts": "{count, plural, një {{counter} person} other {{counter} vetë}} në {days, plural, një {day} other {{days} ditë}} të kaluar",
   "trends.trending_now": "Prirjet e tashme",
   "ui.beforeunload": "Skica juaj do të humbë, nëse dilni nga Mastodon-i.",
   "units.short.billion": "{count}Md",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Prikaži i podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Ako napustite Mastodont, izgubićete napisani nacrt.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/sr.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Било које од ових",
   "hashtag.column_settings.tag_mode.none": "Ништа од ових",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи и подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Пратиоци",
   "timeline_hint.resources.follows": "Праћени",
   "timeline_hint.resources.statuses": "Старији тут",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Ако напустите Мастодонт, изгубићете написани нацрт.",
   "units.short.billion": "{count}Б",

app/javascript/mastodon/locales/sv.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Någon av dessa",
   "hashtag.column_settings.tag_mode.none": "Ingen av dessa",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
@@ -451,7 +454,7 @@
   "search_results.nothing_found": "Kunde inte hitta något för dessa sökord",
   "search_results.statuses": "Inlägg",
   "search_results.statuses_fts_disabled": "Att söka toots med deras innehåll är inte möjligt på denna Mastodon-server.",
-  "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
   "status.admin_status": "Öppna denna status i modereringsgränssnittet",
   "status.block": "Blockera @{name}",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Följare",
   "timeline_hint.resources.follows": "Följer",
   "timeline_hint.resources.statuses": "Äldre tutningar",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} pratar",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trendar nu",
   "ui.beforeunload": "Ditt utkast kommer att förloras om du lämnar Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/szl.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ta.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "இவற்றில் எவையேனும்",
   "hashtag.column_settings.tag_mode.none": "இவற்றில் ஏதுமில்லை",
   "hashtag.column_settings.tag_toggle": "இந்த நெடுவரிசையில் கூடுதல் சிட்டைகளைச் சேர்க்கவும்",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "அடிப்படையானவை",
   "home.column_settings.show_reblogs": "பகிர்வுகளைக் காண்பி",
   "home.column_settings.show_replies": "மறுமொழிகளைக் காண்பி",
@@ -366,7 +369,7 @@
   "poll.closed": "மூடிய",
   "poll.refresh": "பத்துயிர்ப்ப?ட்டு",
   "poll.total_people": "{count, plural, one {# நபர்} other {# நபர்கள்}}",
-  "poll.total_votes": "{count, plural, one {# vote} மற்ற {# votes}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
   "poll.vote": "வாக்களி",
   "poll.voted": "உங்கள் தேர்வு",
   "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "வாசகர்கள்",
   "timeline_hint.resources.follows": "வாசிக்கிறார்",
   "timeline_hint.resources.statuses": "பழைய டூட்டுகள்",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} நபர்} other {{counter} நபர்கள்}} உரையாடலில்",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "இப்போது செல்திசையில் இருப்பவை",
   "ui.beforeunload": "நீங்கள் வெளியே சென்றால் உங்கள் வரைவு இழக்கப்படும் மஸ்தோடோன்.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/tai.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/te.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "వీటిలో ఏవైనా",
   "hashtag.column_settings.tag_mode.none": "ఇవేవీ కావు",
   "hashtag.column_settings.tag_toggle": "ఈ నిలువు వరుసలో మరికొన్ని ట్యాగులను చేర్చండి",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "మీరు మాస్టొడొన్ను వదిలివేస్తే మీ డ్రాఫ్ట్లు పోతాయి.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/th.json

@@ -198,7 +198,7 @@
   "explore.trending_tags": "แฮชแท็ก",
   "follow_recommendations.done": "เสร็จสิ้น",
   "follow_recommendations.heading": "ติดตามผู้คนที่คุณต้องการเห็นโพสต์! นี่คือข้อเสนอแนะบางส่วน",
-  "follow_recommendations.lead": "โพสต์จากคนที่คุณติดตามจะแสดงตามลำดับเวลาบนฟีดหลักของคุณ อย่ากลัวที่จะทำผิดพลาด คุณสามารถเลิกติดตามผู้คนได้ง่ายๆ ทุกเมื่อ!",
+  "follow_recommendations.lead": "โพสต์จากผู้คนที่คุณติดตามจะแสดงตามลำดับเวลาในฟีดหน้าแรกของคุณ อย่ากลัวที่จะทำผิดพลาด คุณสามารถเลิกติดตามผู้คนได้อย่างง่ายดายเมื่อใดก็ตาม!",
   "follow_request.authorize": "อนุญาต",
   "follow_request.reject": "ปฏิเสธ",
   "follow_requests.unlocked_explanation": "แม้ว่าไม่มีการล็อคบัญชีของคุณ พนักงานของ {domain} คิดว่าคุณอาจต้องการตรวจทานคำขอติดตามจากบัญชีเหล่านี้ด้วยตนเอง",
@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "ใดก็ตามนี้",
   "hashtag.column_settings.tag_mode.none": "ไม่ใช่ทั้งหมดนี้",
   "hashtag.column_settings.tag_toggle": "รวมแท็กเพิ่มเติมสำหรับคอลัมน์นี้",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
@@ -268,7 +271,7 @@
   "lightbox.next": "ถัดไป",
   "lightbox.previous": "ก่อนหน้า",
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
-  "limited_account_hint.title": "โปรไฟล์นี้ถูกซ่อนไว้โดยโมเดอเรเตอร์ของเซิร์ฟเวอร์ของคุณ",
+  "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้ควบคุมของเซิร์ฟเวอร์ของคุณ",
   "lists.account.add": "เพิ่มไปยังรายการ",
   "lists.account.remove": "เอาออกจากรายการ",
   "lists.delete": "ลบรายการ",
@@ -360,7 +363,7 @@
   "notifications.permission_denied_alert": "ไม่สามารถเปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป เนื่องจากมีการปฏิเสธสิทธิอนุญาตเบราว์เซอร์ก่อนหน้านี้",
   "notifications.permission_required": "การแจ้งเตือนบนเดสก์ท็อปไม่พร้อมใช้งานเนื่องจากไม่ได้ให้สิทธิอนุญาตที่จำเป็น",
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
-  "notifications_permission_banner.how_to_control": "หากต้องการรับการแจ้งเตือนเมื่อไม่ได้เปิด Mastodon ให้เปิดใช้การแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมได้ตามความต้องการด้วยการโต้ตอบประเภทที่สร้างการแจ้งเตือนบนเดสก์ท็อปผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งาน",
+  "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
   "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
   "picture_in_picture.restore": "นำกลับมา",
   "poll.closed": "ปิดแล้ว",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "ผู้ติดตาม",
   "timeline_hint.resources.follows": "การติดตาม",
   "timeline_hint.resources.statuses": "โพสต์ที่เก่ากว่า",
-  "trends.counter_by_accounts": "{count, plural, other {{counter} คน}}กำลังพูดคุย",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
   "units.short.billion": "{count} พันล้าน",

app/javascript/mastodon/locales/tr.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Herhangi biri",
   "hashtag.column_settings.tag_mode.none": "Bunların hiçbiri",
   "hashtag.column_settings.tag_toggle": "Bu sütundaki ek etiketleri içer",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Son {days, plural, one {gündeki} other {{days} gündeki}} toplam hacim",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Boostları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
@@ -468,7 +471,7 @@
   "status.embed": "Gömülü",
   "status.favourite": "Favorilerine ekle",
   "status.filtered": "Filtrelenmiş",
-  "status.hide": "Hide toot",
+  "status.hide": "Gönderiyi sakla",
   "status.history.created": "{name} oluşturdu {date}",
   "status.history.edited": "{name} düzenledi {date}",
   "status.load_more": "Daha fazlasını yükle",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Takipçiler",
   "timeline_hint.resources.follows": "Takip Edilenler",
   "timeline_hint.resources.statuses": "Eski tootlar",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} kişi} other {{counter} kişi}} konuşuyor",
+  "trends.counter_by_accounts": "Son {days, plural, one {gündeki} other {{days} gündeki}} {count, plural, one {{counter} kişi} other {{counter} kişi}}",
   "trends.trending_now": "Şu an gündemde",
   "ui.beforeunload": "Mastodon'u terk ederseniz taslağınız kaybolacak.",
   "units.short.billion": "{count}Mr",

app/javascript/mastodon/locales/tt.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/ug.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/uk.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Який-небудь зі списку",
   "hashtag.column_settings.tag_mode.none": "Жоден зі списку",
   "hashtag.column_settings.tag_toggle": "Додати додаткові теґи до цього стовпчика",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Загальний обсяг за останні(й) {days, plural, one {день} few {{days} дні} other {{days} днів}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Підписники",
   "timeline_hint.resources.follows": "Підписки",
   "timeline_hint.resources.statuses": "Попередні дописи",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} особа обговорює} few {{counter} особи обговорюють} many {{counter} осіб обговорюють} other {{counter} особи обговорюють}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} особа} few {{counter} особи} other {{counter} осіб}} за останні(й) {days, plural, one {день} few {{days} дні} other {{days} днів}}",
   "trends.trending_now": "Актуальні",
   "ui.beforeunload": "Вашу чернетку буде втрачено, якщо ви покинете Mastodon.",
   "units.short.billion": "{count} млрд.",

app/javascript/mastodon/locales/ur.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "ان میں سے کوئی",
   "hashtag.column_settings.tag_mode.none": "ان میں سے کوئی بھی نہیں",
   "hashtag.column_settings.tag_toggle": "اس کالم کے لئے مزید ٹیگز شامل کریں",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "بنیادی",
   "home.column_settings.show_reblogs": "افزائشات دکھائیں",
   "home.column_settings.show_replies": "جوابات دکھائیں",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/vi.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Một phần",
   "hashtag.column_settings.tag_mode.none": "Không chọn",
   "hashtag.column_settings.tag_toggle": "Bao gồm thêm hashtag cho cột này",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Tổng số lần sử dụng {days, plural, other {{days} ngày}} qua",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Tùy chỉnh",
   "home.column_settings.show_reblogs": "Hiện những lượt đăng lại",
   "home.column_settings.show_replies": "Hiện những tút dạng trả lời",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "Người theo dõi",
   "timeline_hint.resources.follows": "Đang theo dõi",
   "timeline_hint.resources.statuses": "Tút cũ hơn",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} người} other {{counter} người}} đang thảo luận",
+  "trends.counter_by_accounts": "{count, plural, other {{count} lượt}} dùng trong {days, plural, other {{days} ngày}} qua",
   "trends.trending_now": "Xu hướng",
   "ui.beforeunload": "Bản nháp của bạn sẽ bị mất nếu bạn thoát khỏi Mastodon.",
   "units.short.billion": "{count}B",

app/javascript/mastodon/locales/zgh.json

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "Any of these",
   "hashtag.column_settings.tag_mode.none": "None of these",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "ⵉⵎⴹⴼⴰⵕⵏ",
   "timeline_hint.resources.follows": "Follows",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} ⵓⴼⴳⴰⵏ} other {{counter} ⵉⴼⴳⴰⵏⵏ}} ⴰⴳ ⵙⵙⴰⵡⴰⵍⵏ",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "units.short.billion": "{count}B",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "无一",
   "hashtag.column_settings.tag_toggle": "在此栏加入额外的标签",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "在过去的{days, plural,one {day}other {{days}days}}的总数量",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
@@ -278,7 +281,7 @@
   "lists.new.title_placeholder": "新列表的标题",
   "lists.replies_policy.followed": "任何被关注的用户",
   "lists.replies_policy.list": "列表成员",
-  "lists.replies_policy.none": "没有人",
+  "lists.replies_policy.none": "无人",
   "lists.replies_policy.title": "显示回复给：",
   "lists.search": "搜索你关注的人",
   "lists.subheading": "你的列表",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "关注者",
   "timeline_hint.resources.follows": "关注",
   "timeline_hint.resources.statuses": "更早的嘟文",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}正在讨论",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "现在流行",
   "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会丢失。",
   "units.short.billion": "{count} B",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "全不",
   "hashtag.column_settings.tag_toggle": "在這欄位加入額外的標籤",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "關注者",
   "timeline_hint.resources.follows": "關注中",
   "timeline_hint.resources.statuses": "更早的文章",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} 個人}other {{counter} 個人}}正在討論",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "現在流行",
   "ui.beforeunload": "如果你現在離開 Mastodon，你的草稿內容將會被丟棄。",
   "units.short.billion": "{count}B",

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

@@ -220,6 +220,9 @@
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "全不",
   "hashtag.column_settings.tag_toggle": "將額外標籤加入到這個欄位",
+  "hashtag.follow": "Follow hashtag",
+  "hashtag.total_volume": "過去 {days, plural, one {日} other {{days} 日}} 之總量",
+  "hashtag.unfollow": "Unfollow hashtag",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
@@ -517,7 +520,7 @@
   "timeline_hint.resources.followers": "跟隨者",
   "timeline_hint.resources.follows": "正在跟隨",
   "timeline_hint.resources.statuses": "更早的嘟文",
-  "trends.counter_by_accounts": "{count, plural,one {{counter} 人}other {{counter} 人}}正在討論",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}} 於過去 {days, plural, one {日} other {{days} days}} 之間",
   "trends.trending_now": "現正熱門",
   "ui.beforeunload": "如果離開 Mastodon，您的草稿將會不見。",
   "units.short.billion": "{count}B",

config/locales/activerecord.fr.yml

@@ -45,5 +45,7 @@ fr:
             permissions_as_keys:
               dangerous: inclure des autorisations non sécurisées pour le rôle de base
               elevated: ne peut pas inclure des autorisations que votre rôle actuel ne possède pas
+              own_role: ne peut pas être modifié avec votre rôle actuel
             position:
               elevated: ne peut pas être supérieur à votre rôle actuel
+              own_role: ne peut pas être modifié avec votre rôle actuel

config/locales/activerecord.he.yml

@@ -21,6 +21,14 @@ he:
             username:
               invalid: ספרות, אותיות לטיניות וקו תחתי בלבד
               reserved: שמור
+        admin/webhook:
+          attributes:
+            url:
+              invalid: כתובת לא חוקית
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: הינה כתובת לא חוקית
         status:
           attributes:
             reblog:
@@ -30,3 +38,14 @@ he:
             email:
               blocked: עושה שימוש בספק דוא"ל אסור
               unreachable: נראה שלא קיים
+            role_id:
+              elevated: לא יכול להיות גבוה יותר מתפקידך הנוכחי
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: כלול הרשאות לא בטוחות לתפקיד הבסיסי
+              elevated: לא ניתן לכלול הרשאות שתפקידך הנוכחי לא כולל
+              own_role: לא ניתן למזג על תפקידך הנוכחי
+            position:
+              elevated: לא יכול להיות גבוה יותר מתפקידך הנוכחי
+              own_role: לא ניתן לשנות באמצעות תפקידך הנוכחי

config/locales/activerecord.pl.yml

@@ -43,6 +43,8 @@ pl:
         user_role:
           attributes:
             permissions_as_keys:
+              dangerous: dołącz uprawnienia, które nie są bezpieczne dla roli podstawowej
+              elevated: nie może zawierać uprawnień, jakie twoja obecna rola nie posiada
               own_role: nie można zmienić z aktualną rolą
             position:
               elevated: nie może być wyższa niż twoja bieżąca rola

config/locales/activerecord.th.yml

@@ -43,7 +43,9 @@ th:
         user_role:
           attributes:
             permissions_as_keys:
-              dangerous: รวมสิทธิ์ที่ไม่ปลอดภัยสำหรับบทบาทพื้นฐาน
+              dangerous: รวมสิทธิอนุญาตที่ไม่ปลอดภัยสำหรับบทบาทพื้นฐาน
-              elevated: ไม่สามารถรวบรวมสิทธิ์ในบทบาทปัจจุบันของคุณไม่ได้
+              elevated: ไม่สามารถรวมสิทธิอนุญาตที่บทบาทปัจจุบันของคุณไม่มี
+              own_role: ไม่สามารถเปลี่ยนด้วยบทบาทปัจจุบันของคุณ
             position:
               elevated: ไม่สามารถสูงกว่าบทบาทปัจจุบันของคุณ
+              own_role: ไม่สามารถเปลี่ยนด้วยบทบาทปัจจุบันของคุณ

config/locales/activerecord.tr.yml

@@ -45,5 +45,7 @@ tr:
             permissions_as_keys:
               dangerous: temel rol için güvenli olmayan izinleri içerir
               elevated: mevcut rolünüzün sahip olmadığı izinleri içeremez
+              own_role: mevcut rolünüzle değiştirilemez
             position:
               elevated: mevcut rolünüzden yüksek olamaz
+              own_role: mevcut rolünüzle değiştirilemez

config/locales/activerecord.vi.yml

@@ -45,5 +45,7 @@ vi:
             permissions_as_keys:
               dangerous: bao gồm các quyền không an toàn cho vai trò cơ bản
               elevated: không thể bao gồm các quyền mà vai trò hiện tại của bạn không có
+              own_role: không thể thay đổi vai trò hiện tại của bạn
             position:
               elevated: không thể cao hơn vai trò hiện tại của bạn
+              own_role: không thể thay đổi vai trò hiện tại của bạn

config/locales/activerecord.zh-CN.yml

@@ -19,27 +19,27 @@ zh-CN:
         account:
           attributes:
             username:
-              invalid: 只能使用字母、数字和下划线
+              invalid: 只能包含字母、数字和下划线
               reserved: 是保留关键字
         admin/webhook:
           attributes:
             url:
-              invalid: 不是有效的 URL。
+              invalid: 非有效网址
         doorkeeper/application:
           attributes:
             website:
-              invalid: 网址无效
+              invalid: 非有效网址
         status:
           attributes:
             reblog:
-              taken: 已经被转嘟过
+              taken: 已被转嘟过
         user:
           attributes:
             email:
               blocked: 使用了被封禁的电子邮件提供商
               unreachable: 似乎不存在
             role_id:
-              elevated: 不能高于您当前的角色
+              elevated: 不能高于您当前的身份
         user_role:
           attributes:
             permissions_as_keys:
@@ -48,3 +48,4 @@ zh-CN:
               own_role: 无法以您当前的身份更改
             position:
               elevated: 不能高于您当前的角色
+              own_role: 无法以您当前的身份更改

config/locales/devise.he.yml

@@ -110,3 +110,8 @@ he:
       expired: פג תוקפו. נא לבקש חדש
       not_found: לא נמצא
       not_locked: לא היה נעול
+      not_saved:
+        many: "%{count} שגיאות מנעו מ%{resource} זה מלהשמר:"
+        one: 'שגיאה אחת מנעה מ%{resource} זה מלהשמר:'
+        other: "%{count} שגיאות מנעו מ%{resource} זה מלהשמר:"
+        two: " %{count} שגיאות מנעו מ%{resource} זה מלהשמר:"

config/locales/doorkeeper.th.yml

@@ -81,25 +81,25 @@ th:
     errors:
       messages:
         access_denied: เจ้าของทรัพยากรหรือเซิร์ฟเวอร์การอนุญาตปฏิเสธคำขอ
-        credential_flow_not_configured: การไหลของข้อมูลรับรองรหัสผ่านเจ้าของทรัพยากรล้มเหลวเนื่องจาก Doorkeeper.configure.resource_owner_from_credentials ไม่ได้ถูกกำหนดค่า
+        credential_flow_not_configured: โฟลว์ข้อมูลประจำตัวรหัสผ่านเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_from_credentials
-        invalid_client: การตรวจสอบสิทธิ์ไคลเอ็นต์ล้มเหลวเนื่องจากไคลเอ็นต์ที่ไม่รู้จัก ไม่รวมการตรวจสอบไคลเอ็นต์ หรือวิธีการตรวจสอบสิทธิ์ที่ไม่รองรับ
+        invalid_client: การรับรองความถูกต้องไคลเอ็นต์ล้มเหลวเนื่องจากไคลเอ็นต์ที่ไม่รู้จัก ไม่มีการรับรองความถูกต้องไคลเอ็นต์ที่รวมอยู่ หรือวิธีการรับรองความถูกต้องที่ไม่รองรับ
-        invalid_grant: การให้สิทธิ์ที่ระบุไม่ถูกต้อง หมดอายุ เพิกถอน ไม่ตรงกับ URI การเปลี่ยนเส้นทางที่ใช้ในคำขอการให้สิทธิ์ หรือออกให้ไคลเอ็นต์อื่น
+        invalid_grant: การให้การรับรองความถูกต้องที่ให้มาไม่ถูกต้อง หมดอายุแล้ว เพิกถอนแล้ว ไม่ตรงกับ URI การเปลี่ยนเส้นทางที่ใช้ในคำขอการรับรองความถูกต้อง หรือออกให้ไคลเอ็นต์อื่น
         invalid_redirect_uri: URI การเปลี่ยนเส้นทางที่รวมอยู่ไม่ถูกต้อง
         invalid_request:
           missing_param: 'พารามิเตอร์ที่จำเป็นขาดหายไป: %{value}'
-          request_not_authorized: คำขอต้องได้รับอนุญาต พารามิเตอร์ที่จำเป็นสำหรับการให้สิทธิ์คำขอขาดหายไปหรือไม่ถูกต้อง
+          request_not_authorized: คำขอจำเป็นต้องได้รับอนุญาต พารามิเตอร์ที่จำเป็นสำหรับการอนุญาตคำขอขาดหายไปหรือไม่ถูกต้อง
-          unknown: คำขอไม่มีพารามิเตอร์ที่จำเป็น มีค่าพารามิเตอร์ที่ไม่รองรับ หรืออยู่ในรูปแบบที่ไม่ถูกต้อง
+          unknown: คำขอไม่มีพารามิเตอร์ที่จำเป็น รวมค่าพารามิเตอร์ที่ไม่รองรับ หรือผิดรูปแบบ
-        invalid_resource_owner: ข้อมูลรับรองเจ้าของทรัพยากรที่ระบุไม่ถูกต้อง หรือไม่พบเจ้าของทรัพยากร
+        invalid_resource_owner: ข้อมูลประจำตัวเจ้าของทรัพยากรที่ให้มาไม่ถูกต้อง หรือไม่พบเจ้าของทรัพยากร
         invalid_scope: ขอบเขตที่ขอไม่ถูกต้อง ไม่รู้จัก หรือผิดรูปแบบ
         invalid_token:
           expired: โทเคนการเข้าถึงหมดอายุแล้ว
           revoked: เพิกถอนโทเคนการเข้าถึงแล้ว
           unknown: โทเคนการเข้าถึงไม่ถูกต้อง
         resource_owner_authenticator_not_configured: การค้นหาเจ้าของทรัพยากรล้มเหลวเนื่องจากไม่ได้กำหนดค่า Doorkeeper.configure.resource_owner_authenticator
-        server_error: เซิร์ฟเวอร์การให้สิทธิ์พบสภาวะที่ไม่คาดคิดซึ่งทำให้ไม่สามารถดำเนินการตามคำขอได้
+        server_error: เซิร์ฟเวอร์การรับรองความถูกต้องพบเงื่อนไขที่ไม่คาดคิดซึ่งป้องกันไม่ให้เซิร์ฟเวอร์ดำเนินการตามคำขอ
-        temporarily_unavailable: ขณะนี้เซิร์ฟเวอร์การให้สิทธิ์ไม่สามารถจัดการตามคำขอได้ เนื่องจากการโอเวอร์โหลดหรือมีการบำรุงรักษาเซิร์ฟเวอร์ชั่วคราว
+        temporarily_unavailable: เซิร์ฟเวอร์การรับรองความถูกต้องไม่สามารถจัดการคำขอได้ในปัจจุบันเนื่องจากการทำงานเกินพิกัดชั่วคราวหรือการบำรุงรักษาเซิร์ฟเวอร์
         unauthorized_client: ไคลเอ็นต์ไม่ได้รับอนุญาตให้ทำคำขอนี้โดยใช้วิธีการนี้
-        unsupported_grant_type: ประเภทการให้สิทธิ์ไม่ได้รับการสนับสนุนโดยเซิร์ฟเวอร์การให้สิทธิ์นะ
+        unsupported_grant_type: ชนิดการให้การรับรองความถูกต้องไม่รองรับโดยเซิร์ฟเวอร์การรับรองความถูกต้อง
         unsupported_response_type: เซิร์ฟเวอร์การอนุญาตไม่รองรับชนิดการตอบสนองนี้
     flash:
       applications:

config/locales/eo.yml

@@ -22,7 +22,7 @@ eo:
     federation_hint_html: Per konto ĉe %{instance}, vi povos sekvi homojn ĉe iu ajn Mastodon nodo kaj preter.
     get_apps: Provu telefonan aplikaĵon
     hosted_on: "%{domain} estas nodo de Mastodon"
-    instance_actor_flash: 'Ĉi tiu konto estas virtuala agento uzata por reprezenti la servilon mem kaj neniu individua uzanto. Ĝi estas uzata por celoj de la federaĵo kaj devas ne esti brokita se vi ne volas bloki la tutan servilon, en kiu okazo vi devas uzi blokadon de domajno.
+    instance_actor_flash: 'Ĉi tiu konto estas virtuala agento uzata por reprezenti la servilon mem kaj neniu individua uzanto. Ĝi estas uzata por celoj de la federaĵo, kaj devas ne esti brokita, krom se vi ne volas bloki la tutan servilon, tiuokaze vi devas uzi blokadon de domajno.
 
       '
     learn_more: Lerni pli

config/locales/he.yml

@@ -35,11 +35,12 @@ he:
     server_stats: 'סטטיסטיקות שרת:'
     source_code: קוד מקור
     status_count_after:
-      many: חצרוצים
+      many: פוסטים
-      one: חצרוץ
+      one: פוסט
-      other: חצרוצים
+      other: פוסטים
-      two: חצרוצים
+      two: פוסטים
     status_count_before: שכתבו
+    tagline: רשת חברתית מבוזרת
     terms: תנאי שימוש
     unavailable_content: שרתים מוגבלים
     unavailable_content_description:
@@ -83,10 +84,10 @@ he:
     pin_errors:
       following: עליך לעקוב אחרי חשבון לפני שניתן יהיה להמליץ עליו
     posts:
-      many: חצרוצים
+      many: פוסטים
-      one: חצרוץ
+      one: פוסט
-      other: חצרוצים
+      other: פוסטים
-      two: חצרוצים
+      two: פוסטים
     posts_tab_heading: חצרוצים
     posts_with_replies: חצרוצים ותגובות
     roles:
@@ -110,11 +111,17 @@ he:
       avatar: יַצְגָן
       by_domain: שם מתחם
       change_email:
+        changed_msg: דוא"ל שונה בהצלחה
         current_email: כתובת דוא"ל נוכחית
         label: שינוי כתובת דוא"ל משוייכת לחשבון
         new_email: כתובת דוא"ל חדשה
         submit: שלחי בקשה לשינוי דוא"ל
         title: שינוי כתובת דוא"ל עבור המשתמש.ת %{username}
+      change_role:
+        changed_msg: תפקיד שונה בהצלחה !
+        label: שנה תפקיד
+        no_role: ללא תפקיד
+        title: שינוי תפקיד  עבור המשתמש.ת %{username}
       confirm: אישור
       confirmed: אושר
       confirming: המאשר
@@ -158,6 +165,7 @@ he:
         active: פעילים
         all: הכל
         pending: בהמתנה
+        silenced: מוגבלים
         suspended: מושהים
         title: ניהול קהילה
       moderation_notes: הודעות מנחה
@@ -165,6 +173,7 @@ he:
       most_recent_ip: כתובות אחרונות
       no_account_selected: לא בוצעו שינויים בחשבונות ל שכן לא נבחרו חשבונות
       no_limits_imposed: לא הוטלו הגבלות
+      no_role_assigned: ללא תפקיד
       not_subscribed: לא רשום
       pending: ממתינים לסקירה
       perform_full_suspension: ביצוע השעייה מלאה
@@ -193,6 +202,7 @@ he:
       reset: איפוס
       reset_password: אתחול סיסמא
       resubscribe: להרשם מחדש
+      role: תפקיד
       search: חיפוש
       search_same_email_domain: משתמשים אחרים מאותו דומיין דוא"ל
       search_same_ip: משתמשים אחרים מאותה כתובת IP
@@ -252,7 +262,7 @@ he:
         destroy_email_domain_block: מחיקת חסימת דומיין דוא"ל
         destroy_instance: טיהור דומיין
         destroy_ip_block: מחיקת כלל IP
-        destroy_status: מחיקת חצרוץ
+        destroy_status: מחיקת פוסט
         destroy_unavailable_domain: מחיקת דומיין בלתי זמין
         disable_2fa_user: השעיית זיהוי דו-גורמי
         disable_custom_emoji: השעיית אמוג'י מיוחד
@@ -303,7 +313,7 @@ he:
         destroy_email_domain_block_html: '%{name} הסיר/ה חסימה מדומיין הדוא"ל %{target}'
         destroy_instance_html: "%{name} טיהר/ה את הדומיין %{target}"
         destroy_ip_block_html: "%{name} מחק/ה את הכלל עבור IP %{target}"
-        destroy_status_html: "%{name} הסיר/ה חצרוץ מאת %{target}"
+        destroy_status_html: "%{name} הסיר/ה פוסט מאת %{target}"
         destroy_unavailable_domain_html: "%{name} התחיל/ה מחדש משלוח לדומיין %{target}"
         disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
         disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
@@ -331,8 +341,8 @@ he:
         update_announcement_html: "%{name} עדכן/ה הכרזה %{target}"
         update_custom_emoji_html: "%{name} עדכן/ה אמוג'י %{target}"
         update_domain_block_html: "%{name} עדכן/ה חסימת דומיין עבור %{target}"
-        update_status_html: "%{name} עדכן/ה חצרוץ של %{target}"
+        update_status_html: "%{name} עדכן/ה פוסט של %{target}"
-      deleted_status: "(חצרוץ נמחק)"
+      deleted_status: "(פוסט נמחק)"
       empty: לא נמצאו יומנים.
       filter_by_action: סינון לפי פעולה
       filter_by_user: סינון לפי משתמש
@@ -436,6 +446,7 @@ he:
       destroyed_msg: חסימת שרת בוטלה
       domain: שרת
       edit: עריכת חסימת שם מתחם
+      existing_domain_block: כבר החלת הגבלות מחמירות יותר על %{name}
       existing_domain_block_html: כבר הפעלת הגבלות חמורות יותר על %{name}, עליך ראשית <a href="%{unblock_url}">להסיר מעליו/ה את החסימה</a>.
       new:
         create: יצירת חסימה
@@ -666,6 +677,71 @@ he:
       unresolved: לא פתור
       updated_at: עודכן
       view_profile: צפה בפרופיל
+    roles:
+      add_new: הוספת תפקיד
+      assigned_users:
+        many: "%{count} משתמשים"
+        one: 'משתמש %{count} '
+        other: "%{count} משתמשים"
+        two: "%{count} שני משתמשים"
+      categories:
+        administration: ניהול מערכת
+        devops: פיתוח
+        invites: הזמנות
+        moderation: פיקוח
+        special: מיוחדים
+      delete: מחיקה
+      description_html: באמצעות <strong>תפקידי משתמש</strong>, תוכלו להתאים אישית לאילו פונקציות ואזורים של מסטודון המשתמשים יוכלו לגשת
+      edit: עריכת התפקיד של %{name}
+      everyone: הרשאות ברירת מחדל
+      everyone_full_description_html: זהו <strong>התפקיד הבסיסי </strong> שמשפיע על <strong>כלל המשתשמשים</strong>, אפילו אלו ללא תפקיד. כל התפקידים האחרים יורשים את ההרשאות שלהם ממנו.
+      permissions_count:
+        many: "%{count} הרשאות"
+        one: הרשאה %{count}
+        other: "%{count} הרשאות"
+        two: "%{count} הרשאות"
+      privileges:
+        administrator: מנהל מערכת
+        administrator_description: משתמשים עם הרשאה זו יוכלו לעקוף כל הרשאה
+        delete_user_data: מחיקת כל נתוני המשתמש
+        delete_user_data_description: מאפשר למשתמשים למחוק נתוני משתמשים אחרים ללא דיחוי
+        invite_users: הזמנת משתמשים
+        invite_users_description: מאפשר למשתמשים להזמין אנשים חדשים לשרת
+        manage_announcements: ניהול הכרזות
+        manage_announcements_description: מאפשר למשתמשים לנהל הכרזות של השרת
+        manage_appeals: ניהול ערעורים
+        manage_appeals_description: מאפשר למשתמשים לסקור ערעורים כנגד פעולות מודרציה
+        manage_blocks: ניהול חסימות
+        manage_blocks_description: מאפשר למשתמשים לחסום ספקי דוא"ל וכתובות IP
+        manage_custom_emojis: ניהול סמלונים בהתאמה אישית
+        manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת
+        manage_federation: ניהול פדרציה
+        manage_federation_description: מאפשר למשתמשים לחסום או לאפשר התממשקות עם שמות מתחם אחרים
+        manage_invites: ניהול הזמנות
+        manage_invites_description: מאפשר למשתמשים לעלעל ב ולבטל קישורי הזמנה
+        manage_reports: ניהול דו"חות
+        manage_reports_description: מאפשר למשתמשים לסקור דו"חות ולבצע פעולות מודרציה בהתבסס עליהם
+        manage_roles: ניהול תפקידים
+        manage_roles_description: מאפשר למשתמשים לנהל ולמנות אחרים לתפקידים נמוכים יותר משלהם.
+        manage_rules: ניהול כללים
+        manage_rules_description: מאפשר למשתמשים לנהל את כללי השרת
+        manage_settings: נהל הגדרות
+        manage_settings_description: מאפשר למשתמשים לנהל את הגדרות השרת
+        manage_taxonomies: ניהול טקסונומיות
+        manage_taxonomies_description: מאפשר למשתמשים לסקור תוכן אופנתי (טרנדי) ולעדכן אפשרויות של תגיות.
+        manage_user_access: ניהול גישת משתמשים
+        manage_user_access_description: מאפשר למשתמשים לבטל אימות דו-שלבי של משתמשים אחרים, לשנות את כתובות הדוא"ל שלהם, ולאפס את סיסמתם
+        manage_users: ניהול משתמשים
+        manage_users_description: מאפשר למשתמשים לצפות בפרטים של משתמשים אחרים ולבצע פעולות מודרציה לפיהם
+        manage_webhooks: ניהול Webhooks
+        manage_webhooks_description: מאפשר למשתמשים להגדיר Webhooks לאירועים מנהלתיים
+        view_audit_log: צפייה בלוג ביקורת
+        view_audit_log_description: מאפשר למשתשמשים לצפות בהיסטוריה של פעולות מנהלתיות על השרת
+        view_dashboard: הצג לוח מחוונים
+        view_dashboard_description: אפשר למשתמשים לגשת ללוח המחוונים
+        view_devops: פיתוח
+        view_devops_description: מאפשר למשתמשים לגשת ללוחות המחוונים של Sidekiq ושל pgHero
+      title: תפקידים
     rules:
       add_new: הוספת כלל
       delete: מחיקה
@@ -825,10 +901,10 @@ he:
         title: מפרסמים
       rejected: דחוי
       statuses:
-        allow: הרשאת חצרוץ
+        allow: הרשאת פוסט
         allow_account: הרשאת מחבר/ת
         description_html: אלו הם חצרוצים שהשרת שלך מכיר וזוכים להדהודים וחיבובים רבים כרגע. זה עשוי למשתמשיך החדשים והחוזרים למצוא עוד נעקבים. החצרוצים לא מוצגים עד שיאושר המחבר/ת, והמחבר/ת יאשרו שחשבונים יומלץ לאחרים. ניתן לאשר או לדחות חצרוצים ספציפיים.
-        disallow: לא לאשר חצרוץ
+        disallow: לדחות פוסט
         disallow_account: לא לאשר מחבר/ת
         not_discoverable: המחבר/ת לא בחר/ה לאפשר את גילויים
         shared_by:
@@ -870,13 +946,26 @@ he:
       empty: לא הגדרת עדיין שום טקסט מוכן מראש לאזהרה.
       title: ניהול טקסטים מוכנים מראש לאזהרות
     webhooks:
+      add_new: הוספת נקודת קצה
       delete: מחיקה
       disable: כיבוי
       disabled: כבוי
+      edit: עריכת נקודת קצה
+      empty: לא הוגדו נקודות קצה להתליות רשת עדיין.
       enable: אפשר
       enabled: פעילים
+      enabled_events:
+        many: "%{count} אירועים אופשרו"
+        one: אירוע %{count} מאופשר
+        other: "%{count} אירועים אופשרו"
+        two: "%{count} אירועים אופשרו"
       events: אירועים
+      new: Webhook חדש
+      rotate_secret: החלף מפתח
+      secret: מפתח הרשמה
       status: סטטוס
+      title: התליות רשת
+      webhook: התליית רשת
   admin_mailer:
     new_appeal:
       actions:
@@ -905,7 +994,7 @@ he:
         title: נושאים חמים
       new_trending_statuses:
         no_approved_statuses: אין כרגע שום חצרוצים חמים מאושרים.
-        requirements: כל אחד מהמועמדים האלה עשוי לעבור החצרוץ החם המאושר מדרגה %{rank}, שההא כרגע %{lowest_status_url} עם ציון של %{lowest_status_score}.
+        requirements: כל אחד מהמועמדים האלה עשוי לעבור את הפוסט החם המאושר מדרגה %{rank}, שהוא כרגע %{lowest_status_url} עם ציון של %{lowest_status_score}.
         title: חצרוצים לוהטים
       new_trending_tags:
         no_approved_tags: אין כרגע שום האשתגיות חמות מאושרות.
@@ -930,14 +1019,14 @@ he:
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: כולם יכולים לתרום.
     sensitive_content: תוכן רגיש
-    toot_layout: פריסת חצרוץ
+    toot_layout: פריסת פוסט
   application_mailer:
     notification_preferences: שינוי העדפות דוא"ל
     salutation: "%{name},"
     settings: 'שינוי הגדרות דוא"ל: %{link}'
     view: 'תצוגה:'
     view_profile: צפיה בפרופיל
-    view_status: הצגת חצרוץ
+    view_status: הצגת פוסט
   applications:
     created: ישום נוצר בהצלחה
     destroyed: ישום נמחק בהצלחה
@@ -1061,15 +1150,17 @@ he:
       appealed_msg: הערעור שלך הוגש. במידה ויאושר, תיודע.
       appeals:
         submit: הגש ערעור
+      approve_appeal: קבלת ערעור
       associated_report: הדו"ח המשויך
       created_at: מתאריך
       description_html: אלו הן הפעולות שננקטו כנגד חשבונך והאזהרות שנשלחו אליך על ידי צוות %{instance}.
       recipient: הנמען
-      status: 'חצרוץ #%{id}'
+      reject_appeal: דחיית ערעור
-      status_removed: החצרוץ כבר הוסר מהמערכת
+      status: 'פוסט #%{id}'
+      status_removed: הפוסט כבר הוסר מהמערכת
       title: "%{action} מתאריך %{date}"
       title_actions:
-        delete_statuses: הסרת חצרוץ
+        delete_statuses: הסרת פוסט
         disable: הקפאת חשבון
         mark_statuses_as_sensitive: סימון חצרוצים כרגישים
         none: אזהרה
@@ -1127,14 +1218,26 @@ he:
       public: פידים פומביים
       thread: שיחות
     edit:
+      add_keyword: הוספת מילת מפתח
+      keywords: מילות מפתח
       title: ערוך מסנן
     errors:
+      deprecated_api_multiple_keywords: לא ניתן לשנות פרמטרים אלו מהיישומון הזה בגלל שהם חלים על יותר ממילת מפתח אחת. ניתן להשתמש ביישומון מעודכן יותר או בממשק הוובי.
       invalid_context: לא סופק הקשר או הקשר לא תקין
     index:
+      contexts: פילטרים ב %{contexts}
       delete: למחוק
       empty: אין לך מסננים.
+      expires_in: פג תוקף ב %{distance}
+      expires_on: פג תוקף ב %{date}
+      keywords:
+        many: "%{count} מילות מפתח"
+        one: מילת מפתח %{count}
+        other: "%{count} מילות מפתח"
+        two: "%{count} מילות מפתח"
       title: מסננים
     new:
+      save: שמירת מסנן חדש
       title: הוספת מסנן חדש
   footer:
     developers: מפתחות
@@ -1215,7 +1318,7 @@ he:
     title: הסטוריית אימותים
   media_attachments:
     validations:
-      images_and_video: לא ניתן להוסיף וידאו לחצרוץ שכבר מכיל תמונות
+      images_and_video: לא ניתן להוסיף וידאו לפוסט שכבר מכיל תמונות
       not_ready: לא ניתן להצמיד קבצים שהעלאתם לא הסתיימה. נסה/י שוב בעוד רגע!
       too_many: לא ניתן להוסיף יותר מארבעה קבצים
   migrations:
@@ -1257,6 +1360,8 @@ he:
     copy_account_note_text: 'חשבון זה הועבר מ-%{acct}, הנה הערותיך הקודמות לגביהם:'
   notification_mailer:
     admin:
+      report:
+        subject: '%{name} שלח/ה דו"ח'
       sign_up:
         subject: "%{name} נרשמו"
     digest:
@@ -1343,7 +1448,7 @@ he:
       too_many_options: לא יכול להכיל יותר מ-%{max} פריטים
   preferences:
     other: שונות
-    posting_defaults: ברירות מחדל לחצרוץ
+    posting_defaults: ברירות מחדל לפוסטים
     public_timelines: פידים פומביים
   reactions:
     errors:
@@ -1376,13 +1481,13 @@ he:
   remote_interaction:
     favourite:
       proceed: המשך לחיבוב
-      prompt: 'ברצונך לחבב חצרוץ זה:'
+      prompt: 'ברצונך לחבב פוסט זה:'
     reblog:
       proceed: המשיכו להדהוד
-      prompt: 'ברצונך להדהד חצרוץ זה:'
+      prompt: 'ברצונך להדהד פוסט זה:'
     reply:
       proceed: המשיבו לתגובה
-      prompt: 'ברצונך להשיב לחצרוץ זה:'
+      prompt: 'ברצונך להשיב לפוסט זה:'
   reports:
     errors:
       invalid_rules: לא מתייחס לכללים קבילים
@@ -1488,7 +1593,7 @@ he:
       two: 'מכיל את ההאשתגיות האסורות: %{tags}'
     edited_at_html: נערך ב-%{date}
     errors:
-      in_reply_not_found: נראה שהחצרוץ שאת/ה מנסה להגיב לו לא קיים.
+      in_reply_not_found: נראה שהפוסט שאת/ה מנסה להגיב לו לא קיים.
     open_in_web: פתח ברשת
     over_character_limit: חריגה מגבול התווים של %{max}
     pin_errors:
@@ -1558,7 +1663,7 @@ he:
     min_reblogs: שמור חצרוצים מהודהדים לפחות
     min_reblogs_hint: לא מוחק מי מחצרוציך שקיבלו לפחות את המספר הזה של הדהודים. להשאיר ריק כדי למחוק חצרוצים ללא קשר למספר ההדהודים שקיבלו
   stream_entries:
-    pinned: חצרוץ מוצמד
+    pinned: פוסט נעוץ
     reblogged: הודהד
     sensitive_content: תוכן רגיש
   strikes: