Merge pull request #1766 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

141 files changed, 4401 insertions, 1136 deletions

diff --git a/Gemfile b/Gemfile
index f9ff96360..a81cd7c31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,13 +79,13 @@ gem 'ruby-progressbar', '~> 1.11'
 gem 'sanitize', '~> 6.0'
 gem 'scenic', '~> 1.6'
 gem 'sidekiq', '~> 6.4'
-gem 'sidekiq-scheduler', '~> 3.2'
+gem 'sidekiq-scheduler', '~> 4.0'
 gem 'sidekiq-unique-jobs', '~> 7.1'
 gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.3'
 gem 'simple_form', '~> 5.1'
 gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
-gem 'stoplight', '~> 2.2.1'
+gem 'stoplight', '~> 3.0.0'
 gem 'strong_migrations', '~> 0.7'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5c0a77c56..ad5fd7055 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,7 +203,6 @@ GEM
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
-    e2mmap (0.1.0)
     ed25519 (1.3.0)
     elasticsearch (7.13.3)
       elasticsearch-api (= 7.13.3)
@@ -610,12 +609,10 @@ GEM
       redis (>= 4.2.0)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (3.2.0)
-      e2mmap
-      redis (>= 3, < 5)
+    sidekiq-scheduler (4.0.0)
+      redis (>= 4.2.0)
       rufus-scheduler (~> 3.2)
-      sidekiq (>= 3)
-      thwait
+      sidekiq (>= 4)
       tilt (>= 1.4.0)
     sidekiq-unique-jobs (7.1.21)
       brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
@@ -646,7 +643,7 @@ GEM
       net-ssh (>= 2.8.0)
     stackprof (0.2.19)
     statsd-ruby (1.5.0)
-    stoplight (2.2.1)
+    stoplight (3.0.0)
     strong_migrations (0.7.9)
       activerecord (>= 5)
     swd (1.3.0)
@@ -659,8 +656,6 @@ GEM
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     thor (1.2.1)
-    thwait (0.2.0)
-      e2mmap
     tilt (2.0.10)
     tpm-key_attestation (0.9.0)
       bindata (~> 2.4)
@@ -837,7 +832,7 @@ DEPENDENCIES
   scenic (~> 1.6)
   sidekiq (~> 6.4)
   sidekiq-bulk (~> 0.2.0)
-  sidekiq-scheduler (~> 3.2)
+  sidekiq-scheduler (~> 4.0)
   sidekiq-unique-jobs (~> 7.1)
   simple-navigation (~> 4.3)
   simple_form (~> 5.1)
@@ -845,7 +840,7 @@ DEPENDENCIES
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.4)
   stackprof
-  stoplight (~> 2.2.1)
+  stoplight (~> 3.0.0)
   strong_migrations (~> 0.7)
   thor (~> 1.2)
   tty-prompt (~> 0.23)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ce25e26f9..1c670fde0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -132,7 +132,7 @@ module ApplicationHelper
     elsif status.private_visibility? || status.limited_visibility?
       fa_icon('lock', title: I18n.t('statuses.visibilities.private'))
     elsif status.direct_visibility?
-      fa_icon('envelope', title: I18n.t('statuses.visibilities.direct'))
+      fa_icon('at', title: I18n.t('statuses.visibilities.direct'))
     end
   end
 
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index e92b4c839..488eabeec 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -101,7 +101,7 @@ module StatusesHelper
     when 'private'
       fa_icon 'lock fw'
     when 'direct'
-      fa_icon 'envelope fw'
+      fa_icon 'at fw'
     end
   end
 
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js
index 42ad39efa..85938867b 100644
--- a/app/javascript/flavours/glitch/actions/notifications.js
+++ b/app/javascript/flavours/glitch/actions/notifications.js
@@ -70,7 +70,8 @@ export const loadPending = () => ({
 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {
-    const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
+    const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
+    const showInColumn = activeFilter === 'all' ? getState().getIn(['settings', 'notifications', 'shows', notification.type], true) : activeFilter === notification.type;
     const showAlert    = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
     const playSound    = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
     const filters      = getFiltersRegex(getState(), { contextType: 'notifications' });
diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.js b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
index e39a31e5d..6cbcd81ee 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.js
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
@@ -234,7 +234,7 @@ class ColumnsArea extends ImmutablePureComponent {
             </div>
           </div>
 
-          <div className='columns-area__panels__main'>
+          <div className={`columns-area__panels__main ${floatingActionButton && 'with-fab'}`}>
             {!navbarUnder && <TabsBar key='tabs' />}
             {content}
             {navbarUnder && <TabsBar key='tabs' />}
diff --git a/app/javascript/flavours/glitch/styles/components/single_column.scss b/app/javascript/flavours/glitch/styles/components/single_column.scss
index db510f1f4..ba43e7f29 100644
--- a/app/javascript/flavours/glitch/styles/components/single_column.scss
+++ b/app/javascript/flavours/glitch/styles/components/single_column.scss
@@ -233,6 +233,10 @@
   .columns-area__panels__pane--compositional {
     display: none;
   }
+
+  .with-fab .scrollable .item-list:last-child {
+    padding-bottom: 5.25rem;
+  }
 }
 
 @media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 00e8d74d7..96cf628d6 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -58,7 +58,8 @@ export const loadPending = () => ({
 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {
-    const showInColumn = getState().getIn(['settings', 'notifications', 'shows', notification.type], true);
+    const activeFilter = getState().getIn(['settings', 'notifications', 'quickFilter', 'active']);
+    const showInColumn = activeFilter === 'all' ? getState().getIn(['settings', 'notifications', 'shows', notification.type], true) : activeFilter === notification.type;
     const showAlert    = getState().getIn(['settings', 'notifications', 'alerts', notification.type], true);
     const playSound    = getState().getIn(['settings', 'notifications', 'sounds', notification.type], true);
     const filters      = getFiltersRegex(getState(), { contextType: 'notifications' });
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 8d917a995..766093226 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -468,7 +468,7 @@ class Status extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index c99e01f73..13bce1b83 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -185,7 +185,7 @@ class DetailedStatus extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index f8a344690..ab87ee427 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -88,7 +88,7 @@ class BoostModal extends ImmutablePureComponent {
       'public': { icon: 'globe', text: intl.formatMessage(messages.public_short) },
       'unlisted': { icon: 'unlock', text: intl.formatMessage(messages.unlisted_short) },
       'private': { icon: 'lock', text: intl.formatMessage(messages.private_short) },
-      'direct': { icon: 'envelope', text: intl.formatMessage(messages.direct_short) },
+      'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
     };
 
     const visibilityIcon = visibilityIconInfo[status.get('visibility')];
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index db047f5f0..e665f4447 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -234,7 +234,7 @@ class ColumnsArea extends ImmutablePureComponent {
             </div>
           </div>
 
-          <div className='columns-area__panels__main'>
+          <div className={`columns-area__panels__main ${floatingActionButton && 'with-fab'}`}>
             <TabsBar key='tabs' />
             {content}
           </div>
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index fe91569bc..2f596a325 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -57,12 +57,12 @@
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
   "alert.unexpected.title": "Oops!",
-  "announcement.announcement": "Announcement",
+  "announcement.announcement": "Aankondiging",
   "attachments_list.unprocessed": "(unprocessed)",
   "autosuggest_hashtag.per_week": "{count} per week",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.retry": "Probeer weer",
   "bundle_column_error.title": "Network error",
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
@@ -70,26 +70,26 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direkte boodskappe",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
   "column.follow_requests": "Follow requests",
-  "column.home": "Home",
-  "column.lists": "Lists",
-  "column.mutes": "Muted users",
-  "column.notifications": "Notifications",
+  "column.home": "Tuis",
+  "column.lists": "Lyste",
+  "column.mutes": "Gedempte gebruikers",
+  "column.notifications": "Kennisgewings",
   "column.pins": "Pinned toot",
   "column.public": "Federated timeline",
-  "column_back_button.label": "Back",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
+  "column_back_button.label": "Terug",
+  "column_header.hide_settings": "Versteek instellings",
+  "column_header.moveLeft_settings": "Skuif kolom na links",
+  "column_header.moveRight_settings": "Skuif kolom na regs",
   "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
+  "column_header.show_settings": "Wys instellings",
   "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
+  "column_subheading.settings": "Instellings",
+  "community.column_settings.local_only": "Slegs plaaslik",
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "Remote only",
   "compose_form.direct_message_warning_learn_more": "Learn more",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Jy het nog nie direkte boodskappe nie. Wanneer jy een stuur of ontvang, sal dit hier verskyn.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "om direkte boodskappe kolom oop te maak",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direkte boodskappe",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Remove poll",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Visible for mentioned users only",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Slegs genoemde persone",
   "privacy.private.long": "Visible for followers only",
   "privacy.private.short": "Followers-only",
   "privacy.public.long": "Visible for all",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index ac93bf706..cd085fa86 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -70,7 +70,7 @@
   "column.blocks": "المُستَخدِمون المَحظورون",
   "column.bookmarks": "الفواصل المرجعية",
   "column.community": "الخيط الزمني المحلي",
-  "column.conversations": "المحادثات",
+  "column.direct": "الرسائل المباشِرة",
   "column.directory": "تَصَفُّحُ المَلفات الشخصية",
   "column.domain_blocks": "النِّطاقَاتُ المَحظُورَة",
   "column.favourites": "المُفَضَّلَة",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
   "empty_column.bookmarked_statuses": "ليس لديك أية منشورات في الفواصل المرجعية بعد. عندما ستقوم بإضافة البعض منها، ستظهر هنا.",
   "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
-  "empty_column.conversations": "عندما ترسل أو تستلم منشورًا محصورٌا على الأشخاص المشار إليهم فيه، سيظهر هنا.",
+  "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
   "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "ليس لديك أية منشورات مفضلة بعد. عندما ستقوم بالإعجاب بواحدة، ستظهر هنا.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "للترقية",
   "keyboard_shortcuts.column": "للتركيز على منشور على أحد الأعمدة",
   "keyboard_shortcuts.compose": "للتركيز على نافذة تحرير النصوص",
-  "keyboard_shortcuts.conversations": "لفتح عمود المحادثات",
   "keyboard_shortcuts.description": "الوصف",
+  "keyboard_shortcuts.direct": "لفتح عمود الرسائل المباشرة",
   "keyboard_shortcuts.down": "للانتقال إلى أسفل القائمة",
   "keyboard_shortcuts.enter": "لفتح المنشور",
   "keyboard_shortcuts.favourite": "للإضافة إلى المفضلة",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "الفواصل المرجعية",
   "navigation_bar.community_timeline": "الخيط العام المحلي",
   "navigation_bar.compose": "لتحرير منشور جديد",
+  "navigation_bar.direct": "الرسائل المباشِرة",
   "navigation_bar.discover": "اكتشف",
   "navigation_bar.domain_blocks": "النطاقات المخفية",
   "navigation_bar.edit_profile": "عدّل الملف التعريفي",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "إزالة استطلاع الرأي",
   "privacy.change": "اضبط خصوصية المنشور",
   "privacy.direct.long": "أنشر إلى المستخدمين المشار إليهم فقط",
-  "privacy.direct.short": "للمشار إليهم فقط",
+  "privacy.direct.short": "الأشخاص المشار إليهم فقط",
   "privacy.private.long": "أنشر لمتابعيك فقط",
   "privacy.private.short": "للمتابِعين فقط",
   "privacy.public.long": "مرئي للكل",
@@ -393,7 +394,7 @@
   "report.categories.other": "أخرى",
   "report.categories.spam": "مزعج",
   "report.categories.violation": "المحتوى ينتهك شرطا أو عدة شروط استخدام للخادم",
-  "report.category.subtitle": "Choose the best match",
+  "report.category.subtitle": "اختر أفضل تطابق",
   "report.category.title": "Tell us what's going on with this {type}",
   "report.category.title_account": "ملف تعريفي",
   "report.category.title_status": "منشور",
@@ -413,13 +414,13 @@
   "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
   "report.reasons.violation": "ينتهك قواعد الخادم",
   "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
+  "report.rules.subtitle": "اختر كل ما ينطبق",
   "report.rules.title": "ما هي القواعد المنتهكة؟",
-  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.subtitle": "اختر كل ما ينطبق",
   "report.statuses.title": "هل توجد مشاركات تدعم صحة هذا البلاغ؟",
   "report.submit": "إرسال",
   "report.target": "ابلغ عن {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action": "يمكنك هنا التحكم في ما يعرض لك على ماستدون:",
   "report.thanks.take_action_actionable": "في أثناء مراجعتنا للبلاغ، يمكنك اتخاذ إجراء ضد @{name}:",
   "report.thanks.title": "هل ترغب في مشاهدة هذا؟",
   "report.thanks.title_actionable": "شُكرًا لَكَ على الإبلاغ، سَوفَ نَنظُرُ فِي هَذَا الأمر.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 3400e3cd1..984153c12 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloquiaos",
   "column.bookmarks": "Marcadores",
   "column.community": "Llinia temporal llocal",
-  "column.conversations": "Conversations",
+  "column.direct": "Mensaxes direutos",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Dominios anubríos",
   "column.favourites": "Favoritos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Entá nun bloquiesti a nengún usuariu.",
   "empty_column.bookmarked_statuses": "Entá nun tienes nengún barritu en Marcadores. Cuando amiestes unu, va amosase equí.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Entá nun tienes nengún mensaxe direutu. Cuando unvies o recibas dalgún, apaez equí.",
   "empty_column.domain_blocks": "Entá nun hai dominios anubríos.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Entá nun tienes nengún barritu en Favoritos. Cuando amiestes unu, va amosase equí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "pa compartir un toot",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "Enfocar l'área de composición",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "pa baxar na llista",
   "keyboard_shortcuts.enter": "p'abrir estaos",
   "keyboard_shortcuts.favourite": "p'amestar a Favoritos",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Llinia temporal llocal",
   "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Mensaxes direutos",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Dominios anubríos",
   "navigation_bar.edit_profile": "Editar el perfil",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 42cd08f1f..166ed4601 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
   "column.community": "Локална емисия",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Преглед на профили",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Любими",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Не сте блокирали потребители все още.",
   "empty_column.bookmarked_statuses": "Все още нямате отметнати публикации. Когато отметнете някоя, тя ще се покаже тук.",
   "empty_column.community": "Локалната емисия е празна. Напишете нещо публично, за да започнете!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Все още нямате любими публикации. Когато поставите някоя в любими, тя ще се покаже тук.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "за споделяне",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "за фокусиране на текстовото пространство за композиране",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Описание",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "за придвижване надолу в списъка",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "за поставяне в любими",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Отметки",
   "navigation_bar.community_timeline": "Локална емисия",
   "navigation_bar.compose": "Композиране на нова публикация",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Откриване",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Редактирай профил",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index b009d5964..718a1b2b2 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -70,7 +70,7 @@
   "column.blocks": "যাদের ব্লক করা হয়েছে",
   "column.bookmarks": "বুকমার্ক",
   "column.community": "স্থানীয় সময়সারি",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "প্রোফাইল ব্রাউজ করুন",
   "column.domain_blocks": "লুকোনো ডোমেনগুলি",
   "column.favourites": "পছন্দের গুলো",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের ব্লক করেন নি।",
   "empty_column.bookmarked_statuses": "আপনার কাছে এখনও কোনও বুকমার্কড টুট নেই। আপনি যখন একটি বুকমার্ক করেন, এটি এখানে প্রদর্শিত হবে।",
   "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "এখনও কোনও লুকানো ডোমেন নেই।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "আপনার পছন্দের কোনো টুট এখনো নেই। আপনি কোনো লেখা পছন্দের হিসেবে চিহ্নিত করলে এখানে পাওয়া যাবে।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "সমর্থন করতে",
   "keyboard_shortcuts.column": "কোনো কলামএ কোনো লেখা ফোকাস করতে",
   "keyboard_shortcuts.compose": "লেখা সম্পদনার জায়গায় ফোকাস করতে",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "বিবরণ",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "তালিকার ভেতরে নিচে যেতে",
   "keyboard_shortcuts.enter": "অবস্থা দেখতে",
   "keyboard_shortcuts.favourite": "পছন্দের দেখতে",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "বুকমার্ক",
   "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
   "navigation_bar.compose": "নতুন টুট লিখুন",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "ঘুরে দেখুন",
   "navigation_bar.domain_blocks": "লুকানো ডোমেনগুলি",
   "navigation_bar.edit_profile": "নিজের পাতা সম্পাদনা করতে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 74d430b50..e7711e4d9 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -70,7 +70,7 @@
   "column.blocks": "Implijer·ezed·ien berzet",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Mont a-dreuz ar profiloù",
   "column.domain_blocks": "Domani berzet",
   "column.favourites": "Muiañ-karet",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
   "empty_column.bookmarked_statuses": "N'ho peus toud ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan ganeoc'h e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "N'ho peus toud muiañ-karet ebet c'hoazh. Pa vo lakaet unan ganeoc'h e vo diskouezet amañ.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "da skignañ",
   "keyboard_shortcuts.column": "Fokus ar bann",
   "keyboard_shortcuts.compose": "Fokus an takad testenn",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskrivadur",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Diskennañ er roll",
   "keyboard_shortcuts.enter": "evit digeriñ un toud",
   "keyboard_shortcuts.favourite": "Lakaat an toud evel muiañ-karet",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Sinedoù",
   "navigation_bar.community_timeline": "Red-amzer lec'hel",
   "navigation_bar.compose": "Skrivañ un toud nevez",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Dizoleiñ",
   "navigation_bar.domain_blocks": "Domanioù kuzhet",
   "navigation_bar.edit_profile": "Aozañ ar profil",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 16de55828..9946b6a9c 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,24 +1,24 @@
 {
   "account.account_note_header": "Nota",
-  "account.add_or_remove_from_list": "Afegeix o treu de les llistes",
+  "account.add_or_remove_from_list": "Afegeix o elimina de les llistes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
   "account.block": "Bloqueja @{name}",
-  "account.block_domain": "Amaga-ho tot de {domain}",
+  "account.block_domain": "Bloqueja el domini {domain}",
   "account.blocked": "Bloquejat",
   "account.browse_more_on_origin_server": "Navega més en el perfil original",
   "account.cancel_follow_request": "Anul·la la sol·licitud de seguiment",
   "account.direct": "Envia missatge directe a @{name}",
-  "account.disable_notifications": "Deixa de notificar-me les publicacions de @{name}",
+  "account.disable_notifications": "No em notifiquis les publicacions de @{name}",
   "account.domain_blocked": "Domini bloquejat",
   "account.edit_profile": "Edita el perfil",
   "account.enable_notifications": "Notifica’m les publicacions de @{name}",
   "account.endorse": "Recomana en el teu perfil",
   "account.follow": "Segueix",
   "account.followers": "Seguidors",
-  "account.followers.empty": "Encara ningú no segueix aquest usuari.",
+  "account.followers.empty": "Ningú segueix aquest usuari encara.",
   "account.followers_counter": "{count, plural, one {{counter} Seguidor} other {{counter} Seguidors}}",
-  "account.following": "Seguits",
+  "account.following": "Seguint",
   "account.following_counter": "{count, plural, other {{counter} Seguint}}",
   "account.follows.empty": "Aquest usuari encara no segueix ningú.",
   "account.follows_you": "Et segueix",
@@ -26,8 +26,8 @@
   "account.joined": "Membre des de {date}",
   "account.link_verified_on": "La propietat d'aquest enllaç es va verificar el dia {date}",
   "account.locked_info": "Aquest estat de privadesa del compte està definit com a bloquejat. El propietari revisa manualment qui pot seguir-lo.",
-  "account.media": "Mèdia",
-  "account.mention": "Esmenta @{name}",
+  "account.media": "Multimèdia",
+  "account.mention": "Menciona @{name}",
   "account.moved_to": "{name} s'ha traslladat a:",
   "account.mute": "Silencia @{name}",
   "account.mute_notifications": "Silencia les notificacions de @{name}",
@@ -41,10 +41,10 @@
   "account.statuses_counter": "{count, plural, one {{counter} Publicació} other {{counter} Publicacions}}",
   "account.unblock": "Desbloqueja @{name}",
   "account.unblock_domain": "Desbloqueja el domini {domain}",
-  "account.unblock_short": "Desbloqueja",
-  "account.unendorse": "No recomanis en el perfil",
-  "account.unfollow": "Deixa de seguir",
-  "account.unmute": "Deixa de silenciar @{name}",
+  "account.unblock_short": "Desbloquejar",
+  "account.unendorse": "No recomanar en el perfil",
+  "account.unfollow": "Deixar de seguir",
+  "account.unmute": "Deixar de silenciar @{name}",
   "account.unmute_notifications": "Activar notificacions de @{name}",
   "account.unmute_short": "Deixa de silenciar",
   "account_note.placeholder": "Fes clic per afegir una nota",
@@ -62,16 +62,16 @@
   "autosuggest_hashtag.per_week": "{count} per setmana",
   "boost_modal.combo": "Pots prémer {combo} per evitar-ho el pròxim cop",
   "bundle_column_error.body": "S'ha produït un error en carregar aquest component.",
-  "bundle_column_error.retry": "Torna-ho a provar",
+  "bundle_column_error.retry": "Tornar-ho a provar",
   "bundle_column_error.title": "Error de connexió",
   "bundle_modal_error.close": "Tanca",
   "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
-  "bundle_modal_error.retry": "Torna-ho a provar",
+  "bundle_modal_error.retry": "Tornar-ho a provar",
   "column.blocks": "Usuaris bloquejats",
   "column.bookmarks": "Marcadors",
   "column.community": "Línia de temps local",
-  "column.conversations": "Converses",
-  "column.directory": "Navega pels perfils",
+  "column.direct": "Missatges directes",
+  "column.directory": "Navegar pels perfils",
   "column.domain_blocks": "Dominis bloquejats",
   "column.favourites": "Favorits",
   "column.follow_requests": "Peticions per a seguir-te",
@@ -95,16 +95,16 @@
   "compose_form.direct_message_warning_learn_more": "Més informació",
   "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació perillosa mitjançant Mastodon.",
   "compose_form.hashtag_warning": "Aquesta publicació no es mostrarà en cap etiqueta, ja que no està llistada. Només les publicacions públiques es poden cercar per etiqueta.",
-  "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges només per a seguidors.",
+  "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure les publicacions de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "bloquejat",
   "compose_form.placeholder": "Què et passa pel cap?",
-  "compose_form.poll.add_option": "Afegeix una opció",
+  "compose_form.poll.add_option": "Afegir una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.option_placeholder": "Opció {number}",
   "compose_form.poll.remove_option": "Elimina aquesta opció",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre diverses opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per permetre una única opció",
-  "compose_form.publish": "Publica",
+  "compose_form.publish": "Publicar",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Desa els canvis",
   "compose_form.sensitive.hide": "{count, plural, one {Marca contingut com a sensible} other {Marca contingut com a sensible}}",
@@ -118,7 +118,7 @@
   "confirmations.block.confirm": "Bloqueja",
   "confirmations.block.message": "Segur que vols bloquejar a {name}?",
   "confirmations.delete.confirm": "Suprimeix",
-  "confirmations.delete.message": "Segur que vols suprimir aquesta publicació?",
+  "confirmations.delete.message": "Segur que vols eliminar la publicació?",
   "confirmations.delete_list.confirm": "Suprimeix",
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.discard_edit_media.confirm": "Descarta",
@@ -161,12 +161,12 @@
   "emoji_button.symbols": "Símbols",
   "emoji_button.travel": "Viatges i llocs",
   "empty_column.account_suspended": "Compte suspès",
-  "empty_column.account_timeline": "Aquí no hi ha publicacions!",
+  "empty_column.account_timeline": "No hi ha publicacions aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Encara no has bloquejat cap usuari.",
   "empty_column.bookmarked_statuses": "Encara no has marcat com publicació com a preferida. Quan en marquis una apareixerà aquí.",
   "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per posar-ho tot en marxa!",
-  "empty_column.conversations": "Cada vegada que envies o reps una publicació que és només visible per la gent que hi has mencionat en ella, serà mostrada aquí.",
+  "empty_column.direct": "Encara no tens missatges directes. Quan n'enviïs o en rebis, es mostraran aquí.",
   "empty_column.domain_blocks": "Encara no hi ha dominis bloquejats.",
   "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Revisa-ho més tard!",
   "empty_column.favourited_statuses": "Encara no has marcat cap publicació com a preferida. Quan les marquis, apareixeran aquí.",
@@ -227,14 +227,14 @@
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
   "keyboard_shortcuts.back": "Anar enrere",
   "keyboard_shortcuts.blocked": "Obre la llista d'usuaris bloquejats",
-  "keyboard_shortcuts.boost": "Impulsa publicació",
+  "keyboard_shortcuts.boost": "Impulsa la publicació",
   "keyboard_shortcuts.column": "Centra la columna",
   "keyboard_shortcuts.compose": "Centra l'àrea de composició del text",
-  "keyboard_shortcuts.conversations": "per a obrir la columna de converses",
   "keyboard_shortcuts.description": "Descripció",
+  "keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
   "keyboard_shortcuts.down": "Mou-lo avall en la llista",
-  "keyboard_shortcuts.enter": "Obre publicació",
-  "keyboard_shortcuts.favourite": "Afavorir publicació",
+  "keyboard_shortcuts.enter": "Obrir publicació",
+  "keyboard_shortcuts.favourite": "Afavoreix la publicació",
   "keyboard_shortcuts.favourites": "Obre la llista de preferits",
   "keyboard_shortcuts.federated": "Obre la línia de temps federada",
   "keyboard_shortcuts.heading": "Dreceres de teclat",
@@ -242,7 +242,7 @@
   "keyboard_shortcuts.hotkey": "Tecla d'accés directe",
   "keyboard_shortcuts.legend": "Mostra aquesta llegenda",
   "keyboard_shortcuts.local": "Obre la línia de temps local",
-  "keyboard_shortcuts.mention": "Esmenta l'autor",
+  "keyboard_shortcuts.mention": "Mencionar l'autor",
   "keyboard_shortcuts.muted": "Obre la llista d'usuaris silenciats",
   "keyboard_shortcuts.my_profile": "Obre el teu perfil",
   "keyboard_shortcuts.notifications": "Obre la columna de notificacions",
@@ -256,7 +256,7 @@
   "keyboard_shortcuts.start": "Obre la columna \"Primers passos\"",
   "keyboard_shortcuts.toggle_hidden": "Mostra/oculta el text marcat com a sensible",
   "keyboard_shortcuts.toggle_sensitivity": "Mostra/amaga contingut multimèdia",
-  "keyboard_shortcuts.toot": "Inicia una nova publicació",
+  "keyboard_shortcuts.toot": "Iniciar una publicació nova",
   "keyboard_shortcuts.unfocus": "Descentra l'àrea de composició de text/cerca",
   "keyboard_shortcuts.up": "Moure amunt en la llista",
   "lightbox.close": "Tanca",
@@ -289,7 +289,8 @@
   "navigation_bar.blocks": "Usuaris bloquejats",
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.community_timeline": "Línia de temps local",
-  "navigation_bar.compose": "Redacta una nova publicació",
+  "navigation_bar.compose": "Redactar una nova publicació",
+  "navigation_bar.direct": "Missatges directes",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Dominis bloquejats",
   "navigation_bar.edit_profile": "Edita el perfil",
@@ -301,7 +302,7 @@
   "navigation_bar.info": "Sobre aquest servidor",
   "navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
   "navigation_bar.lists": "Llistes",
-  "navigation_bar.logout": "Tanca la sessió",
+  "navigation_bar.logout": "Tancar sessió",
   "navigation_bar.mutes": "Usuaris silenciats",
   "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Publicacions fixades",
@@ -312,11 +313,11 @@
   "notification.favourite": "{name} ha afavorit la teva publicació",
   "notification.follow": "{name} et segueix",
   "notification.follow_request": "{name} ha sol·licitat seguir-te",
-  "notification.mention": "{name} t'ha esmentat",
+  "notification.mention": "{name} t'ha mencionat",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta en què has votat",
-  "notification.reblog": "{name} ha impulsat el teu estat",
-  "notification.status": "ha publicat {name}",
+  "notification.reblog": "{name} ha impulsat la teva publicació",
+  "notification.status": "{name} acaba de publicar",
   "notification.update": "{name} ha editat una publicació",
   "notifications.clear": "Esborra les notificacions",
   "notifications.clear_confirmation": "Segur que vols esborrar permanentment totes les teves notificacions?",
@@ -362,11 +363,11 @@
   "poll.vote": "Vota",
   "poll.voted": "Vas votar per aquesta resposta",
   "poll.votes": "{votes, plural, one {# vot} other {# vots}}",
-  "poll_button.add_poll": "Afegeix una enquesta",
+  "poll_button.add_poll": "Afegir una enquesta",
   "poll_button.remove_poll": "Elimina l'enquesta",
-  "privacy.change": "Ajusta la privacitat de la publicació",
+  "privacy.change": "Canvia la privacitat de la publicació",
   "privacy.direct.long": "Visible només per als usuaris esmentats",
-  "privacy.direct.short": "Només la gent que menciono",
+  "privacy.direct.short": "Només gent mencionada",
   "privacy.private.long": "Visible només per als seguidors",
   "privacy.private.short": "Només seguidors",
   "privacy.public.long": "Visible per tothom",
@@ -440,12 +441,12 @@
   "search_results.statuses_fts_disabled": "La cerca de publicacions pel seu contingut no està habilitada en aquest servidor Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "status.admin_account": "Obre l'interfície de moderació per a @{name}",
-  "status.admin_status": "Obre aquesta publicació a la interfície de moderació",
+  "status.admin_status": "Obrir aquesta publicació a la interfície de moderació",
   "status.block": "Bloqueja @{name}",
   "status.bookmark": "Afavoreix",
   "status.cancel_reblog_private": "Desfés l'impuls",
   "status.cannot_reblog": "Aquesta publicació no es pot impulsar",
-  "status.copy": "Copia l'enllaç a l'estat",
+  "status.copy": "Copia l'enllaç a la publicació",
   "status.delete": "Esborra",
   "status.detailed_status": "Visualització detallada de la conversa",
   "status.direct": "Envia missatge directe a @{name}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 5a64eaebb..2a4106c4b 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -70,7 +70,7 @@
   "column.blocks": "بەکارهێنەرە بلۆککراوەکان",
   "column.bookmarks": "نیشانەکان",
   "column.community": "هێڵی کاتی ناوخۆیی",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "گەڕان لە پرۆفایلەکان",
   "column.domain_blocks": "دۆمەینە داخراوەکان",
   "column.favourites": "دڵخوازترینەکان",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "تۆ هێشتا هیچ بەکارهێنەرێکت بلۆک نەکردووە.",
   "empty_column.bookmarked_statuses": "تۆ هێشتا هیچ توتێکی دیاریکراوت نیە کاتێک نیشانەیەک نیشان دەکەیت، لێرە دەرئەکەویت.",
   "empty_column.community": "هێڵی کاتی ناوخۆیی بەتاڵە. شتێک بە ئاشکرا بنووسە بۆ ئەوەی تۆپەکە بسووڕێت!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "هێشتا هیچ دۆمەینێکی بلۆک کراو نییە.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "تۆ هێشتا هیچ توتێکی دڵخوازت نییە، کاتێک حەزت لە دانەیەکی باشە، لێرە دەرئەکەویت.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "بۆ بەهێزکردن",
   "keyboard_shortcuts.column": "بۆ ئەوەی تیشک بخاتە سەر توتێک لە یەکێک لە ستوونەکان",
   "keyboard_shortcuts.compose": "بۆ سەرنجدان بە نووسینی ناوچەی دەق",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "وه‌سف",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "بۆ چوونە خوارەوە لە لیستەکەدا",
   "keyboard_shortcuts.enter": "بۆ کردنەوەی توت",
   "keyboard_shortcuts.favourite": "بۆ دڵخواز",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "نیشانکراوەکان",
   "navigation_bar.community_timeline": "دەمنامەی ناوخۆیی",
   "navigation_bar.compose": "نووسینی توتی نوێ",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "دۆزینەوە",
   "navigation_bar.domain_blocks": "دۆمەینە بلۆک کراوەکان",
   "navigation_bar.edit_profile": "دەستکاری پرۆفایل بکە",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 770bd71bc..a746fe606 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -70,7 +70,7 @@
   "column.blocks": "Utilizatori bluccati",
   "column.bookmarks": "Segnalibri",
   "column.community": "Linea pubblica lucale",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Percorre i prufili",
   "column.domain_blocks": "Duminii piattati",
   "column.favourites": "Favuriti",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
   "empty_column.bookmarked_statuses": "Ùn avete manc'un segnalibru. Quandu aghjunghjerate unu, sarà mustratu quì.",
   "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ùn avete manc'unu statutu favuritu. Quandu aghjunghjerate unu à i vostri favuriti, sarà mustratu quì.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "sparte",
   "keyboard_shortcuts.column": "fucalizà un statutu indè una colonna",
   "keyboard_shortcuts.compose": "fucalizà nant'à l'area di ridazzione",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descrizzione",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "falà indè a lista",
   "keyboard_shortcuts.enter": "apre u statutu",
   "keyboard_shortcuts.favourite": "aghjunghje à i favuriti",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
   "navigation_bar.compose": "Scrive un novu statutu",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.edit_profile": "Mudificà u prufile",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index df1e750b7..6b50244df 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Záložky",
   "column.community": "Místní časová osa",
-  "column.conversations": "Konverzace",
+  "column.direct": "Přímé zprávy",
   "column.directory": "Prozkoumat profily",
   "column.domain_blocks": "Blokované domény",
   "column.favourites": "Oblíbené",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ještě jste nezablokovali žádného uživatele.",
   "empty_column.bookmarked_statuses": "Ještě nemáte v záložkách žádné příspěvky. Pokud si do nich nějaký přidáte, zobrazí se zde.",
   "empty_column.community": "Místní časová osa je prázdná. Napište něco veřejně a rozhýbejte to tu!",
-  "empty_column.conversations": "Jakmile pošlete nebo obdržíte příspěvek, který je viditelný pouze lidem v něm zmíněným, objeví se tady.",
+  "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
   "empty_column.domain_blocks": "Ještě nemáte žádné blokované domény.",
   "empty_column.explore_statuses": "Momentálně není nic populární. Vraťte se později!",
   "empty_column.favourited_statuses": "Ještě nemáte žádné oblíbené příspěvky. Pokud si nějaký oblíbíte, zobrazí se zde.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Boostnout příspěvek",
   "keyboard_shortcuts.column": "Focus na sloupec",
   "keyboard_shortcuts.compose": "Focus na textové pole nového příspěvku",
-  "keyboard_shortcuts.conversations": "Otevřít sloupec konverzací",
   "keyboard_shortcuts.description": "Popis",
+  "keyboard_shortcuts.direct": "Otevřít sloupec přímých zpráv",
   "keyboard_shortcuts.down": "Posunout dolů v seznamu",
   "keyboard_shortcuts.enter": "Otevřít příspěvek",
   "keyboard_shortcuts.favourite": "Oblíbit příspěvek",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Místní časová osa",
   "navigation_bar.compose": "Vytvořit nový příspěvek",
+  "navigation_bar.direct": "Přímé zprávy",
   "navigation_bar.discover": "Objevujte",
   "navigation_bar.domain_blocks": "Blokované domény",
   "navigation_bar.edit_profile": "Upravit profil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Odstranit anketu",
   "privacy.change": "Změnit soukromí příspěvku",
   "privacy.direct.long": "Viditelný pouze pro zmíněné uživatele",
-  "privacy.direct.short": "Pouze lidé, které zmíním",
+  "privacy.direct.short": "Jen zmínění lidé",
   "privacy.private.long": "Viditelný pouze pro sledující",
   "privacy.private.short": "Pouze sledující",
   "privacy.public.long": "Viditelný pro všechny",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 7edb1d1cf..7e90d8fe0 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -70,7 +70,7 @@
   "column.blocks": "Defnyddwyr a flociwyd",
   "column.bookmarks": "Tudalnodau",
   "column.community": "Ffrwd lleol",
-  "column.conversations": "Sgyrsiau",
+  "column.direct": "Negeseuon preifat",
   "column.directory": "Pori proffiliau",
   "column.domain_blocks": "Parthau cuddiedig",
   "column.favourites": "Ffefrynnau",
@@ -166,10 +166,10 @@
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
   "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw dwtiau tudalnodiedig eto. Pan y byddwch yn tudalnodi un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
-  "empty_column.conversations": "Unwaith y byddwch chi'n anfon neu'n derbyn post sydd ond yn weladwy i'r bobl a grybwyllir ynddo, bydd yn ymddangos yma.",
+  "empty_column.direct": "Does gennych unrhyw negeseuon preifat eto. Pan byddwch yn anfon neu derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
   "empty_column.explore_statuses": "Does dim byd yn trendio ar hyn o bryd. Gwiriwch yn ôl yn nes ymlaen!",
-  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff dwtiau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
+  "empty_column.favourited_statuses": "Nid oes gennych unrhyw hoff bostiadau eto. Pan y byddwch yn hoffi un, mi fydd yn ymddangos yma.",
   "empty_column.favourites": "Does neb wedi hoffi'r post hwn eto. Pan bydd rhywun yn ei hoffi, byddent yn ymddangos yma.",
   "empty_column.follow_recommendations": "Does dim awgrymiadau yma i chi. Gallwch geisio chwilio am bobl yr ydych yn eu hadnabod neu archwilio hashnodau sy'n trendio.",
   "empty_column.follow_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan dderbyniwch chi un, byddent yn ymddangos yma.",
@@ -191,8 +191,8 @@
   "explore.suggested_follows": "I chi",
   "explore.title": "Archwilio",
   "explore.trending_links": "Newyddion",
-  "explore.trending_statuses": "Postiau",
-  "explore.trending_tags": "Hanshnodau",
+  "explore.trending_statuses": "Postiadau",
+  "explore.trending_tags": "Hashnodau",
   "follow_recommendations.done": "Wedi gorffen",
   "follow_recommendations.heading": "Dilynwch y bobl yr hoffech chi weld eu postiadau! Dyma ambell i awgrymiad.",
   "follow_recommendations.lead": "Bydd postiadau gan bobl rydych chi'n eu dilyn yn ymddangos mewn trefn amser ar eich ffrwd cartref. Peidiwch â bod ofn gwneud camgymeriadau, gallwch chi ddad-ddilyn pobl yr un mor hawdd unrhyw bryd!",
@@ -222,7 +222,7 @@
   "home.column_settings.show_replies": "Dangos ymatebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.show_announcements": "Dangos cyhoeddiadau",
-  "intervals.full.days": "{number, plural, one {# ddydd} other {# o ddyddiau}}",
+  "intervals.full.days": "{number, plural, one {# dydd} two {# ddydd} other {# o ddyddiau}}",
   "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
   "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
   "keyboard_shortcuts.back": "i lywio nôl",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "i fŵstio",
   "keyboard_shortcuts.column": "Ffocysu colofn",
   "keyboard_shortcuts.compose": "i ffocysu yr ardal cyfansoddi testun",
-  "keyboard_shortcuts.conversations": "i agor colofn sgyrsiau",
   "keyboard_shortcuts.description": "Disgrifiad",
+  "keyboard_shortcuts.direct": "i agor colofn negeseuon preifat",
   "keyboard_shortcuts.down": "i symud lawr yn y rhestr",
   "keyboard_shortcuts.enter": "Agor post",
   "keyboard_shortcuts.favourite": "i hoffi",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Tudalnodau",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi post newydd",
+  "navigation_bar.direct": "Negeseuon preifat",
   "navigation_bar.discover": "Darganfod",
   "navigation_bar.domain_blocks": "Parthau cuddiedig",
   "navigation_bar.edit_profile": "Golygu proffil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Tynnu pleidlais",
   "privacy.change": "Addasu preifatrwdd y post",
   "privacy.direct.long": "Cyhoeddi i'r defnyddwyr sy'n cael eu crybwyll yn unig",
-  "privacy.direct.short": "Dim ond pobl rwy'n eu crybwyll",
+  "privacy.direct.short": "Pobl sy wedi'u crybwyll yn unig",
   "privacy.private.long": "Cyhoeddi i ddilynwyr yn unig",
   "privacy.private.short": "Dilynwyr yn unig",
   "privacy.public.long": "Gweladwy i bawb",
@@ -376,7 +377,7 @@
   "refresh": "Adnewyddu",
   "regeneration_indicator.label": "Llwytho…",
   "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
-  "relative_time.days": "{number}dydd",
+  "relative_time.days": "{number} dydd",
   "relative_time.full.days": "{number, plural, one {# dydd} other {# o ddyddiau}} yn ôl",
   "relative_time.full.hours": "{number, plural, one {# awr} other {# o oriau}} yn ôl",
   "relative_time.full.just_now": "jyst nawr",
@@ -385,7 +386,7 @@
   "relative_time.hours": "{number} awr",
   "relative_time.just_now": "nawr",
   "relative_time.minutes": "{number} munud",
-  "relative_time.seconds": "{number}eiliad",
+  "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
   "reply_indicator.cancel": "Canslo",
   "report.block": "Blocio",
@@ -434,7 +435,7 @@
   "search_popout.tips.user": "defnyddiwr",
   "search_results.accounts": "Pobl",
   "search_results.all": "Popeth",
-  "search_results.hashtags": "Hanshnodau",
+  "search_results.hashtags": "Hashnodau",
   "search_results.nothing_found": "Methu dod o hyd i unrhyw beth ar gyfer y termau chwilio hyn",
   "search_results.statuses": "Postiadau",
   "search_results.statuses_fts_disabled": "Nid yw chwilio postiadau yn ôl eu cynnwys wedi'i alluogi ar y gweinydd Mastodon hwn.",
@@ -465,11 +466,11 @@
   "status.mute_conversation": "Tawelu sgwrs",
   "status.open": "Ehangu'r post hwn",
   "status.pin": "Pinio ar y proffil",
-  "status.pinned": "Pinio post",
+  "status.pinned": "Post wedi'i binio",
   "status.read_more": "Darllen mwy",
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
-  "status.reblogged_by": "Hybio {name}",
+  "status.reblogged_by": "Hybodd {name}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu & ailddrafftio",
   "status.remove_bookmark": "Tynnu'r tudalnod",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index e04a0634c..40ccdcfb0 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bogmærker",
   "column.community": "Lokal tidslinje",
-  "column.conversations": "Konversationer",
+  "column.direct": "Direkte beskeder",
   "column.directory": "Tjek profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.favourites": "Favoritter",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ingen brugere blokeret endnu.",
   "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.conversations": "Når der sendes eller modtages indlæg, som kun er synligt for personer nævnt heri, vil de dukke op her.",
+  "empty_column.direct": "Der er endnu ingen direkte beskeder. Når en sendes eller modtages, dukker den op hér.",
   "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
   "empty_column.explore_statuses": "Ingen nye tendensen pt. Tjek igen senere!",
   "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Boost indlæg",
   "keyboard_shortcuts.column": "Fokusér kolonne",
   "keyboard_shortcuts.compose": "Fokusér skriveområdet",
-  "keyboard_shortcuts.conversations": "for at åbne konversationskolonnen",
   "keyboard_shortcuts.description": "Beskrivelse",
+  "keyboard_shortcuts.direct": "for at åbne direkte beskeder-kolonnen",
   "keyboard_shortcuts.down": "Flyt nedad på listen",
   "keyboard_shortcuts.enter": "Åbn indlæg",
   "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Skriv nyt indlæg",
+  "navigation_bar.direct": "Direkte beskeder",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.edit_profile": "Redigér profil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Justér indlægsfortrolighed",
   "privacy.direct.long": "Kun synlig for nævnte brugere",
-  "privacy.direct.short": "Kun personer, jeg nævner",
+  "privacy.direct.short": "Kun nævnte personer",
   "privacy.private.long": "Kun synlig for følgere",
   "privacy.private.short": "Kun følgere",
   "privacy.public.long": "Synlig for alle",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 87f2b2017..813d84bce 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -13,10 +13,10 @@
   "account.domain_blocked": "Domain versteckt",
   "account.edit_profile": "Profil bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
-  "account.endorse": "Im Profil anzeigen",
+  "account.endorse": "Auf Profil hervorheben",
   "account.follow": "Folgen",
   "account.followers": "Follower",
-  "account.followers.empty": "Diesem Profil folgt bislang niemand.",
+  "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
   "account.following": "Folgt",
   "account.following_counter": "{count, plural, one {{counter} Folgt} other {{counter} Folgt}}",
@@ -70,7 +70,7 @@
   "column.blocks": "Blockierte Profile",
   "column.bookmarks": "Lesezeichen",
   "column.community": "Lokale Zeitleiste",
-  "column.conversations": "Konversationen",
+  "column.direct": "Mensaxes directas",
   "column.directory": "Profile durchsuchen",
   "column.domain_blocks": "Blockierte Domains",
   "column.favourites": "Favoriten",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du hast keine Profile blockiert.",
   "empty_column.bookmarked_statuses": "Du hast bis jetzt keine Beiträge als Lesezeichen gespeichert. Wenn du einen Beitrag als Lesezeichen speicherst wird er hier erscheinen.",
   "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
-  "empty_column.conversations": "Sobald du einen Beitrag sendest oder empfängst, der nur für die in ihm erwähnten Personen sichtbar ist, wird er hier angezeigt.",
+  "empty_column.direct": "Du hast noch keine Direktnachrichten. Sobald du eine sendest oder empfängst, wird sie hier zu sehen sein.",
   "empty_column.domain_blocks": "Es sind noch keine Domains versteckt.",
   "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder!",
   "empty_column.favourited_statuses": "Du hast noch keine favorisierten Tröts. Wenn du einen favorisierst, wird er hier erscheinen.",
@@ -174,7 +174,7 @@
   "empty_column.follow_recommendations": "Es sieht so aus, als könnten keine Vorschläge für dich generiert werden. Du kannst versuchen nach Leuten zu suchen, die du vielleicht kennst oder du kannst angesagte Hashtags erkunden.",
   "empty_column.follow_requests": "Du hast noch keine Folge-Anfragen. Sobald du eine erhältst, wird sie hier angezeigt.",
   "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.",
-  "empty_column.home": "Deine Startseite ist leer! Besuche {public} oder nutze die Suche, um loszulegen und andere Leute zu finden.",
+  "empty_column.home": "Deine Startseite ist leer! Folge mehr Leuten, um sie zu füllen. {suggestions}",
   "empty_column.home.suggestions": "Ein paar Vorschläge ansehen",
   "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen werden sie hier erscheinen.",
   "empty_column.lists": "Du hast noch keine Listen. Wenn du eine anlegst, wird sie hier angezeigt.",
@@ -198,7 +198,7 @@
   "follow_recommendations.lead": "Beiträge von Personen, denen du folgst, werden in chronologischer Reihenfolge auf deiner Startseite angezeigt. Hab keine Angst, Fehler zu machen, du kannst den Leuten jederzeit wieder entfolgen!",
   "follow_request.authorize": "Erlauben",
   "follow_request.reject": "Ablehnen",
-  "follow_requests.unlocked_explanation": "Auch wenn dein Konto nicht gesperrt ist, haben die Mitarbeiter von {domain} gedacht, dass es besser wäre den Follow manuell zu bestätigen.",
+  "follow_requests.unlocked_explanation": "Auch wenn dein Konto nicht gesperrt ist, haben die Moderator_innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
   "generic.saved": "Gespeichert",
   "getting_started.developers": "Entwickler",
   "getting_started.directory": "Profilverzeichnis",
@@ -225,13 +225,13 @@
   "intervals.full.days": "{number, plural, one {# Tag} other {# Tage}}",
   "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
   "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
-  "keyboard_shortcuts.back": "zurück navigieren",
+  "keyboard_shortcuts.back": "Zurück navigieren",
   "keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen",
   "keyboard_shortcuts.boost": "teilen",
   "keyboard_shortcuts.column": "einen Beitrag in einer der Spalten fokussieren",
   "keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
-  "keyboard_shortcuts.conversations": "um die Konversationsspalte zu öffnen",
   "keyboard_shortcuts.description": "Beschreibung",
+  "keyboard_shortcuts.direct": "um Direktnachrichtenspalte zu öffnen",
   "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
   "keyboard_shortcuts.enter": "Beitrag öffnen",
   "keyboard_shortcuts.favourite": "um zu favorisieren",
@@ -279,7 +279,7 @@
   "lists.subheading": "Deine Listen",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
   "loading_indicator.label": "Wird geladen …",
-  "media_gallery.toggle_visible": "Sichtbarkeit umschalten",
+  "media_gallery.toggle_visible": "{number, plural, one {Bild verbergen} other {Bilder verbergen}}",
   "missing_indicator.label": "Nicht gefunden",
   "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
   "mute_modal.duration": "Dauer",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Lesezeichen",
   "navigation_bar.community_timeline": "Lokale Zeitleiste",
   "navigation_bar.compose": "Neuen Beitrag verfassen",
+  "navigation_bar.direct": "Direktnachrichten",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Versteckte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Wird an erwähnte Profile gesendet",
-  "privacy.direct.short": "Nur Leute, die ich erwähne",
+  "privacy.direct.short": "Nur erwähnte Personen",
   "privacy.private.long": "Nur für Folgende sichtbar",
   "privacy.private.short": "Nur Follower",
   "privacy.public.long": "Für alle sichtbar",
@@ -392,23 +393,23 @@
   "report.block_explanation": "Du wirst die Beiträge von diesem Konto nicht sehen. Das Konto wird nicht in der Lage sein, deine Beiträge zu sehen oder dir zu folgen. Die Person hinter dem Konto wird wissen, dass du das Konto blockiert hast.",
   "report.categories.other": "Andere",
   "report.categories.spam": "Spam",
-  "report.categories.violation": "Inhalt verletzt ein oder mehrere Server-Regeln",
-  "report.category.subtitle": "Wähle die beste Zugehörigkeit",
-  "report.category.title": "Sag uns, was mit diesem {type} vor sich geht",
+  "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Server-Regeln",
+  "report.category.subtitle": "Wähle die passendste Kategorie",
+  "report.category.title": "Sag uns, was das Problem mit diesem {type} ist",
   "report.category.title_account": "Profil",
   "report.category.title_status": "Beitrag",
   "report.close": "Fertig",
   "report.comment.title": "Gibt es etwas anderes, was wir wissen sollten?",
   "report.forward": "An {target} weiterleiten",
-  "report.forward_hint": "Dieses Konto ist von einem anderen Server. Soll eine anonymisierte Kopie des Berichts auch dorthin geschickt werden?",
+  "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin geschickt werden?",
   "report.mute": "Stummschalten",
   "report.mute_explanation": "Du wirst die Beiträge vom Konto nicht mehr sehen. Das Konto kann dir immernoch folgen und die Person hinter dem Konto wird deine Beiträge sehen können und nicht wissen, dass du sie stumm geschaltet hast.",
   "report.next": "Weiter",
   "report.placeholder": "Zusätzliche Kommentare",
   "report.reasons.dislike": "Das gefällt mir nicht",
-  "report.reasons.dislike_description": "Das ist nicht etwas, was ihr nicht sehen wollt",
+  "report.reasons.dislike_description": "Es ist etwas, das du nicht sehen willst",
   "report.reasons.other": "Da ist was anderes",
-  "report.reasons.other_description": "Das Problem passt nicht in eine der Kategorien",
+  "report.reasons.other_description": "Das Problem passt nicht in die Kategorien",
   "report.reasons.spam": "Das ist Spam",
   "report.reasons.spam_description": "Bösartige Links, gefälschtes Engagement oder wiederholte Antworten",
   "report.reasons.violation": "Es verstößt gegen Serverregeln",
@@ -419,10 +420,10 @@
   "report.statuses.title": "Gibt es Beiträge, die diesen Bericht unterstützen?",
   "report.submit": "Absenden",
   "report.target": "{target} melden",
-  "report.thanks.take_action": "Hier sind deine Optionen, die es dir erlauben zu kontrollieren, was du auf Mastodon sehen möchtest:",
+  "report.thanks.take_action": "Das sind deine Möglichkeiten, zu bestimmen, was du auf Mastodon sehen möchtest:",
   "report.thanks.take_action_actionable": "Während wir dies überprüfen, kannst du gegen @{name} vorgehen:",
   "report.thanks.title": "Möchtest du das nicht sehen?",
-  "report.thanks.title_actionable": "Vielen Dank für die Berichterstattung, wir werden uns damit befassen.",
+  "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.",
   "search.placeholder": "Suche",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 5a6af8291..47cd09ba9 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -70,7 +70,7 @@
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Σελιδοδείκτες",
   "column.community": "Τοπική ροή",
-  "column.conversations": "Συνομιλίες",
+  "column.direct": "Προσωπικά μηνύματα",
   "column.directory": "Δες προφίλ",
   "column.domain_blocks": "Κρυμμένοι τομείς",
   "column.favourites": "Αγαπημένα",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
   "empty_column.bookmarked_statuses": "Δεν έχεις κανένα αποθηκευμένο τουτ ακόμα. Μόλις αποθηκεύσεις κάποιο, θα εμφανιστεί εδώ.",
   "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
-  "empty_column.conversations": "Μόλις στείλετε ή λάβετε μια δημοσίευση που είναι ορατή μόνο σε άτομα που αναφέρονται σε αυτή, θα εμφανιστεί εδώ.",
+  "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
   "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Δεν έχεις κανένα αγαπημένο τουτ ακόμα. Μόλις αγαπήσεις κάποιο, θα εμφανιστεί εδώ.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "προώθηση",
   "keyboard_shortcuts.column": "εμφάνιση της κατάστασης σε μια από τις στήλες",
   "keyboard_shortcuts.compose": "εστίαση στην περιοχή συγγραφής",
-  "keyboard_shortcuts.conversations": "για να ανοίξετε στήλη συνομιλιών",
   "keyboard_shortcuts.description": "Περιγραφή",
+  "keyboard_shortcuts.direct": "άνοιγμα στήλης προσωπικών μηνυμάτων",
   "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
   "keyboard_shortcuts.enter": "εμφάνιση κατάστασης",
   "keyboard_shortcuts.favourite": "σημείωση ως αγαπημένο",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
   "navigation_bar.community_timeline": "Τοπική ροή",
   "navigation_bar.compose": "Γράψε νέο τουτ",
+  "navigation_bar.direct": "Προσωπικά μηνύματα",
   "navigation_bar.discover": "Ανακάλυψη",
   "navigation_bar.domain_blocks": "Κρυμμένοι τομείς",
   "navigation_bar.edit_profile": "Επεξεργασία προφίλ",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας δημοσίευσης",
   "privacy.direct.long": "Δημοσίευση μόνο σε όσους και όσες αναφέρονται",
-  "privacy.direct.short": "Μόνο άτομα που αναφέρω",
+  "privacy.direct.short": "Αναφερόμενα άτομα μόνο",
   "privacy.private.long": "Δημοσίευση μόνο στους ακόλουθους",
   "privacy.private.short": "Μόνο ακόλουθοι",
   "privacy.public.long": "Ορατό σε όλους",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
new file mode 100644
index 000000000..cf698618e
--- /dev/null
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -0,0 +1,544 @@
+{
+  "account.account_note_header": "Note",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Block domain {domain}",
+  "account.blocked": "Blocked",
+  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.cancel_follow_request": "Cancel follow request",
+  "account.direct": "Direct message @{name}",
+  "account.disable_notifications": "Stop notifying me when @{name} posts",
+  "account.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.enable_notifications": "Notify me when @{name} posts",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Followers}}",
+  "account.following": "Following",
+  "account.following_counter": "{count, plural, one {{counter} Following} other {{counter} Following}}",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.joined": "Joined {date}",
+  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Media",
+  "account.mention": "Mention @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Mute @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.posts": "Posts",
+  "account.posts_with_replies": "Posts and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} Post} other {{counter} Posts}}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unblock_short": "Unblock",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.unmute_short": "Unmute",
+  "account_note.placeholder": "Click to add a note",
+  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
+  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.retention.average": "Average",
+  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort_size": "New users",
+  "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Rate limited",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "announcement.announcement": "Announcement",
+  "attachments_list.unprocessed": "(unprocessed)",
+  "autosuggest_hashtag.per_week": "{count} per week",
+  "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
+  "column.blocks": "Blocked users",
+  "column.bookmarks": "Bookmarks",
+  "column.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "column.directory": "Browse profiles",
+  "column.domain_blocks": "Blocked domains",
+  "column.favourites": "Favourites",
+  "column.follow_requests": "Follow requests",
+  "column.home": "Home",
+  "column.lists": "Lists",
+  "column.mutes": "Muted users",
+  "column.notifications": "Notifications",
+  "column.pins": "Pinned post",
+  "column.public": "Federated timeline",
+  "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
+  "column_header.moveLeft_settings": "Move column to the left",
+  "column_header.moveRight_settings": "Move column to the right",
+  "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Unpin",
+  "column_subheading.settings": "Settings",
+  "community.column_settings.local_only": "Local only",
+  "community.column_settings.media_only": "Media only",
+  "community.column_settings.remote_only": "Remote only",
+  "compose_form.direct_message_warning_learn_more": "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.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
+  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
+  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.placeholder": "What is on your mind?",
+  "compose_form.poll.add_option": "Add a choice",
+  "compose_form.poll.duration": "Poll duration",
+  "compose_form.poll.option_placeholder": "Choice {number}",
+  "compose_form.poll.remove_option": "Remove this choice",
+  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
+  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "Save changes",
+  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
+  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.spoiler.marked": "Text is hidden behind warning",
+  "compose_form.spoiler.unmarked": "Text is not hidden",
+  "compose_form.spoiler_placeholder": "Write your warning here",
+  "confirmation_modal.cancel": "Cancel",
+  "confirmations.block.block_and_report": "Block & Report",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Are you sure you want to block {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Are you sure you want to delete this status?",
+  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.discard_edit_media.confirm": "Discard",
+  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.domain_block.confirm": "Hide entire domain",
+  "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.",
+  "confirmations.logout.confirm": "Log out",
+  "confirmations.logout.message": "Are you sure you want to log out?",
+  "confirmations.mute.confirm": "Mute",
+  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "confirmations.reply.confirm": "Reply",
+  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "conversation.delete": "Delete conversation",
+  "conversation.mark_as_read": "Mark as read",
+  "conversation.open": "View conversation",
+  "conversation.with": "With {names}",
+  "directory.federated": "From known fediverse",
+  "directory.local": "From {domain} only",
+  "directory.new_arrivals": "New arrivals",
+  "directory.recently_active": "Recently active",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
+  "embed.preview": "Here is what it will look like:",
+  "emoji_button.activity": "Activity",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Flags",
+  "emoji_button.food": "Food & Drink",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Nature",
+  "emoji_button.not_found": "No matching emojis found",
+  "emoji_button.objects": "Objects",
+  "emoji_button.people": "People",
+  "emoji_button.recent": "Frequently used",
+  "emoji_button.search": "Search...",
+  "emoji_button.search_results": "Search results",
+  "emoji_button.symbols": "Symbols",
+  "emoji_button.travel": "Travel & Places",
+  "empty_column.account_suspended": "Account suspended",
+  "empty_column.account_timeline": "No posts found",
+  "empty_column.account_unavailable": "Profile unavailable",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
+  "empty_column.favourites": "No one has favourited this post yet. When someone does, they will show up here.",
+  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
+  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Follow more people to fill it up. {suggestions}",
+  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. When other people interact with you, you will see it here.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
+  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
+  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
+  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "explore.search_results": "Search results",
+  "explore.suggested_follows": "For you",
+  "explore.title": "Explore",
+  "explore.trending_links": "News",
+  "explore.trending_statuses": "Posts",
+  "explore.trending_tags": "Hashtags",
+  "follow_recommendations.done": "Done",
+  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
+  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
+  "generic.saved": "Saved",
+  "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Documentation",
+  "getting_started.heading": "Getting started",
+  "getting_started.invite": "Invite people",
+  "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
+  "getting_started.security": "Security",
+  "getting_started.terms": "Terms of service",
+  "hashtag.column_header.tag_mode.all": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "hashtag.column_settings.select.no_options_message": "No suggestions found",
+  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
+  "hashtag.column_settings.tag_mode.all": "All of these",
+  "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",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "home.hide_announcements": "Hide announcements",
+  "home.show_announcements": "Show announcements",
+  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
+  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
+  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "keyboard_shortcuts.back": "to navigate back",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "to boost",
+  "keyboard_shortcuts.column": "to focus a status in one of the columns",
+  "keyboard_shortcuts.compose": "to focus the compose textarea",
+  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Hotkey",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.notifications": "to open notifications column",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned posts list",
+  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.reply": "to reply",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toot": "to start a brand new post",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.compress": "Compress image view box",
+  "lightbox.expand": "Expand image view box",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "Add to list",
+  "lists.account.remove": "Remove from list",
+  "lists.delete": "Delete list",
+  "lists.edit": "Edit list",
+  "lists.edit.submit": "Change title",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.replies_policy.followed": "Any followed user",
+  "lists.replies_policy.list": "Members of the list",
+  "lists.replies_policy.none": "No one",
+  "lists.replies_policy.title": "Show replies to:",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "{number, plural, one {Hide image} other {Hide images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.duration": "Duration",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "mute_modal.indefinite": "Indefinite",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.community_timeline": "Local timeline",
+  "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "navigation_bar.explore": "Explore",
+  "navigation_bar.favourites": "Favourites",
+  "navigation_bar.filters": "Muted words",
+  "navigation_bar.follow_requests": "Follow requests",
+  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.info": "About this server",
+  "navigation_bar.keyboard_shortcuts": "Hotkeys",
+  "navigation_bar.lists": "Lists",
+  "navigation_bar.logout": "Logout",
+  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "Pinned posts",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "notification.admin.sign_up": "{name} signed up",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} followed you",
+  "notification.follow_request": "{name} has requested to follow you",
+  "notification.mention": "{name} mentioned you",
+  "notification.own_poll": "Your poll has ended",
+  "notification.poll": "A poll you have voted in has ended",
+  "notification.reblog": "{name} boosted your status",
+  "notification.status": "{name} just posted",
+  "notification.update": "{name} edited a post",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.alert": "Desktop notifications",
+  "notifications.column_settings.favourite": "Favourites:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.show": "Show in column",
+  "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.status": "New posts:",
+  "notifications.column_settings.unread_notifications.category": "Unread notifications",
+  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.update": "Edits:",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.filter.polls": "Poll results",
+  "notifications.filter.statuses": "Updates from people you follow",
+  "notifications.grant_permission": "Grant permission.",
+  "notifications.group": "{count} notifications",
+  "notifications.mark_as_read": "Mark every notification as read",
+  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
+  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
+  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
+  "notifications_permission_banner.enable": "Enable desktop notifications",
+  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
+  "notifications_permission_banner.title": "Never miss a thing",
+  "picture_in_picture.restore": "Put it back",
+  "poll.closed": "Closed",
+  "poll.refresh": "Refresh",
+  "poll.total_people": "{count, plural, one {# person} other {# people}}",
+  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
+  "poll.vote": "Vote",
+  "poll.voted": "You voted for this answer",
+  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
+  "poll_button.add_poll": "Add a poll",
+  "poll_button.remove_poll": "Remove poll",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Visible for mentioned users only",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "Visible for followers only",
+  "privacy.private.short": "Followers-only",
+  "privacy.public.long": "Visible for all",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.short": "Unlisted",
+  "refresh": "Refresh",
+  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "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.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
+  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "now",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "today",
+  "reply_indicator.cancel": "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.categories.other": "Other",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Content violates one or more server rules",
+  "report.category.subtitle": "Choose the best match",
+  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title_account": "profile",
+  "report.category.title_status": "post",
+  "report.close": "Done",
+  "report.comment.title": "Is there anything else you think we should know?",
+  "report.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.mute": "Mute",
+  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
+  "report.next": "Next",
+  "report.placeholder": "Type or paste additional comments",
+  "report.reasons.dislike": "I don't like it",
+  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.other": "It's something else",
+  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.spam": "It's spam",
+  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.violation": "It violates server rules",
+  "report.reasons.violation_description": "You are aware that it breaks specific rules",
+  "report.rules.subtitle": "Select all that apply",
+  "report.rules.title": "Which rules are being violated?",
+  "report.statuses.subtitle": "Select all that apply",
+  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.submit": "Submit report",
+  "report.target": "Report {target}",
+  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
+  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.title": "Don't want to see this?",
+  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
+  "report.unfollow": "Unfollow @{name}",
+  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Advanced 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.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Simple text returns matching display names, usernames and hashtags",
+  "search_popout.tips.user": "user",
+  "search_results.accounts": "People",
+  "search_results.all": "All",
+  "search_results.hashtags": "Hashtags",
+  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.statuses": "Posts",
+  "search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.copy": "Copy link to status",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.edit": "Edit",
+  "status.edited": "Edited {date}",
+  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.history.created": "{name} created {date}",
+  "status.history.edited": "{name} edited {date}",
+  "status.load_more": "Load more",
+  "status.media_hidden": "Media hidden",
+  "status.mention": "Mention @{name}",
+  "status.more": "More",
+  "status.mute": "Mute @{name}",
+  "status.mute_conversation": "Mute conversation",
+  "status.open": "Expand this status",
+  "status.pin": "Pin on profile",
+  "status.pinned": "Pinned post",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost with original visibility",
+  "status.reblogged_by": "{name} boosted",
+  "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
+  "status.redraft": "Delete & re-draft",
+  "status.remove_bookmark": "Remove bookmark",
+  "status.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
+  "status.show_less": "Show less",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Show more",
+  "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
+  "status.uncached_media_warning": "Not available",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Unpin from profile",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested in…",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
+  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
+  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
+  "time_remaining.moments": "Moments remaining",
+  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
+  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
+  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.follows": "Follows",
+  "timeline_hint.resources.statuses": "Older posts",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "units.short.billion": "{count}B",
+  "units.short.million": "{count}M",
+  "units.short.thousand": "{count}K",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add images, a video or an audio file",
+  "upload_error.limit": "File upload limit exceeded.",
+  "upload_error.poll": "File upload not allowed with polls.",
+  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.description_missing": "No description added",
+  "upload_form.edit": "Edit",
+  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.undo": "Delete",
+  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
+  "upload_modal.analyzing_picture": "Analyzing picture…",
+  "upload_modal.apply": "Apply",
+  "upload_modal.applying": "Applying…",
+  "upload_modal.choose_image": "Choose image",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Detect text from picture",
+  "upload_modal.edit_media": "Edit media",
+  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
+  "upload_modal.preparing_ocr": "Preparing OCR…",
+  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_progress.label": "Uploading…",
+  "video.close": "Close video",
+  "video.download": "Download file",
+  "video.exit_fullscreen": "Exit full screen",
+  "video.expand": "Expand video",
+  "video.fullscreen": "Full screen",
+  "video.hide": "Hide video",
+  "video.mute": "Mute sound",
+  "video.pause": "Pause",
+  "video.play": "Play",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 315c416db..a9b1890df 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokitaj uzantoj",
   "column.bookmarks": "Legosignoj",
   "column.community": "Loka templinio",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Trarigardi profilojn",
   "column.domain_blocks": "Blokitaj domajnoj",
   "column.favourites": "Stelumoj",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
   "empty_column.bookmarked_statuses": "Vi ankoraŭ ne aldonis mesaĝon al viaj legosignoj. Kiam vi aldonos iun, tiu aperos ĉi tie.",
   "empty_column.community": "La loka templinio estas malplena. Skribu ion por plenigi ĝin!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
   "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
   "empty_column.favourited_statuses": "Vi ankoraŭ ne stelumis mesaĝon. Kiam vi stelumos iun, tiu aperos ĉi tie.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "diskonigi",
   "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj",
   "keyboard_shortcuts.compose": "enfokusigi la tekstujon",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Priskribo",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "iri suben en la listo",
   "keyboard_shortcuts.enter": "malfermi mesaĝon",
   "keyboard_shortcuts.favourite": "stelumi",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Legosignoj",
   "navigation_bar.community_timeline": "Loka templinio",
   "navigation_bar.compose": "Skribi novan mesaĝon",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 1eac00cff..873e1cb07 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea temporal local",
-  "column.conversations": "Conversaciones",
+  "column.direct": "Mensajes directos",
   "column.directory": "Explorar perfiles",
   "column.domain_blocks": "Dominios bloqueados",
   "column.favourites": "Favoritos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
   "empty_column.bookmarked_statuses": "Todavía no tenés mensajes guardados en \"Marcadores\". Cuando guardés uno en \"Marcadores\", se mostrará acá.",
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
-  "empty_column.conversations": "Una vez que enviés o recibás un mensaje que sólo sea visible para la gente mencionada en él, aparecerá aquí.",
+  "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
   "empty_column.domain_blocks": "Todavía no hay dominios bloqueados.",
   "empty_column.explore_statuses": "No hay nada en tendencia ahora mismo. ¡Volvé a revisar más tarde!",
   "empty_column.favourited_statuses": "Todavía no tenés mensajes favoritos. Cuando marqués uno como favorito, se mostrará acá.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Adherir al mensaje",
   "keyboard_shortcuts.column": "Enfocar columna",
   "keyboard_shortcuts.compose": "Enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
   "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "para abrir columna de mensajes directos",
   "keyboard_shortcuts.down": "Bajar en la lista",
   "keyboard_shortcuts.enter": "Abrir mensaje",
   "keyboard_shortcuts.favourite": "Marcar mensaje como favorito",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Línea temporal local",
   "navigation_bar.compose": "Redactar un nuevo mensaje",
+  "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
   "privacy.direct.long": "Visible sólo para los usuarios mencionados",
-  "privacy.direct.short": "Sólo a las cuentas que menciono",
+  "privacy.direct.short": "Sólo cuentas mencionadas",
   "privacy.private.long": "Visible sólo para los seguidores",
   "privacy.private.short": "Sólo para seguidores",
   "privacy.public.long": "Visible para todos",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index c51ed52a6..55a3f67cd 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea de tiempo local",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
   "column.favourites": "Favoritos",
@@ -93,7 +93,7 @@
   "community.column_settings.media_only": "Solo media",
   "community.column_settings.remote_only": "Solo remoto",
   "compose_form.direct_message_warning_learn_more": "Aprender mas",
-  "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": "Los mensajes en Mastodon no están cifrados de extremo a extremo. No comparta ninguna información confidencial en Mastodon.",
   "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ningún toot guardado como marcador. Cuando guardes uno, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada es tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes toots preferidos. Cuando marques uno como favorito, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "retootear",
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Historia local",
   "navigation_bar.compose": "Escribir un nuevo toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -368,10 +369,10 @@
   "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Sólo mostrar a seguidores",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Solo seguidores",
+  "privacy.public.long": "Visible para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visible para todos, pero excluido de las funciones de descubrimiento",
   "privacy.unlisted.short": "No listado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 83888e634..d8ea364d6 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Línea de tiempo local",
-  "column.conversations": "Conversaciones",
+  "column.direct": "Mensajes directos",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
   "column.favourites": "Favoritos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
-  "empty_column.conversations": "Una vez que envíe o reciba un mensaje que solo sea visible para la gente mencionada en él, aparecerá aquí.",
+  "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
   "empty_column.explore_statuses": "Nada está en tendencia en este momento. ¡Revisa más tarde!",
   "empty_column.favourited_statuses": "Aún no tienes publicaciones favoritas. Cuando marques una como favorita, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Retootear",
   "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
   "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
-  "keyboard_shortcuts.conversations": "para abrir la columna de conversaciones",
   "keyboard_shortcuts.description": "Descripción",
+  "keyboard_shortcuts.direct": "para abrir la columna de mensajes directos",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "añadir a favoritos",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Línea de tiempo local",
   "navigation_bar.compose": "Escribir nueva publicación",
+  "navigation_bar.direct": "Mensajes directos",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Eliminar encuesta",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "Sólo mostrar a los usuarios mencionados",
-  "privacy.direct.short": "Solo la gente que yo menciono",
+  "privacy.direct.short": "Sólo cuentas mencionadas",
   "privacy.private.long": "Sólo mostrar a seguidores",
   "privacy.private.short": "Solo seguidores",
   "privacy.public.long": "Visible para todos",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index ca40ff370..6cccbb666 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Järjehoidjad",
   "column.community": "Kohalik ajajoon",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Sirvi profiile",
   "column.domain_blocks": "Peidetud domeenid",
   "column.favourites": "Lemmikud",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
   "empty_column.bookmarked_statuses": "Teil pole veel järjehoidjatesse lisatud tuututusi. Kui lisate mõne, näete neid siin.",
   "empty_column.community": "Kohalik ajajoon on tühi. Kirjutage midagi avalikult, et pall veerema ajada!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Teil pole veel lemmikuid tuute. Kui märgite mõne, näete neid siin.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "upitamiseks",
   "keyboard_shortcuts.column": "fokuseerimaks staatust ühele tulpadest",
   "keyboard_shortcuts.compose": "fokuseerimaks tekstikoostamise alale",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Kirjeldus",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "liikumaks nimstus alla",
   "keyboard_shortcuts.enter": "staatuse avamiseks",
   "keyboard_shortcuts.favourite": "lemmikuks märkimiseks",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Järjehoidjad",
   "navigation_bar.community_timeline": "Kohalik ajajoon",
   "navigation_bar.compose": "Koosta uus tuut",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Avasta",
   "navigation_bar.domain_blocks": "Peidetud domeenid",
   "navigation_bar.edit_profile": "Muuda profiili",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 119395b2f..6a328edf0 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Laster-markak",
   "column.community": "Denbora-lerro lokala",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Arakatu profilak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
   "column.favourites": "Gogokoak",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
   "empty_column.bookmarked_statuses": "Oraindik ez dituzu bidalketa laster-markatutarik. Bat laster-markatzerakoan, hemen agertuko da.",
   "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.",
   "empty_column.explore_statuses": "Ez dago joerarik une honetan. Begiratu beranduago!",
   "empty_column.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bultzatu bidalketa",
   "keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
   "keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskripzioa",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "zerrendan behera mugitzea",
   "keyboard_shortcuts.enter": "Ireki bidalketa",
   "keyboard_shortcuts.favourite": "Egin gogoko bidalketa",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Laster-markak",
   "navigation_bar.community_timeline": "Denbora-lerro lokala",
   "navigation_bar.compose": "Idatzi bidalketa berria",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
   "navigation_bar.edit_profile": "Aldatu profila",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index ae74607ab..a3bd5bbf8 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -70,7 +70,7 @@
   "column.blocks": "کاربران مسدود شده",
   "column.bookmarks": "نشانک‌ها",
   "column.community": "خط زمانی محلّی",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "مرور نمایه‌ها",
   "column.domain_blocks": "دامنه‌های مسدود شده",
   "column.favourites": "پسندیده‌ها",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
   "empty_column.bookmarked_statuses": "هنوز هیچ فرستهٔ نشانه‌گذاری شده‌ای ندارید. هنگامی که فرسته‌ای را نشانه‌گذاری کنید، این‌جا نشان داده خواهد شد.",
   "empty_column.community": "خط زمانی محلّی خالی است. چیزی بنویسید تا چرخش بچرخد!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "هنوز هیچ دامنه‌ای مسدود نشده است.",
   "empty_column.explore_statuses": "الآن چیزی پرطرفدار نیست. بعداً دوباره بررسی کنید!",
   "empty_column.favourited_statuses": "شما هنوز هیچ فرسته‌ای را نپسندیده‌اید. هنگامی که فرسته‌ای را بپسندید، این‌جا نشان داده خواهد شد.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "تقویت فرسته",
   "keyboard_shortcuts.column": "برای تمرکز روی یک فرسته در یکی از ستون‌ها",
   "keyboard_shortcuts.compose": "تمرکز روی محیط نوشتن",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "توضیح",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "پایین بردن در سیاهه",
   "keyboard_shortcuts.enter": "گشودن فرسته",
   "keyboard_shortcuts.favourite": "پسندیدن فرسته",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "نشانک‌ها",
   "navigation_bar.community_timeline": "خط زمانی محلّی",
   "navigation_bar.compose": "نوشتن فرستهٔ تازه",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "گشت و گذار",
   "navigation_bar.domain_blocks": "دامنه‌های مسدود شده",
   "navigation_bar.edit_profile": "ویرایش نمایه",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 99f81be6e..7a5f18267 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -70,7 +70,7 @@
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Kirjanmerkit",
   "column.community": "Paikallinen aikajana",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Selaa profiileja",
   "column.domain_blocks": "Piilotetut verkkotunnukset",
   "column.favourites": "Suosikit",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä estetty.",
   "empty_column.explore_statuses": "Mikään ei ole nyt trendi. Tarkista myöhemmin!",
   "empty_column.favourited_statuses": "Et ole vielä lisännyt viestejä kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Buustaa viestiä",
   "keyboard_shortcuts.column": "Kohdista sarakkeeseen",
   "keyboard_shortcuts.compose": "siirry tekstinsyöttöön",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Kuvaus",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Siirry listassa alaspäin",
   "keyboard_shortcuts.enter": "Avaa julkaisu",
   "keyboard_shortcuts.favourite": "Lisää suosikkeihin",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Kirjanmerkit",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Luo uusi viesti",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Löydä uutta",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
   "navigation_bar.edit_profile": "Muokkaa profiilia",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 32f2e3f6e..b22213ec4 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,25 +1,25 @@
 {
   "account.account_note_header": "Note",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Bloquer le domaine {domain}",
-  "account.blocked": "Bloqué",
+  "account.blocked": "Bloqué·e",
   "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Annuler la demande de suivi",
   "account.direct": "Envoyer un message direct à @{name}",
-  "account.disable_notifications": "Arrêter de me notifier quand @{name} publie",
+  "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
   "account.domain_blocked": "Domaine bloqué",
   "account.edit_profile": "Modifier le profil",
-  "account.enable_notifications": "Me notifier quand @{name} publie",
+  "account.enable_notifications": "Me notifier quand @{name} publie quelque chose",
   "account.endorse": "Recommander sur votre profil",
   "account.follow": "Suivre",
-  "account.followers": "Abonnés",
+  "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} Abonné·e} other {{counter} Abonné·e·s}}",
   "account.following": "Abonnements",
-  "account.following_counter": "{count, plural, other {{counter} Abonnements}}",
+  "account.following_counter": "{count, plural, one {{counter} Abonnement} other {{counter} Abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
   "account.follows_you": "Vous suit",
   "account.hide_reblogs": "Masquer les partages de @{name}",
@@ -30,12 +30,12 @@
   "account.mention": "Mentionner @{name}",
   "account.moved_to": "{name} a déménagé vers :",
   "account.mute": "Masquer @{name}",
-  "account.mute_notifications": "Ignorer les notifications de @{name}",
+  "account.mute_notifications": "Masquer les notifications de @{name}",
   "account.muted": "Masqué·e",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages et réponses",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la requête",
+  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Message} other {{counter} Messages}}",
@@ -48,8 +48,8 @@
   "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
   "account.unmute_short": "Ne plus masquer",
   "account_note.placeholder": "Cliquez pour ajouter une note",
-  "admin.dashboard.daily_retention": "Taux de maintien des utilisateur·rice·s par jour après inscription",
-  "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate efter måned efter tilmelding",
+  "admin.dashboard.daily_retention": "Taux de rétention des utilisateur·rice·s par jour après inscription",
+  "admin.dashboard.monthly_retention": "Taux de rétention des utilisateur·rice·s par mois après inscription",
   "admin.dashboard.retention.average": "Moyenne",
   "admin.dashboard.retention.cohort": "Mois d'inscription",
   "admin.dashboard.retention.cohort_size": "Nouveaux utilisateurs",
@@ -70,7 +70,7 @@
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
   "column.community": "Fil public local",
-  "column.conversations": "Conversations",
+  "column.direct": "Messages directs",
   "column.directory": "Parcourir les profils",
   "column.domain_blocks": "Domaines bloqués",
   "column.favourites": "Favoris",
@@ -146,10 +146,10 @@
   "directory.recently_active": "Actif·ve·s récemment",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
-  "emoji_button.activity": "Activité",
+  "emoji_button.activity": "Activités",
   "emoji_button.custom": "Personnalisés",
   "emoji_button.flags": "Drapeaux",
-  "emoji_button.food": "Nourriture & Boisson",
+  "emoji_button.food": "Nourriture et boisson",
   "emoji_button.label": "Insérer un émoji",
   "emoji_button.nature": "Nature",
   "emoji_button.not_found": "Aucun émoji correspondant n'a été trouvé",
@@ -159,14 +159,14 @@
   "emoji_button.search": "Recherche...",
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
-  "emoji_button.travel": "Lieux & Voyages",
+  "emoji_button.travel": "Voyage et lieux",
   "empty_column.account_suspended": "Compte suspendu",
   "empty_column.account_timeline": "Aucun message ici !",
   "empty_column.account_unavailable": "Profil non disponible",
   "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
   "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "empty_column.conversations": "Une fois que vous avez envoyé ou reçu un message qui ne sera visible que par les personnes mentionnées, il apparaîtra ici.",
+  "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
   "empty_column.explore_statuses": "Rien n'est en tendance pour le moment. Revenez plus tard !",
   "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Partager le message",
   "keyboard_shortcuts.column": "Se placer dans une colonne",
   "keyboard_shortcuts.compose": "Se placer dans la zone de rédaction",
-  "keyboard_shortcuts.conversations": "pour ouvrir la colonne des conversations",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "ouvrir la colonne des messages directs",
   "keyboard_shortcuts.down": "Descendre dans la liste",
   "keyboard_shortcuts.enter": "Ouvrir le message",
   "keyboard_shortcuts.favourite": "Ajouter le message aux favoris",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marque-pages",
   "navigation_bar.community_timeline": "Fil public local",
   "navigation_bar.compose": "Rédiger un nouveau message",
+  "navigation_bar.direct": "Messages directs",
   "navigation_bar.discover": "Découvrir",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.edit_profile": "Modifier le profil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
   "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
-  "privacy.direct.short": "Seulement les personnes mentionnées",
+  "privacy.direct.short": "Personnes mentionnées uniquement",
   "privacy.private.long": "Visible uniquement par vos abonné·e·s",
   "privacy.private.short": "Abonné·e·s uniquement",
   "privacy.public.long": "Visible pour tous",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 6370cd9d6..217b9358c 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -70,7 +70,7 @@
   "column.blocks": "Cuntais choiscthe",
   "column.bookmarks": "Leabharmharcanna",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite posts yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Cuir an phróifíl in eagar",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index be1b10025..7cef3d69c 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -50,7 +50,7 @@
   "account_note.placeholder": "Briog airson nòta a chur ris",
   "admin.dashboard.daily_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir latha",
   "admin.dashboard.monthly_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir mìos",
-  "admin.dashboard.retention.average": "Cuibheasach",
+  "admin.dashboard.retention.average": "Średnia",
   "admin.dashboard.retention.cohort": "Mìos a’ chlàraidh",
   "admin.dashboard.retention.cohort_size": "Cleachdaichean ùra",
   "alert.rate_limited.message": "Feuch ris a-rithist às dèidh {retry_time, time, medium}.",
@@ -70,7 +70,7 @@
   "column.blocks": "Cleachdaichean bacte",
   "column.bookmarks": "Comharran-lìn",
   "column.community": "Loidhne-ama ionadail",
-  "column.conversations": "Còmhraidhean",
+  "column.direct": "Teachdaireachdan dìreach",
   "column.directory": "Rùraich sna pròifilean",
   "column.domain_blocks": "Àrainnean bacte",
   "column.favourites": "Na h-annsachdan",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Cha do bhac thu cleachdaiche sam bith fhathast.",
   "empty_column.bookmarked_statuses": "Chan eil comharra-lìn ri post agad fhathast. Nuair a nì thu comharra-lìn de dh’fhear, nochdaidh e an-seo.",
   "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!",
-  "empty_column.conversations": "Nuair a chuireas no gheibh thu post nach fhaic ach an fheadhainn le iomradh orra ann, nochdaidh e an-seo.",
+  "empty_column.direct": "Chan eil teachdaireachd dhìreach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
   "empty_column.domain_blocks": "Cha deach àrainn sam bith a bhacadh fhathast.",
   "empty_column.explore_statuses": "Chan eil dad a’ treandadh an-dràsta fhèin. Thoir sùil a-rithist an ceann greis!",
   "empty_column.favourited_statuses": "Chan eil annsachd air post agad fhathast. Nuair a nì thu annsachd de dh’fhear, nochdaidh e an-seo.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Brosnaich post",
   "keyboard_shortcuts.column": "Cuir am fòcas air colbh",
   "keyboard_shortcuts.compose": "Cuir am fòcas air raon teacsa an sgrìobhaidh",
-  "keyboard_shortcuts.conversations": "a dh’fhosgladh colbh nan còmhraidhean",
   "keyboard_shortcuts.description": "Tuairisgeul",
+  "keyboard_shortcuts.direct": "a dh’fhosgladh colbh nan teachdaireachdan dìreach",
   "keyboard_shortcuts.down": "Gluais sìos air an liosta",
   "keyboard_shortcuts.enter": "Fosgail post",
   "keyboard_shortcuts.favourite": "Cuir post ris na h-annsachdan",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Comharran-lìn",
   "navigation_bar.community_timeline": "Loidhne-ama ionadail",
   "navigation_bar.compose": "Sgrìobh post ùr",
+  "navigation_bar.direct": "Teachdaireachdan dìreach",
   "navigation_bar.discover": "Rùraich",
   "navigation_bar.domain_blocks": "Àrainnean bacte",
   "navigation_bar.edit_profile": "Deasaich a’ phròifil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Thoir air falbh an cunntas-bheachd",
   "privacy.change": "Cuir gleus air prìobhaideachd a’ phuist",
   "privacy.direct.long": "Chan fhaic ach na cleachdaichean le iomradh orra seo",
-  "privacy.direct.short": "Daoine air an dug mi iomradh a-mhàin",
+  "privacy.direct.short": "An fheadhainn le iomradh orra a-mhàin",
   "privacy.private.long": "Chan fhaic ach na daoine a tha a’ leantainn ort seo",
   "privacy.private.short": "Luchd-leantainn a-mhàin",
   "privacy.public.long": "Chì a h-uile duine e",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 114d90335..8cd8cecbc 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronoloxía local",
-  "column.conversations": "Conversas",
+  "column.direct": "Mensaxes directas",
   "column.directory": "Procurar perfís",
   "column.domain_blocks": "Dominios agochados",
   "column.favourites": "Favoritos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Aínda non bloqueaches a ningún usuaria.",
   "empty_column.bookmarked_statuses": "Aínda non marcaches ningunha publicación. Cando o fagas, aparecerán aquí.",
   "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
-  "empty_column.conversations": "Aquí verás as publicacións que envíes ou recibas é só son visibles para as persoas mencionadas.",
+  "empty_column.direct": "Aínda non tes mensaxes directas. Cando envíes ou recibas unha, amosarase aquí.",
   "empty_column.domain_blocks": "Aínda non hai dominios agochados.",
   "empty_column.explore_statuses": "Non hai temas en voga. Volve máis tarde!",
   "empty_column.favourited_statuses": "Aínda non tes publicacións favoritas. Cando che guste algunha, aparecerá aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Promover publicación",
   "keyboard_shortcuts.column": "Destacar unha columna",
   "keyboard_shortcuts.compose": "Por o cursor na área de escritura",
-  "keyboard_shortcuts.conversations": "para abrir a columna das conversas",
   "keyboard_shortcuts.description": "Descrición",
+  "keyboard_shortcuts.direct": "para abrir a columna de mensaxes directas",
   "keyboard_shortcuts.down": "Para mover cara abaixo na listaxe",
   "keyboard_shortcuts.enter": "Para abrir publicación",
   "keyboard_shortcuts.favourite": "Para engadir a favoritos",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronoloxía local",
   "navigation_bar.compose": "Escribir unha nova publicación",
+  "navigation_bar.direct": "Mensaxes directas",
   "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Eliminar enquisa",
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Só para as usuarias mencionadas",
-  "privacy.direct.short": "Só para persoas mencionadas",
+  "privacy.direct.short": "Só persoas mencionadas",
   "privacy.private.long": "Só para os seguidoras",
   "privacy.private.short": "Só para seguidoras",
   "privacy.public.long": "Visible por todas",
@@ -408,11 +409,11 @@
   "report.reasons.dislike": "Non me gusta",
   "report.reasons.dislike_description": "Non é algo que queiras ver",
   "report.reasons.other": "É outra cousa",
-  "report.reasons.other_description": "O asunto non cae dentro de outras categorías",
+  "report.reasons.other_description": "O problema non cae dentro de outras categorías",
   "report.reasons.spam": "É spam",
   "report.reasons.spam_description": "Ligazóns perigosas, relacións falsas, ou respostas repetitivas",
   "report.reasons.violation": "Viola as regras do servidor",
-  "report.reasons.violation_description": "Daste conta de que quebra unhas normas en concreto",
+  "report.reasons.violation_description": "Décheste conta de que quebra unhas normas en concreto",
   "report.rules.subtitle": "Elixe todo o que sexa de aplicación",
   "report.rules.title": "Que regras foron incumpridas?",
   "report.statuses.subtitle": "Elixe todo o que corresponda",
@@ -455,8 +456,8 @@
   "status.embed": "Incrustar",
   "status.favourite": "Favorito",
   "status.filtered": "Filtrado",
-  "status.history.created": "{name} creado o {date}",
-  "status.history.edited": "{name} editado o {date}",
+  "status.history.created": "{name} creouno o {date}",
+  "status.history.edited": "{name} editouno o {date}",
   "status.load_more": "Cargar máis",
   "status.media_hidden": "Contido multimedia agochado",
   "status.mention": "Mencionar @{name}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index efa740656..0cd308923 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -1,24 +1,24 @@
 {
-  "account.account_note_header": "ההודעה שלך ל@{name}",
+  "account.account_note_header": "הערה",
   "account.add_or_remove_from_list": "הוסף או הסר מהרשימות",
   "account.badges.bot": "בוט",
   "account.badges.group": "קבוצה",
-  "account.block": "חסימת @{name}",
-  "account.block_domain": "להסתיר הכל מהקהילה {domain}",
+  "account.block": "חסמי את @{name}",
+  "account.block_domain": "חסמו את שם המתחם (דומיין) {domain}",
   "account.blocked": "חסום",
-  "account.browse_more_on_origin_server": "המשך לגלוש בפרופיל המקורי",
+  "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
   "account.cancel_follow_request": "בטל בקשת מעקב",
-  "account.direct": "Direct Message @{name}",
+  "account.direct": "הודעה ישירה ל@{name}",
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
-  "account.domain_blocked": "הדומיין חסוי",
+  "account.domain_blocked": "הדומיין חסום",
   "account.edit_profile": "עריכת פרופיל",
-  "account.enable_notifications": "שלח לי התראות כש@{name} מפרסמים",
-  "account.endorse": "הצג בפרופיל",
-  "account.follow": "מעקב",
+  "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
+  "account.endorse": "קדם את החשבון בפרופיל",
+  "account.follow": "עקוב",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
-  "account.following": "Following",
+  "account.following": "נעקבים",
   "account.following_counter": "{count, plural,one {עוקב אחרי {counter}}other {עוקב אחרי {counter}}}",
   "account.follows.empty": "משתמש זה לא עוקב אחר אף אחד עדיין.",
   "account.follows_you": "במעקב אחריך",
@@ -30,28 +30,28 @@
   "account.mention": "אזכור של @{name}",
   "account.moved_to": "החשבון {name} הועבר אל:",
   "account.mute": "להשתיק את @{name}",
-  "account.mute_notifications": "להסתיר התראות מאת @{name}",
+  "account.mute_notifications": "להסתיר התראות מ @{name}",
   "account.muted": "מושתק",
-  "account.posts": "הודעות",
-  "account.posts_with_replies": "Toots with replies",
-  "account.report": "לדווח על @{name}",
-  "account.requested": "בהמתנה לאישור",
-  "account.share": "לשתף את הפרופיל של @{name}",
-  "account.show_reblogs": "להראות הדהודים מאת @{name}",
+  "account.posts": "חצרוצים",
+  "account.posts_with_replies": "חצרוצים ותגובות",
+  "account.report": "דווח על @{name}",
+  "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
+  "account.share": "שתף את הפרופיל של @{name}",
+  "account.show_reblogs": "הצג הדהודים מאת @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
-  "account.unblock": "הסרת חסימה מעל @{name}",
-  "account.unblock_domain": "הסר חסימה מקהילת {domain}",
-  "account.unblock_short": "Unblock",
-  "account.unendorse": "לא להציג בפרופיל",
+  "account.unblock": "הסר את החסימה של @{name}",
+  "account.unblock_domain": "הסראת שם המתחם {domain}",
+  "account.unblock_short": "הסר חסימה",
+  "account.unendorse": "אל תקדם בפרופיל",
   "account.unfollow": "הפסקת מעקב",
   "account.unmute": "הפסקת השתקת @{name}",
-  "account.unmute_notifications": "להפסיק הסתרת הודעות מעם @{name}",
-  "account.unmute_short": "Unmute",
-  "account_note.placeholder": "ללא הערה",
-  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
-  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "account.unmute_notifications": "להפסיק השתקת הודעות מ @{name}",
+  "account.unmute_short": "ביטול השתקה",
+  "account_note.placeholder": "יש ללחוץ כדי להוסיף הערות",
+  "admin.dashboard.daily_retention": "קצב שימור משתמשים (פר יום) אחרי ההרשמה",
+  "admin.dashboard.monthly_retention": "קצב שימור משתמשים (פר חודש) אחרי ההרשמה",
   "admin.dashboard.retention.average": "ממוצע",
-  "admin.dashboard.retention.cohort": "Sign-up month",
+  "admin.dashboard.retention.cohort": "חודש רישום",
   "admin.dashboard.retention.cohort_size": "משתמשים חדשים",
   "alert.rate_limited.message": "נא לנסות אחרי {retry_time, time, medium}.",
   "alert.rate_limited.title": "מגבלות מיכסה",
@@ -70,7 +70,7 @@
   "column.blocks": "חסימות",
   "column.bookmarks": "סימניות",
   "column.community": "ציר זמן מקומי",
-  "column.conversations": "Conversations",
+  "column.direct": "הודעות ישירות",
   "column.directory": "גלוש פרופילים",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "חיבובים",
@@ -93,7 +93,7 @@
   "community.column_settings.media_only": "Media only",
   "community.column_settings.remote_only": "מרחוק בלבד",
   "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": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
@@ -105,11 +105,11 @@
   "compose_form.poll.switch_to_multiple": "אפשרו בחירה מרובה בסקר",
   "compose_form.poll.switch_to_single": "אפשרו בחירה בודדת בסקר",
   "compose_form.publish": "ללחוש",
-  "compose_form.publish_loud": "לחצרץ!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.save_changes": "שמירת שינויים",
+  "compose_form.sensitive.hide": "{count, plural, one {סימון מידע כרגיש} other {סימון מידע כרגיש}}",
+  "compose_form.sensitive.marked": "{count, plural, one {מידע מסומן כרגיש} other {מידע מסומן כרגיש}}",
+  "compose_form.sensitive.unmarked": "{count, plural, one {מידע לא מסומן כרגיש} other {מידע לא מסומן כרגיש}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "אזהרת תוכן",
@@ -121,14 +121,14 @@
   "confirmations.delete.message": "למחוק את ההודעה?",
   "confirmations.delete_list.confirm": "למחוק",
   "confirmations.delete_list.message": "האם אתם בטוחים שאתם רוצים למחוק את הרשימה לצמיתות?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.discard_edit_media.confirm": "השלך",
+  "confirmations.discard_edit_media.message": "יש לך שינויים לא שמורים לתיאור המדיה. להשליך אותם בכל זאת?",
   "confirmations.domain_block.confirm": "הסתר קהילה שלמה",
   "confirmations.domain_block.message": "באמת באמת לחסום את כל קהילת {domain}? ברב המקרים השתקות נבחרות של מספר משתמשים מסויימים צריכה להספיק.",
   "confirmations.logout.confirm": "להתנתק",
   "confirmations.logout.message": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.mute.confirm": "להשתיק",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
+  "confirmations.mute.explanation": "זה יסתיר חצרוצים שלהם וחצרוצים המזכירים אותם, אבל עדיין יתיר להם לראות פוסטים שלך ולעקוב אחריך.",
   "confirmations.mute.message": "להשתיק את {name}?",
   "confirmations.redraft.confirm": "מחק וערוך מחדש",
   "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
@@ -140,9 +140,9 @@
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
   "conversation.with": "עם {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
+  "directory.federated": "מהפדרציה הידועה",
+  "directory.local": "מ- {domain} בלבד",
+  "directory.new_arrivals": "חדשים כאן",
   "directory.recently_active": "פעילים לאחרונה",
   "embed.instructions": "ניתן להטמיע את ההודעה באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
@@ -166,109 +166,109 @@
   "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.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "אין נושאים חמים כרגע. אולי אחר כך!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_recommendations": "נראה שלא ניתן לייצר המלצות עבורך. נסה/י להשתמש בחיפוש כדי למצוא אנשים מוכרים או לבדוק את הנושאים החמים.",
+  "empty_column.follow_requests": "אין לך שום בקשות מעקב עדיין. לכשיתקבלו כאלה, הן תופענה כאן.",
   "empty_column.hashtag": "אין כלום בהאשתג הזה עדיין.",
-  "empty_column.home": "אף אחד לא במעקב עדיין. אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר חצוצרנים אחרים.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home": "אף אחד לא במעקב עדיין. אפשר לבקר ב{public} או להשתמש בחיפוש כדי להתחיל ולהכיר חצוצרנים אחרים. {suggestions}",
+  "empty_column.home.suggestions": "ראה/י כמה הצעות",
   "empty_column.list": "אין עדיין מאום ברשימה.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
-  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.lists": "אין לך שום רשימות עדיין. לכשיהיו, הן תופענה כאן.",
+  "empty_column.mutes": "עוד לא השתקת שום משתמש.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
-  "error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
-  "error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
-  "error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
-  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
-  "errors.unexpected_crash.report_issue": "Report issue",
-  "explore.search_results": "Search results",
-  "explore.suggested_follows": "For you",
-  "explore.title": "Explore",
-  "explore.trending_links": "News",
-  "explore.trending_statuses": "Posts",
-  "explore.trending_tags": "Hashtags",
-  "follow_recommendations.done": "Done",
-  "follow_recommendations.heading": "Follow people you'd like to see posts from! Here are some suggestions.",
-  "follow_recommendations.lead": "Posts from people you follow will show up in chronological order on your home feed. Don't be afraid to make mistakes, you can unfollow people just as easily any time!",
+  "error.unexpected_crash.explanation": "עקב תקלה בקוד שלנו או בעיית תאימות דפדפן, לא ניתן להציג דף זה כראוי.",
+  "error.unexpected_crash.explanation_addons": "לא ניתן להציג דף זה כראוי. הבעיה נגרמת כנראה עקב תוסף דפדפן או כלי תרגום אוטומטי.",
+  "error.unexpected_crash.next_steps": "נסה/י לרענן את הדף. אם זה לא עוזר, אולי אפשר עדיין להשתמש במסטודון דרך דפדפן אחר או באמצעות אפליקציה ילידית.",
+  "error.unexpected_crash.next_steps_addons": "נסה/י להסיר אותם ולרענן את הדף. אם זה לא עוזר, אולי אפשר עדיין להשתמש במסטודון דרך דפדפן אחר או באמצעות אפליקציה ילידית.",
+  "errors.unexpected_crash.copy_stacktrace": "להעתיק את הקוד ללוח הכתיבה",
+  "errors.unexpected_crash.report_issue": "דווח על בעיה",
+  "explore.search_results": "תוצאות חיפוש",
+  "explore.suggested_follows": "עבורך",
+  "explore.title": "סיור",
+  "explore.trending_links": "חדשות",
+  "explore.trending_statuses": "חצרוצים",
+  "explore.trending_tags": "האשטאגים",
+  "follow_recommendations.done": "בוצע",
+  "follow_recommendations.heading": "עקב/י אחרי אנשים שתרצה/י לראות את חצרוציהם! הנה כמה הצעות.",
+  "follow_recommendations.lead": "חצרוצים מאנשים במעקב יופיעו בסדר כרונולוגי בפיד הבית. אל תחששו מטעויות, אפשר להסיר מעקב באותה הקלות ובכל זמן!",
   "follow_request.authorize": "קבלה",
   "follow_request.reject": "דחיה",
-  "follow_requests.unlocked_explanation": "Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.",
-  "generic.saved": "Saved",
-  "getting_started.developers": "Developers",
-  "getting_started.directory": "Profile directory",
-  "getting_started.documentation": "Documentation",
+  "follow_requests.unlocked_explanation": "למרות שחשבונך אינו נעול, צוות {domain} חושב שאולי כדאי לוודא את בקשות המעקב האלה ידנית.",
+  "generic.saved": "נשמר",
+  "getting_started.developers": "מפתחות",
+  "getting_started.directory": "ספריית פרופילים",
+  "getting_started.documentation": "תיעוד",
   "getting_started.heading": "בואו נתחיל",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "להזמין אנשים",
   "getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {github}.",
   "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
-  "hashtag.column_header.tag_mode.all": "and {additional}",
-  "hashtag.column_header.tag_mode.any": "or {additional}",
-  "hashtag.column_header.tag_mode.none": "without {additional}",
-  "hashtag.column_settings.select.no_options_message": "No suggestions found",
-  "hashtag.column_settings.select.placeholder": "Enter hashtags…",
-  "hashtag.column_settings.tag_mode.all": "All of these",
-  "hashtag.column_settings.tag_mode.any": "Any of these",
-  "hashtag.column_settings.tag_mode.none": "None of these",
+  "getting_started.terms": "תנאי שימוש",
+  "hashtag.column_header.tag_mode.all": "ו- {additional}",
+  "hashtag.column_header.tag_mode.any": "או {additional}",
+  "hashtag.column_header.tag_mode.none": "ללא {additional}",
+  "hashtag.column_settings.select.no_options_message": "לא נמצאו הצעות",
+  "hashtag.column_settings.select.placeholder": "הזן תגי הקבצה…",
+  "hashtag.column_settings.tag_mode.all": "כל אלה",
+  "hashtag.column_settings.tag_mode.any": "כל אלה",
+  "hashtag.column_settings.tag_mode.none": "אפאחד מאלה",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
-  "intervals.full.days": "{number, plural, one {# day} other {# days}}",
-  "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
-  "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
+  "home.hide_announcements": "הסתר הכרזות",
+  "home.show_announcements": "הצג הכרזות",
+  "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
+  "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
+  "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",
   "keyboard_shortcuts.back": "ניווט חזרה",
-  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.blocked": "פתיחת רשימת חסומים",
   "keyboard_shortcuts.boost": "להדהד",
   "keyboard_shortcuts.column": "להתמקד בהודעה באחד מהטורים",
   "keyboard_shortcuts.compose": "להתמקד בתיבת חיבור ההודעות",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "תיאור",
+  "keyboard_shortcuts.direct": "לפתיחת טור הודעות ישירות",
   "keyboard_shortcuts.down": "לנוע במורד הרשימה",
-  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.enter": "פתח חצרוץ",
   "keyboard_shortcuts.favourite": "לחבב",
-  "keyboard_shortcuts.favourites": "to open favourites list",
-  "keyboard_shortcuts.federated": "to open federated timeline",
+  "keyboard_shortcuts.favourites": "פתיחת רשימת מועדפים",
+  "keyboard_shortcuts.federated": "פתיחת ציר זמן בין-קהילתי",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.home": "פתיחת ציר זמן אישי",
   "keyboard_shortcuts.hotkey": "מקש קיצור",
   "keyboard_shortcuts.legend": "להציג את הפירוש",
-  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.local": "פתיחת ציר זמן קהילתי",
   "keyboard_shortcuts.mention": "לאזכר את המחבר(ת)",
-  "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "to open your profile",
-  "keyboard_shortcuts.notifications": "to open notifications column",
-  "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "to open pinned toots list",
-  "keyboard_shortcuts.profile": "to open author's profile",
+  "keyboard_shortcuts.muted": "פתיחת רשימת משתמשים מושתקים",
+  "keyboard_shortcuts.my_profile": "פתיחת הפרופיל שלך",
+  "keyboard_shortcuts.notifications": "פתיחת טור התראות",
+  "keyboard_shortcuts.open_media": "פתיחת מדיה",
+  "keyboard_shortcuts.pinned": "פתיחת רשימת חצרותים מוצמדים",
+  "keyboard_shortcuts.profile": "פתח את פרופיל המשתמש",
   "keyboard_shortcuts.reply": "לענות",
-  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.requests": "פתיחת רשימת בקשות מעקב",
   "keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "הצגת/הסתרת שדה אזהרת תוכן (CW)",
   "keyboard_shortcuts.start": "to open \"get started\" column",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toggle_sensitivity": "to show/hide media",
+  "keyboard_shortcuts.toggle_hidden": "הצגת/הסתרת טקסט מוסתר מאחורי אזהרת תוכן",
+  "keyboard_shortcuts.toggle_sensitivity": "הצגת/הסתרת מדיה",
   "keyboard_shortcuts.toot": "להתחיל חיצרוץ חדש",
   "keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש",
   "keyboard_shortcuts.up": "לנוע במעלה הרשימה",
   "lightbox.close": "סגירה",
-  "lightbox.compress": "Compress image view box",
-  "lightbox.expand": "Expand image view box",
+  "lightbox.compress": "דחיסת קופסת צפייה בתמונה",
+  "lightbox.expand": "הרחבת קופסת צפייה בתמונה",
   "lightbox.next": "הלאה",
   "lightbox.previous": "הקודם",
   "lists.account.add": "הוסף לרשימה",
   "lists.account.remove": "הסר מרשימה",
-  "lists.delete": "Delete list",
-  "lists.edit": "Edit list",
-  "lists.edit.submit": "Change title",
+  "lists.delete": "מחיקת רשימה",
+  "lists.edit": "עריכת רשימה",
+  "lists.edit.submit": "שנה/י כותרת",
   "lists.new.create": "הוספת רשימה",
   "lists.new.title_placeholder": "כותרת הרשימה החדשה",
   "lists.replies_policy.followed": "משתמשים שאני עוקב אחריהם",
@@ -277,7 +277,7 @@
   "lists.replies_policy.title": "הצג תגובות ל:",
   "lists.search": "חיפוש בין אנשים שאני עוקב\\ת אחריהם",
   "lists.subheading": "הרשימות שלך",
-  "load_pending": "{count, plural, one {# new item} other {# new items}}",
+  "load_pending": "{count, plural, one {# פריט חדש} other {# פריטים חדשים}}",
   "loading_indicator.label": "טוען...",
   "media_gallery.toggle_visible": "נראה\\בלתי נראה",
   "missing_indicator.label": "לא נמצא",
@@ -285,146 +285,147 @@
   "mute_modal.duration": "משך הזמן",
   "mute_modal.hide_notifications": "להסתיר הודעות מחשבון זה?",
   "mute_modal.indefinite": "ללא תאריך סיום",
-  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.apps": "יישומונים לנייד",
   "navigation_bar.blocks": "חסימות",
-  "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.bookmarks": "סימניות",
   "navigation_bar.community_timeline": "ציר זמן מקומי",
   "navigation_bar.compose": "Compose new toot",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.direct": "הודעות ישירות",
+  "navigation_bar.discover": "גלה",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "עריכת פרופיל",
-  "navigation_bar.explore": "Explore",
+  "navigation_bar.explore": "חקור",
   "navigation_bar.favourites": "חיבובים",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "מילים מושתקות",
   "navigation_bar.follow_requests": "בקשות מעקב",
-  "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
   "navigation_bar.info": "מידע נוסף",
   "navigation_bar.keyboard_shortcuts": "קיצורי מקלדת",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.lists": "רשימות",
   "navigation_bar.logout": "יציאה",
   "navigation_bar.mutes": "השתקות",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "אישי",
   "navigation_bar.pins": "חיצרוצים מקובעים",
   "navigation_bar.preferences": "העדפות",
   "navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
-  "navigation_bar.security": "Security",
-  "notification.admin.sign_up": "{name} signed up",
+  "navigation_bar.security": "בטיחות",
+  "notification.admin.sign_up": "{name} נרשמו",
   "notification.favourite": "חצרוצך חובב על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
-  "notification.follow_request": "{name} has requested to follow you",
+  "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.mention": "אוזכרת על ידי {name}",
-  "notification.own_poll": "Your poll has ended",
-  "notification.poll": "A poll you have voted in has ended",
+  "notification.own_poll": "הסקר שלך הסתיים",
+  "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "חצרוצך הודהד על ידי {name}",
-  "notification.status": "{name} just posted",
+  "notification.status": "{name} הרגע פרסמו",
   "notification.update": "{name} ערכו פוסט",
   "notifications.clear": "הסרת התראות",
   "notifications.clear_confirmation": "להסיר את כל ההתראות? בטוח?",
-  "notifications.column_settings.admin.sign_up": "New sign-ups:",
+  "notifications.column_settings.admin.sign_up": "הרשמות חדשות:",
   "notifications.column_settings.alert": "התראות לשולחן העבודה",
   "notifications.column_settings.favourite": "מחובבים:",
-  "notifications.column_settings.filter_bar.advanced": "Display all categories",
-  "notifications.column_settings.filter_bar.category": "Quick filter bar",
-  "notifications.column_settings.filter_bar.show_bar": "Show filter bar",
+  "notifications.column_settings.filter_bar.advanced": "הצג את כל הקטגוריות",
+  "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
+  "notifications.column_settings.filter_bar.show_bar": "הצג שורת סינון",
   "notifications.column_settings.follow": "עוקבים חדשים:",
-  "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
   "notifications.column_settings.mention": "פניות:",
-  "notifications.column_settings.poll": "Poll results:",
+  "notifications.column_settings.poll": "תוצאות סקר:",
   "notifications.column_settings.push": "הודעות בדחיפה",
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
   "notifications.column_settings.status": "New toots:",
-  "notifications.column_settings.unread_notifications.category": "Unread notifications",
-  "notifications.column_settings.unread_notifications.highlight": "Highlight unread notifications",
+  "notifications.column_settings.unread_notifications.category": "התראות שלא נקראו",
+  "notifications.column_settings.unread_notifications.highlight": "הבלט התראות שלא נקראו",
   "notifications.column_settings.update": "שינויים:",
-  "notifications.filter.all": "All",
-  "notifications.filter.boosts": "Boosts",
-  "notifications.filter.favourites": "Favourites",
-  "notifications.filter.follows": "Follows",
-  "notifications.filter.mentions": "Mentions",
-  "notifications.filter.polls": "Poll results",
-  "notifications.filter.statuses": "Updates from people you follow",
-  "notifications.grant_permission": "Grant permission.",
-  "notifications.group": "{count} notifications",
-  "notifications.mark_as_read": "Mark every notification as read",
-  "notifications.permission_denied": "Desktop notifications are unavailable due to previously denied browser permissions request",
-  "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
-  "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
-  "notifications_permission_banner.enable": "Enable desktop notifications",
-  "notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
-  "notifications_permission_banner.title": "Never miss a thing",
-  "picture_in_picture.restore": "Put it back",
-  "poll.closed": "Closed",
-  "poll.refresh": "Refresh",
-  "poll.total_people": "{count, plural, one {# person} other {# people}}",
-  "poll.total_votes": "{count, plural, one {# vote} other {# votes}}",
-  "poll.vote": "Vote",
-  "poll.voted": "You voted for this answer",
-  "poll.votes": "{votes, plural, one {# vote} other {# votes}}",
-  "poll_button.add_poll": "Add a poll",
-  "poll_button.remove_poll": "Remove poll",
+  "notifications.filter.all": "הכל",
+  "notifications.filter.boosts": "הדהודים",
+  "notifications.filter.favourites": "חיבובים",
+  "notifications.filter.follows": "נעקבים",
+  "notifications.filter.mentions": "אזכורים",
+  "notifications.filter.polls": "תוצאות סקר",
+  "notifications.filter.statuses": "עדכונים מאנשים במעקב",
+  "notifications.grant_permission": "מתן הרשאה.",
+  "notifications.group": "{count} התראות",
+  "notifications.mark_as_read": "סימון כל ההודעות כנקראו",
+  "notifications.permission_denied": "לא ניתן להציג התראות מסך כיוון כיוון שהרשאות דפדפן נשללו בעבר",
+  "notifications.permission_denied_alert": "לא ניתן לאפשר נוטיפיקציות מסך שכן הדפדפן סורב הרשאה בעבר",
+  "notifications.permission_required": "לא ניתן לאפשר נוטיפיקציות מסך כיוון שהרשאה דרושה לא ניתנה.",
+  "notifications_permission_banner.enable": "לאפשר נוטיפיקציות מסך",
+  "notifications_permission_banner.how_to_control": "כדי לקבל הודעות גם כאשר מסטודון סגור יש לאפשר נוטיפיקציות מסך. ניתן לשלוט בדיוק איזה סוג של אינטראקציות יביא לנוטיפיקציות מסך דרך כפתור ה- {icon} מרגע שהן מאופשרות.",
+  "notifications_permission_banner.title": "לעולם אל תחמיץ דבר",
+  "picture_in_picture.restore": "החזירי למקומו",
+  "poll.closed": "סגור",
+  "poll.refresh": "רענון",
+  "poll.total_people": "{count, plural, one {# איש/אישה} other {# אנשים}}",
+  "poll.total_votes": "{count, plural, one {# קול} other {# קולות}}",
+  "poll.vote": "קול",
+  "poll.voted": "הצבעת לתשובה זו",
+  "poll.votes": "{votes, plural, one {# קול} other {# קולות}}",
+  "poll_button.add_poll": "הוספת סקר",
+  "poll_button.remove_poll": "הסרת סקר",
   "privacy.change": "שינוי פרטיות ההודעה",
   "privacy.direct.long": "הצג רק למי שהודעה זו פונה אליו",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "אנשים מוזכרים בלבד",
   "privacy.private.long": "הצג לעוקבים בלבד",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "עוקבים בלבד",
+  "privacy.public.long": "גלוי לכל",
   "privacy.public.short": "פומבי",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "גלוי לכל, אבל מוסתר מאמצעי גילוי",
   "privacy.unlisted.short": "לא לפיד הכללי",
-  "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
-  "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.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
-  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
-  "relative_time.hours": "{number}h",
+  "refresh": "רענון",
+  "regeneration_indicator.label": "טוען…",
+  "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
+  "relative_time.days": "{number} ימים",
+  "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}",
+  "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}",
+  "relative_time.full.just_now": "ממש עכשיו",
+  "relative_time.full.minutes": "לפני {number, plural, one {# דקה} other {# דקות}}",
+  "relative_time.full.seconds": "לפני {number, plural, one {# שניה} other {# שניות}}",
+  "relative_time.hours": "{number} שעות",
   "relative_time.just_now": "כרגע",
-  "relative_time.minutes": "{number}m",
-  "relative_time.seconds": "{number}s",
-  "relative_time.today": "today",
+  "relative_time.minutes": "{number} דקות",
+  "relative_time.seconds": "{number} שניות",
+  "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.categories.other": "Other",
-  "report.categories.spam": "Spam",
-  "report.categories.violation": "Content violates one or more server rules",
-  "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
-  "report.close": "Done",
-  "report.comment.title": "Is there anything else you think we should know?",
-  "report.forward": "Forward to {target}",
-  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
-  "report.mute": "Mute",
-  "report.mute_explanation": "You will not see their posts. They can still follow you and see your posts and will not know that they are muted.",
-  "report.next": "Next",
+  "report.block": "לחסום",
+  "report.block_explanation": "לא ניתן יהיה לראות את חצרוציהם. הם לא יוכלו לראות את חצרוציך או לעקוב אחריך. הם יוכלו לדעת שהם חסומים.",
+  "report.categories.other": "אחר",
+  "report.categories.spam": "ספאם",
+  "report.categories.violation": "התוכן מפר אחד או יותר מחוקי השרת",
+  "report.category.subtitle": "בחר/י את המתאים ביותר",
+  "report.category.title": "ספר/י לנו מה קורה עם ה-{type} הזה",
+  "report.category.title_account": "פרופיל",
+  "report.category.title_status": "חצרוץ",
+  "report.close": "בוצע",
+  "report.comment.title": "האם יש דבר נוסף שלדעתך חשוב שנדע?",
+  "report.forward": "קדם ל-{target}",
+  "report.forward_hint": "חשבון זה הוא משרת אחר. האם לשלוח בנוסף עותק אנונימי לשם?",
+  "report.mute": "להשתיק",
+  "report.mute_explanation": "לא ניתן יהיה לראות את חצרוציהם. הם עדיין יוכלו לעקוב אחריך ולראות את חצרוציך ולא ידעו שהם מושתקים.",
+  "report.next": "הבא",
   "report.placeholder": "הערות נוספות",
-  "report.reasons.dislike": "I don't like it",
-  "report.reasons.dislike_description": "It is not something you want to see",
-  "report.reasons.other": "It's something else",
-  "report.reasons.other_description": "The issue does not fit into other categories",
-  "report.reasons.spam": "It's spam",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
-  "report.reasons.violation": "It violates server rules",
-  "report.reasons.violation_description": "You are aware that it breaks specific rules",
-  "report.rules.subtitle": "Select all that apply",
-  "report.rules.title": "Which rules are being violated?",
-  "report.statuses.subtitle": "Select all that apply",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.reasons.dislike": "אני לא אוהב את זה",
+  "report.reasons.dislike_description": "זה לא משהו שתרצה/י לראות",
+  "report.reasons.other": "זה משהו אחר",
+  "report.reasons.other_description": "הבעיה לא מתאימה לקטגוריות אחרות",
+  "report.reasons.spam": "זה ספאם",
+  "report.reasons.spam_description": "קישורים מרושעים, התייחסות מזוייפת או תגובות חוזרות",
+  "report.reasons.violation": "מפר את חוקי השרת",
+  "report.reasons.violation_description": "את/ה מודע/ת לכך שזה מפר חוקים ספציפיים",
+  "report.rules.subtitle": "בחר/י את כל המתאימים",
+  "report.rules.title": "אילו חוקים מופרים?",
+  "report.statuses.subtitle": "בחר/י את כל המתאימים",
+  "report.statuses.title": "האם ישנם חצרוצים התומכים בדיווח זה?",
   "report.submit": "שליחה",
-  "report.target": "דיווח",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
-  "report.thanks.title": "Don't want to see this?",
-  "report.thanks.title_actionable": "Thanks for reporting, we'll look into this.",
-  "report.unfollow": "Unfollow @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.target": "דיווח על {target}",
+  "report.thanks.take_action": "הנה כמה אפשרויות לשליטה בתצוגת מסטודון:",
+  "report.thanks.take_action_actionable": "בזמן שאנו בוחנות את הדיווח, ניתן לפעול כנגד @{name}:",
+  "report.thanks.title": "לא מעוניין/ת לראות את זה?",
+  "report.thanks.title_actionable": "תודה על הדיווח, נבדוק את העניין.",
+  "report.unfollow": "הפסיקו לעקוב אחרי @{name}",
+  "report.unfollow_explanation": "אתם עוקבים אחרי החשבון הזה. כדי להפסיק לראות את הפרסומים שלו בפיד הבית שלכם, הפסיקו לעקוב אחריהם.",
   "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.",
@@ -432,112 +433,112 @@
   "search_popout.tips.status": "status",
   "search_popout.tips.text": "טקסט פשוט מחזיר כינויים, שמות משתמש והאשתגים",
   "search_popout.tips.user": "משתמש(ת)",
-  "search_results.accounts": "People",
-  "search_results.all": "All",
-  "search_results.hashtags": "Hashtags",
-  "search_results.nothing_found": "Could not find anything for these search terms",
+  "search_results.accounts": "אנשים",
+  "search_results.all": "כל התוצאות",
+  "search_results.hashtags": "האשתגיות",
+  "search_results.nothing_found": "לא נמצא דבר עבור תנאי חיפוש אלה",
   "search_results.statuses": "Toots",
   "search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
-  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
   "status.admin_status": "Open this status in the moderation interface",
-  "status.block": "Block @{name}",
-  "status.bookmark": "Bookmark",
-  "status.cancel_reblog_private": "Unboost",
+  "status.block": "חסימת @{name}",
+  "status.bookmark": "סימניה",
+  "status.cancel_reblog_private": "הסרת הדהוד",
   "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
   "status.copy": "Copy link to status",
   "status.delete": "מחיקה",
-  "status.detailed_status": "Detailed conversation view",
+  "status.detailed_status": "תצוגת שיחה מפורטת",
   "status.direct": "הודעה ישירה ל@{name}",
-  "status.edit": "Edit",
-  "status.edited": "Edited {date}",
-  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.edit": "עריכה",
+  "status.edited": "נערך ב{date}",
+  "status.edited_x_times": "נערך {count, plural, one {פעם {count}} other {{count} פעמים}}",
   "status.embed": "הטמעה",
   "status.favourite": "חיבוב",
-  "status.filtered": "Filtered",
-  "status.history.created": "{name} created {date}",
-  "status.history.edited": "{name} edited {date}",
+  "status.filtered": "סונן",
+  "status.history.created": "{name} יצר/ה {date}",
+  "status.history.edited": "{name} ערך/ה {date}",
   "status.load_more": "עוד",
   "status.media_hidden": "מדיה מוסתרת",
   "status.mention": "פניה אל @{name}",
   "status.more": "עוד",
-  "status.mute": "Mute @{name}",
+  "status.mute": "להשתיק את @{name}",
   "status.mute_conversation": "השתקת שיחה",
   "status.open": "הרחבת הודעה",
   "status.pin": "לקבע באודות",
   "status.pinned": "Pinned toot",
-  "status.read_more": "Read more",
+  "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
-  "status.reblog_private": "Boost with original visibility",
+  "status.reblog_private": "להדהד ברמת הנראות המקורית",
   "status.reblogged_by": "הודהד על ידי {name}",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
-  "status.redraft": "Delete & re-draft",
-  "status.remove_bookmark": "Remove bookmark",
+  "status.redraft": "מחיקה ועריכה מחדש",
+  "status.remove_bookmark": "הסרת סימניה",
   "status.reply": "תגובה",
   "status.replyAll": "תגובה לכולם",
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
   "status.show_less": "הראה פחות",
-  "status.show_less_all": "Show less for all",
+  "status.show_less_all": "להציג פחות מהכל",
   "status.show_more": "הראה יותר",
-  "status.show_more_all": "Show more for all",
-  "status.show_thread": "Show thread",
-  "status.uncached_media_warning": "Not available",
+  "status.show_more_all": "להציג יותר מהכל",
+  "status.show_thread": "להציג סיב",
+  "status.uncached_media_warning": "לא זמין",
   "status.unmute_conversation": "הסרת השתקת שיחה",
   "status.unpin": "לשחרר מקיבוע באודות",
-  "suggestions.dismiss": "Dismiss suggestion",
-  "suggestions.header": "You might be interested in…",
+  "suggestions.dismiss": "להתעלם מהצעה",
+  "suggestions.header": "ייתכן שזה יעניין אותך…",
   "tabs_bar.federated_timeline": "ציר זמן בין-קהילתי",
   "tabs_bar.home": "בבית",
   "tabs_bar.local_timeline": "ציר זמן מקומי",
   "tabs_bar.notifications": "התראות",
-  "tabs_bar.search": "Search",
-  "time_remaining.days": "{number, plural, one {# day} other {# days}} left",
-  "time_remaining.hours": "{number, plural, one {# hour} other {# hours}} left",
-  "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
-  "time_remaining.moments": "Moments remaining",
-  "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
+  "tabs_bar.search": "חיפוש",
+  "time_remaining.days": "נותרו {number, plural, one {# יום} other {# ימים}}",
+  "time_remaining.hours": "נותרו {number, plural, one {# שעה} other {# שעות}}",
+  "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
+  "time_remaining.moments": "רגעים נותרו",
+  "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
+  "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
+  "timeline_hint.resources.followers": "עוקבים",
+  "timeline_hint.resources.follows": "נעקבים",
   "timeline_hint.resources.statuses": "Older toots",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
-  "trends.trending_now": "Trending now",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} אחד/ת מדבר/ת} other {{counter} אנשים מדברים}}",
+  "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
-  "units.short.billion": "{count}B",
-  "units.short.million": "{count}M",
-  "units.short.thousand": "{count}K",
+  "units.short.billion": "{count} מליארד",
+  "units.short.million": "{count} מליון",
+  "units.short.thousand": "{count} אלפים",
   "upload_area.title": "ניתן להעלות על ידי Drag & drop",
   "upload_button.label": "הוספת מדיה",
-  "upload_error.limit": "File upload limit exceeded.",
-  "upload_error.poll": "File upload not allowed with polls.",
-  "upload_form.audio_description": "Describe for people with hearing loss",
+  "upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
+  "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
+  "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
-  "upload_form.description_missing": "No description added",
-  "upload_form.edit": "Edit",
-  "upload_form.thumbnail": "Change thumbnail",
+  "upload_form.description_missing": "לא הוסף תיאור",
+  "upload_form.edit": "עריכה",
+  "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
   "upload_form.undo": "ביטול",
-  "upload_form.video_description": "Describe for people with hearing loss or visual impairment",
-  "upload_modal.analyzing_picture": "Analyzing picture…",
-  "upload_modal.apply": "Apply",
-  "upload_modal.applying": "Applying…",
-  "upload_modal.choose_image": "Choose image",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detect text from picture",
-  "upload_modal.edit_media": "Edit media",
-  "upload_modal.hint": "Click or drag the circle on the preview to choose the focal point which will always be in view on all thumbnails.",
-  "upload_modal.preparing_ocr": "Preparing OCR…",
-  "upload_modal.preview_label": "Preview ({ratio})",
+  "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
+  "upload_modal.analyzing_picture": "מנתח תמונה…",
+  "upload_modal.apply": "החל",
+  "upload_modal.applying": "מחיל…",
+  "upload_modal.choose_image": "בחר/י תמונה",
+  "upload_modal.description_placeholder": "דג סקרן שט בים מאוכזב ולפתע מצא חברה",
+  "upload_modal.detect_text": "זהה טקסט מתמונה",
+  "upload_modal.edit_media": "עריכת מדיה",
+  "upload_modal.hint": "הקליקי או גררי את המעגל על גבי התצוגה המקדימה על מנת לבחור בנקודת המוקד שתראה תמיד בכל התמונות הממוזערות.",
+  "upload_modal.preparing_ocr": "מכין OCR…",
+  "upload_modal.preview_label": "תצוגה ({ratio})",
   "upload_progress.label": "עולה...",
   "video.close": "סגירת וידאו",
-  "video.download": "Download file",
+  "video.download": "הורדת קובץ",
   "video.exit_fullscreen": "יציאה ממסך מלא",
   "video.expand": "להרחיב וידאו",
-  "video.fullscreen": "Full screen",
+  "video.fullscreen": "מסך מלא",
   "video.hide": "להסתיר וידאו",
   "video.mute": "השתקת צליל",
-  "video.pause": "Pause",
+  "video.pause": "השהיה",
   "video.play": "ניגון",
   "video.unmute": "החזרת צליל"
 }
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index d208cf51e..3ee12c30d 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -70,7 +70,7 @@
   "column.blocks": "ब्लॉक्ड यूज़र्स",
   "column.bookmarks": "पुस्तकचिह्न:",
   "column.community": "लोकल टाइम्लाइन",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "प्रोफाइल्स खोजें",
   "column.domain_blocks": "छुपे डोमेन्स",
   "column.favourites": "पसंदीदा",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "आप अभी तक किसी भी यूजर के द्वारा ब्लॉक्ड नहीं हो।",
   "empty_column.bookmarked_statuses": "आपके पास अभी तक कोई बुकमार्क नहीं है। जब आप एक बुकमार्क करते हैं, तो यह यहां दिखाई देगा।",
   "empty_column.community": "लोकल टाइम्लाइन खाली है, कुछ देखने के लिये सार्वजनिक रूप से कुछ लिखें!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "अभी तक कोई छुपा हुआ डोमेन नहीं है।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "आपके पास अभी कोई भी चहिता टूट नहीं है. जब आप किसी टूट को पसंद (स्टार) करेंगे, तब वो यहाँ दिखेगा।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "बढ़ावा देने के लिए",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "कंपोज़ टेक्स्ट-एरिया पर ध्यान केंद्रित करने के लिए",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "विवरण",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "सूची में शामिल करने के लिए",
   "keyboard_shortcuts.enter": "स्टेटस खोलने के लिए",
   "keyboard_shortcuts.favourite": "पसंदीदा के लिए",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "पुस्तकचिह्न:",
   "navigation_bar.community_timeline": "लोकल टाइम्लाइन",
   "navigation_bar.compose": "नया टूट् लिखें",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "खोजें",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "प्रोफ़ाइल संपादित करें",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 16434ea46..f0c7954a3 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Knjižne oznake",
   "column.community": "Lokalna vremenska crta",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Pregledavanje profila",
   "column.domain_blocks": "Blokirane domene",
   "column.favourites": "Favoriti",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Još niste blokirali nikoga.",
   "empty_column.bookmarked_statuses": "Još nemaš niti jedan označeni toot. Kada označiš jedan, prikazad će se ovdje.",
   "empty_column.community": "Lokalna vremenska crta je prazna. Napišite nešto javno da biste pokrenuli stvari!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Još nema blokiranih domena.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "za boostanje",
   "keyboard_shortcuts.column": "za fokusiranje na toot u jednom od stupaca",
   "keyboard_shortcuts.compose": "za fokusiranje na tekstualni okvir za stvaranje",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "za pomak dolje na listi",
   "keyboard_shortcuts.enter": "za otvaranje toota",
   "keyboard_shortcuts.favourite": "za označavanje favoritom",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna vremenska crta",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Istraživanje",
   "navigation_bar.domain_blocks": "Blokirane domene",
   "navigation_bar.edit_profile": "Uredi profil",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index ccf0dd3fd..4986cd199 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -70,7 +70,7 @@
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Könyvjelzők",
   "column.community": "Helyi idővonal",
-  "column.conversations": "Beszélgetések",
+  "column.direct": "Közvetlen üzenetek",
   "column.directory": "Profilok böngészése",
   "column.domain_blocks": "Rejtett domainek",
   "column.favourites": "Kedvencek",
@@ -86,7 +86,7 @@
   "column_header.moveLeft_settings": "Oszlop elmozdítása balra",
   "column_header.moveRight_settings": "Oszlop elmozdítása jobbra",
   "column_header.pin": "Kitűzés",
-  "column_header.show_settings": "Beállítások mutatása",
+  "column_header.show_settings": "Beállítások megjelenítése",
   "column_header.unpin": "Kitűzés eltávolítása",
   "column_subheading.settings": "Beállítások",
   "community.column_settings.local_only": "Csak helyi",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Még senkit sem tiltottál le.",
   "empty_column.bookmarked_statuses": "Még nincs egyetlen könyvjelzőzött bejegyzésed sem. Ha könyvjelzőzöl egyet, itt fog megjelenni.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
-  "empty_column.conversations": "Ha olyan bejegyzést küldesz vagy fogadsz, melyet csak az abban megemlítettek látnak, itt fog megjelenni.",
+  "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
   "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
   "empty_column.explore_statuses": "Jelenleg semmi sem felkapott. Nézz vissza később!",
   "empty_column.favourited_statuses": "Még nincs egyetlen kedvenc bejegyzésed sem. Ha kedvencnek jelölsz egyet, itt fog megjelenni.",
@@ -219,9 +219,9 @@
   "hashtag.column_settings.tag_toggle": "Új címkék felvétele ehhez az oszlophoz",
   "home.column_settings.basic": "Alapvető",
   "home.column_settings.show_reblogs": "Megtolások mutatása",
-  "home.column_settings.show_replies": "Válaszok mutatása",
+  "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
-  "home.show_announcements": "Közlemények mutatása",
+  "home.show_announcements": "Közlemények megjelenítése",
   "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
   "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
   "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bejegyzés megtolása",
   "keyboard_shortcuts.column": "Fókuszálás egy oszlopra",
   "keyboard_shortcuts.compose": "fókuszálás a szerkesztési szövegdobozra",
-  "keyboard_shortcuts.conversations": "beszélgetések megnyitása",
   "keyboard_shortcuts.description": "Leírás",
+  "keyboard_shortcuts.direct": "közvetlen üzenetek megnyitása",
   "keyboard_shortcuts.down": "lefele navigálás a listában",
   "keyboard_shortcuts.enter": "Bejegyzés megnyitása",
   "keyboard_shortcuts.favourite": "Bejegyzés kedvencnek jelölése",
@@ -252,10 +252,10 @@
   "keyboard_shortcuts.reply": "Válasz bejegyzésre",
   "keyboard_shortcuts.requests": "követési kérések listájának megnyitása",
   "keyboard_shortcuts.search": "fókuszálás a keresőre",
-  "keyboard_shortcuts.spoilers": "CW mező mutatása/elrejtése",
+  "keyboard_shortcuts.spoilers": "Tartalmi figyelmeztetés mező megjelenítése/elrejtése",
   "keyboard_shortcuts.start": "\"Első lépések\" megnyitása",
-  "keyboard_shortcuts.toggle_hidden": "tartalmi figyelmeztetéssel ellátott szöveg mutatása/elrejtése",
-  "keyboard_shortcuts.toggle_sensitivity": "média mutatása/elrejtése",
+  "keyboard_shortcuts.toggle_hidden": "Tartalmi figyelmeztetéssel ellátott szöveg megjelenítése/elrejtése",
+  "keyboard_shortcuts.toggle_sensitivity": "Média megjelenítése/elrejtése",
   "keyboard_shortcuts.toot": "Új bejegyzés írása",
   "keyboard_shortcuts.unfocus": "Szerkesztés/keresés fókuszból való kivétele",
   "keyboard_shortcuts.up": "felfelé mozdítás a listában",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Könyvjelzők",
   "navigation_bar.community_timeline": "Helyi idővonal",
   "navigation_bar.compose": "Új bejegyzés írása",
+  "navigation_bar.direct": "Közvetlen üzenetek",
   "navigation_bar.discover": "Felfedezés",
   "navigation_bar.domain_blocks": "Rejtett domainek",
   "navigation_bar.edit_profile": "Profil szerkesztése",
@@ -323,7 +324,7 @@
   "notifications.column_settings.admin.sign_up": "Új regisztrálók:",
   "notifications.column_settings.alert": "Asztali értesítések",
   "notifications.column_settings.favourite": "Kedvencek:",
-  "notifications.column_settings.filter_bar.advanced": "Minden kategória mutatása",
+  "notifications.column_settings.filter_bar.advanced": "Minden kategória megjelenítése",
   "notifications.column_settings.filter_bar.category": "Gyorskereső mező",
   "notifications.column_settings.filter_bar.show_bar": "Szűrősáv mutatása",
   "notifications.column_settings.follow": "Új követők:",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Szavazás törlése",
   "privacy.change": "Bejegyzés láthatóságának módosítása",
   "privacy.direct.long": "Csak a megemlített felhasználóknak látható",
-  "privacy.direct.short": "Csak a megemlítettek",
+  "privacy.direct.short": "Csak megemlítetteknek",
   "privacy.private.long": "Csak követőknek látható",
   "privacy.private.short": "Csak követők",
   "privacy.public.long": "Mindenki számára látható",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index c7ba3b852..1bce7a771 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -70,7 +70,7 @@
   "column.blocks": "Արգելափակուած օգտատէրեր",
   "column.bookmarks": "Էջանիշեր",
   "column.community": "Տեղական հոսք",
-  "column.conversations": "Զրոյցներ",
+  "column.direct": "Direct messages",
   "column.directory": "Զննել անձնական էջերը",
   "column.domain_blocks": "Թաքցուած տիրոյթները",
   "column.favourites": "Հաւանածներ",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
   "empty_column.bookmarked_statuses": "Դու դեռ չունես որեւէ էջանշուած գրառում։ Երբ էջանշես, դրանք կը երեւան այստեղ։",
   "empty_column.community": "Տեղական հոսքը դատարկ է։ Հրապարակային մի բան գրի՛ր շարժիչը գործարկելու համար։",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած գրառում։ Երբ հաւանես, դրանք կերեւան այստեղ։",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "տարածելու համար",
   "keyboard_shortcuts.column": "սիւներից մէկի վրայ սեւեռուելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրոյթին սեւեռուելու համար",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Նկարագրութիւն",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժուելու համար",
   "keyboard_shortcuts.enter": "Գրառումը բացելու համար",
   "keyboard_shortcuts.favourite": "հաւանելու համար",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Էջանիշեր",
   "navigation_bar.community_timeline": "Տեղական հոսք",
   "navigation_bar.compose": "Ստեղծել նոր գրառում",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
   "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Հեռացնել հարցումը",
   "privacy.change": "Կարգաւորել գրառման գաղտնիութիւնը",
   "privacy.direct.long": "Կը տեսնեն միայն նշուած օգտատէրերը",
-  "privacy.direct.short": "Միայն նշածս մարդիկ",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Կը տեսնեն միայն հետեւորդները",
   "privacy.private.short": "Միայն հետեւողները",
   "privacy.public.long": "Տեսանելի բոլորին",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index c093688e4..75b039177 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -70,7 +70,7 @@
   "column.blocks": "Pengguna yang diblokir",
   "column.bookmarks": "Markah",
   "column.community": "Linimasa Lokal",
-  "column.conversations": "Percakapan",
+  "column.direct": "Pesan langsung",
   "column.directory": "Jelajahi profil",
   "column.domain_blocks": "Topik tersembunyi",
   "column.favourites": "Favorit",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Anda belum memblokir siapapun.",
   "empty_column.bookmarked_statuses": "Anda belum memiliki toot termarkah. Saat Anda menandainya sebagai markah, ia akan muncul di sini.",
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
-  "empty_column.conversations": "Saat Anda mengirim atau menerima kiriman yang hanya terlihat oleh orang yang disebutkan, itu akan muncul di sini.",
+  "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
   "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
   "empty_column.explore_statuses": "Tidak ada yang sedang tren pada saat ini. Silakan mengecek lagi nanti!",
   "empty_column.favourited_statuses": "Anda belum memiliki toot favorit. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "untuk menyebarkan",
   "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
   "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
-  "keyboard_shortcuts.conversations": "untuk membuka kolom percakapan",
   "keyboard_shortcuts.description": "Deskripsi",
+  "keyboard_shortcuts.direct": "untuk membuka kolom pesan langsung",
   "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
   "keyboard_shortcuts.enter": "untuk membuka status",
   "keyboard_shortcuts.favourite": "untuk memfavoritkan",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Markah",
   "navigation_bar.community_timeline": "Linimasa lokal",
   "navigation_bar.compose": "Tulis toot baru",
+  "navigation_bar.direct": "Pesan langsung",
   "navigation_bar.discover": "Temukan",
   "navigation_bar.domain_blocks": "Domain tersembunyi",
   "navigation_bar.edit_profile": "Ubah profil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Hapus japat",
   "privacy.change": "Tentukan privasi status",
   "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
-  "privacy.direct.short": "Hanya orang yang saya sebut",
+  "privacy.direct.short": "Orang yang disebutkan saja",
   "privacy.private.long": "Kirim postingan hanya kepada pengikut",
   "privacy.private.short": "Pengikut saja",
   "privacy.public.long": "Terlihat oleh semua",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index d0ce09335..1752bda65 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -48,8 +48,8 @@
   "account.unmute_notifications": "Desilencigez avizi de @{name}",
   "account.unmute_short": "Desilencigez",
   "account_note.placeholder": "Click to add a note",
-  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
-  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.daily_retention": "Dia uzantoretenseso pos registro",
+  "admin.dashboard.monthly_retention": "Monata uzantoreteneso pos registro",
   "admin.dashboard.retention.average": "Averajo",
   "admin.dashboard.retention.cohort": "Registromonato",
   "admin.dashboard.retention.cohort_size": "Nova uzanti",
@@ -68,116 +68,116 @@
   "bundle_modal_error.message": "Nulo ne functionis dum chargar ca kompozaj.",
   "bundle_modal_error.retry": "Probez itere",
   "column.blocks": "Blokusita uzeri",
-  "column.bookmarks": "Bookmarks",
+  "column.bookmarks": "Libromarki",
   "column.community": "Lokala tempolineo",
-  "column.conversations": "Conversations",
-  "column.directory": "Browse profiles",
+  "column.direct": "Direta mesaji",
+  "column.directory": "Videz profili",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Favorati",
   "column.follow_requests": "Demandi di sequado",
   "column.home": "Hemo",
-  "column.lists": "Lists",
+  "column.lists": "Listi",
   "column.mutes": "Celita uzeri",
   "column.notifications": "Savigi",
   "column.pins": "Pinned toot",
   "column.public": "Federata tempolineo",
   "column_back_button.label": "Retro",
-  "column_header.hide_settings": "Hide settings",
-  "column_header.moveLeft_settings": "Move column to the left",
-  "column_header.moveRight_settings": "Move column to the right",
-  "column_header.pin": "Pin",
-  "column_header.show_settings": "Show settings",
-  "column_header.unpin": "Unpin",
-  "column_subheading.settings": "Settings",
-  "community.column_settings.local_only": "Local only",
+  "column_header.hide_settings": "Celez ajusti",
+  "column_header.moveLeft_settings": "Movez kolumno a la sinistro",
+  "column_header.moveRight_settings": "Movez kolumno a la dextro",
+  "column_header.pin": "Pinglagez",
+  "column_header.show_settings": "Montrez ajusti",
+  "column_header.unpin": "Depinglagez",
+  "column_subheading.settings": "Ajusti",
+  "community.column_settings.local_only": "Lokala nur",
   "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
+  "community.column_settings.remote_only": "Fora nur",
+  "compose_form.direct_message_warning_learn_more": "Lernez plu",
+  "compose_form.encryption_warning": "Posti di Mastodon ne intersequante chifrigesas. Ne partigez irga danjera informo che Mastodon.",
   "compose_form.hashtag_warning": "This toot won't be listed under any hashtag as it is unlisted. Only public toots can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.lock_disclaimer": "Vua konto ne esas {locked}. Irgu povas sequar vu por vidar vua sequanto-nura posti.",
+  "compose_form.lock_disclaimer.lock": "klefagesas",
   "compose_form.placeholder": "Quo esas en tua spirito?",
-  "compose_form.poll.add_option": "Add a choice",
-  "compose_form.poll.duration": "Poll duration",
-  "compose_form.poll.option_placeholder": "Choice {number}",
-  "compose_form.poll.remove_option": "Remove this choice",
-  "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
-  "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
+  "compose_form.poll.add_option": "Insertez selekto",
+  "compose_form.poll.duration": "Votpostoduro",
+  "compose_form.poll.option_placeholder": "Selektato {number}",
+  "compose_form.poll.remove_option": "Efacez ca selektajo",
+  "compose_form.poll.switch_to_multiple": "Chanjez votposto por permisar multiselektaji",
+  "compose_form.poll.switch_to_single": "Chanjez votposto por permisar una selektajo",
   "compose_form.publish": "Siflar",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.save_changes": "Save changes",
-  "compose_form.sensitive.hide": "{count, plural, one {Mark media as sensitive} other {Mark media as sensitive}}",
-  "compose_form.sensitive.marked": "{count, plural, one {Media is marked as sensitive} other {Media is marked as sensitive}}",
-  "compose_form.sensitive.unmarked": "{count, plural, one {Media is not marked as sensitive} other {Media is not marked as sensitive}}",
+  "compose_form.save_changes": "Sparez chanji",
+  "compose_form.sensitive.hide": "{count, plural,one {Markigez medii quale privata} other {Markigez medii quale privata}}",
+  "compose_form.sensitive.marked": "{count, plural,one {Medii markigesis quale privata} other {Medii markigesis quale privata}}",
+  "compose_form.sensitive.unmarked": "{count, plural,one {Medii ne markigesis quale privata} other {Medii ne markigesis quale privata}}",
   "compose_form.spoiler.marked": "Text is hidden behind warning",
   "compose_form.spoiler.unmarked": "Text is not hidden",
   "compose_form.spoiler_placeholder": "Averto di kontenajo",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.block_and_report": "Block & Report",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
+  "confirmation_modal.cancel": "Extingez",
+  "confirmations.block.block_and_report": "Restriktez e Raportigez",
+  "confirmations.block.confirm": "Restriktez",
+  "confirmations.block.message": "Ka vu certe volas restrikar {name}?",
+  "confirmations.delete.confirm": "Efacez",
   "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
-  "confirmations.discard_edit_media.confirm": "Discard",
-  "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
+  "confirmations.delete_list.confirm": "Efacez",
+  "confirmations.delete_list.message": "Ka vu certe volas netempale efacar ca listo?",
+  "confirmations.discard_edit_media.confirm": "Efacez",
+  "confirmations.discard_edit_media.message": "Vu havas nesparita chanji di mediodeskript o prevido, vu volas jus efacar?",
   "confirmations.domain_block.confirm": "Hide entire domain",
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
-  "confirmations.logout.confirm": "Log out",
-  "confirmations.logout.message": "Are you sure you want to log out?",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.explanation": "This will hide posts from them and posts mentioning them, but it will still allow them to see your posts and follow you.",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.logout.confirm": "Ekirez",
+  "confirmations.logout.message": "Ka tu certe volas ekirar?",
+  "confirmations.mute.confirm": "Silencigez",
+  "confirmations.mute.explanation": "Co celigos posti de oli e posti quo mencionas oli, ma ol ankore permisas oli vidar vua posti e sequar vu.",
+  "confirmations.mute.message": "Ka vu certe volas silencigar {name}?",
+  "confirmations.redraft.confirm": "Efacez e riskisez",
   "confirmations.redraft.message": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
-  "confirmations.reply.confirm": "Reply",
-  "confirmations.reply.message": "Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "conversation.delete": "Delete conversation",
-  "conversation.mark_as_read": "Mark as read",
-  "conversation.open": "View conversation",
-  "conversation.with": "With {names}",
-  "directory.federated": "From known fediverse",
-  "directory.local": "From {domain} only",
-  "directory.new_arrivals": "New arrivals",
-  "directory.recently_active": "Recently active",
+  "confirmations.reply.confirm": "Respondez",
+  "confirmations.reply.message": "Respondar nun remplos mesajo quon vu nun igas. Ka vu certe volas durar?",
+  "confirmations.unfollow.confirm": "Desequez",
+  "confirmations.unfollow.message": "Ka vu certe volas desequar {name}?",
+  "conversation.delete": "Efacez konverso",
+  "conversation.mark_as_read": "Markigez quale lektita",
+  "conversation.open": "Videz konverso",
+  "conversation.with": "Kun {names}",
+  "directory.federated": "De savita fediverso",
+  "directory.local": "De {domain} nur",
+  "directory.new_arrivals": "Nova venanti",
+  "directory.recently_active": "Recenta aktivo",
   "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
-  "emoji_button.activity": "Activity",
-  "emoji_button.custom": "Custom",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
+  "embed.preview": "Co esas quon ol semblos tale:",
+  "emoji_button.activity": "Ago",
+  "emoji_button.custom": "Kustumizato",
+  "emoji_button.flags": "Flagi",
+  "emoji_button.food": "Manjajo & Drinkajo",
   "emoji_button.label": "Insertar emoji",
-  "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "No matching emojis found",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.recent": "Frequently used",
-  "emoji_button.search": "Search...",
-  "emoji_button.search_results": "Search results",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
-  "empty_column.account_suspended": "Account suspended",
+  "emoji_button.nature": "Naturo",
+  "emoji_button.not_found": "Nula tala parigata emojii",
+  "emoji_button.objects": "Kozi",
+  "emoji_button.people": "Personi",
+  "emoji_button.recent": "Ofta uzato",
+  "emoji_button.search": "Trovez...",
+  "emoji_button.search_results": "Trovuri",
+  "emoji_button.symbols": "Simboli",
+  "emoji_button.travel": "Vizito & Plasi",
+  "empty_column.account_suspended": "Konto restriktesis",
   "empty_column.account_timeline": "No toots here!",
-  "empty_column.account_unavailable": "Profile unavailable",
-  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.account_unavailable": "Profilo esas nedisponebla",
+  "empty_column.blocks": "Vu ne restriktis irga uzanti til nun.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Vu ne havas irga direta mesaji til nun. Kande vu sendas o ganas, ol montresos hike.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
+  "empty_column.explore_statuses": "Nulo esas tendenca nun. Videz itere pose!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
   "empty_column.favourites": "No one has favourited this toot yet. When someone does, they will show up here.",
-  "empty_column.follow_recommendations": "Looks like no suggestions could be generated for you. You can try using search to look for people you might know or explore trending hashtags.",
-  "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.follow_recommendations": "Semblas tale nula sugestato povas facesar por vu. Vu povas probar trovar personi quon vu forsan konocas o exploras tendenca hashtagi.",
+  "empty_column.follow_requests": "Vu ne havas irga sequodemandi til nun. Kande vu ganas talo, ol montresos hike.",
   "empty_column.hashtag": "Esas ankore nulo en ta gretovorto.",
   "empty_column.home": "Tu sequas ankore nulu. Vizitez {public} od uzez la serchilo por komencar e renkontrar altra uzeri.",
-  "empty_column.home.suggestions": "See some suggestions",
+  "empty_column.home.suggestions": "Videz ula sugestati",
   "empty_column.list": "There is nothing in this list yet.",
-  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.lists": "Vu ne havas irga listi til nun. Kande vu kreas talo, ol montresos hike.",
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Tu havas ankore nula savigo. Komunikez kun altri por debutar la konverso.",
   "empty_column.public": "Esas nulo hike! Skribez ulo publike, o manuale sequez uzeri de altra instaluri por plenigar ol.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "apertar kolumno di direta mesaji",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokala tempolineo",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direta mesaji",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Modifikar profilo",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 053c18fcf..8e3212f8f 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -70,7 +70,7 @@
   "column.blocks": "Útilokaðir notendur",
   "column.bookmarks": "Bókamerki",
   "column.community": "Staðvær tímalína",
-  "column.conversations": "Samtöl",
+  "column.direct": "Bein skilaboð",
   "column.directory": "Vafra notandasnið",
   "column.domain_blocks": "Útilokuð lén",
   "column.favourites": "Eftirlæti",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Þú hefur ekki ennþá útilokað neina notendur.",
   "empty_column.bookmarked_statuses": "Þú ert ekki ennþá með neinar bókamerktar færslur. Þegar þú bókamerkir færslu, mun það birtast hér.",
   "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!",
-  "empty_column.conversations": "Þegar þú hefur sent eða móttekið færslu sem er aðeins sýnileg fólki sem nefnt er í henni þá birtist hún hér.",
+  "empty_column.direct": "Þú átt ennþá engin bein skilaboð. Þegar þú sendir eða tekur á móti slíkum skilaboðum, munu þau birtast hér.",
   "empty_column.domain_blocks": "Það eru ennþá engin útilokuð lén.",
   "empty_column.explore_statuses": "Ekkert er á uppleið í augnablikinu. Athugaðu aftur síðar!",
   "empty_column.favourited_statuses": "Þú ert ekki ennþá með neinar eftirlætisfærslur. Þegar þú setur færslu í eftirlæti, munu þau birtast hér.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Endurbirta færslu",
   "keyboard_shortcuts.column": "Setja virkni í dálk",
   "keyboard_shortcuts.compose": "Setja virkni á textainnsetningarreit",
-  "keyboard_shortcuts.conversations": "að opna samtalsdálka",
   "keyboard_shortcuts.description": "Lýsing",
+  "keyboard_shortcuts.direct": "að opna dálk með beinum skilaboðum",
   "keyboard_shortcuts.down": "Fara neðar í listanum",
   "keyboard_shortcuts.enter": "Opna færslu",
   "keyboard_shortcuts.favourite": "Eftirlætisfærsla",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bókamerki",
   "navigation_bar.community_timeline": "Staðvær tímalína",
   "navigation_bar.compose": "Semja nýja færslu",
+  "navigation_bar.direct": "Bein skilaboð",
   "navigation_bar.discover": "Uppgötva",
   "navigation_bar.domain_blocks": "Útilokuð lén",
   "navigation_bar.edit_profile": "Breyta notandasniði",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Fjarlægja könnun",
   "privacy.change": "Aðlaga gagnaleynd færslu",
   "privacy.direct.long": "Senda einungis á notendur sem minnst er á",
-  "privacy.direct.short": "Aðeins fólk sem ég minnist á",
+  "privacy.direct.short": "Aðeins fólk sem minnst er á",
   "privacy.private.long": "Senda einungis á fylgjendur",
   "privacy.private.short": "Einungis fylgjendur",
   "privacy.public.long": "Sýnilegt fyrir alla",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 8e881e284..c5fb5c731 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -70,7 +70,7 @@
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
   "column.community": "Timeline locale",
-  "column.conversations": "Conversazioni",
+  "column.direct": "Messaggi diretti",
   "column.directory": "Sfoglia profili",
   "column.domain_blocks": "Domini bloccati",
   "column.favourites": "Preferiti",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
   "empty_column.bookmarked_statuses": "Non hai ancora segnato alcun post. Quando ne segni uno, sarà mostrato qui.",
   "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
-  "empty_column.conversations": "Quando invii o ricevi un post visibile solo alle persone citate in esso, apparirà qui.",
+  "empty_column.direct": "Non hai ancora nessun messaggio diretto. Quando ne manderai o riceverai qualcuno, apparirà qui.",
   "empty_column.domain_blocks": "Non vi sono domini nascosti.",
   "empty_column.explore_statuses": "Nulla è in tendenza in questo momento. Riprova più tardi!",
   "empty_column.favourited_statuses": "Non hai ancora segnato nessun post come apprezzato. Quando lo farai, comparirà qui.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Condividi il post",
   "keyboard_shortcuts.column": "per portare il focus su uno status in una delle colonne",
   "keyboard_shortcuts.compose": "per portare il focus nell'area di composizione",
-  "keyboard_shortcuts.conversations": "per aprire la colonna conversazioni",
   "keyboard_shortcuts.description": "Descrizione",
+  "keyboard_shortcuts.direct": "per aprire la colonna dei messaggi diretti",
   "keyboard_shortcuts.down": "Spostati in basso nella lista",
   "keyboard_shortcuts.enter": "Apri il post",
   "keyboard_shortcuts.favourite": "Apprezza post",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Segnalibri",
   "navigation_bar.community_timeline": "Timeline locale",
   "navigation_bar.compose": "Componi nuovo toot",
+  "navigation_bar.direct": "Messaggi diretti",
   "navigation_bar.discover": "Scopri",
   "navigation_bar.domain_blocks": "Domini nascosti",
   "navigation_bar.edit_profile": "Modifica profilo",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Rimuovi sondaggio",
   "privacy.change": "Modifica privacy del post",
   "privacy.direct.long": "Invia solo a utenti menzionati",
-  "privacy.direct.short": "Solo le persone che menziono",
+  "privacy.direct.short": "Solo persone citate",
   "privacy.private.long": "Invia solo ai follower",
   "privacy.private.short": "Solo i seguaci",
   "privacy.public.long": "Visibile a tutti",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c607e84a5..86c9c34bc 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -70,7 +70,7 @@
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "ブックマーク",
   "column.community": "ローカルタイムライン",
-  "column.conversations": "会話",
+  "column.direct": "ダイレクトメッセージ",
   "column.directory": "ディレクトリ",
   "column.domain_blocks": "ブロックしたドメイン",
   "column.favourites": "お気に入り",
@@ -170,7 +170,7 @@
   "empty_column.blocks": "まだ誰もブロックしていません。",
   "empty_column.bookmarked_statuses": "まだ何もブックマーク登録していません。ブックマーク登録するとここに表示されます。",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
-  "empty_column.conversations": "メンションした相手にだけ表示されるメッセージを一度でも送受信した場合、ここに表示されます。",
+  "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
   "empty_column.domain_blocks": "ブロックしているドメインはありません。",
   "empty_column.explore_statuses": "まだ何もありません。後で確認してください。",
   "empty_column.favourited_statuses": "まだ何もお気に入り登録していません。お気に入り登録するとここに表示されます。",
@@ -234,8 +234,8 @@
   "keyboard_shortcuts.boost": "ブースト",
   "keyboard_shortcuts.column": "左からn番目のカラムの最新に移動",
   "keyboard_shortcuts.compose": "投稿の入力欄に移動",
-  "keyboard_shortcuts.conversations": "会話カラムを開く",
   "keyboard_shortcuts.description": "説明",
+  "keyboard_shortcuts.direct": "ダイレクトメッセージのカラムを開く",
   "keyboard_shortcuts.down": "カラム内一つ下に移動",
   "keyboard_shortcuts.enter": "投稿の詳細を表示",
   "keyboard_shortcuts.favourite": "お気に入り",
@@ -294,6 +294,7 @@
   "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "投稿の新規作成",
+  "navigation_bar.direct": "ダイレクトメッセージ",
   "navigation_bar.discover": "見つける",
   "navigation_bar.domain_blocks": "ブロックしたドメイン",
   "navigation_bar.edit_profile": "プロフィールを編集",
@@ -370,8 +371,8 @@
   "poll_button.add_poll": "アンケートを追加",
   "poll_button.remove_poll": "アンケートを削除",
   "privacy.change": "公開範囲を変更",
-  "privacy.direct.long": "送信した相手のみ閲覧可",
-  "privacy.direct.short": "メンションした相手のみ",
+  "privacy.direct.long": "指定された相手のみ閲覧可",
+  "privacy.direct.short": "指定された相手のみ",
   "privacy.private.long": "フォロワーのみ閲覧可",
   "privacy.private.short": "フォロワーのみ",
   "privacy.public.long": "誰でも閲覧可",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 6b5fa5c97..a9437bdb1 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -70,7 +70,7 @@
   "column.blocks": "დაბლოკილი მომხმარებლები",
   "column.bookmarks": "Bookmarks",
   "column.community": "ლოკალური თაიმლაინი",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "დამალული დომენები",
   "column.favourites": "ფავორიტები",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "დასაბუსტად",
   "keyboard_shortcuts.column": "ერთ-ერთი სვეტში სტატუსზე ფოკუსირებისთვის",
   "keyboard_shortcuts.compose": "შედგენის ტექსტ-არეაზე ფოკუსირებისთვის",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "აღწერილობა",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "სიაში ქვემოთ გადასაადგილებლად",
   "keyboard_shortcuts.enter": "სტატუსის გასახსნელად",
   "keyboard_shortcuts.favourite": "ფავორიტად ქცევისთვის",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "აღმოაჩინე",
   "navigation_bar.domain_blocks": "დამალული დომენები",
   "navigation_bar.edit_profile": "შეცვალე პროფილი",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 48a1d6fa8..9d77262dd 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -70,7 +70,7 @@
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
   "column.community": "Tasuddemt tadigant",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Inig deg imaɣnuten",
   "column.domain_blocks": "Taɣulin yeffren",
   "column.favourites": "Ismenyifen",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ur tesḥebseḍ ula yiwen n umseqdac ar tura.",
   "empty_column.bookmarked_statuses": "Ulac tijewwaqin i terniḍ ɣer yismenyifen-ik ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "i beṭṭu tikelt-nniḍen",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Aglam",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
   "keyboard_shortcuts.favourite": "akken ad ternuḍ ɣer yismenyifen",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.community_timeline": "Tasuddemt tadigant",
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Ẓer",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.edit_profile": "Ẓreg amaɣnu",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index fd9074afd..110d33ae4 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -70,7 +70,7 @@
   "column.blocks": "Бұғатталғандар",
   "column.bookmarks": "Бетбелгілер",
   "column.community": "Жергілікті желі",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Профильдерді аралау",
   "column.domain_blocks": "Жасырылған домендер",
   "column.favourites": "Таңдаулылар",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ешкімді бұғаттамағансыз.",
   "empty_column.bookmarked_statuses": "Ешқандай жазба Бетбелгілер тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
   "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Бұғатталған домен жоқ.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Ешқандай жазба 'Таңдаулылар' тізіміне қосылмапты. Қосылғаннан кейін осында жинала бастайды.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "жазба бөлісу",
   "keyboard_shortcuts.column": "бағандардағы жазбаны оқу",
   "keyboard_shortcuts.compose": "пост жазу",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Сипаттама",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "тізімде төмен түсу",
   "keyboard_shortcuts.enter": "жазбаны ашу",
   "keyboard_shortcuts.favourite": "таңдаулыға қосу",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Бетбелгілер",
   "navigation_bar.community_timeline": "Жергілікті желі",
   "navigation_bar.compose": "Жаңа жазба бастау",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "шарлау",
   "navigation_bar.domain_blocks": "Жабық домендер",
   "navigation_bar.edit_profile": "Профиль түзету",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 222a62164..d00d7feb7 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 4af91f569..a9c4fc6ce 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -70,7 +70,7 @@
   "column.blocks": "차단한 사용자",
   "column.bookmarks": "보관함",
   "column.community": "로컬 타임라인",
-  "column.conversations": "대화",
+  "column.direct": "다이렉트 메시지",
   "column.directory": "프로필 둘러보기",
   "column.domain_blocks": "차단한 도메인",
   "column.favourites": "좋아요",
@@ -93,7 +93,7 @@
   "community.column_settings.media_only": "미디어만",
   "community.column_settings.remote_only": "원격만",
   "compose_form.direct_message_warning_learn_more": "더 알아보기",
-  "compose_form.encryption_warning": "마스토돈의 게시물들은 종단간 암호화가 되지 않습니아. 위험한 정보를 마스토돈을 통해 전달하지 마세요.",
+  "compose_form.encryption_warning": "마스토돈의 게시물들은 종단간 암호화가 되지 않습니다. 위험한 정보를 마스토돈을 통해 전달하지 마세요.",
   "compose_form.hashtag_warning": "이 게시물은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 게시물만이 해시태그로 검색 될 수 있습니다.",
   "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
   "empty_column.bookmarked_statuses": "아직 보관한 게시물이 없습니다. 게시물을 보관하면 여기에 나타납니다.",
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
-  "empty_column.conversations": "멘션한 사람만 볼 수 있는 게시물을 보내거나 받은 경우에, 여기에 나타납니다.",
+  "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
   "empty_column.domain_blocks": "아직 차단한 도메인이 없습니다.",
   "empty_column.explore_statuses": "아직 유행하는 것이 없습니다. 나중에 다시 확인하세요!",
   "empty_column.favourited_statuses": "아직 마음에 들어한 게시물이 없습니다. 게시물을 좋아요 하면 여기에 나타납니다.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "게시물 부스트",
   "keyboard_shortcuts.column": "해당 컬럼에 포커스",
   "keyboard_shortcuts.compose": "작성창에 포커스",
-  "keyboard_shortcuts.conversations": "대화 컬럼 열기",
   "keyboard_shortcuts.description": "설명",
+  "keyboard_shortcuts.direct": "다이렉트 메시지 컬럼 열기",
   "keyboard_shortcuts.down": "리스트에서 아래로 이동",
   "keyboard_shortcuts.enter": "게시물 열기",
   "keyboard_shortcuts.favourite": "관심글 지정",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "보관함",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 게시물 작성",
+  "navigation_bar.direct": "다이렉트 메시지",
   "navigation_bar.discover": "발견하기",
   "navigation_bar.domain_blocks": "차단한 도메인",
   "navigation_bar.edit_profile": "프로필 편집",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "투표 삭제",
   "privacy.change": "게시물의 프라이버시 설정을 변경",
   "privacy.direct.long": "멘션한 사용자에게만 공개",
-  "privacy.direct.short": "내가 멘션한 사람만",
+  "privacy.direct.short": "멘션한 사람들만",
   "privacy.private.long": "팔로워에게만 공개",
   "privacy.private.short": "팔로워 전용",
   "privacy.public.long": "모두가 볼 수 있음",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 02df9eff6..89765f8ff 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -70,7 +70,7 @@
   "column.blocks": "Bikarhênerên astengkirî",
   "column.bookmarks": "Şûnpel",
   "column.community": "Demnameya herêmî",
-  "column.conversations": "Axaftin",
+  "column.direct": "Peyamên rasterast",
   "column.directory": "Li profîlan bigere",
   "column.domain_blocks": "Navperên astengkirî",
   "column.favourites": "Bijarte",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Te tu bikarhêner asteng nekiriye.",
   "empty_column.bookmarked_statuses": "Hîn tu peyamên şûnpelkirî tuneye. Gava ku hûn yek şûnpel bikin, ew ê li vir xûya bike.",
   "empty_column.community": "Demnameya herêmî vala ye. Tiştek ji raya giştî re binivsînin da ku rûpel biherike!",
-  "empty_column.conversations": "Dema tu şandiyekê bişîninî an jî bistînî ku tenê ji kesên qalkirî re xuyabar in, ew ê li vir xuya bibe.",
+  "empty_column.direct": "Hêj peyameke te yê rasterast tuneye. Gava ku tu yekî bişeynî an jî bigirî, ew ê li vir xûya bike.",
   "empty_column.domain_blocks": "Hê jî navperên hatine asteng kirin tune ne.",
   "empty_column.explore_statuses": "Tiştek niha di rojevê de tune. Paşê vegere!",
   "empty_column.favourited_statuses": "Hîn tu peyamên te yên bijare tunene. Gava ku te yekî bijart, ew ê li vir xûya bike.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Şandiyê bilind bike",
   "keyboard_shortcuts.column": "Stûna balkişandinê",
   "keyboard_shortcuts.compose": "Bal bikşîne cîhê nivîsê/textarea",
-  "keyboard_shortcuts.conversations": "ji bo vekirina stûna axaftinan",
   "keyboard_shortcuts.description": "Danasîn",
+  "keyboard_shortcuts.direct": "ji bo vekirina stûnê peyamên rasterast",
   "keyboard_shortcuts.down": "Di rêzokê de dakêşe jêr",
   "keyboard_shortcuts.enter": "Şandiyê veke",
   "keyboard_shortcuts.favourite": "Şandiya bijarte",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Şûnpel",
   "navigation_bar.community_timeline": "Demnameya herêmî",
   "navigation_bar.compose": "Şandiyeke nû binivsîne",
+  "navigation_bar.direct": "Peyamên rasterast",
   "navigation_bar.discover": "Vekolê",
   "navigation_bar.domain_blocks": "Navparên astengkirî",
   "navigation_bar.edit_profile": "Profîl serrast bike",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Rapirsî yê rake",
   "privacy.change": "Nepênîtiya şandiyan biguherîne",
   "privacy.direct.long": "Tenê ji bo bikarhênerên qalkirî tê dîtin",
-  "privacy.direct.short": "Tenê mirovên ku min qalkirî",
+  "privacy.direct.short": "Tenê kesên qalkirî",
   "privacy.private.long": "Tenê bo şopîneran xuyabar e",
   "privacy.private.short": "Tenê şopîneran",
   "privacy.public.long": "Ji bo hemûyan xuyabar e",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 7aa686a7a..60dca71f5 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -70,7 +70,7 @@
   "column.blocks": "Devnydhyoryon lettys",
   "column.bookmarks": "Folennosow",
   "column.community": "Amserlin leel",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Peuri profilys",
   "column.domain_blocks": "Gorfarthow lettys",
   "column.favourites": "Re drudh",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ny wrussowgh lettya devnydhyoryon vyth hwath.",
   "empty_column.bookmarked_statuses": "Nyns eus dhywgh postow gans folennos hwath. Pan wrewgh gorra onan, ev a wra omdhiskwedhes omma.",
   "empty_column.community": "An amserlin leel yw gwag. Skrifewgh neppytn yn poblek dh'y lonchya!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Nyns eus gorfarthow lettys hwath.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nyns eus dhywgh postow drudh hwath. Pan wrewgh merkya onan vel drudh, ev a wra omdhiskwedhes omma.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Kenertha post",
   "keyboard_shortcuts.column": "Fogella koloven",
   "keyboard_shortcuts.compose": "Fogella tekstva gomposya",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Deskrifans",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Movya war-nans y'n rol",
   "keyboard_shortcuts.enter": "Ygeri post",
   "keyboard_shortcuts.favourite": "Merkya post vel drudh",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Folennosow",
   "navigation_bar.community_timeline": "Amserlin leel",
   "navigation_bar.compose": "Komposya post nowydh",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Diskudha",
   "navigation_bar.domain_blocks": "Gorfarthow lettys",
   "navigation_bar.edit_profile": "Golegi profil",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index ade4933f9..4d44ffac6 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Mėgstamiausi",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 3bfb7532a..24311b859 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -70,7 +70,7 @@
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
   "column.community": "Vietējā ziņu līnija",
-  "column.conversations": "Sarunas",
+  "column.direct": "Privātie ziņojumi",
   "column.directory": "Pārlūkot profilus",
   "column.domain_blocks": "Bloķētie domēni",
   "column.favourites": "Izlase",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Patreiz tu neesi nevienu bloķējis.",
   "empty_column.bookmarked_statuses": "Patreiz tev nav neviena grāmatzīmēm pievienota ieraksta. Kad tādu pievienosi, tas parādīsies šeit.",
   "empty_column.community": "Vietējā ziņu lenta ir tukša. Uzraksti kaut ko publiski, lai viss notiktu!",
-  "empty_column.conversations": "Kad nosūtīsi vai saņemsi ziņu, kas ir redzama tikai tajā minētajām personām, tā tiks parādīta šeit.",
+  "empty_column.direct": "Patrez tev nav privātu ziņu. Tiklīdz tādu nosūtīsi vai saņemsi, tās parādīsies šeit.",
   "empty_column.domain_blocks": "Vēl nav neviena bloķēta domēna.",
   "empty_column.explore_statuses": "Pašlaik nekas nav tendēts. Pārbaudiet vēlāk!",
   "empty_column.favourited_statuses": "Patreiz tev nav neviena izceltā ieraksta. Kad kādu izcelsi, tas parādīsies šeit.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Palielināt ziņu",
   "keyboard_shortcuts.column": "Fokusēt kolonnu",
   "keyboard_shortcuts.compose": "Fokusēt veidojamā teksta lauku",
-  "keyboard_shortcuts.conversations": "lai atvērtu sarunu kolonnu",
   "keyboard_shortcuts.description": "Apraksts",
+  "keyboard_shortcuts.direct": "lai atvērtu privāto ziņojumu kolonnu",
   "keyboard_shortcuts.down": "Pārvietot sarakstā uz leju",
   "keyboard_shortcuts.enter": "Atvērt ziņu",
   "keyboard_shortcuts.favourite": "Pievienot izlasei",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Grāmatzīmes",
   "navigation_bar.community_timeline": "Vietējā ziņu lenta",
   "navigation_bar.compose": "Veidot jaunu ziņu",
+  "navigation_bar.direct": "Privātie ziņojumi",
   "navigation_bar.discover": "Atklāt",
   "navigation_bar.domain_blocks": "Bloķētie domēni",
   "navigation_bar.edit_profile": "Rediģēt profilu",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Noņemt aptauju",
   "privacy.change": "Mainīt ziņas privātumu",
   "privacy.direct.long": "Redzams tikai pieminētajiem lietotājiem",
-  "privacy.direct.short": "Tikai cilvēki, kurus es pieminu",
+  "privacy.direct.short": "Tikai minētie cilvēki",
   "privacy.private.long": "Redzams tikai sekotājiem",
   "privacy.private.short": "Tikai sekotājiem",
   "privacy.public.long": "Redzama visiem",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 72bb52adf..aa6e8a969 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
   "column.community": "Локална временска зона",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Види профили",
   "column.domain_blocks": "Скриени домеини",
   "column.favourites": "Омилени",
@@ -166,7 +166,7 @@
   "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.community": "Локалниот времеплов е празен. Објавете нешто јавно за да може да почне шоуто!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Немате сокриени домеини уште.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Уреди профил",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index a1db3f5a5..908db9833 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -70,7 +70,7 @@
   "column.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "column.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "column.community": "പ്രാദേശികമായ സമയരേഖ",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "പ്രൊഫൈലുകൾ മറിച്ചുനോക്കുക",
   "column.domain_blocks": "മറയ്ക്കപ്പെട്ട മേഖലകൾ",
   "column.favourites": "പ്രിയപ്പെട്ടവ",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "നിങ്ങൾ ഇതുവരെ ഒരു ഉപയോക്താക്കളെയും തടഞ്ഞിട്ടില്ല.",
   "empty_column.bookmarked_statuses": "നിങ്ങൾക് ഇതുവരെ അടയാളപ്പെടുത്തിയ ടൂട്ടുകൾ ഇല്ല. അടയാളപ്പെടുത്തിയാൽ അത് ഇവിടെ വരും.",
   "empty_column.community": "പ്രാദേശികമായ സമയരേഖ ശൂന്യമാണ്. എന്തെങ്കിലും പരസ്യമായി എഴുതി തുടക്കം കുറിക്കു!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "മറയ്ക്കപ്പെട്ടിരിക്കുന്ന മേഖലകൾ ഇതുവരെ ഇല്ല.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "നിങ്ങൾക്ക് ഇത് വരെ ഒരു പ്രിയപ്പെട്ട ടൂട്ടും ഇല്ല. നിങ്ങൾ അങ്ങനെ ഒന്ന് പ്രിയപ്പെടുന്ന പക്ഷം അതിവിടെ കാണപ്പെടുന്നതാണ്.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "ബൂസ്റ്റ് ചെയ്യുക",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "വിവരണം",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "ടൂട്ട് എടുക്കാൻ",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 9c3500443..c34c836ce 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -70,7 +70,7 @@
   "column.blocks": "ब्लॉक केलेले खातेधारक",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "गुप्त डोमेन्स",
   "column.favourites": "आवडते",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 0c6996463..405b3eeb6 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -70,7 +70,7 @@
   "column.blocks": "Pengguna yang disekat",
   "column.bookmarks": "Tanda buku",
   "column.community": "Garis masa tempatan",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Layari profil",
   "column.domain_blocks": "Domain disekat",
   "column.favourites": "Kegemaran",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Anda belum menyekat sesiapa.",
   "empty_column.bookmarked_statuses": "Anda belum ada hantaran yang ditanda buku. Apabila anda menanda buku sesuatu, ia akan muncul di sini.",
   "empty_column.community": "Garis masa tempatan kosong. Tulislah secara awam untuk memulakan sesuatu!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Belum ada domain yang disekat.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Anda belum ada hantaran yang digemari. Apabila anda menggemari sesuatu, ia akan muncul di sini.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "Tumpu pada lajur",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Keterangan",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "Buka hantaran",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Tanda buku",
   "navigation_bar.community_timeline": "Garis masa tempatan",
   "navigation_bar.compose": "Karang hantaran baharu",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Teroka",
   "navigation_bar.domain_blocks": "Domain disekat",
   "navigation_bar.edit_profile": "Sunting profil",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 5e40dacb8..ad27cf200 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -70,7 +70,7 @@
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bladwijzers",
   "column.community": "Lokale tijdlijn",
-  "column.conversations": "Gesprekken",
+  "column.direct": "Direct messages",
   "column.directory": "Gebruikersgids",
   "column.domain_blocks": "Geblokkeerde domeinen",
   "column.favourites": "Favorieten",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
   "empty_column.bookmarked_statuses": "Jij hebt nog geen berichten aan je bladwijzers toegevoegd. Wanneer je er een aan jouw bladwijzers toevoegt, valt deze hier te zien.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Er zijn nog geen geblokkeerde domeinen.",
   "empty_column.explore_statuses": "Momenteel zijn er geen trends. Kom later terug!",
   "empty_column.favourited_statuses": "Jij hebt nog geen favoriete berichten. Wanneer je er een aan jouw favorieten toevoegt, valt deze hier te zien.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Bericht boosten",
   "keyboard_shortcuts.column": "Op één van de kolommen focussen",
   "keyboard_shortcuts.compose": "Tekstveld om een bericht te schrijven focussen",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Omschrijving",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Naar beneden in de lijst bewegen",
   "keyboard_shortcuts.enter": "Volledig bericht tonen",
   "keyboard_shortcuts.favourite": "Aan jouw favorieten toevoegen",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bladwijzers",
   "navigation_bar.community_timeline": "Lokale tijdlijn",
   "navigation_bar.compose": "Nieuw bericht schrijven",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Ontdekken",
   "navigation_bar.domain_blocks": "Geblokkeerde domeinen",
   "navigation_bar.edit_profile": "Profiel bewerken",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Poll verwijderen",
   "privacy.change": "Zichtbaarheid van bericht aanpassen",
   "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
-  "privacy.direct.short": "Alleen gebruikers die ik noem",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Alleen aan volgers tonen",
   "privacy.private.short": "Alleen volgers",
   "privacy.public.long": "Voor iedereen zichtbaar",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 521403c51..76095b2e8 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokkerte brukarar",
   "column.bookmarks": "Bokmerke",
   "column.community": "Lokal tidsline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Sjå gjennom profilar",
   "column.domain_blocks": "Gøymde domene",
   "column.favourites": "Favorittar",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ikkje blokkert nokon brukarar enno.",
   "empty_column.bookmarked_statuses": "Du har ikkje nokon bokmerkte tut enno. Når du bokmerkjer eit, dukkar det opp her.",
   "empty_column.community": "Den lokale samtiden er tom. Skriv noko offentleg å få ballen til å rulle!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Det er ingen gøymde domene ennå.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Du har ingen favoritt-tut ennå. Når du merkjer ein som favoritt, så dukkar det opp her.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "for å framheva",
   "keyboard_shortcuts.column": "for å fokusera på ein status i ei av kolonnane",
   "keyboard_shortcuts.compose": "for å fokusera tekstfeltet for skriving",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Skildring",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "for å flytta seg opp og ned i lista",
   "keyboard_shortcuts.enter": "for å opna status",
   "keyboard_shortcuts.favourite": "for å merkja som favoritt",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bokmerke",
   "navigation_bar.community_timeline": "Lokal tidsline",
   "navigation_bar.compose": "Lag eit nytt tut",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domene",
   "navigation_bar.edit_profile": "Rediger profil",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 707564404..3279fa547 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokkerte brukere",
   "column.bookmarks": "Bokmerker",
   "column.community": "Lokal tidslinje",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Bla gjennom profiler",
   "column.domain_blocks": "Skjulte domener",
   "column.favourites": "Likt",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ikke blokkert noen brukere enda.",
   "empty_column.bookmarked_statuses": "Du har ikke bokmerket noen tuter enda. Når du bokmerker en, vil den dukke opp her.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Det er ingen skjulte domener enda.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Du har ikke likt noen tuter enda. Når du liker en, vil den dukke opp her.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "å fremheve",
   "keyboard_shortcuts.column": "å fokusere en status i en av kolonnene",
   "keyboard_shortcuts.compose": "å fokusere komponeringsfeltet",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Beskrivelse",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "for å flytte ned i listen",
   "keyboard_shortcuts.enter": "å åpne status",
   "keyboard_shortcuts.favourite": "for å favorittmarkere",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bokmerker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Skriv en ny tut",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Oppdag",
   "navigation_bar.domain_blocks": "Skjulte domener",
   "navigation_bar.edit_profile": "Rediger profil",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index e13c68c3f..e74d5315a 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -70,7 +70,7 @@
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Marcadors",
   "column.community": "Flux public local",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Percórrer los perfils",
   "column.domain_blocks": "Domenis resconduts",
   "column.favourites": "Favorits",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Avètz pas blocat degun pel moment.",
   "empty_column.bookmarked_statuses": "Avètz pas cap de tuts marcats pel moment. Quand ne marquetz un, serà mostrat aquí.",
   "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Avètz pas encara cap de tut favorit. Quand n’auretz un, apareisserà aquí.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "partejar",
   "keyboard_shortcuts.column": "centrar un estatut a una colomna",
   "keyboard_shortcuts.compose": "anar al camp tèxte",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "descripcion",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "far davalar dins la lista",
   "keyboard_shortcuts.enter": "dobrir los estatuts",
   "keyboard_shortcuts.favourite": "apondre als favorits",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcadors",
   "navigation_bar.community_timeline": "Flux public local",
   "navigation_bar.compose": "Escriure un nòu tut",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
   "navigation_bar.edit_profile": "Modificar lo perfil",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 09d473ef4..c4baf0533 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index a0f3f5dd7..90e5dfbb4 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -70,7 +70,7 @@
   "column.blocks": "Zablokowani użytkownicy",
   "column.bookmarks": "Zakładki",
   "column.community": "Lokalna oś czasu",
-  "column.conversations": "Konwersacje",
+  "column.direct": "Wiadomości bezpośrednie",
   "column.directory": "Przeglądaj profile",
   "column.domain_blocks": "Ukryte domeny",
   "column.favourites": "Ulubione",
@@ -170,7 +170,7 @@
   "empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
   "empty_column.bookmarked_statuses": "Nie dodałeś(-aś) żadnego wpisu do zakładek. Kiedy to zrobisz, pojawi się on tutaj.",
   "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
-  "empty_column.conversations": "Gdy wyślesz lub otrzymasz wpis, który jest widoczny tylko dla osób w nim wymienionych, pojawi się on tutaj.",
+  "empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
   "empty_column.domain_blocks": "Brak ukrytych domen.",
   "empty_column.explore_statuses": "Nic nie jest w tej chwili popularne. Sprawdź później!",
   "empty_column.favourited_statuses": "Nie dodałeś(-aś) żadnego wpisu do ulubionych. Kiedy to zrobisz, pojawi się on tutaj.",
@@ -234,8 +234,8 @@
   "keyboard_shortcuts.boost": "aby podbić wpis",
   "keyboard_shortcuts.column": "aby przejść do wpisu z jednej z kolumn",
   "keyboard_shortcuts.compose": "aby przejść do pola tworzenia wpisu",
-  "keyboard_shortcuts.conversations": "aby otworzyć kolumnę konwersacji",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "aby otworzyć kolumnę wiadomości bezpośrednich",
   "keyboard_shortcuts.down": "aby przejść na dół listy",
   "keyboard_shortcuts.enter": "aby otworzyć wpis",
   "keyboard_shortcuts.favourite": "aby dodać do ulubionych",
@@ -294,6 +294,7 @@
   "navigation_bar.bookmarks": "Zakładki",
   "navigation_bar.community_timeline": "Lokalna oś czasu",
   "navigation_bar.compose": "Utwórz nowy wpis",
+  "navigation_bar.direct": "Wiadomości bezpośrednie",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
@@ -371,7 +372,7 @@
   "poll_button.remove_poll": "Usuń głosowanie",
   "privacy.change": "Dostosuj widoczność wpisów",
   "privacy.direct.long": "Widoczny tylko dla wspomnianych",
-  "privacy.direct.short": "Tylko wspominane osoby",
+  "privacy.direct.short": "Tylko wspomniane osoby",
   "privacy.private.long": "Widoczny tylko dla osób, które Cię śledzą",
   "privacy.private.short": "Tylko śledzący",
   "privacy.public.long": "Widoczne dla każdego",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 67725b3ee..ba1bc592e 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -70,7 +70,7 @@
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Salvos",
   "column.community": "Linha local",
-  "column.conversations": "Conversations",
+  "column.direct": "Mensagens diretas",
   "column.directory": "Explorar perfis",
   "column.domain_blocks": "Domínios bloqueados",
   "column.favourites": "Favoritos",
@@ -93,7 +93,7 @@
   "community.column_settings.media_only": "Somente mídia",
   "community.column_settings.remote_only": "Somente global",
   "compose_form.direct_message_warning_learn_more": "Saiba mais",
-  "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": "Postagens no Mastodon não são criptografados de ponta a ponta. Não compartilhe nenhuma informação perigosa sobre o Mastodon.",
   "compose_form.hashtag_warning": "Este toot não aparecerá em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "Seu perfil não está {locked}. Qualquer um pode te seguir e ver os toots privados.",
   "compose_form.lock_disclaimer.lock": "trancado",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Nada aqui.",
   "empty_column.bookmarked_statuses": "Nada aqui. Quando você salvar um toot, ele aparecerá aqui.",
   "empty_column.community": "A linha local está vazia. Publique algo para começar!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Você ainda não tem mensagens diretas. Quando você enviar ou receber uma, será exibida aqui.",
   "empty_column.domain_blocks": "Nada aqui.",
   "empty_column.explore_statuses": "Nada está em alta no momento. Volte mais tarde!",
   "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "dar boost",
   "keyboard_shortcuts.column": "focar na coluna",
   "keyboard_shortcuts.compose": "focar no compositor",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descrição",
+  "keyboard_shortcuts.direct": "para abrir a coluna de mensagens diretas",
   "keyboard_shortcuts.down": "mover para baixo",
   "keyboard_shortcuts.enter": "abrir toot",
   "keyboard_shortcuts.favourite": "favoritar toot",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Salvos",
   "navigation_bar.community_timeline": "Linha do tempo local",
   "navigation_bar.compose": "Compor novo toot",
+  "navigation_bar.direct": "Mensagens diretas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios bloqueados",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -337,7 +338,7 @@
   "notifications.column_settings.status": "Novos toots:",
   "notifications.column_settings.unread_notifications.category": "Notificações não lidas",
   "notifications.column_settings.unread_notifications.highlight": "Destacar notificações não lidas",
-  "notifications.column_settings.update": "Edits:",
+  "notifications.column_settings.update": "Editar:",
   "notifications.filter.all": "Tudo",
   "notifications.filter.boosts": "Boosts",
   "notifications.filter.favourites": "Favoritos",
@@ -366,22 +367,22 @@
   "poll_button.remove_poll": "Remover enquete",
   "privacy.change": "Alterar privacidade do toot",
   "privacy.direct.long": "Postar só para usuários mencionados",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Apenas pessoas mencionadas",
   "privacy.private.long": "Postar só para seguidores",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Apenas seguidores",
+  "privacy.public.long": "Visível para todos",
   "privacy.public.short": "Público",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Visível para todos, mas desativou os recursos de descoberta",
   "privacy.unlisted.short": "Não-listado",
   "refresh": "Atualizar",
   "regeneration_indicator.label": "Carregando…",
   "regeneration_indicator.sublabel": "Sua página inicial está sendo preparada!",
   "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.days": "{number, plural, one {# dia} other {# dias}} atrás",
+  "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} atrás",
   "relative_time.full.just_now": "agora mesmo",
-  "relative_time.full.minutes": "{number, plural, one {# minute} other {# minutes}} ago",
-  "relative_time.full.seconds": "{number, plural, one {# second} other {# seconds}} ago",
+  "relative_time.full.minutes": "{number, plural, one {# minuto} other {# minutos}} atrás",
+  "relative_time.full.seconds": "{number, plural, one {# segundo} other {# segundos}} atrás",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "agora",
   "relative_time.minutes": "{number}m",
@@ -451,7 +452,7 @@
   "status.direct": "Enviar toot direto para @{name}",
   "status.edit": "Editar",
   "status.edited": "Editado em {date}",
-  "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
+  "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Incorporar",
   "status.favourite": "Favoritar",
   "status.filtered": "Filtrado",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index f36683346..1149fc658 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -70,7 +70,7 @@
   "column.blocks": "Utilizadores Bloqueados",
   "column.bookmarks": "Itens salvos",
   "column.community": "Cronologia local",
-  "column.conversations": "Conversações",
+  "column.direct": "Mensagens diretas",
   "column.directory": "Procurar perfis",
   "column.domain_blocks": "Domínios escondidos",
   "column.favourites": "Favoritos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
   "empty_column.bookmarked_statuses": "Ainda não adicionou nenhum toot aos Itens salvos. Quando adicionar, eles serão exibidos aqui.",
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
-  "empty_column.conversations": "Quando enviar ou receber uma publicação que seja visível apenas para as pessoas nela mencionadas, ela aparecerá aqui.",
+  "empty_column.direct": "Ainda não tem qualquer mensagem direta. Quando enviar ou receber alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
   "empty_column.explore_statuses": "Nada em destaque por agora. Volte mais tarde!",
   "empty_column.favourited_statuses": "Ainda não tens quaisquer toots favoritos. Quando tiveres algum, ele irá aparecer aqui.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "para partilhar",
   "keyboard_shortcuts.column": "para focar uma publicação numa das colunas",
   "keyboard_shortcuts.compose": "para focar na área de publicação",
-  "keyboard_shortcuts.conversations": "para abrir a coluna de conversações",
   "keyboard_shortcuts.description": "Descrição",
+  "keyboard_shortcuts.direct": "para abrir a coluna das mensagens diretas",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
   "keyboard_shortcuts.enter": "para expandir uma publicação",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Itens salvos",
   "navigation_bar.community_timeline": "Cronologia local",
   "navigation_bar.compose": "Escrever novo toot",
+  "navigation_bar.direct": "Mensagens diretas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
   "navigation_bar.edit_profile": "Editar perfil",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Remover votação",
   "privacy.change": "Ajustar a privacidade da publicação",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
-  "privacy.direct.short": "Apenas pessoas que menciono",
+  "privacy.direct.short": "Apenas pessoas mencionadas",
   "privacy.private.long": "Apenas para os seguidores",
   "privacy.private.short": "Apenas seguidores",
   "privacy.public.long": "Visível para todos",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 5a0932f5b..f4f20df2d 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -70,7 +70,7 @@
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
   "column.community": "Cronologie locală",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Explorează profiluri",
   "column.domain_blocks": "Domenii blocate",
   "column.favourites": "Favorite",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Momentan nu ai blocat niciun utilizator.",
   "empty_column.bookmarked_statuses": "Momentan nu ai nicio postare marcată. Când vei marca una, va apărea aici.",
   "empty_column.community": "Nu există nimic în cronologia locală. Postează ceva public pentru a sparge gheața!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Momentan nu există domenii blocate.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Momentan nu ai nicio postare favorită. Când vei adăuga una, va apărea aici.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Distribuie postarea",
   "keyboard_shortcuts.column": "Focalizează pe coloană",
   "keyboard_shortcuts.compose": "Focalizează pe zona de text",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descriere",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Coboară în listă",
   "keyboard_shortcuts.enter": "Deschide postarea",
   "keyboard_shortcuts.favourite": "Adaugă postarea la favorite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Marcaje",
   "navigation_bar.community_timeline": "Cronologie locală",
   "navigation_bar.compose": "Compune o nouă postare",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Descoperă",
   "navigation_bar.domain_blocks": "Domenii blocate",
   "navigation_bar.edit_profile": "Modifică profilul",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index dfc37e8d1..4846509be 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -70,7 +70,7 @@
   "column.blocks": "Заблокированные пользователи",
   "column.bookmarks": "Закладки",
   "column.community": "Локальная лента",
-  "column.conversations": "Диалоги",
+  "column.direct": "Личные сообщения",
   "column.directory": "Просмотр профилей",
   "column.domain_blocks": "Заблокированные домены",
   "column.favourites": "Избранное",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Вы ещё никого не заблокировали.",
   "empty_column.bookmarked_statuses": "У вас пока нет постов в закладках. Как добавите один, он отобразится здесь.",
   "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
-  "empty_column.conversations": "Здесь отображаются адресованные посты. Как только вы отправите или получите один, он отобразится здесь.",
+  "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
   "empty_column.domain_blocks": "Скрытых доменов пока нет.",
   "empty_column.explore_statuses": "Нет актуального. Проверьте позже!",
   "empty_column.favourited_statuses": "Вы не добавили ни один пост в «Избранное». Как только вы это сделаете, он появится здесь.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "продвинуть пост",
   "keyboard_shortcuts.column": "фокус на одном из столбцов",
   "keyboard_shortcuts.compose": "фокус на поле ввода",
-  "keyboard_shortcuts.conversations": "открыть колонку диалогов",
   "keyboard_shortcuts.description": "Описание",
+  "keyboard_shortcuts.direct": "чтобы открыть колонку с личными сообщениями",
   "keyboard_shortcuts.down": "вниз по списку",
   "keyboard_shortcuts.enter": "открыть пост",
   "keyboard_shortcuts.favourite": "в избранное",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальная лента",
   "navigation_bar.compose": "Создать новый пост",
+  "navigation_bar.direct": "Личные сообщения",
   "navigation_bar.discover": "Изучайте",
   "navigation_bar.domain_blocks": "Скрытые домены",
   "navigation_bar.edit_profile": "Изменить профиль",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Удалить опрос",
   "privacy.change": "Изменить видимость поста",
   "privacy.direct.long": "Показать только упомянутым",
-  "privacy.direct.short": "Для упомянутых",
+  "privacy.direct.short": "Только упомянутые",
   "privacy.private.long": "Показать только подписчикам",
   "privacy.private.short": "Для подписчиков",
   "privacy.public.long": "Виден всем",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index ed5dc9ebd..13d3244d7 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -70,7 +70,7 @@
   "column.blocks": "निषिद्धभोक्तारः",
   "column.bookmarks": "पुटचिह्नानि",
   "column.community": "स्थानीयसमयतालिका",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "व्यक्तित्वानि दृश्यन्ताम्",
   "column.domain_blocks": "निषिद्धप्रदेशाः",
   "column.favourites": "प्रियाः",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "नैकोऽप्युपभोक्ता निषिद्धो वर्तते",
   "empty_column.bookmarked_statuses": "नैकमपि पुटचिह्नयुक्तदौत्यानि सन्ति । यदा भविष्यति तदत्र दृश्यते ।",
   "empty_column.community": "स्थानीयसमयतालिका रिक्ता । सार्वजनिकत्वेनाऽत्र किमपि लिख्यताम् ।",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "न निषिद्धप्रदेशाः सन्ति ।",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "न प्रियदौत्यानि सन्ति । यदा प्रीतिरित्यङ्क्यतेऽत्र दृश्यते ।",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index fe6dd22cf..48a471352 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -70,7 +70,7 @@
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
   "column.community": "Lìnia de tempus locale",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Nàviga in is profilos",
   "column.domain_blocks": "Domìnios blocados",
   "column.favourites": "Preferidos",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "No as blocadu ancora nemos.",
   "empty_column.bookmarked_statuses": "Non tenes ancora peruna publicatzione in is marcadores. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
   "empty_column.community": "Sa lìnia de tempus locale est bòida. Iscrie inoghe pro cumintzare sa festa!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Non tenes ancora perunu domìniu blocadu.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Non tenes ancora peruna publicatzione in is preferidos. Cando nd'as a agiùnghere una, at a èssere ammustrada inoghe.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "pro cumpartzire",
   "keyboard_shortcuts.column": "pro atzentrare una publicatzione in una de is colunnas",
   "keyboard_shortcuts.compose": "pro atzentrare in s'àrea de cumpositzione de testu",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Descritzione",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "pro mòere in bàsciu in sa lista",
   "keyboard_shortcuts.enter": "pro abèrrere una publicatzione",
   "keyboard_shortcuts.favourite": "pro marcare comente a preferidu",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "Lìnia de tempus locale",
   "navigation_bar.compose": "Cumpone una publicatzione noa",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Iscoberi",
   "navigation_bar.domain_blocks": "Domìnios blocados",
   "navigation_bar.edit_profile": "Modìfica profilu",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 1190bbe00..e9e383968 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -70,7 +70,7 @@
   "column.blocks": "අවහිර කළ පරිශීලකයින්",
   "column.bookmarks": "පොත් යොමු",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "පැතිකඩයන් පිරික්සන්න",
   "column.domain_blocks": "අවහිර කළ වසම්",
   "column.favourites": "ප්‍රියතමයන්",
@@ -166,7 +166,7 @@
   "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.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "අවහිර කළ වසම් නොමැත.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "සවිස්තරය",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "පොත් යොමු",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "පැතිකඩ සංස්කරණය",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index aee720837..809145b40 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokovaní užívatelia",
   "column.bookmarks": "Záložky",
   "column.community": "Miestna časová os",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Prehľadávaj profily",
   "column.domain_blocks": "Skryté domény",
   "column.favourites": "Obľúbené",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
   "empty_column.bookmarked_statuses": "Ešte nemáš žiadné záložky. Keď si pridáš príspevok k záložkám, zobrazí sa tu.",
   "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Nemáš obľúbené ešte žiadne príspevky. Keď si nejaký obľúbiš, bude zobrazený práve tu.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "Vyzdvihni príspevok",
   "keyboard_shortcuts.column": "zameraj sa na príspevok v jednom zo stĺpcov",
   "keyboard_shortcuts.compose": "zameraj sa na písaciu plochu",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Popis",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "posunúť sa dole v zozname",
   "keyboard_shortcuts.enter": "Otvor príspevok",
   "keyboard_shortcuts.favourite": "pridaj do obľúbených",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Miestna časová os",
   "navigation_bar.compose": "Napíš nový príspevok",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "Skryté domény",
   "navigation_bar.edit_profile": "Uprav profil",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 23061d152..11539f209 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -18,11 +18,11 @@
   "account.followers": "Sledilci",
   "account.followers.empty": "Nihče ne sledi temu uporabniku.",
   "account.followers_counter": "{count, plural, one {ima {count} sledilca} two {ima {count} sledilca} few {ima {count} sledilcev} other {ima {count} sledilce}}",
-  "account.following": "Following",
+  "account.following": "Sledim",
   "account.following_counter": "{count, plural, one {sledi {count} osebi} two {sledi {count} osebama} few {sledi {count} osebam} other {sledi {count} osebam}}",
   "account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
   "account.follows_you": "Vam sledi",
-  "account.hide_reblogs": "Skrij spodbude od @{name}",
+  "account.hide_reblogs": "Skrij izpostavitve od @{name}",
   "account.joined": "Pridružen/a {date}",
   "account.link_verified_on": "Lastništvo te povezave je bilo preverjeno {date}",
   "account.locked_info": "Stanje zasebnosti računa je nastavljeno na zaklenjeno. Lastnik ročno pregleda, kdo ga lahko spremlja.",
@@ -32,12 +32,12 @@
   "account.mute": "Utišaj @{name}",
   "account.mute_notifications": "Utišaj obvestila od @{name}",
   "account.muted": "Utišan",
-  "account.posts": "Tuti",
-  "account.posts_with_replies": "Tuti in odgovori",
+  "account.posts": "Objave",
+  "account.posts_with_replies": "Objave in odgovori",
   "account.report": "Prijavi @{name}",
   "account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
   "account.share": "Delite profil osebe @{name}",
-  "account.show_reblogs": "Pokaži spodbude osebe @{name}",
+  "account.show_reblogs": "Pokaži izpostavitve osebe @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} Toot} other {{counter} Toots}}",
   "account.unblock": "Odblokiraj @{name}",
   "account.unblock_domain": "Razkrij {domain}",
@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani uporabniki",
   "column.bookmarks": "Zaznamki",
   "column.community": "Lokalna časovnica",
-  "column.conversations": "Conversations",
+  "column.direct": "Neposredna sporočila",
   "column.directory": "Prebrskaj profile",
   "column.domain_blocks": "Skrite domene",
   "column.favourites": "Priljubljene",
@@ -79,7 +79,7 @@
   "column.lists": "Seznami",
   "column.mutes": "Utišani uporabniki",
   "column.notifications": "Obvestila",
-  "column.pins": "Pripeti tuti",
+  "column.pins": "Pripete objave",
   "column.public": "Združena časovnica",
   "column_back_button.label": "Nazaj",
   "column_header.hide_settings": "Skrij nastavitve",
@@ -92,9 +92,9 @@
   "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo mediji",
   "community.column_settings.remote_only": "Samo oddaljeno",
-  "compose_form.direct_message_warning_learn_more": "Nauči se več",
-  "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
-  "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim ključnikom, ker ni javen. Samo javne tute lahko iščete s ključniki.",
+  "compose_form.direct_message_warning_learn_more": "Izvej več",
+  "compose_form.encryption_warning": "Objave na Mastodonu niso šifrirane od kraja do kraja. Prek Mastodona ne delite nobenih občutljivih informacij.",
+  "compose_form.hashtag_warning": "Ta objava ne bo navedena pod nobenim ključnikom, ker ni javen. Samo javne objave lahko iščete s ključniki.",
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
   "compose_form.placeholder": "O čem razmišljaš?",
@@ -104,7 +104,7 @@
   "compose_form.poll.remove_option": "Odstrani to izbiro",
   "compose_form.poll.switch_to_multiple": "Spremenite anketo, da omogočite več izbir",
   "compose_form.poll.switch_to_single": "Spremenite anketo, da omogočite eno izbiro",
-  "compose_form.publish": "Tutni",
+  "compose_form.publish": "Objavi",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Shrani spremembe",
   "compose_form.sensitive.hide": "Označi medij kot občutljiv",
@@ -118,7 +118,7 @@
   "confirmations.block.confirm": "Blokiraj",
   "confirmations.block.message": "Ali ste prepričani, da želite blokirati {name}?",
   "confirmations.delete.confirm": "Izbriši",
-  "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to stanje?",
+  "confirmations.delete.message": "Ali ste prepričani, da želite izbrisati to objavo?",
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
   "confirmations.discard_edit_media.confirm": "Opusti",
@@ -131,7 +131,7 @@
   "confirmations.mute.explanation": "S tem boste skrili objave pred njimi in objave, ki jih omenjajo, še vedno pa bodo lahko videli vaše objave in vam sledili.",
   "confirmations.mute.message": "Ali ste prepričani, da želite utišati {name}?",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
-  "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in spodbude bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
+  "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati ta status in ga preoblikovati? Vzljubi in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.reply.confirm": "Odgovori",
   "confirmations.reply.message": "Odgovarjanje bo prepisalo sporočilo, ki ga trenutno sestavljate. Ali ste prepričani, da želite nadaljevati?",
   "confirmations.unfollow.confirm": "Prenehaj slediti",
@@ -161,16 +161,16 @@
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Potovanja in Kraji",
   "empty_column.account_suspended": "Račun je suspendiran",
-  "empty_column.account_timeline": "Tukaj ni tutov!",
+  "empty_column.account_timeline": "Tukaj ni objav!",
   "empty_column.account_unavailable": "Profil ni na voljo",
   "empty_column.blocks": "Niste še blokirali nobenega uporabnika.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
   "empty_column.domain_blocks": "Še vedno ni skritih domen.",
   "empty_column.explore_statuses": "Trenutno ni nič v trendu. Preverite znova kasneje!",
-  "empty_column.favourited_statuses": "Nimate priljubljenih tutov. Ko boste vzljubili kakšnega, se bo prikazal tukaj.",
-  "empty_column.favourites": "Nihče še ni vzljubil tega tuta. Ko ga bo nekdo, se bo pojavil tukaj.",
+  "empty_column.favourited_statuses": "Nimate priljubljenih objav. Ko boste vzljubili kakšno, bo prikazana tukaj.",
+  "empty_column.favourites": "Nihče še ni vzljubil te objave. Ko jo bo nekdo, se bo pojavila tukaj.",
   "empty_column.follow_recommendations": "Kaže, da za vas ni mogoče pripraviti nobenih predlogov. Poskusite uporabiti iskanje, da poiščete osebe, ki jih poznate, ali raziščete ključnike, ki so v trendu.",
   "empty_column.follow_requests": "Nimate prošenj za sledenje. Ko boste prejeli kakšno, se bo prikazala tukaj.",
   "empty_column.hashtag": "V tem ključniku še ni nič.",
@@ -218,7 +218,7 @@
   "hashtag.column_settings.tag_mode.none": "Nič od naštetega",
   "hashtag.column_settings.tag_toggle": "Za ta stolpec vključi dodatne oznake",
   "home.column_settings.basic": "Osnovno",
-  "home.column_settings.show_reblogs": "Pokaži spodbude",
+  "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij objave",
   "home.show_announcements": "Prikaži objave",
@@ -227,11 +227,11 @@
   "intervals.full.minutes": "{number, plural, one {# minuta} two {# minuti} few {# minute} other {# minut}}",
   "keyboard_shortcuts.back": "pojdi nazaj",
   "keyboard_shortcuts.blocked": "odpri seznam blokiranih uporabnikov",
-  "keyboard_shortcuts.boost": "spodbudi",
+  "keyboard_shortcuts.boost": "Izpostavi objavo",
   "keyboard_shortcuts.column": "fokusiraj na status v enemu od stolpcev",
   "keyboard_shortcuts.compose": "fokusiraj na območje za sestavljanje besedila",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "odpri stolpec za neposredna sporočila",
   "keyboard_shortcuts.down": "premakni se navzdol po seznamu",
   "keyboard_shortcuts.enter": "odpri status",
   "keyboard_shortcuts.favourite": "vzljubi",
@@ -241,13 +241,13 @@
   "keyboard_shortcuts.home": "odpri domačo časovnico",
   "keyboard_shortcuts.hotkey": "Hitra tipka",
   "keyboard_shortcuts.legend": "pokaži to legendo",
-  "keyboard_shortcuts.local": "odpri lokalno časovnico",
+  "keyboard_shortcuts.local": "Odpri krajevno časovnico",
   "keyboard_shortcuts.mention": "omeni avtorja",
   "keyboard_shortcuts.muted": "odpri seznam utišanih uporabnikov",
   "keyboard_shortcuts.my_profile": "odpri svoj profil",
   "keyboard_shortcuts.notifications": "odpri stolpec z obvestili",
   "keyboard_shortcuts.open_media": "to open media",
-  "keyboard_shortcuts.pinned": "odpri seznam pripetih tutov",
+  "keyboard_shortcuts.pinned": "Odpri seznam pripetih objav",
   "keyboard_shortcuts.profile": "odpri avtorjev profil",
   "keyboard_shortcuts.reply": "odgovori",
   "keyboard_shortcuts.requests": "odpri seznam s prošnjami za sledenje",
@@ -256,7 +256,7 @@
   "keyboard_shortcuts.start": "odpri stolpec \"začni\"",
   "keyboard_shortcuts.toggle_hidden": "prikaži/skrij besedilo za CW",
   "keyboard_shortcuts.toggle_sensitivity": "prikaži/skrij medije",
-  "keyboard_shortcuts.toot": "začni povsem nov tut",
+  "keyboard_shortcuts.toot": "Začni povsem novo objavo",
   "keyboard_shortcuts.unfocus": "odfokusiraj območje za sestavljanje besedila/iskanje",
   "keyboard_shortcuts.up": "premakni se navzgor po seznamu",
   "lightbox.close": "Zapri",
@@ -289,7 +289,8 @@
   "navigation_bar.blocks": "Blokirani uporabniki",
   "navigation_bar.bookmarks": "Zaznamki",
   "navigation_bar.community_timeline": "Lokalna časovnica",
-  "navigation_bar.compose": "Sestavi nov tut",
+  "navigation_bar.compose": "Sestavi novo objavo",
+  "navigation_bar.direct": "Neposredna sporočila",
   "navigation_bar.discover": "Odkrijte",
   "navigation_bar.domain_blocks": "Skrite domene",
   "navigation_bar.edit_profile": "Uredi profil",
@@ -304,7 +305,7 @@
   "navigation_bar.logout": "Odjava",
   "navigation_bar.mutes": "Utišani uporabniki",
   "navigation_bar.personal": "Osebno",
-  "navigation_bar.pins": "Pripeti tuti",
+  "navigation_bar.pins": "Pripete objave",
   "navigation_bar.preferences": "Nastavitve",
   "navigation_bar.public_timeline": "Združena časovnica",
   "navigation_bar.security": "Varnost",
@@ -315,7 +316,7 @@
   "notification.mention": "{name} vas je omenil/a",
   "notification.own_poll": "Vaša anketa se je končala",
   "notification.poll": "Glasovanje, v katerem ste sodelovali, se je končalo",
-  "notification.reblog": "{name} je spodbudil/a vaš status",
+  "notification.reblog": "{name} je izpostavila/a vašo objavo",
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notifications.clear": "Počisti obvestila",
@@ -331,7 +332,7 @@
   "notifications.column_settings.mention": "Omembe:",
   "notifications.column_settings.poll": "Rezultati glasovanja:",
   "notifications.column_settings.push": "Potisna obvestila",
-  "notifications.column_settings.reblog": "Spodbude:",
+  "notifications.column_settings.reblog": "Izpostavitve:",
   "notifications.column_settings.show": "Prikaži v stolpcu",
   "notifications.column_settings.sound": "Predvajaj zvok",
   "notifications.column_settings.status": "New toots:",
@@ -339,7 +340,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Poudari neprebrana obvestila",
   "notifications.column_settings.update": "Urejanja:",
   "notifications.filter.all": "Vse",
-  "notifications.filter.boosts": "Spodbude",
+  "notifications.filter.boosts": "Izpostavitev",
   "notifications.filter.favourites": "Priljubljeni",
   "notifications.filter.follows": "Sledi",
   "notifications.filter.mentions": "Omembe",
@@ -366,12 +367,12 @@
   "poll_button.remove_poll": "Odstrani anketo",
   "privacy.change": "Prilagodi zasebnost statusa",
   "privacy.direct.long": "Objavi samo omenjenim uporabnikom",
-  "privacy.direct.short": "Direct",
+  "privacy.direct.short": "Samo omenjeni",
   "privacy.private.long": "Objavi samo sledilcem",
-  "privacy.private.short": "Followers-only",
-  "privacy.public.long": "Visible for all",
+  "privacy.private.short": "Samo sledilci",
+  "privacy.public.long": "Vidno vsem",
   "privacy.public.short": "Javno",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Vidno za vse, vendar izključeno iz funkcionalnosti odkrivanja",
   "privacy.unlisted.short": "Ni prikazano",
   "refresh": "Osveži",
   "regeneration_indicator.label": "Nalaganje…",
@@ -427,24 +428,24 @@
   "report.unfollow_explanation": "Temu računu sledite. Da ne boste več videli njegovih objav v svojem domačem viru, mu prenehajte slediti.",
   "search.placeholder": "Iskanje",
   "search_popout.search_format": "Napredna oblika iskanja",
-  "search_popout.tips.full_text": "Enostavno besedilo vrne statuse, ki ste jih napisali, vzljubili, spodbudili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
+  "search_popout.tips.full_text": "Enostavno besedilo vrne objave, ki ste jih napisali, vzljubili, izpostavili ali ste bili v njih omenjeni, kot tudi ujemajoča se uporabniška imena, prikazna imena in ključnike.",
   "search_popout.tips.hashtag": "ključnik",
-  "search_popout.tips.status": "stanje",
+  "search_popout.tips.status": "objava",
   "search_popout.tips.text": "Enostavno besedilo vrne ujemajoča se prikazna imena, uporabniška imena in ključnike",
   "search_popout.tips.user": "uporabnik",
   "search_results.accounts": "Ljudje",
   "search_results.all": "Vse",
   "search_results.hashtags": "Ključniki",
   "search_results.nothing_found": "Za ta iskalni niz ni zadetkov",
-  "search_results.statuses": "Tuti",
-  "search_results.statuses_fts_disabled": "Iskanje tutov po njihovi vsebini ni omogočeno na tem strežniku Mastodon.",
+  "search_results.statuses": "Objave",
+  "search_results.statuses_fts_disabled": "Iskanje objav po njihovi vsebini ni omogočeno na tem strežniku Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}",
   "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
   "status.admin_status": "Odpri status v vmesniku za moderiranje",
   "status.block": "Blokiraj @{name}",
   "status.bookmark": "Dodaj med zaznamke",
-  "status.cancel_reblog_private": "Prekini spodbudo",
-  "status.cannot_reblog": "Te objave ni mogoče spodbuditi",
+  "status.cancel_reblog_private": "Prekliči izpostavitev",
+  "status.cannot_reblog": "Te objave ni mogoče izpostaviti",
   "status.copy": "Kopiraj povezavo do statusa",
   "status.delete": "Izbriši",
   "status.detailed_status": "Podroben pogled pogovora",
@@ -465,12 +466,12 @@
   "status.mute_conversation": "Utišaj pogovor",
   "status.open": "Razširi ta status",
   "status.pin": "Pripni na profil",
-  "status.pinned": "Pripeti tut",
+  "status.pinned": "Pripeta objava",
   "status.read_more": "Preberi več",
-  "status.reblog": "Spodbudi",
-  "status.reblog_private": "Spodbudi izvirnemu občinstvu",
-  "status.reblogged_by": "{name} spodbuja",
-  "status.reblogs.empty": "Nihče še ni spodbudil tega tuta. Ko se bo to zgodilo, se bodo pojavili tukaj.",
+  "status.reblog": "Izpostavi",
+  "status.reblog_private": "Izpostavi z izvirno vidljivostjo",
+  "status.reblogged_by": "{name} je izpostavil/a",
+  "status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
   "status.redraft": "Izbriši in preoblikuj",
   "status.remove_bookmark": "Odstrani zaznamek",
   "status.reply": "Odgovori",
@@ -490,7 +491,7 @@
   "suggestions.header": "Morda bi vas zanimalo…",
   "tabs_bar.federated_timeline": "Združeno",
   "tabs_bar.home": "Domov",
-  "tabs_bar.local_timeline": "Lokalno",
+  "tabs_bar.local_timeline": "Krajevno",
   "tabs_bar.notifications": "Obvestila",
   "tabs_bar.search": "Iskanje",
   "time_remaining.days": "{number, plural, one {# dan} other {# dni}} je ostalo",
@@ -514,7 +515,7 @@
   "upload_error.poll": "Prenos datoteke z anketami ni dovoljen.",
   "upload_form.audio_description": "Opiši za osebe z okvaro sluha",
   "upload_form.description": "Opišite za slabovidne",
-  "upload_form.description_missing": "No description added",
+  "upload_form.description_missing": "Noben opis ni bil dodan",
   "upload_form.edit": "Uredi",
   "upload_form.thumbnail": "Spremeni sličico",
   "upload_form.undo": "Izbriši",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 3535d4ea2..f51dbd002 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -70,7 +70,7 @@
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Faqerojtës",
   "column.community": "Rrjedhë kohore vendore",
-  "column.conversations": "Biseda",
+  "column.direct": "Mesazhe të drejtpërdrejtë",
   "column.directory": "Shfletoni profile",
   "column.domain_blocks": "Përkatësi të bllokuara",
   "column.favourites": "Të parapëlqyer",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.",
   "empty_column.bookmarked_statuses": "S’keni faqeruajtur ende ndonjë mesazh. Kur faqeruani një të tillë, ai do të shfaqet këtu.",
   "empty_column.community": "Rrjedha kohore vendore është e zbrazët. Shkruani diçka publikisht që t’i hyhet valles!",
-  "empty_column.conversations": "Pasi të dërgoni ose merrni një postim që është i dukshëm vetëm për personat e përmendur në të, do të shfaqet këtu.",
+  "empty_column.direct": "S’keni ende ndonjë mesazh të drejtpërdrejtë. Kur dërgoni ose merrni një të tillë, ai do të shfaqet këtu.",
   "empty_column.domain_blocks": "Ende s’ka përkatësi të fshehura.",
   "empty_column.explore_statuses": "Asgjë në modë tani. Kontrolloni më vonë!",
   "empty_column.favourited_statuses": "S’keni ende ndonjë mesazh të parapëlqyer. Kur parapëlqeni një të tillë, ai do të shfaqet këtu.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "për përforcim",
   "keyboard_shortcuts.column": "për kalim fokusi mbi një gjendje te një nga shtyllat",
   "keyboard_shortcuts.compose": "për kalim fokusi te fusha e hartimit të mesazheve",
-  "keyboard_shortcuts.conversations": "për të hapur shtyllë bisedash",
   "keyboard_shortcuts.description": "Përshkrim",
+  "keyboard_shortcuts.direct": "për hapje shtylle mesazhesh të drejtpërdrejtë",
   "keyboard_shortcuts.down": "për zbritje poshtë nëpër listë",
   "keyboard_shortcuts.enter": "për hapje gjendjeje",
   "keyboard_shortcuts.favourite": "për t’i vënë shenjë si të parapëlqyer",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Faqerojtës",
   "navigation_bar.community_timeline": "Rrjedhë kohore vendore",
   "navigation_bar.compose": "Hartoni mesazh të ri",
+  "navigation_bar.direct": "Mesazhe të drejtpërdrejtë",
   "navigation_bar.discover": "Zbuloni",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
   "navigation_bar.edit_profile": "Përpunoni profilin",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Hiqe pyetësorin",
   "privacy.change": "Rregulloni privatësi mesazhesh",
   "privacy.direct.long": "I dukshëm vetëm për përdorues të përmendur",
-  "privacy.direct.short": "Vetëm persona që përmend",
+  "privacy.direct.short": "Vetëm për personat e përmendur",
   "privacy.private.long": "I dukshëm vetëm për ndjekës",
   "privacy.private.short": "Vetëm ndjekës",
   "privacy.public.long": "I dukshëm për të tërë",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index e732873c4..453ff7a0e 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
   "column.community": "Lokalna lajna",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Hidden domains",
   "column.favourites": "Omiljeni",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "Lokalna lajna je prazna. Napišite nešto javno da lajna produva!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "da podržite",
   "keyboard_shortcuts.column": "da se prebacite na status u jednoj od kolona",
   "keyboard_shortcuts.compose": "da se prebacite na pisanje novog tuta",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "da se pomerite na dole u listi",
   "keyboard_shortcuts.enter": "da otvorite status",
   "keyboard_shortcuts.favourite": "da označite kao omiljeno",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna lajna",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Izmeni profil",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 15f8640c6..f183c343c 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -70,7 +70,7 @@
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Обележивачи",
   "column.community": "Локална временска линија",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Претражи налоге",
   "column.domain_blocks": "Скривени домени",
   "column.favourites": "Омиљене",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Још увек немате блокираних корисника.",
   "empty_column.bookmarked_statuses": "Још увек немате обележене трубе. Када их обележите, појавиће се овде.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "Још увек нема сакривених домена.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "Још увек немате труба које су вам се свиделе. Када вам се једна свиди, појавиће се овде.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "да подржите",
   "keyboard_shortcuts.column": "да се пребаците на статус у једној од колона",
   "keyboard_shortcuts.compose": "да се пребаците на писање новог тута",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Опис",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "да се померите на доле у листи",
   "keyboard_shortcuts.enter": "да отворите статус",
   "keyboard_shortcuts.favourite": "да означите као омиљено",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Маркери",
   "navigation_bar.community_timeline": "Локална временска линија",
   "navigation_bar.compose": "Саставите нову трубу",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Откриј",
   "navigation_bar.domain_blocks": "Сакривени домени",
   "navigation_bar.edit_profile": "Измени налог",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 15d2f7aeb..0741f14d0 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bokmärken",
   "column.community": "Lokal tidslinje",
-  "column.conversations": "Konversationer",
+  "column.direct": "Direktmeddelanden",
   "column.directory": "Bläddra bland profiler",
   "column.domain_blocks": "Dolda domäner",
   "column.favourites": "Favoriter",
@@ -80,7 +80,7 @@
   "column.mutes": "Tystade användare",
   "column.notifications": "Aviseringar",
   "column.pins": "Nålade toots",
-  "column.public": "Förenad tidslinje",
+  "column.public": "Federerad tidslinje",
   "column_back_button.label": "Tillbaka",
   "column_header.hide_settings": "Dölj inställningar",
   "column_header.moveLeft_settings": "Flytta kolumnen åt vänster",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Du har ännu ej blockerat några användare.",
   "empty_column.bookmarked_statuses": "Du har inte bokmärkt några tutar än. När du gör ett bokmärke kommer det synas här.",
   "empty_column.community": "Den lokala tidslinjen är tom. Skriv något offentligt för att sätta bollen i rullning!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "Du har inga direktmeddelanden. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
   "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!",
   "empty_column.favourited_statuses": "Du har inga favoritmarkerade toots än. När du favoritmarkerar en kommer den visas här.",
@@ -230,13 +230,13 @@
   "keyboard_shortcuts.boost": "för att knuffa",
   "keyboard_shortcuts.column": "för att fokusera en status i en av kolumnerna",
   "keyboard_shortcuts.compose": "för att fokusera skrivfältet",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Beskrivning",
+  "keyboard_shortcuts.direct": "för att öppna Direktmeddelanden",
   "keyboard_shortcuts.down": "för att flytta nedåt i listan",
   "keyboard_shortcuts.enter": "för att öppna en status",
   "keyboard_shortcuts.favourite": "för att sätta som favorit",
   "keyboard_shortcuts.favourites": "för att öppna Favoriter",
-  "keyboard_shortcuts.federated": "för att öppna Förenad tidslinje",
+  "keyboard_shortcuts.federated": "Öppna federerad tidslinje",
   "keyboard_shortcuts.heading": "Tangentbordsgenvägar",
   "keyboard_shortcuts.home": "för att öppna Hem-tidslinjen",
   "keyboard_shortcuts.hotkey": "Kommando",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bokmärken",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Författa ny toot",
+  "navigation_bar.direct": "Direktmeddelanden",
   "navigation_bar.discover": "Upptäck",
   "navigation_bar.domain_blocks": "Dolda domäner",
   "navigation_bar.edit_profile": "Redigera profil",
@@ -306,7 +307,7 @@
   "navigation_bar.personal": "Personligt",
   "navigation_bar.pins": "Nålade inlägg (toots)",
   "navigation_bar.preferences": "Inställningar",
-  "navigation_bar.public_timeline": "Förenad tidslinje",
+  "navigation_bar.public_timeline": "Federerad tidslinje",
   "navigation_bar.security": "Säkerhet",
   "notification.admin.sign_up": "{name} registrerade sig",
   "notification.favourite": "{name} favoriserade din status",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Ta bort omröstning",
   "privacy.change": "Justera sekretess",
   "privacy.direct.long": "Skicka endast till nämnda användare",
-  "privacy.direct.short": "Bara personer jag nämner",
+  "privacy.direct.short": "Direct",
   "privacy.private.long": "Endast synligt för följare",
   "privacy.private.short": "Endast följare",
   "privacy.public.long": "Synlig för alla",
@@ -488,7 +489,7 @@
   "status.unpin": "Ångra fäst i profil",
   "suggestions.dismiss": "Avfärda förslag",
   "suggestions.header": "Du kanske är intresserad av…",
-  "tabs_bar.federated_timeline": "Förenad",
+  "tabs_bar.federated_timeline": "Federerad",
   "tabs_bar.home": "Hem",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Aviseringar",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 09d473ef4..c4baf0533 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index e8c9757ad..4d159b844 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -70,7 +70,7 @@
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "அடையாளக்குறிகள்",
   "column.community": "சுய நிகழ்வு காலவரிசை",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "சுயவிவரங்களை உலாவு",
   "column.domain_blocks": "மறைந்திருக்கும் திரளங்கள்",
   "column.favourites": "பிடித்தவைகள்",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "நீங்கள் இதுவரை எந்தப் பயனர்களையும் முடக்கியிருக்கவில்லை.",
   "empty_column.bookmarked_statuses": "உங்களிடம் அடையாளக்குறியிட்ட டூட்டுகள் எவையும் இல்லை. அடையாளக்குறியிட்ட பிறகு அவை இங்கே காட்டப்படும்.",
   "empty_column.community": "உங்கள் மாஸ்டடான் முச்சந்தியில் யாரும் இல்லை. எதையேனும் எழுதி ஆட்டத்தைத் துவக்குங்கள்!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "தடுக்கப்பட்டக் களங்கள் இதுவரை இல்லை.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "உங்களுக்குப் பிடித்த டூட்டுகள் இதுவரை இல்லை. ஒரு டூட்டில் நீங்கள் விருப்பக்குறி இட்டால், அது இங்கே காண்பிக்கப்படும்.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "பகிர",
   "keyboard_shortcuts.column": "ஏதேனும் ஒரு நெடுவரிசையில் உள்ள டூட்டுல் கவனம் செலுத்த",
   "keyboard_shortcuts.compose": "பதிவு எழுதும் பெட்டியில் கவனம் செலுத்த",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "விவரம்",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "பட்டியலின் கீழே செல்ல",
   "keyboard_shortcuts.enter": "டூட்டைத் திறக்க",
   "keyboard_shortcuts.favourite": "விருப்பக்குறி இட",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "அடையாளக்குறிகள்",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "கண்டு பிடி",
   "navigation_bar.domain_blocks": "மறைந்த களங்கள்",
   "navigation_bar.edit_profile": "சுயவிவரத்தைத் திருத்தவும்",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index d76b9a451..37f0bf261 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 8eb92f7ad..9c46c7950 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -70,7 +70,7 @@
   "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "column.bookmarks": "Bookmarks",
   "column.community": "స్థానిక కాలక్రమం",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "దాచిన డొమైన్లు",
   "column.favourites": "ఇష్టపడినవి",
@@ -166,7 +166,7 @@
   "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.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "దాచబడిన డొమైన్లు ఇంకా ఏమీ లేవు.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "మీకు ఇష్టపడిన టూట్లు ఇంకా ఎమీ లేవు. మీరు ఒకదానిని ఇష్టపడినప్పుడు, అది ఇక్కడ కనిపిస్తుంది.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "బూస్ట్ చేయడానికి",
   "keyboard_shortcuts.column": "నిలువు వరుసలలో ఒకదానిపై దృష్టి పెట్టడానికి",
   "keyboard_shortcuts.compose": "కంపోజ్ టెక్స్ట్ఏరియా పై దృష్టి పెట్టడానికి",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "జాబితాలో క్రిందికి వెళ్ళడానికి",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "ఇష్టపడడానికి",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "కనుగొను",
   "navigation_bar.domain_blocks": "దాచిన డొమైన్లు",
   "navigation_bar.edit_profile": "ప్రొఫైల్ని సవరించండి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 423d3efd4..b2bbf78b3 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -70,7 +70,7 @@
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "ที่คั่นหน้า",
   "column.community": "เส้นเวลาในเซิร์ฟเวอร์",
-  "column.conversations": "การสนทนา",
+  "column.direct": "ข้อความโดยตรง",
   "column.directory": "เรียกดูโปรไฟล์",
   "column.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "column.favourites": "รายการโปรด",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "คุณยังไม่ได้ปิดกั้นผู้ใช้ใด ๆ",
   "empty_column.bookmarked_statuses": "คุณยังไม่มีโพสต์ที่เพิ่มที่คั่นหน้าไว้ใด ๆ เมื่อคุณเพิ่มที่คั่นหน้าโพสต์ โพสต์จะปรากฏที่นี่",
   "empty_column.community": "เส้นเวลาในเซิร์ฟเวอร์ว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
   "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ปิดกั้นอยู่",
   "empty_column.explore_statuses": "ไม่มีสิ่งใดที่กำลังนิยมในตอนนี้ กลับมาตรวจสอบในภายหลัง!",
   "empty_column.favourited_statuses": "คุณยังไม่มีโพสต์ที่ชื่นชอบใด ๆ เมื่อคุณชื่นชอบโพสต์ โพสต์จะปรากฏที่นี่",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "ดันโพสต์",
   "keyboard_shortcuts.column": "โฟกัสคอลัมน์",
   "keyboard_shortcuts.compose": "โฟกัสพื้นที่เขียนข้อความ",
-  "keyboard_shortcuts.conversations": "เพื่อเปิดคอลัมน์การสนทนา",
   "keyboard_shortcuts.description": "คำอธิบาย",
+  "keyboard_shortcuts.direct": "เพื่อเปิดคอลัมน์ข้อความโดยตรง",
   "keyboard_shortcuts.down": "ย้ายลงในรายการ",
   "keyboard_shortcuts.enter": "เปิดโพสต์",
   "keyboard_shortcuts.favourite": "ชื่นชอบโพสต์",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
   "navigation_bar.community_timeline": "เส้นเวลาในเซิร์ฟเวอร์",
   "navigation_bar.compose": "เขียนโพสต์ใหม่",
+  "navigation_bar.direct": "ข้อความโดยตรง",
   "navigation_bar.discover": "ค้นพบ",
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
   "privacy.change": "เปลี่ยนความเป็นส่วนตัวของโพสต์",
   "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
-  "privacy.direct.short": "เฉพาะผู้คนที่ฉันกล่าวถึงเท่านั้น",
+  "privacy.direct.short": "ผู้คนที่กล่าวถึงเท่านั้น",
   "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
   "privacy.private.short": "ผู้ติดตามเท่านั้น",
   "privacy.public.long": "ปรากฏแก่ทั้งหมด",
@@ -512,13 +513,13 @@
   "upload_button.label": "เพิ่มไฟล์ภาพ, วิดีโอ หรือเสียง",
   "upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์",
   "upload_error.poll": "ไม่อนุญาตให้อัปโหลดไฟล์กับการลงคะแนน",
-  "upload_form.audio_description": "อธิบายสำหรับผู้สูญเสียการได้ยิน",
+  "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้บกพร่องทางการมองเห็น",
   "upload_form.description_missing": "ไม่มีการเพิ่มคำอธิบาย",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
   "upload_form.undo": "ลบ",
-  "upload_form.video_description": "อธิบายสำหรับผู้สูญเสียการได้ยินหรือบกพร่องทางการมองเห็น",
+  "upload_form.video_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยินหรือบกพร่องทางการมองเห็น",
   "upload_modal.analyzing_picture": "กำลังวิเคราะห์รูปภาพ…",
   "upload_modal.apply": "นำไปใช้",
   "upload_modal.applying": "กำลังนำไปใช้…",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index bc0e8f721..b16b5577c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -70,7 +70,7 @@
   "column.blocks": "Engellenen kullanıcılar",
   "column.bookmarks": "Yer İmleri",
   "column.community": "Yerel zaman tüneli",
-  "column.conversations": "Sohbetler",
+  "column.direct": "Doğrudan iletiler",
   "column.directory": "Profillere göz at",
   "column.domain_blocks": "Engellenen alan adları",
   "column.favourites": "Favoriler",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Henüz herhangi bir kullanıcıyı engellemedin.",
   "empty_column.bookmarked_statuses": "Henüz yer imine eklediğin toot yok. Bir tanesi yer imine eklendiğinde burada görünür.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
-  "empty_column.conversations": "Sadece bahsedilen kişilere özel gönderi paylaştığında veya bu gizlilik seçeneğinde bir gönderi aldığında bu sayfada gözükecek.",
+  "empty_column.direct": "Henüz doğrudan iletiniz yok. Bir tane gönderdiğinizde veya aldığınız burada listelenecekler.",
   "empty_column.domain_blocks": "Henüz engellenmiş bir alan adı yok.",
   "empty_column.explore_statuses": "Şu an öne çıkan birşey yok. Daha sonra tekrar bakın!",
   "empty_column.favourited_statuses": "Favori tootun yok. Favori tootun olduğunda burada görünür.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "gönderiyi boostla",
   "keyboard_shortcuts.column": "sütunlardan birindeki duruma odaklanmak için",
   "keyboard_shortcuts.compose": "yazma alanına odaklanmak için",
-  "keyboard_shortcuts.conversations": "sohbetler sütununu açmak için",
   "keyboard_shortcuts.description": "Açıklama",
+  "keyboard_shortcuts.direct": "doğrudan iletiler sütununu açmak için",
   "keyboard_shortcuts.down": "listede aşağıya inmek için",
   "keyboard_shortcuts.enter": "gönderiyi aç",
   "keyboard_shortcuts.favourite": "gönderiyi favorilerine ekle",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Yer İmleri",
   "navigation_bar.community_timeline": "Yerel Zaman Tüneli",
   "navigation_bar.compose": "Yeni gönderi yaz",
+  "navigation_bar.direct": "Doğrudan iletiler",
   "navigation_bar.discover": "Keşfet",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
   "navigation_bar.edit_profile": "Profili düzenle",
@@ -315,7 +316,7 @@
   "notification.mention": "{name} senden bahsetti",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
-  "notification.reblog": "{name} gönderini teşvik etti",
+  "notification.reblog": "{name} gönderini boostladı",
   "notification.status": "{name} az önce gönderdi",
   "notification.update": "{name} bir gönderiyi düzenledi",
   "notifications.clear": "Bildirimleri temizle",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Anketi kaldır",
   "privacy.change": "Gönderi gizliliğini değiştir",
   "privacy.direct.long": "Sadece bahsedilen kullanıcılar için görünür",
-  "privacy.direct.short": "Sadece bahsettiğim kişiler",
+  "privacy.direct.short": "Sadece bahsedilen kişiler",
   "privacy.private.long": "Sadece takipçiler için görünür",
   "privacy.private.short": "Sadece takipçiler",
   "privacy.public.long": "Herkese açık",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index bd20b1efe..8e78f551f 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Кыстыргычлар",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Тасвирлама",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Кыстыргычлар",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Профильны үзгәртү",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 09d473ef4..c4baf0533 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -70,7 +70,7 @@
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "Favourites",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 16d4e0b3b..2dfa8ccd9 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -6,30 +6,30 @@
   "account.block": "Заблокувати @{name}",
   "account.block_domain": "Заблокувати домен {domain}",
   "account.blocked": "Заблоковані",
-  "account.browse_more_on_origin_server": "Переглянути більше в оригіналі",
+  "account.browse_more_on_origin_server": "Переглянути більше в оригінальному профілі",
   "account.cancel_follow_request": "Скасувати запит на підписку",
-  "account.direct": "Пряме повідомлення @{name}",
+  "account.direct": "Надіслати пряме повідомлення @{name}",
   "account.disable_notifications": "Не повідомляти мене про дописи @{name}",
-  "account.domain_blocked": "Домен приховано",
+  "account.domain_blocked": "Домен заблоковано",
   "account.edit_profile": "Редагувати профіль",
   "account.enable_notifications": "Повідомляти мене про дописи @{name}",
-  "account.endorse": "Публікувати у профілі",
+  "account.endorse": "Рекомендувати у профілі",
   "account.follow": "Підписатися",
   "account.followers": "Підписники",
-  "account.followers.empty": "Ніхто ще не підписався на цього користувача.",
-  "account.followers_counter": "{count, plural, one {{counter} Підписник} few {{counter} Підписники} many {{counter} Підписників} other {{counter} Підписники}}",
-  "account.following": "Стежите",
-  "account.following_counter": "{count, plural, one {{counter} Підписка} few {{counter} Підписки} many {{counter} Підписок} other {{counter} Підписки}}",
+  "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
+  "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписника} many {{counter} підписників} other {{counter} підписники}}",
+  "account.following": "Ви стежите",
+  "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписки}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
-  "account.follows_you": "Підписаний(-а) на вас",
-  "account.hide_reblogs": "Сховати передмухи від @{name}",
-  "account.joined": "Долучення {date}",
+  "account.follows_you": "Підписані на вас",
+  "account.hide_reblogs": "Сховати поширення від @{name}",
+  "account.joined": "Долучилися {date}",
   "account.link_verified_on": "Права власності на це посилання були перевірені {date}",
-  "account.locked_info": "Статус конфіденційності цього облікового запису встановлено у заблокований. Власник вручну переглядає, хто може за ним стежити.",
+  "account.locked_info": "Це закритий обліковий запис. Власник вручну обирає, хто може на нього підписуватися.",
   "account.media": "Медіа",
   "account.mention": "Згадати @{name}",
   "account.moved_to": "{name} переїхав на:",
-  "account.mute": "Нехтувати @{name}",
+  "account.mute": "Приховати @{name}",
   "account.mute_notifications": "Не показувати сповіщення від @{name}",
   "account.muted": "Нехтується",
   "account.posts": "Дмухи",
@@ -48,38 +48,38 @@
   "account.unmute_notifications": "Показувати сповіщення від @{name}",
   "account.unmute_short": "Не нехтувати",
   "account_note.placeholder": "Коментарі відсутні",
-  "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
-  "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
+  "admin.dashboard.daily_retention": "Щоденний показник утримання користувачів після реєстрації",
+  "admin.dashboard.monthly_retention": "Щомісячний показник утримання користувачів після реєстрації",
   "admin.dashboard.retention.average": "Середнє",
   "admin.dashboard.retention.cohort": "Місяць реєстрації",
   "admin.dashboard.retention.cohort_size": "Нові користувачі",
   "alert.rate_limited.message": "Спробуйте ще раз через {retry_time, time, medium}.",
   "alert.rate_limited.title": "Швидкість обмежена",
-  "alert.unexpected.message": "Трапилась неочікувана помилка.",
+  "alert.unexpected.message": "Сталася неочікувана помилка.",
   "alert.unexpected.title": "Ой!",
   "announcement.announcement": "Оголошення",
   "attachments_list.unprocessed": "(не оброблено)",
   "autosuggest_hashtag.per_week": "{count} в тиждень",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу",
-  "bundle_column_error.body": "Щось пішло не так під час завантаження компоненту.",
+  "bundle_column_error.body": "Щось пішло не так під час завантаження цього компоненту.",
   "bundle_column_error.retry": "Спробуйте ще раз",
   "bundle_column_error.title": "Помилка мережі",
   "bundle_modal_error.close": "Закрити",
-  "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.",
+  "bundle_modal_error.message": "Щось пішло не так під час завантаження цього компоненту.",
   "bundle_modal_error.retry": "Спробувати ще раз",
   "column.blocks": "Заблоковані користувачі",
   "column.bookmarks": "Закладки",
   "column.community": "Локальна стрічка",
-  "column.conversations": "Бесіди",
+  "column.direct": "Прямі повідомлення",
   "column.directory": "Переглянути профілі",
-  "column.domain_blocks": "Приховані домени",
+  "column.domain_blocks": "Заблоковані домени",
   "column.favourites": "Вподобане",
   "column.follow_requests": "Запити на підписку",
   "column.home": "Головна",
   "column.lists": "Списки",
   "column.mutes": "Нехтувані користувачі",
   "column.notifications": "Сповіщення",
-  "column.pins": "Закріплені дмухи",
+  "column.pins": "Закріплені дописи",
   "column.public": "Глобальна стрічка",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Приховати налаштування",
@@ -89,22 +89,22 @@
   "column_header.show_settings": "Показати налаштування",
   "column_header.unpin": "Відкріпити",
   "column_subheading.settings": "Налаштування",
-  "community.column_settings.local_only": "Тільки локальні",
-  "community.column_settings.media_only": "Тільки медіа",
-  "community.column_settings.remote_only": "Тільки видалені",
+  "community.column_settings.local_only": "Лише локальні",
+  "community.column_settings.media_only": "Лише з медіа",
+  "community.column_settings.remote_only": "Лише віддалені",
   "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.hashtag_warning": "Цей дмух не буде відображений у жодній стрічці хештеґу, оскільки він прихований. Тільки публічні дмухи можуть бути знайдені за хештеґом.",
-  "compose_form.lock_disclaimer": "Ваш акаунт не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші приватні пости.",
+  "compose_form.encryption_warning": "Дописи на Mastodon не захищені шифруванням. Не поширюйте жодну потенційно небезпечну інформацію.",
+  "compose_form.hashtag_warning": "Цей допис не буде зображений у жодній стрічці гештеґу, оскільки він прихований. Тільки публічні дописи можуть бути знайдені за гештеґом.",
+  "compose_form.lock_disclaimer": "Ваш обліковий запис не {locked}. Будь-який користувач може підписатися на вас та переглядати ваші дописи для підписників.",
   "compose_form.lock_disclaimer.lock": "приватний",
   "compose_form.placeholder": "Що у вас на думці?",
   "compose_form.poll.add_option": "Додати варіант",
   "compose_form.poll.duration": "Тривалість опитування",
   "compose_form.poll.option_placeholder": "Варіант {number}",
   "compose_form.poll.remove_option": "Видалити цей варіант",
-  "compose_form.poll.switch_to_multiple": "Перемкнути у режим вибору декількох відповідей",
+  "compose_form.poll.switch_to_multiple": "Дозволити вибір декількох відповідей",
   "compose_form.poll.switch_to_single": "Перемкнути у режим вибору однієї відповіді",
-  "compose_form.publish": "Дмухнути",
+  "compose_form.publish": "Надіслати",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Зберегти зміни",
   "compose_form.sensitive.hide": "{count, plural, one {Позначити медіа делікатним} other {Позначити медіа делікатними}}",
@@ -123,67 +123,67 @@
   "confirmations.delete_list.message": "Ви впевнені, що хочете видалити цей список назавжди?",
   "confirmations.discard_edit_media.confirm": "Відкинути",
   "confirmations.discard_edit_media.message": "У вас є незбережені зміни в описі медіа або попереднього перегляду, все одно відкинути їх?",
-  "confirmations.domain_block.confirm": "Сховати весь домен",
-  "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або нехтувати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
+  "confirmations.domain_block.confirm": "Заблокувати весь домен",
+  "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати або приховати лише деяких користувачів. Ви не зможете бачити контент з цього домену у будь-яких стрічках або ваших сповіщеннях. Ваші підписники з цього домену будуть відписані від вас.",
   "confirmations.logout.confirm": "Вийти",
   "confirmations.logout.message": "Ви впевнені, що хочете вийти?",
   "confirmations.mute.confirm": "Нехтуавти",
   "confirmations.mute.explanation": "Це сховає дописи від них і дописи зі згадками про них, проте вони все одно матимуть змогу бачити ваші дописи й підписуватися на вас.",
-  "confirmations.mute.message": "Ви впевнені, що хочете нехтувати {name}?",
-  "confirmations.redraft.confirm": "Видалити та перестворити",
-  "confirmations.redraft.message": "Ви впевнені, що хочете видалити допис і перестворити його? Ви втратите всі відповіді, передмухи та вподобайки допису.",
+  "confirmations.mute.message": "Ви впевнені, що хочете приховати {name}?",
+  "confirmations.redraft.confirm": "Видалити та виправити",
+  "confirmations.redraft.message": "Ви впевнені, що хочете відредагувати допис? Ви втратите всі відповіді, поширення та вподобайки допису.",
   "confirmations.reply.confirm": "Відповісти",
-  "confirmations.reply.message": "Поточна відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
+  "confirmations.reply.message": "Нова відповідь перезапише повідомлення, яке ви зараз пишете. Ви впевнені, що хочете продовжити?",
   "confirmations.unfollow.confirm": "Відписатися",
   "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
-  "conversation.delete": "Видалити цю бесіду",
+  "conversation.delete": "Видалити бесіду",
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
   "conversation.with": "З {names}",
   "directory.federated": "З відомого федесвіту",
-  "directory.local": "Тільки з домену {domain}",
+  "directory.local": "Лише з домену {domain}",
   "directory.new_arrivals": "Нові надходження",
-  "directory.recently_active": "Активні нещодавно",
-  "embed.instructions": "Вбудуйте цей статус до вашого вебсайту, скопіювавши код нижче.",
+  "directory.recently_active": "Нещодавно активні",
+  "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось як він виглядатиме:",
-  "emoji_button.activity": "Заняття",
-  "emoji_button.custom": "Особливі",
+  "emoji_button.activity": "Діяльність",
+  "emoji_button.custom": "Власні",
   "emoji_button.flags": "Прапори",
   "emoji_button.food": "Їжа та напої",
-  "emoji_button.label": "Вставити емодзі",
+  "emoji_button.label": "Вставити емоджі",
   "emoji_button.nature": "Природа",
-  "emoji_button.not_found": "Немає емодзі!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Немає емоджі!! (╯°□°）╯︵ ┻━┻",
   "emoji_button.objects": "Предмети",
   "emoji_button.people": "Люди",
   "emoji_button.recent": "Часто використовувані",
   "emoji_button.search": "Шукати...",
   "emoji_button.search_results": "Результати пошуку",
   "emoji_button.symbols": "Символи",
-  "emoji_button.travel": "Подорожі",
+  "emoji_button.travel": "Подорожі та місця",
   "empty_column.account_suspended": "Обліковий запис заблоковано",
-  "empty_column.account_timeline": "Тут дмухалок немає!",
+  "empty_column.account_timeline": "Тут немає дописів!",
   "empty_column.account_unavailable": "Профіль недоступний",
   "empty_column.blocks": "Ви ще не заблокували жодного користувача.",
-  "empty_column.bookmarked_statuses": "У вас ще немає дмухів у закладках. Коли ви щось додасте до заклкдок, воно з'явиться тут.",
+  "empty_column.bookmarked_statuses": "У вас ще немає дописів у закладках. Коли ви щось додасте до закладок, воно з'явиться тут.",
   "empty_column.community": "Локальна стрічка пуста. Напишіть щось, щоб розігріти народ!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "У вас ще немає прямих повідомлень. Коли ви щось отримаєте чи надішлете, воно з'явиться тут.",
   "empty_column.domain_blocks": "Тут поки немає прихованих доменів.",
-  "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
-  "empty_column.favourited_statuses": "У вас ще немає вподобаних дмухів. Коли ви щось вподобаєте, воно з'явиться тут.",
-  "empty_column.favourites": "Ніхто ще не вподобав цього дмуху. Коли хтось це зробить, вони з'являться тут.",
-  "empty_column.follow_recommendations": "Схоже, для вас не буде створено жодної пропозиції. Ви можете спробувати скористатися пошуком людей, яких ви можете знати або переглянути популярні хештеґи.",
+  "empty_column.explore_statuses": "Нема нічого популярного. Подивіться пізніше!",
+  "empty_column.favourited_statuses": "У вас ще немає вподобаних дописів. Коли ви щось вподобаєте, воно з'явиться тут.",
+  "empty_column.favourites": "Ніхто ще не вподобав цей допис. Коли хтось це зробить, він з'явиться тут.",
+  "empty_column.follow_recommendations": "Схоже, для вас не було створено жодної пропозиції. Ви можете спробувати скористатися пошуком людей, яких ви можете знати, або переглянути популярні гештеґи.",
   "empty_column.follow_requests": "У вас ще немає запитів на підписку. Коли ви їх отримаєте, вони з'являться тут.",
-  "empty_column.hashtag": "Дописів з цим хештегом поки не існує.",
-  "empty_column.home": "Ви поки ні на кого не підписані. Погортайте {public}, або скористуйтесь пошуком, щоб освоїтися та познайомитися з іншими користувачами.",
+  "empty_column.hashtag": "Дописів з цим гештеґом поки не існує.",
+  "empty_column.home": "Ваша стрічка порожня! Підпишіться на інших, щоб її заповнити. {suggestions}",
   "empty_column.home.suggestions": "Переглянути пропозиції",
-  "empty_column.list": "Немає нічого в цьому списку. Коли його учасники дмухнуть нові статуси, вони з'являться тут.",
+  "empty_column.list": "Цей список порожній. Коли його учасники додадуть нові дописи, вони з'являться тут.",
   "empty_column.lists": "У вас ще немає списків. Коли ви їх створите, вони з'являться тут.",
   "empty_column.mutes": "Ви ще не нехтуєте жодного користувача.",
   "empty_column.notifications": "У вас ще немає сповіщень. Переписуйтесь з іншими користувачами, щоб почати розмову.",
-  "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших інстанцій, щоб заповнити стрічку",
-  "error.unexpected_crash.explanation": "Ця сторінка не може бути коректно відображена через баґ у нашому коді або через проблему сумісності браузера.",
+  "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших серверів, щоб заповнити стрічку",
+  "error.unexpected_crash.explanation": "Через помилку у нашому коді або несумісність браузера, ця сторінка не може бути зображена коректно.",
   "error.unexpected_crash.explanation_addons": "Неможливо правильно показати цю сторінку. Ймовірно, цю помилку викликано додатком браузера або автоматичним засобом перекладу.",
-  "error.unexpected_crash.next_steps": "Спробуйте перезавантажити сторінку. Якщо це не допоможе, ви все ще зможете використовувати Mastodon через інший браузер або рідний додаток.",
+  "error.unexpected_crash.next_steps": "Спробуйте перезавантажити сторінку. Якщо це не допоможе, ви все ще зможете використовувати Mastodon через інший браузер або рідний застосунок.",
   "error.unexpected_crash.next_steps_addons": "Спробуйте їх вимкнути та оновити сторінку. Якщо це не допомагає, ви можете використовувати Mastodon через інший браузер або окремий застосунок.",
   "errors.unexpected_crash.copy_stacktrace": "Скопіювати трасування стека у буфер обміну",
   "errors.unexpected_crash.report_issue": "Повідомити про проблему",
@@ -203,53 +203,53 @@
   "getting_started.developers": "Розробникам",
   "getting_started.directory": "Каталог профілів",
   "getting_started.documentation": "Документація",
-  "getting_started.heading": "Ласкаво просимо",
-  "getting_started.invite": "Запросіть людей",
-  "getting_started.open_source_notice": "Mastodon — програма з відкритим сирцевим кодом. Ви можете допомогти проекту, або повідомити про проблеми на GitHub за адресою {github}.",
-  "getting_started.security": "Безпека",
+  "getting_started.heading": "Розпочати",
+  "getting_started.invite": "Запросити людей",
+  "getting_started.open_source_notice": "Mastodon — програма з відкритим сирцевим кодом. Ви можете допомогти проєкту, або повідомити про проблеми на GitHub: {github}.",
+  "getting_started.security": "Налаштування облікового запису",
   "getting_started.terms": "Умови використання",
   "hashtag.column_header.tag_mode.all": "та {additional}",
   "hashtag.column_header.tag_mode.any": "або {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
-  "hashtag.column_settings.select.no_options_message": "Не знайдено пропозицій",
-  "hashtag.column_settings.select.placeholder": "Введіть хештеґи…",
-  "hashtag.column_settings.tag_mode.all": "Усі ці",
-  "hashtag.column_settings.tag_mode.any": "Який-небудь з цих",
-  "hashtag.column_settings.tag_mode.none": "Жоден з цих",
-  "hashtag.column_settings.tag_toggle": "Додайте додаткові теґи до цього стовпчика",
+  "hashtag.column_settings.select.no_options_message": "Пропозицій не знайдено",
+  "hashtag.column_settings.select.placeholder": "Введіть гештеґи…",
+  "hashtag.column_settings.tag_mode.all": "Усе зі списку",
+  "hashtag.column_settings.tag_mode.any": "Який-небудь зі списку",
+  "hashtag.column_settings.tag_mode.none": "Жоден зі списку",
+  "hashtag.column_settings.tag_toggle": "Додати додаткові теґи до цього стовпчика",
   "home.column_settings.basic": "Основні",
-  "home.column_settings.show_reblogs": "Показувати передмухи",
+  "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
   "home.show_announcements": "Показати оголошення",
   "intervals.full.days": "{number, plural, one {# день} few {# дні} other {# днів}}",
   "intervals.full.hours": "{number, plural, one {# година} few {# години} other {# годин}}",
   "intervals.full.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
-  "keyboard_shortcuts.back": "переходити назад",
-  "keyboard_shortcuts.blocked": "відкрити список заблокованих користувачів",
-  "keyboard_shortcuts.boost": "передмухувати",
-  "keyboard_shortcuts.column": "фокусуватися на одній з колонок",
-  "keyboard_shortcuts.compose": "фокусуватися на полі введення",
-  "keyboard_shortcuts.conversations": "to open conversations column",
+  "keyboard_shortcuts.back": "Перейти назад",
+  "keyboard_shortcuts.blocked": "Відкрити список заблокованих користувачів",
+  "keyboard_shortcuts.boost": "Поширити допис",
+  "keyboard_shortcuts.column": "Фокусуватися на одній з колонок",
+  "keyboard_shortcuts.compose": "Фокусуватися на полі введення",
   "keyboard_shortcuts.description": "Опис",
-  "keyboard_shortcuts.down": "рухатися вниз стрічкою",
-  "keyboard_shortcuts.enter": "відкрити статус",
-  "keyboard_shortcuts.favourite": "вподобати",
-  "keyboard_shortcuts.favourites": "відкрити список улюбленого",
-  "keyboard_shortcuts.federated": "відкрити глобальну стрічку",
-  "keyboard_shortcuts.heading": "Гарячі клавіші",
-  "keyboard_shortcuts.home": "відкрити домашню стрічку",
+  "keyboard_shortcuts.direct": "щоб відкрити колонку прямих повідомлень",
+  "keyboard_shortcuts.down": "Рухатися вниз стрічкою",
+  "keyboard_shortcuts.enter": "Відкрити допис",
+  "keyboard_shortcuts.favourite": "Вподобати допис",
+  "keyboard_shortcuts.favourites": "Відкрити список вподобаного",
+  "keyboard_shortcuts.federated": "Відкрити глобальну стрічку",
+  "keyboard_shortcuts.heading": "Комбінації клавіш",
+  "keyboard_shortcuts.home": "Відкрити домашню стрічку",
   "keyboard_shortcuts.hotkey": "Гаряча клавіша",
-  "keyboard_shortcuts.legend": "показати підказку",
-  "keyboard_shortcuts.local": "відкрити локальну стрічку",
-  "keyboard_shortcuts.mention": "згадати автора",
+  "keyboard_shortcuts.legend": "Показати легенду",
+  "keyboard_shortcuts.local": "Відкрити локальну стрічку",
+  "keyboard_shortcuts.mention": "Згадати автора",
   "keyboard_shortcuts.muted": "Відкрити список нехтуваних користувачів",
-  "keyboard_shortcuts.my_profile": "відкрити ваш профіль",
-  "keyboard_shortcuts.notifications": "відкрити колонку сповіщень",
-  "keyboard_shortcuts.open_media": "відкрити медіа",
-  "keyboard_shortcuts.pinned": "відкрити список закріплених дмухів",
-  "keyboard_shortcuts.profile": "відкрити профіль автора",
-  "keyboard_shortcuts.reply": "відповісти",
+  "keyboard_shortcuts.my_profile": "Відкрити ваш профіль",
+  "keyboard_shortcuts.notifications": "Відкрити колонку сповіщень",
+  "keyboard_shortcuts.open_media": "Відкрити медіа",
+  "keyboard_shortcuts.pinned": "Відкрити список закріплених дописів",
+  "keyboard_shortcuts.profile": "Відкрити профіль автора",
+  "keyboard_shortcuts.reply": "Відповісти",
   "keyboard_shortcuts.requests": "відкрити список бажаючих підписатися",
   "keyboard_shortcuts.search": "сфокусуватися на пошуку",
   "keyboard_shortcuts.spoilers": "показати/приховати поле CW",
@@ -285,41 +285,42 @@
   "mute_modal.duration": "Тривалість",
   "mute_modal.hide_notifications": "Сховати сповіщення від користувача?",
   "mute_modal.indefinite": "Не визначено",
-  "navigation_bar.apps": "Мобільні додатки",
+  "navigation_bar.apps": "Мобільні застосунки",
   "navigation_bar.blocks": "Заблоковані користувачі",
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальна стрічка",
-  "navigation_bar.compose": "Написати новий дмух",
-  "navigation_bar.discover": "Знайти",
-  "navigation_bar.domain_blocks": "Приховані домени",
+  "navigation_bar.compose": "Написати новий допис",
+  "navigation_bar.direct": "Прямі повідомлення",
+  "navigation_bar.discover": "Дослідити",
+  "navigation_bar.domain_blocks": "Заблоковані домени",
   "navigation_bar.edit_profile": "Редагувати профіль",
   "navigation_bar.explore": "Огляд",
   "navigation_bar.favourites": "Вподобане",
   "navigation_bar.filters": "Приховані слова",
   "navigation_bar.follow_requests": "Запити на підписку",
-  "navigation_bar.follows_and_followers": "Підписки і підписники",
-  "navigation_bar.info": "Про сайт",
+  "navigation_bar.follows_and_followers": "Підписки та підписники",
+  "navigation_bar.info": "Про цей сервер",
   "navigation_bar.keyboard_shortcuts": "Гарячі клавіші",
   "navigation_bar.lists": "Списки",
   "navigation_bar.logout": "Вийти",
   "navigation_bar.mutes": "Нехтувані користувачі",
   "navigation_bar.personal": "Особисте",
-  "navigation_bar.pins": "Закріплені дмухи",
+  "navigation_bar.pins": "Закріплені дописи",
   "navigation_bar.preferences": "Налаштування",
   "navigation_bar.public_timeline": "Глобальна стрічка",
   "navigation_bar.security": "Безпека",
-  "notification.admin.sign_up": "{name} приєднується",
-  "notification.favourite": "{name} вподобав(-ла) ваш допис",
-  "notification.follow": "{name} підписався(-лась) на вас",
-  "notification.follow_request": "{name} відправив(-ла) запит на підписку",
-  "notification.mention": "{name} згадав(-ла) вас",
+  "notification.admin.sign_up": "{name} приєдналися",
+  "notification.favourite": "{name} вподобали ваш допис",
+  "notification.follow": "{name} підписалися на вас",
+  "notification.follow_request": "{name} відправили запит на підписку",
+  "notification.mention": "{name} згадали вас",
   "notification.own_poll": "Ваше опитування завершено",
   "notification.poll": "Опитування, у якому ви голосували, закінчилося",
-  "notification.reblog": "{name} передмухнув(-ла) Ваш допис",
+  "notification.reblog": "{name} поширили ваш допис",
   "notification.status": "{name} щойно дописує",
   "notification.update": "{name} змінює допис",
   "notifications.clear": "Очистити сповіщення",
-  "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщеня?",
+  "notifications.clear_confirmation": "Ви впевнені, що хочете назавжди видалити всі сповіщення?",
   "notifications.column_settings.admin.sign_up": "Нові реєстрації:",
   "notifications.column_settings.alert": "Сповіщення на комп'ютері",
   "notifications.column_settings.favourite": "Вподобане:",
@@ -360,22 +361,22 @@
   "poll.total_people": "{count, plural, one {# особа} other {# осіб}}",
   "poll.total_votes": "{count, plural, one {# голос} few {# голоси} many {# голосів} other {# голосів}}",
   "poll.vote": "Проголосувати",
-  "poll.voted": "Ви голосували за цю відповідь",
+  "poll.voted": "Ви проголосували за цю відповідь",
   "poll.votes": "{votes, plural, one {# голос} few {# голоси} many {# голосів} other {# голоса}}",
   "poll_button.add_poll": "Додати опитування",
   "poll_button.remove_poll": "Видалити опитування",
   "privacy.change": "Змінити видимість допису",
   "privacy.direct.long": "Показати тільки згаданим користувачам",
-  "privacy.direct.short": "Лише люди, яких я згадую",
+  "privacy.direct.short": "Лише згадані люди",
   "privacy.private.long": "Показати тільки підписникам",
   "privacy.private.short": "Тільки для підписників",
-  "privacy.public.long": "Visible for all",
+  "privacy.public.long": "Видимий для всіх",
   "privacy.public.short": "Публічно",
-  "privacy.unlisted.long": "Visible for all, but opted-out of discovery features",
+  "privacy.unlisted.long": "Видимий для всіх, але не через можливості виявлення",
   "privacy.unlisted.short": "Прихований",
   "refresh": "Оновити",
   "regeneration_indicator.label": "Завантаження…",
-  "regeneration_indicator.sublabel": "Ваша домашня стрічка готується!",
+  "regeneration_indicator.sublabel": "Хвилинку, ми готуємо вашу стрічку!",
   "relative_time.days": "{number}д",
   "relative_time.full.days": "{number, plural, one {# день} few {# дні} other {# днів}} тому",
   "relative_time.full.hours": "{number, plural, one {# година} few {# години} other {# годин}} тому",
@@ -389,16 +390,16 @@
   "relative_time.today": "сьогодні",
   "reply_indicator.cancel": "Відмінити",
   "report.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": "Ви не будете бачити дописи цього користувача, а вони не зможуть бачити ваші дописи або підписуватися на вас. Вони будуть бачити, що ви їх заблокували.",
   "report.categories.other": "Інше",
   "report.categories.spam": "Спам",
   "report.categories.violation": "Контент порушує одне або кілька правил сервера",
   "report.category.subtitle": "Оберіть найкращий збіг",
-  "report.category.title": "Tell us what's going on with this {type}",
+  "report.category.title": "Розкажіть нам, що не так з цим {type}",
   "report.category.title_account": "профіль",
   "report.category.title_status": "допис",
   "report.close": "Готово",
-  "report.comment.title": "Is there anything else you think we should know?",
+  "report.comment.title": "Чи є щось, що нам потрібно знати?",
   "report.forward": "Надіслати до {target}",
   "report.forward_hint": "Це акаунт з іншого серверу. Відправити анонімізовану копію скарги і туди?",
   "report.mute": "Нехтувати",
@@ -406,25 +407,25 @@
   "report.next": "Далі",
   "report.placeholder": "Додаткові коментарі",
   "report.reasons.dislike": "Мені це не подобається",
-  "report.reasons.dislike_description": "It is not something you want to see",
+  "report.reasons.dislike_description": "Вам би не хотілося це бачити",
   "report.reasons.other": "Це щось інше",
-  "report.reasons.other_description": "The issue does not fit into other categories",
+  "report.reasons.other_description": "Ця проблема не відповідає жодній іншій категорії",
   "report.reasons.spam": "Це спам",
-  "report.reasons.spam_description": "Malicious links, fake engagement, or repetitive replies",
+  "report.reasons.spam_description": "Шкідливі посилання, фальшиві взаємодії, або повідомлення, що повторюються",
   "report.reasons.violation": "Порушує правила сервера",
   "report.reasons.violation_description": "Ви впевнені, що це порушує певні правила",
   "report.rules.subtitle": "Виберіть усі варіанти, що підходять",
   "report.rules.title": "Які правила порушено?",
   "report.statuses.subtitle": "Виберіть усі варіанти, що підходять",
-  "report.statuses.title": "Are there any posts that back up this report?",
+  "report.statuses.title": "Чи є дописи, які належать до цієї скарги?",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на {target}",
-  "report.thanks.take_action": "Here are your options for controlling what you see on Mastodon:",
-  "report.thanks.take_action_actionable": "While we review this, you can take action against @{name}:",
+  "report.thanks.take_action": "Ось ваші варіанти управління тим, що ви бачите в Mastodon:",
+  "report.thanks.take_action_actionable": "Поки ми переглядаємо це, ви можете вжити власних заходів проти @{name}:",
   "report.thanks.title": "Не хочете це бачити?",
   "report.thanks.title_actionable": "Дякуємо за скаргу, ми розглянемо її.",
   "report.unfollow": "Відписатися від @{name}",
-  "report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
+  "report.unfollow_explanation": "Ви підписані на цього користувача. Щоб більше не бачити їхні дописи у вашій стрічці, відпишіться від них.",
   "search.placeholder": "Пошук",
   "search_popout.search_format": "Розширений формат пошуку",
   "search_popout.tips.full_text": "Пошук за текстом знаходить статуси, які ви написали, вподобали, передмухнули, або в яких вас згадували. Також він знаходить імена користувачів, реальні імена та хештеґи.",
@@ -461,8 +462,8 @@
   "status.media_hidden": "Медіа приховано",
   "status.mention": "Згадати @{name}",
   "status.more": "Більше",
-  "status.mute": "Нехтувати @{name}",
-  "status.mute_conversation": "Нехтувати діалог",
+  "status.mute": "Приховати @{name}",
+  "status.mute_conversation": "Ігнорувати діалог",
   "status.open": "Розгорнути допис",
   "status.pin": "Закріпити у профілі",
   "status.pinned": "Закріплений дмух",
@@ -484,7 +485,7 @@
   "status.show_more_all": "Показувати більше для всіх",
   "status.show_thread": "Показати ланцюжок",
   "status.uncached_media_warning": "Недоступно",
-  "status.unmute_conversation": "Не нехтувати діалог",
+  "status.unmute_conversation": "Не ігнорувати діалог",
   "status.unpin": "Відкріпити від профілю",
   "suggestions.dismiss": "Відхилити пропозицію",
   "suggestions.header": "Вас може зацікавити…",
@@ -498,42 +499,42 @@
   "time_remaining.minutes": "{number, plural, one {# хвилина} few {# хвилини} other {# хвилин}}",
   "time_remaining.moments": "Залишилось секунд",
   "time_remaining.seconds": "{number, plural, one {# секунда} few {# секунди} other {# секунд}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} з інших серверів не відображається.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} з інших серверів не зображується.",
   "timeline_hint.resources.followers": "Підписники",
   "timeline_hint.resources.follows": "Підписки",
-  "timeline_hint.resources.statuses": "Старіші дмухи",
+  "timeline_hint.resources.statuses": "Попередні дописи",
   "trends.counter_by_accounts": "{count, plural, one {{counter} особа обговорює} few {{counter} особи обговорюють} many {{counter} осіб обговорюють} other {{counter} особи обговорюють}}",
   "trends.trending_now": "Актуальні",
   "ui.beforeunload": "Вашу чернетку буде втрачено, якщо ви покинете Mastodon.",
-  "units.short.billion": "{count} млрд",
-  "units.short.million": "{count} млн",
-  "units.short.thousand": "{count} тис",
+  "units.short.billion": "{count} млрд.",
+  "units.short.million": "{count} млн.",
+  "units.short.thousand": "{count} тис.",
   "upload_area.title": "Перетягніть сюди, щоб завантажити",
-  "upload_button.label": "Додати медіа",
+  "upload_button.label": "Додати зображення, відео або аудіо",
   "upload_error.limit": "Ліміт завантаження файлів перевищено.",
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
-  "upload_form.description_missing": "Опису не додано",
+  "upload_form.description_missing": "Немає опису",
   "upload_form.edit": "Змінити",
   "upload_form.thumbnail": "Змінити мініатюру",
   "upload_form.undo": "Видалити",
   "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
-  "upload_modal.analyzing_picture": "Аналізуємо малюнок…",
+  "upload_modal.analyzing_picture": "Аналізуємо зображення…",
   "upload_modal.apply": "Застосувати",
   "upload_modal.applying": "Застосування…",
   "upload_modal.choose_image": "Вибрати зображення",
   "upload_modal.description_placeholder": "Щурячий бугай із їжаком-харцизом в'ючись підписали ґешефт у єнах",
-  "upload_modal.detect_text": "Виявити текст на малюнку",
+  "upload_modal.detect_text": "Виявити текст на зображенні",
   "upload_modal.edit_media": "Редагувати медіа",
-  "upload_modal.hint": "Клацніть або перетягніть коло на превью, щоб обрати точку, яку буде завжди видно на мініатюрах.",
+  "upload_modal.hint": "Клацніть або перетягніть коло на превʼю, щоб обрати точку, яку буде завжди видно на мініатюрах.",
   "upload_modal.preparing_ocr": "Підготовка OCR…",
   "upload_modal.preview_label": "Переглянути ({ratio})",
   "upload_progress.label": "Завантаження...",
   "video.close": "Закрити відео",
-  "video.download": "Завантаження файла",
+  "video.download": "Завантажити файл",
   "video.exit_fullscreen": "Вийти з повноекранного режиму",
-  "video.expand": "Розширити відео",
+  "video.expand": "Розгорнути відео",
   "video.fullscreen": "На весь екран",
   "video.hide": "Приховати відео",
   "video.mute": "Вимкнути звук",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index 42728af0f..ba59a393f 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -70,7 +70,7 @@
   "column.blocks": "مسدود صارفین",
   "column.bookmarks": "بُک مارکس",
   "column.community": "مقامی زمانی جدول",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "مشخصات کا مطالعہ کریں",
   "column.domain_blocks": "پوشیدہ ڈومین",
   "column.favourites": "پسندیدہ",
@@ -166,7 +166,7 @@
   "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.community": "مقامی جدول خالی ہے. کچھ تحریر کریں تاکہ بات آگے بڑھے!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "ابھی تک کوئی چھپا ہوا ڈومین نہیں ہے.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "آپ کا کوئی پسندیدہ ٹوٹ نہیں ہے. جب آپ پسند کریں گے، یہاں نظر آئےگا.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "بُک مارکس",
   "navigation_bar.community_timeline": "مقامی ٹائم لائن",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "دریافت کریں",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "پروفائل میں ترمیم کریں",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 6692d2b21..63bc7bd5a 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -70,7 +70,7 @@
   "column.blocks": "Người đã chặn",
   "column.bookmarks": "Đã lưu",
   "column.community": "Máy chủ của bạn",
-  "column.conversations": "Thảo luận",
+  "column.direct": "Nhắn riêng",
   "column.directory": "Tìm người cùng sở thích",
   "column.domain_blocks": "Máy chủ đã chặn",
   "column.favourites": "Thích",
@@ -118,7 +118,7 @@
   "confirmations.block.confirm": "Chặn",
   "confirmations.block.message": "Bạn có thật sự muốn chặn {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
-  "confirmations.delete.message": "Bạn \bthật sự muốn xóa tút này?",
+  "confirmations.delete.message": "Bạn thật sự muốn xóa tút này?",
   "confirmations.delete_list.confirm": "Xóa bỏ",
   "confirmations.delete_list.message": "Bạn thật sự muốn xóa vĩnh viễn danh sách này?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "Bạn chưa chặn bất cứ ai.",
   "empty_column.bookmarked_statuses": "Bạn chưa lưu tút nào. Nếu có, nó sẽ hiển thị ở đây.",
   "empty_column.community": "Máy chủ của bạn chưa có tút nào công khai. Bạn hãy thử viết gì đó đi!",
-  "empty_column.conversations": "Khi bạn gửi hoặc nhận một tút chỉ hiển thị với những người được nhắc đến trong đó, tút đó sẽ hiển thị ở đây.",
+  "empty_column.direct": "Bạn chưa có tin nhắn riêng nào. Khi bạn gửi hoặc nhận một tin nhắn riêng, nó sẽ xuất hiện ở đây.",
   "empty_column.domain_blocks": "Chưa ẩn bất kỳ máy chủ nào.",
   "empty_column.explore_statuses": "Chưa có xu hướng nào. Kiểm tra lại sau!",
   "empty_column.favourited_statuses": "Bạn chưa thích tút nào. Hãy thử đi, nó sẽ xuất hiện ở đây.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "đăng lại",
   "keyboard_shortcuts.column": "mở các mục",
   "keyboard_shortcuts.compose": "mở khung soạn tút",
-  "keyboard_shortcuts.conversations": "mở mục thảo luận",
   "keyboard_shortcuts.description": "Mô tả",
+  "keyboard_shortcuts.direct": "để mở cột tin nhắn",
   "keyboard_shortcuts.down": "di chuyển xuống dưới danh sách",
   "keyboard_shortcuts.enter": "viết tút mới",
   "keyboard_shortcuts.favourite": "thích",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Đã lưu",
   "navigation_bar.community_timeline": "Cộng đồng",
   "navigation_bar.compose": "Viết tút mới",
+  "navigation_bar.direct": "Tin nhắn",
   "navigation_bar.discover": "Khám phá",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
   "navigation_bar.edit_profile": "Sửa hồ sơ",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "Hủy cuộc bình chọn",
   "privacy.change": "Thay đổi quyền riêng tư",
   "privacy.direct.long": "Chỉ người được nhắc đến mới thấy",
-  "privacy.direct.short": "Chỉ người tôi nhắc đến",
+  "privacy.direct.short": "Chỉ người được nhắc",
   "privacy.private.long": "Dành riêng cho người theo dõi",
   "privacy.private.short": "Chỉ người theo dõi",
   "privacy.public.long": "Hiển thị với mọi người",
diff --git a/app/javascript/mastodon/locales/whitelist_en-GB.json b/app/javascript/mastodon/locales/whitelist_en-GB.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_en-GB.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index a6ddaab09..60835209e 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -70,7 +70,7 @@
   "column.blocks": "ⵉⵏⵙⵙⵎⵔⵙⵏ ⵜⵜⵓⴳⴷⵍⵏⵉⵏ",
   "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "Browse profiles",
   "column.domain_blocks": "Blocked domains",
   "column.favourites": "ⵜⵓⴼⵓⵜⵉⵏ",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no blocked domains yet.",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "to boost",
   "keyboard_shortcuts.column": "to focus a status in one of the columns",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "to move down in the list",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "to favourite",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
   "navigation_bar.edit_profile": "ⵙⵏⴼⵍ ⵉⴼⵔⵙ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 0195dee2e..473b84b8d 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -25,7 +25,7 @@
   "account.hide_reblogs": "隐藏来自 @{name} 的转贴",
   "account.joined": "加入于 {date}",
   "account.link_verified_on": "此链接的所有权已在 {date} 被检查",
-  "account.locked_info": "此账户已锁嘟。账户所有者会手动审核关注申请。",
+  "account.locked_info": "此账户已锁嘟。账户所有者会手动审核关注者。",
   "account.media": "媒体",
   "account.mention": "提及 @{name}",
   "account.moved_to": "{name} 已经迁移到：",
@@ -35,8 +35,8 @@
   "account.posts": "帖子",
   "account.posts_with_replies": "帖子和回复",
   "account.report": "举报 @{name}",
-  "account.requested": "正在等待对方通过关注申请。点击以取消发送关注申请",
-  "account.share": "分享 @{name} 的用户简介",
+  "account.requested": "正在等待对方同意。点击以取消发送关注请求",
+  "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
   "account.statuses_counter": "{counter} 条嘟文",
   "account.unblock": "取消屏蔽 @{name}",
@@ -68,19 +68,19 @@
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
   "column.blocks": "已屏蔽的用户",
-  "column.bookmarks": "收藏夹",
+  "column.bookmarks": "书签",
   "column.community": "本站时间轴",
-  "column.conversations": "会话",
+  "column.direct": "私信",
   "column.directory": "浏览用户资料",
   "column.domain_blocks": "已屏蔽的域名",
   "column.favourites": "喜欢",
-  "column.follow_requests": "关注申请",
+  "column.follow_requests": "关注请求",
   "column.home": "主页",
   "column.lists": "列表",
   "column.mutes": "已隐藏的用户",
   "column.notifications": "通知",
   "column.pins": "置顶帖子",
-  "column.public": "跨站时间轴",
+  "column.public": "跨站公共时间轴",
   "column_back_button.label": "返回",
   "column_header.hide_settings": "隐藏设置",
   "column_header.moveLeft_settings": "将此栏左移",
@@ -89,14 +89,14 @@
   "column_header.show_settings": "显示设置",
   "column_header.unpin": "取消置顶",
   "column_subheading.settings": "设置",
-  "community.column_settings.local_only": "仅在本站显示",
+  "community.column_settings.local_only": "仅限本站",
   "community.column_settings.media_only": "仅限媒体",
   "community.column_settings.remote_only": "仅限外部",
   "compose_form.direct_message_warning_learn_more": "了解更多",
   "compose_form.encryption_warning": "Mastodon 上的嘟文并未端到端加密。请不要在 Mastodon 上分享敏感信息。",
   "compose_form.hashtag_warning": "此帖子被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开帖子才能通过话题标签进行搜索。",
   "compose_form.lock_disclaimer": "你的账号没有{locked}。任何人在关注你后都能立即查看仅关注者可见的帖子。",
-  "compose_form.lock_disclaimer.lock": "锁嘟",
+  "compose_form.lock_disclaimer.lock": "开启保护",
   "compose_form.placeholder": "在想些什么？",
   "compose_form.poll.add_option": "添加一个选项",
   "compose_form.poll.duration": "投票持续时间",
@@ -107,42 +107,42 @@
   "compose_form.publish": "嘟嘟",
   "compose_form.publish_loud": "{publish}！",
   "compose_form.save_changes": "保存更改",
-  "compose_form.sensitive.hide": "将媒体标记为敏感内容",
-  "compose_form.sensitive.marked": "媒体已被标记为敏感内容",
+  "compose_form.sensitive.hide": "{count, plural, one {将媒体标记为敏感内容} other {将媒体标记为敏感内容}}",
+  "compose_form.sensitive.marked": "{count, plural, one {媒体已被标记为敏感内容} other {媒体已被标记为敏感内容}}",
   "compose_form.sensitive.unmarked": "媒体未被标记为敏感内容",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
-  "compose_form.spoiler_placeholder": "在此处写下内容警告",
+  "compose_form.spoiler_placeholder": "写下你的警告",
   "confirmation_modal.cancel": "取消",
   "confirmations.block.block_and_report": "屏蔽与举报",
   "confirmations.block.confirm": "屏蔽",
   "confirmations.block.message": "你确定要屏蔽 {name} 吗？",
   "confirmations.delete.confirm": "删除",
-  "confirmations.delete.message": "你确定要删除这个帖子吗？",
+  "confirmations.delete.message": "你确定要删除这条嘟文吗？",
   "confirmations.delete_list.confirm": "删除",
   "confirmations.delete_list.message": "你确定要永久删除此列表吗？",
   "confirmations.discard_edit_media.confirm": "丢弃",
-  "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍然要丢弃它们吗？",
-  "confirmations.domain_block.confirm": "隐藏所有来自此域名的内容",
-  "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户就已经足够了。来自该域名的内容将不再出现在你的公共时间轴或通知列表里。来自该域名的关注者将会被移除。",
+  "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍然丢弃它们吗？",
+  "confirmations.domain_block.confirm": "屏蔽整个域名",
+  "confirmations.domain_block.message": "你真的确定要屏蔽所有来自 {domain} 的内容吗？多数情况下，屏蔽或隐藏几个特定的用户就已经足够了。来自该网站的内容将不再出现在你的任何公共时间轴或通知列表里。来自该网站的关注者将会被移除。",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "你确定要登出吗？",
   "confirmations.mute.confirm": "隐藏",
   "confirmations.mute.explanation": "这将隐藏他们的嘟文以及提到他们的嘟文，但他们仍可以看到你的嘟文并关注你。",
   "confirmations.mute.message": "你确定要隐藏 {name} 吗？",
   "confirmations.redraft.confirm": "删除并重新编辑",
-  "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗？所有相关的转嘟和喜欢都会被清除，回复将失去与这条嘟文的关联。",
+  "confirmations.redraft.message": "你确定要删除这条嘟文并重新编辑它吗？所有相关的转嘟和喜欢都会被清除，回复将会失去关联。",
   "confirmations.reply.confirm": "回复",
-  "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。仍要继续吗？",
+  "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
   "conversation.with": "与 {names}",
-  "directory.federated": "来自联邦宇宙的已知部分",
+  "directory.federated": "来自已知联邦宇宙",
   "directory.local": "仅来自 {domain}",
-  "directory.new_arrivals": "新用户",
+  "directory.new_arrivals": "新来者",
   "directory.recently_active": "最近活跃",
   "embed.instructions": "要在你的网站上嵌入此嘟文，请复制以下代码。",
   "embed.preview": "它会像这样显示出来：",
@@ -156,31 +156,31 @@
   "emoji_button.objects": "物体",
   "emoji_button.people": "人物",
   "emoji_button.recent": "常用",
-  "emoji_button.search": "搜索……",
+  "emoji_button.search": "搜索…",
   "emoji_button.search_results": "搜索结果",
   "emoji_button.symbols": "符号",
   "emoji_button.travel": "旅行和地点",
   "empty_column.account_suspended": "账户已停用",
   "empty_column.account_timeline": "这里没有帖子！",
-  "empty_column.account_unavailable": "用户资料不可用",
+  "empty_column.account_unavailable": "个人资料不可用",
   "empty_column.blocks": "你还未屏蔽任何用户。",
-  "empty_column.bookmarked_statuses": "你还未将任何帖子加入收藏夹。在你加入收藏夹后，帖子将显示在此。",
+  "empty_column.bookmarked_statuses": "你还未将任何帖子加入书签。在你添加书签后，帖子将显示在此。",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
-  "empty_column.conversations": "发送或收到仅对提及对象可见的嘟文后，就会显示在这里。",
+  "empty_column.direct": "你还未使用过私信。当你发出或者收到私信时，它将显示在此。",
   "empty_column.domain_blocks": "目前没有被隐藏的站点。",
   "empty_column.explore_statuses": "目前没有热门话题，稍后再来看看吧！",
   "empty_column.favourited_statuses": "你还未喜欢过任何帖子。当你喜欢帖子时，它将显示在此。",
   "empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。",
   "empty_column.follow_recommendations": "似乎无法为你生成任何建议。你可以尝试使用搜索寻找你可能知道的人或探索热门标签。",
-  "empty_column.follow_requests": "你没有收到新的关注申请。收到后将显示在此。",
+  "empty_column.follow_requests": "你没有收到新的关注请求。收到后将显示在此。",
   "empty_column.hashtag": "这个话题标签下暂时没有内容。",
   "empty_column.home": "你的主页时间线是空的！快去关注更多人吧。 {suggestions}",
   "empty_column.home.suggestions": "查看一些建议",
-  "empty_column.list": "此列表中暂时没有内容。列表中用户所发送的的新嘟文将会显示在这里。",
-  "empty_column.lists": "你还没有创建过列表。你创建的列表会显示在这里。",
+  "empty_column.list": "此列表中暂时没有内容。列表中用户所发送的的新嘟文将会在这里显示。",
+  "empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
   "empty_column.mutes": "你没有隐藏任何用户。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
-  "empty_column.public": "这里什么都没有！写一些公开帖子，或者关注来自其他服务器的用户后，这里就会有嘟文出现了",
+  "empty_column.public": "这里什么都没有！写一些公开帖子，或者关注其他服务器的用户后，这里就会有嘟文出现了",
   "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
   "error.unexpected_crash.explanation_addons": "此页面无法正确显示，这个错误很可能是由浏览器附加组件或自动翻译工具造成的。",
   "error.unexpected_crash.next_steps": "刷新一下页面试试。如果没用，你可以换个浏览器或者用本地应用。",
@@ -190,7 +190,7 @@
   "explore.search_results": "搜索结果",
   "explore.suggested_follows": "为你推荐",
   "explore.title": "探索",
-  "explore.trending_links": "新闻",
+  "explore.trending_links": "最新消息",
   "explore.trending_statuses": "帖子",
   "explore.trending_tags": "话题标签",
   "follow_recommendations.done": "完成",
@@ -198,7 +198,7 @@
   "follow_recommendations.lead": "你关注的人的帖子将按时间顺序显示在你的主页。 别担心，你可以随时取消关注！",
   "follow_request.authorize": "授权",
   "follow_request.reject": "拒绝",
-  "follow_requests.unlocked_explanation": "虽然你没有锁嘟，但是 {domain} 的管理人员觉得你可能想人工审核这些账号的关注申请。",
+  "follow_requests.unlocked_explanation": "虽说你没有锁嘟，但是 {domain} 的工作人员觉得你可能想手工审核这些账号的关注请求。",
   "generic.saved": "已保存",
   "getting_started.developers": "开发",
   "getting_started.directory": "用户目录",
@@ -212,7 +212,7 @@
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
   "hashtag.column_settings.select.no_options_message": "没有找到建议",
-  "hashtag.column_settings.select.placeholder": "输入话题标签……",
+  "hashtag.column_settings.select.placeholder": "输入话题标签…",
   "hashtag.column_settings.tag_mode.all": "全部",
   "hashtag.column_settings.tag_mode.any": "任一",
   "hashtag.column_settings.tag_mode.none": "无一",
@@ -226,12 +226,12 @@
   "intervals.full.hours": "{number} 小时",
   "intervals.full.minutes": "{number} 分钟",
   "keyboard_shortcuts.back": "返回上一页",
-  "keyboard_shortcuts.blocked": "打开已屏蔽用户列表",
+  "keyboard_shortcuts.blocked": "打开被屏蔽用户列表",
   "keyboard_shortcuts.boost": "转嘟",
   "keyboard_shortcuts.column": "选择某栏",
   "keyboard_shortcuts.compose": "选择输入框",
-  "keyboard_shortcuts.conversations": "打开对话栏",
   "keyboard_shortcuts.description": "说明",
+  "keyboard_shortcuts.direct": "打开私信栏",
   "keyboard_shortcuts.down": "在列表中让光标下移",
   "keyboard_shortcuts.enter": "展开帖子",
   "keyboard_shortcuts.favourite": "喜欢帖子",
@@ -250,7 +250,7 @@
   "keyboard_shortcuts.pinned": "打开置顶帖子列表",
   "keyboard_shortcuts.profile": "打开作者的个人资料",
   "keyboard_shortcuts.reply": "回复帖子",
-  "keyboard_shortcuts.requests": "打开关注申请列表",
+  "keyboard_shortcuts.requests": "打开关注请求列表",
   "keyboard_shortcuts.search": "选择搜索框",
   "keyboard_shortcuts.spoilers": "显示或隐藏被折叠的正文",
   "keyboard_shortcuts.start": "打开“开始使用”栏",
@@ -283,20 +283,21 @@
   "missing_indicator.label": "找不到内容",
   "missing_indicator.sublabel": "无法找到此资源",
   "mute_modal.duration": "持续时长",
-  "mute_modal.hide_notifications": "是否同时隐藏来自这个用户的通知？",
+  "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
   "mute_modal.indefinite": "无期限",
   "navigation_bar.apps": "移动应用",
   "navigation_bar.blocks": "已屏蔽的用户",
-  "navigation_bar.bookmarks": "收藏夹",
+  "navigation_bar.bookmarks": "书签",
   "navigation_bar.community_timeline": "本站时间轴",
   "navigation_bar.compose": "撰写新帖子",
+  "navigation_bar.direct": "私信",
   "navigation_bar.discover": "发现",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
   "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.explore": "探索",
   "navigation_bar.favourites": "喜欢",
   "navigation_bar.filters": "隐藏关键词",
-  "navigation_bar.follow_requests": "关注申请",
+  "navigation_bar.follow_requests": "关注请求",
   "navigation_bar.follows_and_followers": "关注管理",
   "navigation_bar.info": "关于此服务",
   "navigation_bar.keyboard_shortcuts": "快捷键列表",
@@ -305,17 +306,17 @@
   "navigation_bar.mutes": "已隐藏的用户",
   "navigation_bar.personal": "个人",
   "navigation_bar.pins": "置顶帖子",
-  "navigation_bar.preferences": "偏好",
-  "navigation_bar.public_timeline": "跨站时间轴",
+  "navigation_bar.preferences": "首选项",
+  "navigation_bar.public_timeline": "跨站公共时间轴",
   "navigation_bar.security": "安全",
-  "notification.admin.sign_up": "{name} 已被注册",
+  "notification.admin.sign_up": "{name} 已注册",
   "notification.favourite": "{name} 喜欢了你的帖子",
   "notification.follow": "{name} 开始关注你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.mention": "{name} 提及了你",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一个投票已经结束",
-  "notification.reblog": "{name} 转发了你的帖子",
+  "notification.reblog": "{name} 转嘟了你的嘟文",
   "notification.status": "{name} 刚刚发帖",
   "notification.update": "{name} 编辑了帖子",
   "notifications.clear": "清空通知列表",
@@ -327,19 +328,19 @@
   "notifications.column_settings.filter_bar.category": "快速过滤栏",
   "notifications.column_settings.filter_bar.show_bar": "显示过滤栏",
   "notifications.column_settings.follow": "新关注者：",
-  "notifications.column_settings.follow_request": "新关注申请：",
+  "notifications.column_settings.follow_request": "新关注请求：",
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票结果：",
   "notifications.column_settings.push": "推送通知",
-  "notifications.column_settings.reblog": "转发：",
+  "notifications.column_settings.reblog": "转贴：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
-  "notifications.column_settings.status": "新帖：",
+  "notifications.column_settings.status": "新嘟文：",
   "notifications.column_settings.unread_notifications.category": "未读通知",
   "notifications.column_settings.unread_notifications.highlight": "高亮显示未读通知",
   "notifications.column_settings.update": "编辑：",
   "notifications.filter.all": "全部",
-  "notifications.filter.boosts": "转发",
+  "notifications.filter.boosts": "转嘟",
   "notifications.filter.favourites": "喜欢",
   "notifications.filter.follows": "关注",
   "notifications.filter.mentions": "提及",
@@ -348,9 +349,9 @@
   "notifications.grant_permission": "授予权限",
   "notifications.group": "{count} 条通知",
   "notifications.mark_as_read": "将所有通知标为已读",
-  "notifications.permission_denied": "由于权限不可用，无法启用桌面通知。",
+  "notifications.permission_denied": "由于权限被拒绝，无法启用桌面通知。",
   "notifications.permission_denied_alert": "由于在此之前浏览器权限请求就已被拒绝，所以启用桌面通知失败",
-  "notifications.permission_required": "未授予所需权限，所以桌面通知不可用",
+  "notifications.permission_required": "所需权限未被授予，所以桌面通知不可用",
   "notifications_permission_banner.enable": "启用桌面通知",
   "notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
   "notifications_permission_banner.title": "精彩不容错过",
@@ -366,13 +367,13 @@
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置帖子的可见范围",
   "privacy.direct.long": "只有被提及的用户能看到",
-  "privacy.direct.short": "仅对提及的人可见",
+  "privacy.direct.short": "仅提到的人",
   "privacy.private.long": "仅关注者可见",
   "privacy.private.short": "仅对关注者可见",
   "privacy.public.long": "所有人可见",
   "privacy.public.short": "公开",
   "privacy.unlisted.long": "对所有人可见，但不加入探索功能",
-  "privacy.unlisted.short": "非公开",
+  "privacy.unlisted.short": "不公开",
   "refresh": "刷新",
   "regeneration_indicator.label": "加载中……",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
@@ -467,7 +468,7 @@
   "status.pin": "在个人资料页面置顶",
   "status.pinned": "置顶帖子",
   "status.read_more": "查看更多",
-  "status.reblog": "转贴",
+  "status.reblog": "转嘟",
   "status.reblog_private": "转贴（可见者不变）",
   "status.reblogged_by": "{name} 转贴了",
   "status.reblogs.empty": "没有人转贴过此贴。如果有人转贴了将显示在此。",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 45e030833..f59ad7a2a 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -70,7 +70,7 @@
   "column.blocks": "封鎖名單",
   "column.bookmarks": "書籤",
   "column.community": "本站時間軸",
-  "column.conversations": "Conversations",
+  "column.direct": "Direct messages",
   "column.directory": "瀏覽個人資料",
   "column.domain_blocks": "封鎖的服務站",
   "column.favourites": "最愛的文章",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "你還沒有封鎖任何使用者。",
   "empty_column.bookmarked_statuses": "你還沒建立任何書籤。這裡將會顯示你建立的書籤。",
   "empty_column.community": "本站時間軸暫時未有內容，快寫一點東西來搶頭香啊！",
-  "empty_column.conversations": "Once you send or receive a post that's only visible to people mentioned in it, it will show up here.",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "尚未隱藏任何網域。",
   "empty_column.explore_statuses": "Nothing is trending right now. Check back later!",
   "empty_column.favourited_statuses": "你還沒收藏任何文章。這裡將會顯示你收藏的嘟文。",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "轉推",
   "keyboard_shortcuts.column": "把標示移動到其中一列",
   "keyboard_shortcuts.compose": "把標示移動到文字輸入區",
-  "keyboard_shortcuts.conversations": "to open conversations column",
   "keyboard_shortcuts.description": "描述",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "在列表往下移動",
   "keyboard_shortcuts.enter": "打開文章",
   "keyboard_shortcuts.favourite": "收藏文章",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "書籤",
   "navigation_bar.community_timeline": "本站時間軸",
   "navigation_bar.compose": "撰寫新文章",
+  "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "封鎖的服務站",
   "navigation_bar.edit_profile": "修改個人資料",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 811e998bb..f78e07ee2 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -70,7 +70,7 @@
   "column.blocks": "已封鎖的使用者",
   "column.bookmarks": "書籤",
   "column.community": "本站時間軸",
-  "column.conversations": "對話",
+  "column.direct": "私訊",
   "column.directory": "瀏覽個人檔案",
   "column.domain_blocks": "已封鎖的網域",
   "column.favourites": "最愛",
@@ -166,7 +166,7 @@
   "empty_column.blocks": "您還沒有封鎖任何使用者。",
   "empty_column.bookmarked_statuses": "您還沒建立任何書籤。當您建立書簽時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
-  "empty_column.conversations": "一旦您傳送或收到僅對其中提到之人可見的嘟文，就會在這邊顯示。",
+  "empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未封鎖任何網域。",
   "empty_column.explore_statuses": "目前沒有熱門討論，請稍候再回來看看！",
   "empty_column.favourited_statuses": "您還沒加過任何嘟文至最愛。當您收藏嘟文時，它將於此顯示。",
@@ -230,8 +230,8 @@
   "keyboard_shortcuts.boost": "轉嘟",
   "keyboard_shortcuts.column": "將焦點放在其中一欄的嘟文",
   "keyboard_shortcuts.compose": "將焦點移至撰寫文字區塊",
-  "keyboard_shortcuts.conversations": "開啟對話欄",
   "keyboard_shortcuts.description": "說明",
+  "keyboard_shortcuts.direct": "開啟私訊欄",
   "keyboard_shortcuts.down": "在列表中往下移動",
   "keyboard_shortcuts.enter": "檢視嘟文",
   "keyboard_shortcuts.favourite": "加到最愛",
@@ -290,6 +290,7 @@
   "navigation_bar.bookmarks": "書籤",
   "navigation_bar.community_timeline": "本站時間軸",
   "navigation_bar.compose": "撰寫新嘟文",
+  "navigation_bar.direct": "私訊",
   "navigation_bar.discover": "探索",
   "navigation_bar.domain_blocks": "隱藏的網域",
   "navigation_bar.edit_profile": "編輯個人檔案",
@@ -366,7 +367,7 @@
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
   "privacy.direct.long": "只有被提及的使用者能看到",
-  "privacy.direct.short": "僅限於我提及的人",
+  "privacy.direct.short": "僅限提及的人",
   "privacy.private.long": "只有跟隨您的使用者能看到",
   "privacy.private.short": "僅限跟隨者",
   "privacy.public.long": "對所有人可見",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 694f5e928..4a805992e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -2469,6 +2469,10 @@ a.account__display-name {
   .columns-area__panels__pane--compositional {
     display: none;
   }
+
+  .with-fab .scrollable .item-list:last-child {
+    padding-bottom: 5.25rem;
+  }
 }
 
 @media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 850ea6d82..237975880 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -92,6 +92,10 @@ class Admin::AccountAction
       text: text_for_warning,
       status_ids: status_ids
     )
+
+    # A log entry is only interesting if the warning contains
+    # custom text from someone. Otherwise it's just noise.
+    log_action(:create, @warning) if @warning.text.present? && type == 'none'
   end
 
   def process_reports!
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
index 878a2188d..0a39d7f26 100644
--- a/app/services/verify_link_service.rb
+++ b/app/services/verify_link_service.rb
@@ -28,7 +28,7 @@ class VerifyLinkService < BaseService
 
     links = Nokogiri::HTML(@body).xpath('//a[contains(concat(" ", normalize-space(@rel), " "), " me ")]|//link[contains(concat(" ", normalize-space(@rel), " "), " me ")]')
 
-    if links.any? { |link| link['href'] == @link_back }
+    if links.any? { |link| link['href'].downcase == @link_back.downcase }
       true
     elsif links.empty?
       false
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml
index 0b71e14a3..1be50331a 100644
--- a/app/views/disputes/strikes/show.html.haml
+++ b/app/views/disputes/strikes/show.html.haml
@@ -3,8 +3,8 @@
 
 - content_for :heading_actions do
   - if @appeal.persisted?
-    = link_to t('admin.accounts.approve'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal)
-    = link_to t('admin.accounts.reject'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal)
+    = link_to t('disputes.strikes.approve_appeal'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal)
+    = link_to t('disputes.strikes.reject_appeal'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal)
 
 - if @strike.overruled?
   %p.hint
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 7b672bda7..6192f293a 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -65,6 +65,6 @@
       - elsif status.private_visibility? || status.limited_visibility?
         = fa_icon 'lock fw'
       - else
-        = fa_icon 'envelope fw'
+        = fa_icon 'at fw'
     = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button' do
       = fa_icon 'star fw'
diff --git a/config/locales/activerecord.he.yml b/config/locales/activerecord.he.yml
index e3b363efc..5dc8ddc96 100644
--- a/config/locales/activerecord.he.yml
+++ b/config/locales/activerecord.he.yml
@@ -1,13 +1,32 @@
 ---
 he:
   activerecord:
+    attributes:
+      poll:
+        expires_at: מועד אחרון
+        options: ברירות
+      user:
+        agreement: הסכם שירות
+        email: כתובת דוא"ל
+        locale: הגדרות אזוריות
+        password: סיסמא
+      user/account:
+        username: שם משתמש/ת
+      user/invite_request:
+        text: סיבה
     errors:
       models:
         account:
           attributes:
             username:
               invalid: ספרות, אותיות לטיניות וקו תחתי בלבד
+              reserved: שמור
         status:
           attributes:
             reblog:
               taken: של החצרוץ כבר קיים
+        user:
+          attributes:
+            email:
+              blocked: עושה שימוש בספק דוא"ל אסור
+              unreachable: נראה שלא קיים
diff --git a/config/locales/af.yml b/config/locales/af.yml
index 4afb11de5..c60cbf41a 100644
--- a/config/locales/af.yml
+++ b/config/locales/af.yml
@@ -1,5 +1,9 @@
 ---
 af:
+  admin:
+    trends:
+      only_allowed: Slegs toegelate
+      trending: Gewild
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index aba42bb43..13c698853 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -295,6 +295,7 @@ ar:
         update_domain_block: تحديث كتلة النطاق
         update_status: تحديث الحالة
       actions:
+        approve_user_html: قبل %{name} تسجيل %{target}
         assigned_to_self_report_html: قام %{name} بتعيين التقرير %{target} لأنفسهم
         change_email_user_html: غيّر %{name} عنوان البريد الإلكتروني للمستخدم %{target}
         confirm_user_html: "%{name} قد قام بتأكيد عنوان البريد الإلكتروني لـ %{target}"
@@ -324,6 +325,7 @@ ar:
         enable_user_html: قام %{name} بتنشيط تسجيل الدخول للمستخدم %{target}
         memorialize_account_html: قام %{name} بتحويل حساب %{target} إلى صفحة تذكارية
         promote_user_html: قام %{name} بترويج المستخدم %{target}
+        reject_user_html: رفض %{name} تسجيل %{target}
         remove_avatar_user_html: قام %{name} بإزالة صورة %{target} الرمزية
         reopen_report_html: قام %{name} بإعادة فتح الشكوى %{target}
         reset_password_user_html: قام %{name} بإعادة تعيين كلمة مرور المستخدم %{target}
@@ -762,6 +764,7 @@ ar:
         usable: يمكن استخدامه
         usage_comparison: تم استخدامه %{today} مرات اليوم، مقارنة بـ %{yesterday} بالأمس
       title: المتداوَلة
+      trending: المتداولة
     warning_presets:
       add_new: إضافة واحد جديد
       delete: حذف
@@ -1564,7 +1567,10 @@ ar:
       title: المغادرة بأرشيف الحساب
     suspicious_sign_in:
       change_password: غيّر كلمتك السرية
+      details: 'فيما يلي تفاصيل تسجيل الدخول:'
+      explanation: لقد اكتشفنا تسجيل دخول إلى حسابك من عنوان IP جديد.
       subject: تم النفاذ عبر حسابك من خلال عنوان إيبي جديد
+      title: تسجيل دخول جديد
     warning:
       appeal: تقديم طعن
       appeal_description: إذا كنت تعتقد أن هذا خطأ، يمكنك تقديم طعن إلى فريق %{instance}.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 3e1c1c6b7..f5fa3ece0 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -17,15 +17,15 @@ ca:
     contact_missing: No configurat
     contact_unavailable: N/D
     continue_to_web: Continua a l'aplicació web
-    discover_users: Descobreix usuaris
+    discover_users: Descobrir usuaris
     documentation: Documentació
     federation_hint_html: Amb un compte de %{instance}, podràs seguir persones de qualsevol servidor Mastodon i de molts més.
-    get_apps: Prova una aplicació mòbil
+    get_apps: Provar una aplicació mòbil
     hosted_on: Mastodon allotjat a %{domain}
     instance_actor_flash: |
       Aquest compte és un actor virtual usat per representar el servidor i no qualsevol usuari individual.
       Es fa servir per a propòsits de federació i no s'ha de ser bloquejar si no voleu bloquejar tota la instància. En aquest cas, hauríeu d'utilitzar un bloqueig de domini.
-    learn_more: Més informació
+    learn_more: Aprèn més
     logged_in_as_html: Actualment has iniciat sessió com a %{username}.
     logout_before_registering: Ja has iniciat sessió.
     privacy_policy: Política de privadesa
@@ -73,7 +73,7 @@ ca:
     moved_html: "%{name} s'ha mogut a %{new_profile_link}:"
     network_hidden: Aquesta informació no està disponible
     nothing_here: No hi ha res aquí!
-    people_followed_by: Usuaris seguits per %{name}
+    people_followed_by: Persones seguides per %{name}
     people_who_follow: Usuaris que segueixen %{name}
     pin_errors:
       following: Has d'estar seguint la persona que vulguis avalar
@@ -911,7 +911,7 @@ ca:
     settings: 'Canvia les preferències de correu: %{link}'
     view: 'Visualització:'
     view_profile: Mostra el perfil
-    view_status: Mostra l'estat
+    view_status: Mostra la publicació
   applications:
     created: L'aplicació s'ha creat correctament
     destroyed: L'aplicació s'ha suprimit correctament
@@ -1124,7 +1124,7 @@ ca:
     delete: Esborra
     none: Cap
     order_by: Ordena per
-    save_changes: Desar els canvis
+    save_changes: Desa els canvis
     today: avui
     validation_errors:
       one: Alguna cosa no va bé! Si us plau, revisa l'error
@@ -1150,7 +1150,7 @@ ca:
     upload: Carrega
   in_memoriam_html: En Memòria.
   invites:
-    delete: Desactivar
+    delete: Desactiva
     expired: Caducat
     expires_in:
       '1800': 30 minuts
@@ -1399,14 +1399,14 @@ ca:
     revoke: Revoca
     revoke_success: S'ha revocat la sessió amb èxit
     title: Sessions
-    view_authentication_history: Veure l'historial d'autenticació del teu compte
+    view_authentication_history: Mostra l'historial d'autenticació del compte
   settings:
     account: Compte
     account_settings: Configuració del compte
     aliases: Àlies de compte
     appearance: Aparença
     authorized_apps: Aplicacions autoritzades
-    back: Tornar a Mastodon
+    back: Torna a Mastodon
     delete: Eliminació del compte
     development: Desenvolupament
     edit_profile: Edita el perfil
@@ -1474,7 +1474,7 @@ ca:
       unlisted: No llistat
       unlisted_long: Tothom ho pot veure, però no es mostra en les línies de temps públiques
   statuses_cleanup:
-    enabled: Esborrar automàticament publicacions antigues
+    enabled: Esborra automàticament publicacions antigues
     enabled_hint: Suprimeix automàticament les teves publicacions quan arribin a un llindar d’edat especificat, tret que coincideixin amb una de les excepcions següents
     exceptions: Excepcions
     explanation: Com que suprimir publicacions és una operació cara, es fa lentament amb el pas del temps i quan el servidor no està ocupat. Per aquest motiu, és possible que les teves publicacions se suprimeixin un temps després d’assolir el llindar d’edat.
@@ -1503,7 +1503,7 @@ ca:
       '604800': 1 setmana
       '63113904': 2 anys
       '7889238': 3 mesos
-    min_age_label: Llindar d'edat
+    min_age_label: Antiguitat
     min_favs: Mantenir les publicacions afavorides més de
     min_favs_hint: No suprimeix cap de les teves publicacions que hagin rebut més d'aquesta quantitat de favorits. Deixa-ho en blanc per suprimir publicacions independentment del nombre de favorits que tinguin
     min_reblogs: Mantenir les publicacions impulsades més de
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 1b788574e..51fde7837 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -7,6 +7,7 @@ cy:
     active_count_after: yn weithredol
     active_footnote: Defnyddwyr Gweithredol Misol (DGM)
     administered_by: 'Gweinyddir gan:'
+    api: API
     apps: Apiau symudol
     apps_platforms: Defnyddio Mastodon o iOS, Android a phlatfformau eraill
     browse_directory: Pori cyfeiriadur proffil a hidlo wrth diddordebau
@@ -24,7 +25,7 @@ cy:
     instance_actor_flash: |
       Mae'r cyfrif hwn yn actor rhithwir a ddefnyddir i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol.
       Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei rwystro oni bai eich bod am rwystro'r achos cyfan, ac os felly dylech ddefnyddio bloc parth.
-    learn_more: Dysu mwy
+    learn_more: Dysgu mwy
     logged_in_as_html: Rydych chi wedi mewngofnodi fel %{username}.
     logout_before_registering: Rydych chi eisoes wedi mewngofnodi.
     privacy_policy: Polisi preifatrwydd
@@ -40,7 +41,7 @@ cy:
       other: statwsau
       two: statwsau
       zero: statwsau
-    status_count_before: Ysgriffennwyd gan
+    status_count_before: Ysgrifennwyd gan
     tagline: Dilyn ffrindiau a darganfod rhai newydd
     terms: Telerau gwasanaeth
     unavailable_content: Cynnwys nad yw ar gael
@@ -76,6 +77,7 @@ cy:
       two: Dilynwyr
       zero: Dilynwyr
     following: Yn dilyn
+    instance_actor_flash: Mae'r cyfrif hwn yn actor rhithwir a ddefnyddir i gynrychioli'r gweinydd ei hun ac nid unrhyw ddefnyddiwr unigol. Fe'i defnyddir at ddibenion ffederasiwn ac ni ddylid ei atal.
     joined: Ymunodd %{date}
     last_active: diweddaraf
     link_verified_on: Gwiriwyd perchnogaeth y ddolen yma ar %{date}
@@ -347,6 +349,8 @@ cy:
         title: Cofnod newydd yng nghosbrestr e-byst
       title: Cosbrestr e-bost
     instances:
+      back_to_all: Popeth
+      back_to_warning: Rhybudd
       by_domain: Parth
       delivery_available: Mae'r cyflenwad ar gael
       moderation:
@@ -1036,6 +1040,7 @@ cy:
         zero: "%{count} pleidlais"
       vote: Pleidleisio
     show_more: Dangos mwy
+    show_older: Dangos pethau hŷn
     show_thread: Dangos edefyn
     sign_in_to_participate: Mengofnodwch i gymryd rhan yn y sgwrs
     visibilities:
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 28c009ef3..0455b700b 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -517,6 +517,7 @@ da:
       delivery:
         all: Alle
         clear: Ryd leveringsfejl
+        failing: Fejler
         restart: Genstart levering
         stop: Stop levering
         unavailable: Utilgængelig
@@ -843,7 +844,7 @@ da:
           one: Brugt af én person den seneste uge
           other: Brugt af %{count} personer den seneste uge
       title: Trends
-      trending: Populært
+      trending: Populære
     warning_presets:
       add_new: Tilføj ny
       delete: Slet
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 26e914fe7..2da287708 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -441,7 +441,7 @@ de:
       obfuscate: Domainname verschleiern
       obfuscate_hint: Den Domainnamen in der Liste teilweise verschleiern, wenn die Liste der Domänenbeschränkungen aktiviert ist
       private_comment: Privater Kommentar
-      private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderatoren.
+      private_comment_hint: Kommentar zu dieser Domain-Beschränkung für die interne Nutzung durch die Moderator_innen.
       public_comment: Öffentlicher Kommentar
       public_comment_hint: Kommentar zu dieser Domain-Beschränkung für die allgemeine Öffentlichkeit, wenn das Veröffentlichen der Blockliste aktiviert ist.
       reject_media: Mediendateien ablehnen
@@ -607,7 +607,7 @@ de:
       add_to_report: Mehr zur Meldung hinzufügen
       are_you_sure: Bist du dir sicher?
       assign_to_self: Mir zuweisen
-      assigned: Zugewiesener Moderator
+      assigned: Zugewiesene_r Moderator_in
       by_target_domain: Domain des gemeldeten Kontos
       category: Kategorie
       category_description_html: Der Grund, warum dieses Konto und/oder der Inhalt gemeldet wurden, wird in der Kommunikation mit dem gemeldeten Konto zitiert
@@ -629,7 +629,7 @@ de:
         delete: Löschen
         placeholder: Beschreibe, welche Maßnahmen ergriffen wurden oder irgendwelche andere Neuigkeiten…
         title: Notizen
-      notes_description_html: Zeige und hinterlasse Notizen an andere Moderatoren und dein zukünftiges Selbst
+      notes_description_html: Zeige und hinterlasse Notizen an andere Moderator_innen und dein zukünftiges Ich
       quick_actions_description_html: 'Führe eine schnelle Aktion aus oder scrolle nach unten, um gemeldete Inhalte zu sehen:'
       remote_user_placeholder: der entfernte Benutzer von %{instance}
       reopen: Meldung wieder eröffnen
@@ -802,6 +802,7 @@ de:
           other: In der letzten Woche von %{count} Personen geteilt
         title: Angesagte Links
         usage_comparison: Heute %{today} mal geteilt, gestern %{yesterday} mal
+      only_allowed: Nur Erlaubte
       pending_review: Überprüfung ausstehend
       preview_card_providers:
         allowed: Links von diesem Herausgeber können angesagt sein
@@ -843,6 +844,7 @@ de:
           one: In der letzten Woche von einer Person genutzt
           other: In der letzten Woche von %{count} Personen genutzt
       title: Trends
+      trending: Häufig diskutiert
     warning_presets:
       add_new: Neu hinzufügen
       delete: Löschen
@@ -1070,7 +1072,7 @@ de:
     '503': Die Seite konnte wegen eines temporären Serverfehlers nicht angezeigt werden.
     noscript_html: Bitte aktiviere JavaScript, um die Mastodon-Web-Anwendung zu verwenden. Alternativ kannst du auch eine der <a href="%{apps_path}">nativen Mastodon-Anwendungen</a> für deine Plattform probieren.
   existing_username_validator:
-    not_found: kann lokalen Benutzer nicht mit diesem Nuternamen finden
+    not_found: kann lokalen Benutzer nicht mit diesem Nutzernamen finden
     not_found_multiple: kann %{usernames} nicht finden
   exports:
     archive_takeout:
@@ -1644,14 +1646,14 @@ de:
       title: Eine neue Anmeldung
     warning:
       appeal: Einspruch einsenden
-      appeal_description: Wenn du glaubst, dass dies ein Fehler ist, kannst du einen Einspruch an die Mitarbeiter von %{instance} senden.
+      appeal_description: Wenn du glaubst, dass es sich um einen Fehler handelt, kannst du einen Einspruch an die Administration von %{instance} senden.
       categories:
         spam: Spam
         violation: Inhalt verletzt die folgenden Community-Richtlinien
       explanation:
-        delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Communityrichtlinien erkannt und von den Moderatoren von %{instance} entfernt.
+        delete_statuses: Einige deiner Beiträge wurden als Verstoß gegen eine oder mehrere Communityrichtlinien erkannt und von den Moderator_innen von %{instance} entfernt.
         disable: Du kannst dein Konto nicht mehr verwenden, aber dein Profil und andere Daten bleiben unversehrt. Du kannst ein Backup deiner Daten anfordern, die Kontoeinstellungen ändern oder dein Konto löschen.
-        mark_statuses_as_sensitive: Einige deiner Beiträge wurden von den Moderatoren von %{instance} als NSFW markiert. Das bedeutet, dass die Nutzer die Medien in den Beiträgen antippen müssen, bevor eine Vorschau angezeigt wird. Du kannst Medien in Zukunft als NSFW markieren, wenn du Beiträge verfasst.
+        mark_statuses_as_sensitive: Einige deiner Beiträge wurden von den Moderator_innen von %{instance} als NSFW markiert. Das bedeutet, dass die Nutzer die Medien in den Beiträgen antippen müssen, bevor eine Vorschau angezeigt wird. Du kannst Medien in Zukunft als NSFW markieren, wenn du Beiträge verfasst.
         sensitive: Von nun an werden alle deine hochgeladenen Mediendateien als sensibel markiert und hinter einer Warnung versteckt.
         silence: Solange dein Konto limitiert ist, können nur die Leute, die dir bereits folgen, deine Beiträge auf dem Server sehen und es könnte sein, dass du von verschiedenen öffentlichen Listungen ausgeschlossen wirst. Andererseits können andere dir manuell folgen.
         suspend: Du kannst dein Konto nicht mehr verwenden und dein Profil und andere Daten sind nicht mehr verfügbar. Du kannst dich immer noch anmelden, um ein Backup deiner Daten anzufordern, bis die Daten innerhalb von 30 Tagen vollständig gelöscht wurden. Allerdings werden wir einige Daten speichern, um zu verhindern, dass du die Sperrung umgehst.
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index be8af6f9e..63bb3aedd 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -2,8 +2,8 @@
 he:
   devise:
     confirmations:
-      confirmed: כתובת הדוא"ל אומתה בהצלחה.
-      send_instructions: נשלח אליך דוא"ל עם הוראות לאימות כתובת הדוא"ל שאמור להתקבל בדקות הקרובות. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
+      confirmed: כתובת הדוא"ל שלך אומתה בהצלחה.
+      send_instructions: נשלח אליך דוא"ל עם הוראות לאימות כתובת הדוא"ל שאמור להתקבל בדקות הקרובות. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה.
       send_paranoid_instructions: אם כתובת הדוא"ל שלך קיימת במסד הנתונים, יתקבל בדקות הקרובות דוא"ל עם הוראות לאימות כתובתך. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
     failure:
       already_authenticated: חשבון זה כבר מחובר.
@@ -12,18 +12,71 @@ he:
       last_attempt: יש לך עוד ניסיון אחד לפני נעילת החשבון.
       locked: חשבון זה נעול.
       not_found_in_database: "%{authentication_keys} או סיסמא לא נכונים."
+      pending: חשבונך נמצא עדיין בבדיקה.
       timeout: פג תוקף השהיה בחשבון. נא להכנס מחדש על מנת להמשיך.
       unauthenticated: יש להרשם או להכנס לחשבון על מנת להמשיך.
       unconfirmed: יש לאמת את כתובת הדוא"ל על מנת להמשיך.
     mailer:
       confirmation_instructions:
+        action: אימות כתובת דוא״ל
+        action_with_app: אישור וחזרה ל-%{app}
+        explanation: יצרת חשבון ב-%{host} עם כתובת דוא"ל זו. רק קליק יחיד נותר כדי להפעילו. אם לא את/ה יצרת את החשבון, בבקשה התעלם/י מהדוא"ל הזה.
+        explanation_when_pending: הוגשה בקשה להזמנה ל-%{host} עם כתובת דוא"ל זו. ברגע שתאשר/י את כתובת הדוא"ל נבחן את בקשתך. ניתן להכנס לאתר על מנת לשנות פרטים או למחוק את החשבון, אבל לא ניתן לגשת לרוב הפעילויות לפני שהחשבון יאושר. אם בקשתך תדחה, המידע שלך יימחק ולא יידרש ממך כל פעולה נוספת. אם בקשה זו לא הגיעה ממך, אנא התעלם/י מדוא"ל זה.
+        extra_html: בנוסף, אנא עיין/י ב<a href="%{terms_path}">חוקי השרת</a> וב<a href="%{policy_path}">תנאי השירות</a>.
         subject: 'מסטודון: הוראות אימות %{instance}'
+        title: אימות כתובת דוא״ל
+      email_changed:
+        explanation: 'כתובת הדוא"ל של חשבונך שונתה ל:'
+        extra: אם לא שינית את כתובת הדוא"ל שלך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
+        subject: 'מסטודון: כתובת הדוא"ל שונתה'
+        title: כתובת דוא״ל חדשה
       password_change:
+        explanation: הסיסמא לחשבונך שונתה.
+        extra: אם לא שינית את סיסמתך, יכול להיות שמישהו השתלט על חשבונך. נא לשנות את הסיסמא מיידית או ליצור קשר עם מנהלי השרת אם ננעלת מחוץ לחשבון.
         subject: 'מסטודון: הסיסמא שונתה'
+        title: הסיסמא שונתה
+      reconfirmation_instructions:
+        explanation: נא לאמת את הכתובת הדוא"ל החדשה על מנת לשנותה.
+        extra: אם שינוי זה לא בוצע על ידך, נא להתעלם מדוא"ל זה. כתובת הדוא"ל של חשבון המסטודון שלך לא תשונה אלא אם תלחץ הקישורית לעיל.
+        subject: 'מסטודון: נא לאשר כתובת דוא"ל עבור %{instance}'
+        title: אימות כתובת דוא״ל
       reset_password_instructions:
+        action: שינוי סיסמא
+        explanation: ביקשת סיסמא חדשה לחשבון.
+        extra: אם לא ביקשת את זה, נא להתעלם מדוא"ל זה. סיסמתך לא תשתנה עוד שתלחץ הקישורית לעיל ותיוצר סיסמא חדשה.
         subject: 'מסטודון: הוראות לאיפוס סיסמא'
+        title: איפוס סיסמה
+      two_factor_disabled:
+        explanation: האימות הדו-גורמי לחשבונך בוטל. ניתן עתה להכנס לחשבון עם כתובת דוא"ל וסיסמא בלבד.
+        subject: 'מסטודון: אימות דו גורמי מושבת'
+        title: אימות דו-גורמי הושעה
+      two_factor_enabled:
+        explanation: אימות דו-גורמי הופעל בחשבונך. עתה על מנת להכנס לחשבון נדרש אסימון המיוצר על אפליקציית ה-TOTP המצומדת.
+        subject: 'מסטודון: אימות דו גורמי הופעל'
+        title: אימות דו־גורמי הופעל
+      two_factor_recovery_codes_changed:
+        explanation: צפני האיחזור הקודמים בוטלו, וחדשים נוצרו.
+        subject: 'מסטודון: צפני אחזור דו-גורמי יוצרו מחדש'
+        title: צפני אחזור דו-גורמי השתנו
       unlock_instructions:
         subject: 'מסטודון: הוראות לביטול נעילה'
+      webauthn_credential:
+        added:
+          explanation: מפתח האבטחה הבא הוסף לחשבונך
+          subject: 'מסטודון: מפתח אבטחה חדש'
+          title: מפתח אבטחה חדש הוסף
+        deleted:
+          explanation: מפתח האבטחה הבא נמחק מחשבונך
+          subject: 'מסטודון: מפתח האבטחה נמחק'
+          title: אחד ממפתחות האבטחה שלך נמחק
+      webauthn_disabled:
+        explanation: בוטלה האפשרות לאמת את חשבונך בעזרת מפתחות אבטחה. כניסה לחשבון אפשרית עכשיו רק בעזרת אסימון שיוצר באפליקציית ה-TOTP המצומדת.
+        subject: 'מסטודון: אימות בעזרת מפתחות אבטחה הושעה'
+        title: מפתחות אבטחה הושעו
+      webauthn_enabled:
+        explanation: אימות בעזרת מפתחות אבטחה הופעלו עבור חשבונך. ניתן עתה להשתמש במפתח האבטחה שלך על מנת להכנס לחשבון.
+        subject: 'מסטודון: אימות בעזרת מפתח אבטחה אופשר'
+        title: מפתחות אבטחה אופשרו
     omniauth_callbacks:
       failure: 'לא ניתן לאמת את חשבונך מ־%{kind} מהסיבה: "%{reason}".'
       success: נכשל אימות מחשבון %{kind}.
@@ -38,6 +91,7 @@ he:
       signed_up: ברוכים הבאים! נרשמת בהצלחה.
       signed_up_but_inactive: נרשמת בהצלחה. למרות זאת לא הצליחה הכניסה לחשבון מאחר וחשבונך עוד לא הופעל.
       signed_up_but_locked: נרשמת בהצלחה. למרות זאת לא הצליחה הכניסה לחשבון מאחר וחשבונך נעול.
+      signed_up_but_pending: מסר עם קישורית אישור נשלח לכתובת הדוא"ל שלך. אחרי לחיצה על הקישורית, נבחן את בקשתך. הודעה תמסר אם בקשתך תתקבל.
       signed_up_but_unconfirmed: דוא"ל עם קישורית לאימות נשלך לכתובתך. נא לעקוב אחר הקישורית על מנת להפעיל את החשבון. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       update_needs_confirmation: עדכת את חשבונך בהצלחה, אך יש צורך לאמת את כתובת הדוא"ל החדשה שלך. נא לבדוק בחשבון הדוא"ל לקבלת קישורית אימות על מנת לאמת את הכתובת החדשה. יש לבדוק את תיבת הספאם ליתר בטחון אם ההודעה לא הגיעה תוך דקות ספורות.
       updated: חשבונך עודכן בהצלחה.
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index fce061a65..a6d7a6d02 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -12,18 +12,71 @@ io:
       last_attempt: Tu ankore povas probar unfoye ante ke tua konto esos extingita.
       locked: Tua konto esas extingita.
       not_found_in_database: Nejusta %{authentication_keys}.
+      pending: Vua konti ankore kontrolesas.
       timeout: Tua kunsido expiris. Voluntez rienirar por durar.
       unauthenticated: Tu devas enirar o membreskar por durar.
       unconfirmed: Tu devas konfirmar tua konto por durar.
     mailer:
       confirmation_instructions:
+        action: Verifikez retpostadreso
+        action_with_app: Konfirmez e retrovenez a %{app}
+        explanation: Vu kreis konto che %{host} per ca retpostadreso. Vu povas facile aktivigar lu. Se vu ne agis lu, ignorez ca retposto.
+        explanation_when_pending: Vu aplikis por ganar invito a %{host} per ca retpostkonto. Pos vu konfirmas vua retpostkonto, ni kontrolos vua apliko. Vu povas enirar por chanjar vua detali o efacar vua konto, ma vu ne povas acesar maxim de funcioni til vua konto aprobesas. Se vua apliko refuzesas, vua informi efacesos, do plusa ago ne bezonesos de vu. Se vu ne agis lu, ignorez ca retposto.
+        extra_html: Anke videz <a href="%{terms_path}">reguli di la servilo</a> e <a href="%{policy_path}">nia servokondicioni</a>.
         subject: Instrucioni por konfirmar %{instance}
+        title: Verifikez retpostadreso
+      email_changed:
+        explanation: 'Retpostadreso di vua konto chanjesas a:'
+        extra: Se vu ne chanjesis vua retpostadreso, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
+        subject: 'Mastodon: Retpostadreso chanjesis'
+        title: Nova retpostadreso
       password_change:
+        explanation: La pasvorto di vua konto chanjesis.
+        extra: Se vu ne chanjesis vua pasvorto, nulu posible acesis vua konto. Chanjez vua pasvorto quik o kontaktez serviladministratero se vu ne povas enirar vua konto.
         subject: Tua pasvorto chanjesis senprobleme.
+        title: Pasvorto chanjesis
+      reconfirmation_instructions:
+        explanation: Konfirmez la nova adreso por chanjar vua retpostadreso.
+        extra: Se ca chanjo ne komencesis da vu, ignorez ca retposto. La retpostadreso por konto di Mastodon ne chanjesos til vu acesas la supera ligilo.
+        subject: 'Mastodon: Konfirmez retpostadreso por %{instance}'
+        title: Verifikez retpostadreso
       reset_password_instructions:
+        action: Chanjez pasvorto
+        explanation: Vu demandis nova pasvorto por vua konto.
+        extra: Se vu ne demandas co, ignorez ca retposto. Vua pasvorto ne chanjesas til vu acesas la supera ligilo e kreas novo.
         subject: Instrucioni por chanjar la pasvorto
+        title: Richanjo di pasvorto
+      two_factor_disabled:
+        explanation: 2-faktorverifiko por vua konto deaktivigesis. Eniro esas nun posible per nur retpostadreso e pasvorto.
+        subject: 'Mastodon: 2-faktorverifiko deaktivigesis'
+        title: 2FA deaktivigesis
+      two_factor_enabled:
+        explanation: 2-faktorverifiko aktivigesis por vua konto. Fisho quo facesis da parigita apliko TOTP bezonesos por eniro.
+        subject: 'Mastodon: 2-faktorverifiko aktivigesis'
+        title: 2FA aktivigesis
+      two_factor_recovery_codes_changed:
+        explanation: Antea rigannumeri devalidesis e novo facesis.
+        subject: 'Mastodon: 2-faktorrigannumeri rifacesis'
+        title: 2FA rigannumeri chanjesis
       unlock_instructions:
         subject: Instructioni por riacendar la konto
+      webauthn_credential:
+        added:
+          explanation: Ca sekurklefo insertesis a vua konto
+          subject: 'Mastodon: Nova sekurklefo'
+          title: Nova sekurklefo insertesis
+        deleted:
+          explanation: Ca sekurklefo efacesis de vua konto
+          subject: 'Mastodon: Sekurklefo efacesis'
+          title: 1 de vua sekurklefi efacesis
+      webauthn_disabled:
+        explanation: Verifiko per sekurklefi deaktivigesis por vua konto. Eniro nun esas posibla per nur ficho quo facesis da parita apliko TOTP.
+        subject: 'Mastodon: Verifiko per sekurklefi deaktivigesis'
+        title: Sekurklefi deaktivigesis
+      webauthn_enabled:
+        explanation: Sekurklefverifiko aktivigesis por vua konto. Vua sekurklefo nun povas uzesar por eniro.
+        subject: 'Mastodon: Sekurklefverifiko aktivigesis'
+        title: Sekurklefi aktivigesis
     omniauth_callbacks:
       failure: 'Ni ne povis autentikigar tu per %{kind}: ''%{reason}''.'
       success: Autentikigita senprobleme per %{kind}.
@@ -31,12 +84,14 @@ io:
       no_token: Tu ne povas irar a ta pagino per altra voyo kam retpost-mesajo por chanjar pasvorto. Se tu venas de tala retpost-mesajo, kontrolez ke tu uzis la tota URL.
       send_instructions: Tu recevos retpost-mesajo kun instrucioni por chanjar tua pasvorto pos kelka minuti.
       send_paranoid_instructions: Se tua retpost-adreso existas en nia datumbazo, tu recevos ligilo por chanjar tua pasvorto per retpost-mesajo.
+      updated: Vua konto sucese chanjesis. Vu nun eniras.
       updated_not_active: Tua pasvorto redaktesis senprobleme.
     registrations:
       destroyed: Til! Tua konto efacesis senprobleme. Ni esperas rividar tu balde.
       signed_up: Bonveno! Tu membreskis senprobleme.
       signed_up_but_inactive: Tu bone membreskis, ma tu ankore ne povas enirar pro ke tua konto ne konfirmesis.
       signed_up_but_locked: Tu bone membreskis, ma tu ne povas enirar pro ke tua konto extingesis.
+      signed_up_but_pending: Mesajo kun konfirmoligilo sendesis a vua retpostadreso. Pos vu kliktas la ligilo, ni kontrolos vua apliko. Vu notifikesos se ol aprobesas.
       signed_up_but_unconfirmed: Retpost-mesajo kun tua ligilo por konfirmar tua konto sendesis a tua retpost-adreso. Voluntez uzar ta ligilo por konfirmar tua konto.
       update_needs_confirmation: Tu vone aktualigis tua konto, ma ni bezonas kontrolar tua nova retpost-adreso. Voluntez kontrolar tua retpost-mesaji ed uzar la ligilo por konfirmar tua nova retpost-adreso.
       updated: Tua konto aktualigesis senprobleme.
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index 287ea49c5..e46500796 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -21,7 +21,7 @@ th:
         action: ยืนยันที่อยู่อีเมล
         action_with_app: ยืนยันแล้วกลับไปยัง %{app}
         explanation: คุณได้สร้างบัญชีใน %{host} ด้วยที่อยู่อีเมลนี้ คุณเหลืออีกคลิกเดียวเพื่อเปิดใช้งานบัญชี หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
-        explanation_when_pending: คุณได้สมัครเพื่อขอคำเชิญสู่ %{host} ด้วยที่อยู่อีเมลนี้ เมื่อคุณยืนยันที่อยู่อีเมลของคุณ เราจะตรวจทานใบสมัครของคุณ คุณสามารถเข้าสู่ระบบเพื่อเปลี่ยนรายละเอียดของคุณหรือลบบัญชีของคุณ แต่คุณไม่สามารถเข้าถึงฟังก์ชันส่วนใหญ่ได้จนกว่าจะมีการอนุมัติบัญชีของคุณ หากมีการปฏิเสธใบสมัครของคุณ จะเอาข้อมูลของคุณออก ดังนั้นจึงไม่ต้องมีการกระทำเพิ่มเติมจากคุณ หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
+        explanation_when_pending: คุณได้สมัครเพื่อขอคำเชิญสู่ %{host} ด้วยที่อยู่อีเมลนี้ เมื่อคุณยืนยันที่อยู่อีเมลของคุณ เราจะตรวจทานใบสมัครของคุณ คุณสามารถเข้าสู่ระบบเพื่อเปลี่ยนรายละเอียดของคุณหรือลบบัญชีของคุณ แต่คุณไม่สามารถเข้าถึงฟังก์ชันส่วนใหญ่ได้จนกว่าจะมีการอนุมัติบัญชีของคุณ หากมีการปฏิเสธใบสมัครของคุณ จะเอาข้อมูลของคุณออก ดังนั้นจึงไม่ต้องการการกระทำเพิ่มเติมจากคุณ หากนี่ไม่ใช่คุณ โปรดเพิกเฉยต่ออีเมลนี้
         extra_html: นอกจากนี้โปรดตรวจสอบ <a href="%{terms_path}">กฎของเซิร์ฟเวอร์</a> และ <a href="%{policy_path}">เงื่อนไขการให้บริการของเรา</a>
         subject: 'Mastodon: คำแนะนำการยืนยันสำหรับ %{instance}'
         title: ยืนยันที่อยู่อีเมล
diff --git a/config/locales/doorkeeper.en-GB.yml b/config/locales/doorkeeper.en-GB.yml
new file mode 100644
index 000000000..ef03d1810
--- /dev/null
+++ b/config/locales/doorkeeper.en-GB.yml
@@ -0,0 +1 @@
+en-GB:
diff --git a/config/locales/doorkeeper.he.yml b/config/locales/doorkeeper.he.yml
index cbbef63b1..e2f0c3401 100644
--- a/config/locales/doorkeeper.he.yml
+++ b/config/locales/doorkeeper.he.yml
@@ -3,7 +3,7 @@ he:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: שם
+        name: שם יישום
         redirect_uri: קישורית הפניה
         scopes: תחומים
         website: אתר יישום
@@ -38,6 +38,7 @@ he:
         application: יישום
         callback_url: כתובת גישה חוזרת (Callback URL)
         delete: למחוק
+        empty: אין לך אפליקציות.
         name: שם
         new: ישום חדש
         scopes: תחומים
@@ -48,7 +49,7 @@ he:
       show:
         actions: פעולות
         application_id: זהות ישום
-        callback_urls: כתובות לקריאה חוזרת (Callback URLs)
+        callback_urls: קישורית Callback
         scopes: תחומים
         secret: סוד
         title: 'ישום: %{name}'
@@ -59,6 +60,8 @@ he:
       error:
         title: התרחשה שגיאה
       new:
+        prompt_html: "%{client_name} מעוניין בהרשאה לגשת לחשבונך. זוהי אפליקציית צד-שלישי. <strong>אם יש סיבה לא לבטוח בה, נא לא לאשר.</strong>"
+        review_permissions: עיון בהרשאות
         title: נדרשת הרשאה
       show:
         title: יש להעתיק את קוד ההרשאה הזה ולהדביקו ביישום שביקש אותו.
@@ -68,6 +71,12 @@ he:
       confirmations:
         revoke: בטוח?
       index:
+        authorized_at: אושר ב-%{date}
+        description_html: אלה אפליקציות שיכולות לגשת לחשבונך בעזרת הממשק. אם ישנן כאן אפליקציות שאינך מזהה, או אפליקציה שאינה פועלת כראוי, ניתן להסיר את הגישה שלה.
+        last_used_at: נראה לאחרונה ב-%{date}
+        never_used: מעולם לא היה בשימוש
+        scopes: הרשאות
+        superapp: פנימי
         title: ישומיך המאושרים
     errors:
       messages:
@@ -76,6 +85,10 @@ he:
         invalid_client: הרשאת הלקוח נכשלה עקב לקוח שאינו ידוע, חוסר בהרשאת לקוח או שיטת הרשאה שאינה נתמכת.
         invalid_grant: חוזה ההרשאה המצורף אינו חוקי, אינו תקף, מבוטל, או שאינו מתאים לקישורית ההפניה שבשימוש על ידי בקשת ההרשאה, או שהופק על ידי לקוח אחר.
         invalid_redirect_uri: קישורית ההפניה המצורפת אינה חוקית.
+        invalid_request:
+          missing_param: 'חסר פרמטר נדרש: %{value}.'
+          request_not_authorized: יש לאשר את הבקשה. פרמטר הנדרש על מנת לאשר את הבקשה חסר או לקוי.
+          unknown: הבקשה חסרה פרמטר נדרש, כוללת ערך שלא נתמך או לקויה בדרך אחרת.
         invalid_resource_owner: הרשאות בעלי המשאב שהוזנו אינן חוקיות, או שלא ניתן למצוא את בעלי המשאב
         invalid_scope: התחום המבוקש אינו חוקי, אינו ידוע, או שתצורותו שגויה.
         invalid_token:
@@ -99,6 +112,33 @@ he:
       authorized_applications:
         destroy:
           notice: הישום בוטל.
+    grouped_scopes:
+      access:
+        read: גישה לקריאה בלבד
+        read/write: גישה לקריאה ולכתיבה
+        write: גישה לכתיבה בלבד
+      title:
+        accounts: חשבונות
+        admin/accounts: חשבונות ניהול
+        admin/all: כל פעולות האדמין
+        admin/reports: ניהול דיווחים
+        all: הכל
+        blocks: חסימות
+        bookmarks: סימניות
+        conversations: שיחות
+        crypto: הצפנה מקצה לקצה
+        favourites: חיבובים
+        filters: מסננים
+        follow: יחסים
+        follows: נעקבים
+        lists: רשימות
+        media: קבצי מדיה מצורפים
+        mutes: השתקות
+        notifications: התראות
+        push: התראות בדחיפה
+        reports: דיווחים
+        search: חיפוש
+        statuses: חצרוצים
     layouts:
       admin:
         nav:
@@ -107,6 +147,39 @@ he:
       application:
         title: נדרשת הרשאת OAuth
     scopes:
+      admin:read: לקרוא את כל המידע על השרת
+      admin:read:accounts: לקרוא מידע רגיש בכל החשבונות
+      admin:read:reports: לקרוא מידע רגיש בכל הדוחות וכל החשבונות המדווחים
+      admin:write: לשנות את כל המידע על השרת
+      admin:write:accounts: ביצוע פעולות הנהלה על חשבונות
+      admin:write:reports: ביצוע פעולות הנהלה על חשבונות
+      crypto: שימוש בהצפנה מקצה לקצה
       follow: לעקוב, לחסום, להסיר חסימה ולהפסיק לעקוב אחרי חשבונות
+      push: קבלת התראות בדחיפה
       read: לקרוא את המידע שבחשבונך
+      read:accounts: צפיה במידע על חשבונות
+      read:blocks: צפייה בחסימות
+      read:bookmarks: צפייה בסימניות
+      read:favourites: צפייה בחיבובים
+      read:filters: צפייה במסננים
+      read:follows: צפייה בנעקבים
+      read:lists: צפיה ברשימותיך
+      read:mutes: צפיה במושתקיך
+      read:notifications: צפיה בהתראותיך
+      read:reports: צפיה בדוחותיך
+      read:search: חיפוש מטעם עצמך
+      read:statuses: צפיה בכל החצרוצים
       write: להפיץ הודעות בשמך
+      write:accounts: שינוי הפרופיל שלך
+      write:blocks: חסימת חשבונות ודומיינים
+      write:bookmarks: סימון חצרוצים
+      write:conversations: השתקת ומחיקת שיחות
+      write:favourites: חצרוצים מחובבים
+      write:filters: יצירת מסננים
+      write:follows: עקיבה אחר אנשים
+      write:lists: יצירת רשימות
+      write:media: העלאת קבצי מדיה
+      write:mutes: השתקת אנשים ושיחות
+      write:notifications: ניקוי התראותיך
+      write:reports: דיווח על אנשים אחרים
+      write:statuses: פרסום חצרוצים
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index d75752c8d..5267b7fa2 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -168,13 +168,13 @@ sl:
       read:notifications: oglejte si svoja obvestila
       read:reports: oglejte si svoje prijave
       read:search: iščite v svojem imenu
-      read:statuses: oglejte si vsa stanja
+      read:statuses: oglejte si vse objave
       write: spremenite vse podatke svojega računa
       write:accounts: spremenite svoj profil
       write:blocks: blokirajte račune in domene
       write:bookmarks: objave zaznamkov
       write:conversations: utišaj in izbriši pogovore
-      write:favourites: priljubljena stanja
+      write:favourites: priljubljene objave
       write:filters: ustvari filtre
       write:follows: sledi osebam
       write:lists: ustvarite sezname
@@ -182,4 +182,4 @@ sl:
       write:mutes: utišaj osebe in pogovore
       write:notifications: počisti svoja obvestila
       write:reports: prijavi druge osebe
-      write:statuses: objavi stanja
+      write:statuses: objavi objave
diff --git a/config/locales/doorkeeper.th.yml b/config/locales/doorkeeper.th.yml
index b608be384..dd25d88b6 100644
--- a/config/locales/doorkeeper.th.yml
+++ b/config/locales/doorkeeper.th.yml
@@ -62,7 +62,7 @@ th:
       new:
         prompt_html: "%{client_name} ต้องการสิทธิอนุญาตเพื่อเข้าถึงบัญชีของคุณ แอปพลิเคชันเป็นแอปพลิเคชันจากบุคคลที่สาม <strong>หากคุณไม่เชื่อถือแอปพลิเคชัน คุณไม่ควรอนุญาตแอปพลิเคชัน</strong>"
         review_permissions: ตรวจทานสิทธิอนุญาต
-        title: ต้องมีการอนุญาต
+        title: ต้องการการอนุญาต
       show:
         title: คัดลอกรหัสการอนุญาตนี้แล้ววางลงในแอปพลิเคชัน
     authorized_applications:
@@ -135,7 +135,7 @@ th:
           applications: แอปพลิเคชัน
           oauth2_provider: ผู้ให้บริการ OAuth2
       application:
-        title: ต้องมีการอนุญาต OAuth
+        title: ต้องการการอนุญาต OAuth
     scopes:
       admin:read: อ่านข้อมูลทั้งหมดในเซิร์ฟเวอร์
       admin:read:accounts: อ่านข้อมูลที่ละเอียดอ่อนของบัญชีทั้งหมด
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index e04ba9e0b..79b09cdb2 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -3,10 +3,10 @@ uk:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: Назва додатку
+        name: Назва застосунку
         redirect_uri: URI перенаправлення
         scopes: Рамки
-        website: Веб-сайт додатку
+        website: Вебсайт застосунку
     errors:
       models:
         doorkeeper/application:
@@ -60,6 +60,7 @@ uk:
       error:
         title: Сталася помилка
       new:
+        prompt_html: "%{client_name} хоче отримати доступ до вашого облікового запису. Це сторонній застосунок. <strong>Якщо ви йому не довіряєте, не варто авторизувати його.</strong>"
         review_permissions: Переглянути дозволи
         title: Необхідна авторизація
       show:
@@ -71,6 +72,7 @@ uk:
         revoke: Ви впевнені?
       index:
         authorized_at: Авторизовано %{date}
+        description_html: Це застосунки, які мають доступ до вашого облікового запису через API. Якщо тут є застосунки, які Ви не розпізнаєте, або програма працює неправильно, ви можете відкликати їхній доступ.
         last_used_at: Востаннє використано %{date}
         never_used: Ніколи не використовувалися
         scopes: Дозволи
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a90409a7c..2c8455d0a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1036,10 +1036,12 @@ en:
       appealed_msg: Your appeal has been submitted. If it is approved, you will be notified.
       appeals:
         submit: Submit appeal
+      approve_appeal: Approve appeal
       associated_report: Associated report
       created_at: Dated
       description_html: These are actions taken against your account and warnings that have been sent to you by the staff of %{instance}.
       recipient: Addressed to
+      reject_appeal: Reject appeal
       status: 'Post #%{id}'
       status_removed: Post already removed from system
       title: "%{action} from %{date}"
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 98b790487..ad333ae29 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -802,6 +802,7 @@ es-AR:
           other: Compartido por %{count} personas durante la última semana
         title: Enlaces en tendencia
         usage_comparison: Compartido %{today} veces hoy, comparado con la/s %{yesterday} vez/veces de ayer
+      only_allowed: Sólo permitidas
       pending_review: Revisión pendiente
       preview_card_providers:
         allowed: Los enlaces de este medio pueden ser tendencia
@@ -843,6 +844,7 @@ es-AR:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
       title: Tendencias
+      trending: En tendencia
     warning_presets:
       add_new: Agregar nuevo
       delete: Eliminar
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index 32c2f702c..360a790fe 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -802,6 +802,7 @@ es-MX:
           other: Compartido por %{count} personas durante la última semana
         title: Enlaces en tendencia
         usage_comparison: Compartido %{today} veces hoy, comparado a %{yesterday} ayer
+      only_allowed: Sólo permitido
       pending_review: Revisión pendiente
       preview_card_providers:
         allowed: Los enlaces de este editor pueden ser tendencia
@@ -843,6 +844,7 @@ es-MX:
           one: Usada por una persona durante la última semana
           other: Usada por %{count} personas durante la última semana
       title: Tendencias
+      trending: En tendencia
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 8988ddadc..7df72d59d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -802,7 +802,7 @@ es:
           other: Compartido por %{count} personas durante la última semana
         title: Enlaces en tendencia
         usage_comparison: Compartido %{today} veces hoy, comparado con %{yesterday} ayer
-      only_allowed: Sólo permitido
+      only_allowed: Sólo las permitidas
       pending_review: Revisión pendiente
       preview_card_providers:
         allowed: Los enlaces de este medio pueden ser tendencia
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index f46ba4f8f..6156901ac 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -832,6 +832,7 @@ gd:
           two: Chaidh a cho-roinneadh le %{count} rè na seachdain seo chaidh
         title: Ceanglaichean a’ treandadh
         usage_comparison: Chaidh a cho-roinneadh %{today} tura(i)s an-diugh an coimeas ri %{yesterday} an-dè
+      only_allowed: An fheadhainn cheadaichte a-mhàin
       pending_review: A’ feitheamh air lèirmheas
       preview_card_providers:
         allowed: Faodaidh ceanglaichean on fhoillsichear seo treandadh
@@ -877,6 +878,7 @@ gd:
           other: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
           two: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
       title: Treandaichean
+      trending: A’ treandadh
     warning_presets:
       add_new: Cuir fear ùr ris
       delete: Sguab às
diff --git a/config/locales/he.yml b/config/locales/he.yml
index d20fec3f7..a5712909b 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -4,43 +4,131 @@ he:
     about_hashtag_html: אלו סטטוסים פומביים המתוייגים בתור<strong>#%{hashtag}</strong>. ניתן להגיב, להדהד או לחבב אותם אם יש לך חשבון בכל מקום בפדרציה.
     about_mastodon_html: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
     about_this: אודות שרת זה
+    active_count_after: פעיל
+    active_footnote: משתמשים פעילים חודשית (MAU)
+    administered_by: 'מנוהל ע"י:'
+    api: ממשק
     apps: יישומונים לנייד
+    apps_platforms: שימוש במסטודון מ-iOS, אנדרואיד ופלטפורמות אחרות
+    browse_directory: עיון בספריית פרופילים וסינון לפי תחומי עניין
+    browse_local_posts: עיון בפיד חי של חצרוצים פומביים בשרת זה
+    browse_public_posts: עיון בפיד חי של חצרוצים פומביים בשרת זה
     contact: יצירת קשר
     contact_missing: ללא הגדרה
     contact_unavailable: לא רלוונטי/חסר
+    continue_to_web: להמשיך לאפליקציית ווב
+    discover_users: גילוי משתמשים
     documentation: תיעוד
+    federation_hint_html: עם חשבון ב-%{instance} ניתן לעקוב אחרי אנשים בכל שרת מסטודון ומעבר.
+    get_apps: נסה/י יישומון לנייד
     hosted_on: מסטודון שיושב בכתובת %{domain}
+    instance_actor_flash: |
+      חשבון זה הינו פועל וירטואלי המשמש לייצוג השרת עצמו ולא משתמש ספציפי.
+      הוא משמש למטרת פדרציה ואין לחסום אותו אלא למטרת חסימת המופע כולו, ובמקרה כזה עדיף להשתמש בחסימת מופע.
     learn_more: מידע נוסף
+    logged_in_as_html: הנך מחובר/ת כרגע כ-%{username}.
+    logout_before_registering: חשבון זה כבר מחובר.
+    privacy_policy: מדיניות פרטיות
+    rules: כללי השרת
+    rules_html: 'להלן סיכום הכללים שעליך לעקוב אחריהם על מנת להשתמש בחשבון בשרת מסטודון זה:'
+    see_whats_happening: מה קורה כעת
+    server_stats: 'סטטיסטיקות שרת:'
     source_code: קוד מקור
+    status_count_after:
+      many: חצרוצים
+      one: חצרוץ
+      other: חצרוצים
+      two: חצרוצים
     status_count_before: שכתבו
+    tagline: מעקב אחרי חברים וגילוי חדשים
+    terms: תנאי שימוש
+    unavailable_content: שרתים מוגבלים
+    unavailable_content_description:
+      domain: שרת
+      reason: סיבה
+      rejecting_media: 'קבצי מדיה משרתים אלה לא יעובדו או ישמרו, ותמונות ממוזערות לא יוצגו. נדרשת הקלקה ידנית על מנת לצפות בקובץ המקורי:'
+      rejecting_media_title: מדיה מסוננת
+      silenced: 'חצרוצים משרתים אלה יוסתרו מפידים ושיחות פומביים, ושום התראות לא ינתנו על אינטראקציות עם משתמשיהם, אלא אם הינך במעקב אחריהם:'
+      silenced_title: שרתים מוגבלים
+      suspended: 'שום מידע עם שרתים אלה לא יעובד, יישמר או יוחלף, מה שהופך כל תקשורת עם משתמשיהם לבלתי אפשרית:'
+      suspended_title: שרתים מושעים
+    unavailable_content_html: ככלל מסטודון מאפשר לך לצפות בתוכן ולתקשר עם משתמשים בכל שרת בפדרציה. אלו הם היוצאים מן הכלל שהוגדרו עבור שרת זה.
+    user_count_after:
+      many: משתמשים
+      one: משתמש
+      other: משתמשים
+      two: משתמשים
     user_count_before: ביתם של
     what_is_mastodon: מה זה מסטודון?
   accounts:
+    choices_html: 'בחירותיו/ה של %{name}:'
+    endorsements_hint: תוכל/י להמליץ על אנשים לעקוב אחריהם דרך ממשק הווב, והם יופיעו כאן.
+    featured_tags_hint: תוכל/י להציג האשתגיות ספציפיות והן תופענה כאן.
     follow: לעקוב
+    followers:
+      many: עוקבים
+      one: עוקב
+      other: עוקבים
+      two: עוקבים
     following: נעקבים
+    instance_actor_flash: חשבון זה הינו פועל וירטואלי המשמש לייצוג השרת עצמו ולא אף משתמש ספציפי. הוא משמש למטרות פדרציה ואין להשעותו.
+    joined: הצטרף/ה ב-%{date}
+    last_active: פעילות אחרונה
+    link_verified_on: בעלות על קישורית זו נבדקה לאחרונה ב-%{date}
     media: מדיה
     moved_html: "%{name} עבר(ה) אל %{new_profile_link}:"
+    network_hidden: מידע זה אינו זמין
     nothing_here: אין פה שום דבר!
     people_followed_by: הנעקבים של %{name}
     people_who_follow: העוקבים של %{name}
+    pin_errors:
+      following: עליך לעקוב אחרי חשבון לפני שניתן יהיה להמליץ עליו
+    posts:
+      many: חצרוצים
+      one: חצרוץ
+      other: חצרוצים
+      two: חצרוצים
+    posts_tab_heading: חצרוצים
     posts_with_replies: חצרוצים ותגובות
     roles:
       admin: מנהל
+      bot: בוט
+      group: קבוצה
       moderator: מנחה
+    unavailable: פרופיל לא זמין
     unfollow: הפסקת מעקב
   admin:
+    account_actions:
+      action: בצע/י פעולה
+      title: ביצוע פעולות הנהלה על %{acct}
     account_moderation_notes:
       create: ליצור
       created_msg: הודעת מנחה נוצרה בהצלחה!
       destroyed_msg: הודעת מנחה נמחקה בהצלחה!
     accounts:
+      add_email_domain_block: חסמו לגמרי את שם המתחם (דומיין) של הדוא"ל
+      approve: אשר
+      approved_msg: בקשת %{username} להירשם אושרה בהצלחה
       are_you_sure: בטוח?
+      avatar: יַצְגָן
       by_domain: שם מתחם
+      change_email:
+        changed_msg: כתובת הדוא"ל המשוייכת לחשבון שונתה בהצלחה !
+        current_email: כתובת דוא"ל נוכחית
+        label: שינוי כתובת דוא"ל משוייכת לחשבון
+        new_email: כתובת דוא"ל חדשה
+        submit: שלחי בקשה לשינוי דוא"ל
+        title: שינוי כתובת דוא"ל עבור המשתמש.ת %{username}
       confirm: אישור
       confirmed: אושר
       confirming: המאשר
+      custom: התאמה אישית
+      delete: מחיקת חשבון
+      deleted: מחוקים
       demote: הורדה בדרגה
+      destroyed_msg: הנתונים של %{username} נכנסו לתור המחיקה וצפויים להימחק באופן מיידי
       disable: לחסום
+      disable_sign_in_token_auth: השעיית הזדהות באמצעות אסימון בדוא"ל של משתמש
       disable_two_factor_authentication: ביטול הזדהות דו-שלבית
       disabled: נחסם
       display_name: שם לתצוגה
@@ -49,11 +137,17 @@ he:
       email: דוא"ל
       email_status: סטטוס דוא"ל
       enable: לאפשר
+      enable_sign_in_token_auth: הפעלת אסימון הזדהות בדוא"ל של משתמש
       enabled: מאופשר
+      enabled_msg: ביטול השעית החשבון של %{username} בוצע בהצלחה
       followers: עוקבים
       follows: נעקבים
+      header: כותרת
       inbox_url: כתובת תיבה נכנסת
+      invite_request_text: סיבות להצטרפות
+      invited_by: הוזמן על ידי
       ip: כתובת IP
+      joined: תאריך הצטרפות
       location:
         all: הכל
         local: מקומי
@@ -62,20 +156,40 @@ he:
       login_status: מצב חיבור
       media_attachments: תוספות מדיה
       memorialize: הפוך לדף זכרון
+      memorialized: מונצחים
+      memorialized_msg: החשבון %{username} הונצח בהצלחה
       moderation:
+        active: פעילים
         all: הכל
+        pending: בהמתנה
         suspended: מושהים
         title: ניהול קהילה
       moderation_notes: הודעות מנחה
       most_recent_activity: פעילות עדכנית
       most_recent_ip: כתובות אחרונות
+      no_account_selected: לא בוצעו שינויים בחשבונות ל שכן לא נבחרו חשבונות
+      no_limits_imposed: לא הוטלו הגבלות
       not_subscribed: לא רשום
+      pending: ממתינים לסקירה
       perform_full_suspension: ביצוע השעייה מלאה
+      previous_strikes: פסילות קודמות
+      previous_strikes_description_html:
+        many: לחשבון הזה יש <strong>%{count}</strong> פסילות.
+        one: לחשבון הזה פסילה <strong>אחת</strong>.
+        other: לחשבון הזה <strong>%{count}</strong> פסילות.
+        two: לחשבון הזה <strong>%{count}</strong> פסילות.
       promote: להעלות בדרגה
       protocol: פרטיכל
       public: פומבי
       push_subscription_expires: הרשמה להודעות בדחיפה פגה
       redownload: לקריאה מחדש של האווטאר
+      redownloaded_msg: הפרופיל של %{username} רוענן בהצלחה מהמקור
+      reject: דחויים
+      rejected_msg: בקשת ההרשמה של %{username} נדחתה בהצלחה
+      remove_avatar: הסרת תמונת פרופיל
+      remove_header: הסרת כותרת
+      removed_avatar_msg: תמונת הפרופיל של %{username} הוסרה בהצלחה
+      removed_header_msg: תמונת הראשה של %{username} הוסרה בהצלחה
       resend_confirmation:
         already_confirmed: משתמש זה כבר אושר
         send: שלח מחדש דוא"ל אימות
@@ -87,113 +201,830 @@ he:
       roles:
         admin: מנהל מערכת
         moderator: מנחה דיונים
+        staff: צוות
         user: משתמש(ת)
       search: חיפוש
+      search_same_email_domain: משתמשים אחרים מאותו דומיין דוא"ל
+      search_same_ip: משתמשים אחרים מאותה כתובת IP
+      security_measures:
+        only_password: סיסמא בלבד
+        password_and_2fa: סיסמא ואימות דו-גורמי
+      sensitive: מאולצים לרגישות
+      sensitized: מסומנים כרגישים
       shared_inbox_url: תיבה משותפת לדואר נכנס
       show:
         created_reports: דיווחים מאת חשבון זה
         targeted_reports: דיווחים נגד חשבון זה
       silence: השתקה
+      silenced: מוגבלים
       statuses: הודעות
       strikes: עבירות קודמות
       subscribe: הרשמה
       suspend: השעייה
+      suspended: מושעים
+      suspension_irreversible: המידע בחשבון זה נמחק באופן בלתי הפיך. ניתן להסיר את ההשעיה מהחשבון על מנת להחזיר אותו למצב שמיש, אבל שום מידע שהיה בבעלותו לא ישוחזר.
+      suspension_reversible_hint_html: חשבון זה הושעה, והמידע בו יוסר במלואו בתאריך %{date}. עד אז, ניתן לשחזר את החשבון ללא תופעות לוואי שליליות. אם ברצונך להסיר את כל המידע בחשבון באופן מידי, ניתן לעשות כן להלן.
       title: חשבונות
+      unblock_email: ביטול חסימת כתובת דוא"ל
+      unblocked_email_msg: הסרת חסימה מכתובת הדוא"ל של %{username} בוצעה בהצלחה
+      unconfirmed_email: כתובת דוא"ל לא מאומתת
+      undo_sensitized: בטל רגישות לכח
       undo_silenced: ביטול השתקה
       undo_suspension: ביטול השעייה
+      unsilenced_msg: ביטול הגבלה לחשבונו של %{username} בוצע בהצלחה
       unsubscribe: הפסקת הרשמה
+      unsuspended_msg: הסרת השעיה מהחשבון של %{username} בוצעה בהצלחה
       username: שם משתמש
+      view_domain: צפיה בסיכום שרת
+      warn: אזהרה
       web: רשת
+      whitelisted: מותר לפדרציה
+    action_logs:
+      action_types:
+        approve_appeal: אישור ערעור
+        approve_user: אישור משתמש
+        assigned_to_self_report: הקצאת דו"ח
+        change_email_user: שינוי כתובת דוא"ל למשתמש
+        confirm_user: אשר משתמש
+        create_account_warning: יצירת אזהרה
+        create_announcement: יצירת הכרזה
+        create_custom_emoji: יצירת אמוג'י מיוחד
+        create_domain_allow: יצירת דומיין מותר
+        create_domain_block: יצירת דומיין חסום
+        create_email_domain_block: יצירת חסימת דומיין דוא"ל
+        create_ip_block: יצירת כלל IP
+        create_unavailable_domain: יצירת דומיין בלתי זמין
+        demote_user: הורדת משתמש בדרגה
+        destroy_announcement: מחיקת הכרזה
+        destroy_custom_emoji: מחיקת אמוג'י יחודי
+        destroy_domain_allow: מחיקת דומיין מותר
+        destroy_domain_block: מחיקת דומיין חסום
+        destroy_email_domain_block: מחיקת חסימת דומיין דוא"ל
+        destroy_instance: טיהור דומיין
+        destroy_ip_block: מחיקת כלל IP
+        destroy_status: מחיקת חצרוץ
+        destroy_unavailable_domain: מחיקת דומיין בלתי זמין
+        disable_2fa_user: השעיית זיהוי דו-גורמי
+        disable_custom_emoji: השעיית אמוג'י מיוחד
+        disable_sign_in_token_auth_user: השעיית אסימון הזדהות בדוא"ל של משתמש
+        disable_user: השעיית משתמש
+        enable_custom_emoji: הפעלת אמוג'י מיוחד
+        enable_sign_in_token_auth_user: הפעלת אסימון הזדהות בדוא"ל של משתמש
+        enable_user: אפשור משתמש
+        memorialize_account: הנצחת חשבון
+        promote_user: קידום משתמש
+        reject_appeal: דחיית ערעור
+        reject_user: דחיית משתמש
+        remove_avatar_user: הסרת תמונת פרופיל
+        reopen_report: פתיחת דו"ח מחדש
+        reset_password_user: איפוס סיסמא
+        resolve_report: פתירת דו"ח
+        sensitive_account: חשבון רגיש לכח
+        silence_account: הגבלת חשבון
+        suspend_account: השעיית חשבון
+        unassigned_report: ביטול הקצאת דו"ח
+        unblock_email_account: ביטול חסימת כתובת דוא"ל
+        unsensitive_account: ביטול Force-Sensitive לחשבון
+        unsilence_account: ביטול השתקת חשבון
+        unsuspend_account: ביטול השעיית חשבון
+        update_announcement: עדכון הכרזה
+        update_custom_emoji: עדכון סמלון מותאם אישית
+        update_domain_block: עדכון חסימת שם מתחם
+        update_status: סטטוס עדכון
+      actions:
+        approve_appeal_html: "%{name} אישר/ה ערעור על החלטת מנהלי הקהילה מ-%{target}"
+        approve_user_html: "%{name} אישר/ה הרשמה מ-%{target}"
+        assigned_to_self_report_html: '%{name} הקצה/תה דו"ח %{target} לעצמם'
+        change_email_user_html: '%{name} שינה/תה את כתובת הדוא"ל של המשתמש %{target}'
+        confirm_user_html: '%{name} אישר/ה את כותבת הדו"אל של המשתמש %{target}'
+        create_account_warning_html: "%{name} שלח/ה אזהרה ל %{target}"
+        create_announcement_html: "%{name} יצר/ה הכרזה חדשה %{target}"
+        create_custom_emoji_html: "%{name} העלו אמוג'י חדש %{target}"
+        create_domain_allow_html: "%{name} אישר/ה פדרציה עם הדומיין %{target}"
+        create_domain_block_html: "%{name} חסם/ה את הדומיין %{target}"
+        create_email_domain_block_html: '%{name} חסם/ה את דומיין הדוא"ל %{target}'
+        create_ip_block_html: "%{name} יצר/ה כלל עבור IP %{target}"
+        create_unavailable_domain_html: "%{name} הפסיק/ה משלוח לדומיין %{target}"
+        demote_user_html: "%{name} הוריד/ה בדרגה את המשתמש %{target}"
+        destroy_announcement_html: "%{name} מחק/ה את ההכרזה %{target}"
+        destroy_custom_emoji_html: "%{name} השמיד/ה את האמוג'י %{target}"
+        destroy_domain_allow_html: "%{name} לא התיר/ה פדרציה עם הדומיין %{target}"
+        destroy_domain_block_html: "%{name} הסיר/ה חסימה מהדומיין %{target}"
+        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_unavailable_domain_html: "%{name} התחיל/ה מחדש משלוח לדומיין %{target}"
+        disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
+        disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
+        disable_sign_in_token_auth_user_html: '%{name} השבית/ה את האימות בעזרת אסימון דוא"ל עבור %{target}'
+        disable_user_html: "%{name} חסם/ה כניסה מהמשתמש/ת %{target}"
+        enable_custom_emoji_html: "%{name} אפשר/ה את האמוג'י %{target}"
+        enable_sign_in_token_auth_user_html: '%{name} אפשר/ה אימות בעזרת אסימון דוא"ל עבור %{target}'
+        enable_user_html: "%{name} אפשר/ה כניסה עבור המשתמש %{target}"
+        memorialize_account_html: "%{name} הפך/ה את חשבונו של %{target} לדף הנצחה"
+        promote_user_html: "%{name} העלה בדרגה את המשתמש %{target}"
+        reject_appeal_html: "%{name} דחו ערעור על החלטת הנהלת הקהילה מ-%{target}"
+        reject_user_html: "%{name} דחו הרשמה מ-%{target}"
+        remove_avatar_user_html: "%{name} הסירו את תמונת הפרופיל של %{target}"
+        reopen_report_html: '%{name} פתח מחדש דו"ח %{target}'
+        reset_password_user_html: "%{name} איפס/ה סיסמא עבור המשתמש %{target}"
+        resolve_report_html: '%{name} פתר/ה דו"ח %{target}'
+        sensitive_account_html: "%{name} סימן/ה את המדיה של %{target} כרגיש"
+        silence_account_html: "%{name} הגביל/ה את חשבונו של %{target}"
+        suspend_account_html: "%{name} השעו את חשבונו של %{target}"
+        unassigned_report_html: '%{name} דו"ח לא מוקצה %{target}'
+        unblock_email_account_html: '%{name} הסיר/ה חסימה מחשבון הדוא"ל של %{target}'
+        unsensitive_account_html: "%{name} ביטל/ה את סימון המדיה של %{target} כרגישה"
+        unsilence_account_html: "%{name} ביטל/ה ההגבלה מהחשבון של %{target}"
+        unsuspend_account_html: "%{name} ביטל/ה את ההשעיה של החשבון של %{target}"
+        update_announcement_html: "%{name} עדכן/ה הכרזה %{target}"
+        update_custom_emoji_html: "%{name} עדכן/ה אמוג'י %{target}"
+        update_domain_block_html: "%{name} עדכן/ה חסימת דומיין עבור %{target}"
+        update_status_html: "%{name} עדכן/ה חצרוץ של %{target}"
+      deleted_status: "(חצרוץ נמחק)"
+      empty: לא נמצאו יומנים.
+      filter_by_action: סינון לפי פעולה
+      filter_by_user: סינון לפי משתמש
+      title: ביקורת יומן
+    announcements:
+      destroyed_msg: הכרזה נמחקה בהצלחה!
+      edit:
+        title: עריכת הכרזה
+      empty: לא נמצאו הכרזות.
+      live: חי
+      new:
+        create: יצירת הכרזה
+        title: הכרזה חדשה
+      publish: פרסום
+      published_msg: ההכרזה פורסמה בהצלחה!
+      scheduled_for: מתוזמן ל-%{time}
+      scheduled_msg: ההכרזה תוזמנה לפרסום!
+      title: הכרזות
+      unpublish: ביטול פרסום
+      unpublished_msg: פרסום ההכרזה בוטל בהצלחה!
+      updated_msg: ההכרזה עודכנה בהצלחה!
+    custom_emojis:
+      assign_category: הקצאת קטגוריה
+      by_domain: לפי קהילה
+      copied_msg: עותק מקומי של האמוג'י נוצר בהצלחה
+      copy: להעתיק
+      copy_failed_msg: לא ניתן ליצור עותק מקומי של האמוג'י הזה
+      create_new_category: צור קטגוריה חדשה
+      created_msg: אמוג'י נוצר בהצלחה!
+      delete: למחוק
+      destroyed_msg: אמוג'י הושמד בהצלחה!
+      disable: השבתה
+      disabled: מושבת
+      disabled_msg: השבתת אמוג'י זה בוצעה בהצלחה
+      emoji: אמוג'י
+      enable: לאפשר
+      enabled: מאופשר
+      enabled_msg: אמוג'י זה אופשר בהצלחה
+      image_hint: PNG או GIF עד לגודל %{size}
+      list: רשימה
+      listed: ברשימה
+      new:
+        title: הוספת אמוג'י מיוחד חדש
+      not_permitted: אין לך הרשאות לביצוע פעולה זו
+      overwrite: לדרוס
+      shortcode: קוד קצר
+      shortcode_hint: לפחות 2 תוים, אלפאנומריים או קו תחתי
+      title: יצגנים מותאמים אישית
+      uncategorized: לא מסווגים
+      unlist: בטל רישום
+      unlisted: לא רשומים
+      update_failed_msg: לא ניתן היה לעדכן את היצגן הזה
+      updated_msg: יצגן עודכן בהצלחה!
+      upload: העלאה
+    dashboard:
+      active_users: משתמשים פעילים
+      interactions: אינטראקציות
+      media_storage: נפח אחסון מדיה
+      new_users: משתמשים חדשים
+      opened_reports: דו"חות פתוחים
+      pending_appeals_html:
+        many: "<strong>%{count}</strong> ערעורים ממתינים"
+        one: ערעור <strong>%{count}</strong> ממתין
+        other: "<strong>%{count}</strong> ערעורים ממתינים"
+        two: "<strong>%{count}</strong> ערעורים ממתינים"
+      pending_reports_html:
+        many: "<strong>%{count}</strong> דוחות ממתינים"
+        one: דו"ח <strong>%{count}</strong> ממתין
+        other: "<strong>%{count}</strong> דוחות ממתינים"
+        two: "<strong>%{count}</strong> דוחות ממתינים"
+      pending_tags_html:
+        many: "<strong>%{count}</strong> האשתגיות ממתינות"
+        one: "<strong>%{count}</strong> האשתג ממתין"
+        other: "<strong>%{count}</strong> האשתגיות ממתינות"
+        two: "<strong>%{count}</strong> האשתגיות ממתינות"
+      pending_users_html:
+        many: "<strong>%{count}</strong> משתמשים ממתינים"
+        one: "<strong>%{count}</strong> משתמש/ת ממתינ/ה"
+        other: "<strong>%{count}</strong> משתמשים ממתינים"
+        two: "<strong>%{count}</strong> משתמשים ממתינים"
+      resolved_reports: דו"חות נפתרו
+      software: תוכנה
+      sources: משאבי הרשמה
+      space: נפח בשימוש
+      title: לוח בקרה
+      top_languages: שפות פעילות מובילות
+      top_servers: שרתים פעילים מובילים
+      website: אתר
+    disputes:
+      appeals:
+        empty: לא נמצאו ערעורים.
+        title: ערעורים
+    domain_allows:
+      add_new: אפשר מַאֲחָד (פדרציה) עם שם המתחם
+      created_msg: הדומיין אופשר לפדרציה בהצלחה
+      destroyed_msg: הדומיין לא אופשר לפדרציה
+      undo: אסור מַאֲחָד (פדרציה) עם שם המתחם
     domain_blocks:
       add_new: הוספת חדש
       created_msg: חסימת שרת בתהליך
       destroyed_msg: חסימת שרת בוטלה
       domain: שרת
+      edit: עריכת חסימת שם מתחם
+      existing_domain_block_html: כבר הפעלת הגבלות חמורות יותר על %{name}, עליך ראשית <a href="%{unblock_url}">להסיר מעליו/ה את החסימה</a>.
       new:
         create: יצירת חסימה
         hint: חסימת השרת לא תמנע יצירת רישומי חשבון במסד הנתונים, אבל תבצע פעולות ניהול קהילה מסוימות על חשבונות אלו אוטומטית ורטרואקטיבית.
         severity:
           desc_html: "<strong>השתקה</strong> תחביא הודעות מחשבון זה לכל מי שלא עוקב אחריו. <strong>השעייה</strong> תסיר מהשרת את כל התוכן, מדיה ותכונות הפרופיל שמקושרות לחשבון זה. <strong>כלום</strong> כדי לחסום קבצי מדיה בלבד."
+          noop: ללא
           silence: השתקה
           suspend: השעייה
         title: חסימת שרת חדשה
+      obfuscate: לערפל את שם הדומיין
+      obfuscate_hint: לערפל באופן חלקי את שם הדומיין ברשימה אם פרסום רשימת ההגבלות על דומיינים מאופשר
+      private_comment: הערה פרטית
+      private_comment_hint: הערה על הגבלות לדומיין זה לשימוש פנימי של מנהלי הקהילה.
+      public_comment: תגובה פומבית
+      public_comment_hint: הערה אודות הגבלת דומיין זה לציבור הכללי, אם פרסום רשימת הגבלות הדומיינים מאופשר.
       reject_media: חסימת קבצי מדיה
       reject_media_hint: מסירה קבצי מדיה השמורים מקומית ומונעת מהורדת קבצים נוספים בעתיד. לא רלוונטי להשעיות
+      reject_reports: דחה דוחות
+      reject_reports_hint: התעלמות מכל הדיווחים הבאים מהדומיין הזה. לא רלוונטי עבור השעיות
       undo: ביטול
+      view: צפייה בחסימת דומיינים
+    email_domain_blocks:
+      add_new: הוספת חדש
+      attempts_over_week:
+        many: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+        one: "%{count} נסיון במשך השבוע שעבר"
+        other: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+        two: "%{count} נסיונות הרשמה במשך השבוע שעבר"
+      created_msg: כתובת מייל נחסמה בהצלחה
+      delete: מחיקה
+      dns:
+        types:
+          mx: רשומת MX
+      domain: דומיין
+      new:
+        create: הוספת דומיין
+        resolve: פתור דומיין
+        title: חסימת דומיין דוא"ל
+      no_email_domain_block_selected: לא בוצעו שינויים לחסימת דומייני דוא"ל שכן לא נבחרו דומיינים
+      resolved_dns_records_hint_html: שם הדומיין מוביל לדומייניי ה-MX הבאים, שהם בסופו של דבר אחראיים לקבלת דוא"ל. חסימת דומיין MX תוביל לחסימת הרשמות מכל כתובת דוא"ל שעושה שימוש בדומיין MX זה, אפילו אם הדומיין הגלוי שונה. <strong>יש להמנע מלחסום ספקי דוא"ל מובילים.</strong>
+      resolved_through_html: נמצא דרך %{domain}
+      title: דומייניי דוא"ל חסומים
+    follow_recommendations:
+      description_html: "<strong>עקבו אחר ההמלצות על מנת לעזור למשתמשים חדשים למצוא תוכן מעניין</strong>. במידה ומשתמש לא תקשר מספיק עם משתמשים אחרים כדי ליצור המלצות מעקב, חשבונות אלה יומלצו במקום. הם מחושבים מחדש על בסיסי יומיומי מתערובת של החשבונות הפעילים ביותר עם החשבונות הנעקבים ביותר עבור שפה נתונה."
+      language: עבור שפה
+      status: מצב
+      suppress: דכא המלצות מעקב
+      suppressed: מדוכא
+      title: המלצות מעקב
+      unsuppress: שחזור המלצות מעקב
     instances:
+      availability:
+        description_html:
+          many: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          one: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          other: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+          two: אם משלוח לדומיין נכשל במשך <strong>%{count} ימים שונים</strong> ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח <em>מ</em>הדומיין.
+        failure_threshold_reached: סף כשלון הושג ב-%{date}.
+        failures_recorded:
+          many: נסיונות כושלים ב-%{count} ימים שונים.
+          one: נסיון כושל ביום %{count}.
+          other: נסיונות כושלים ב-%{count} ימים שונים.
+          two: נסיונות כושלים ב-%{count} ימים שונים.
+        no_failures_recorded: לא נמצאו כשלונות.
+        title: זמינות
+        warning: הנסיון האחרון להתחבר לשרת זה לא עלה בהצלחה
+      back_to_all: כל
+      back_to_limited: מוגבל
+      back_to_warning: אזהרה
+      by_domain: דומיין
+      confirm_purge: האם את/ה בטוח/ה שברצונך למחוק באופן סופי מידע מדומיין זה?
+      content_policies:
+        comment: הערה פנימית
+        description_html: ביכולתך להגדיר מדיניות תוכן שתופעל על כל החשבונות מדומיין זה ומתת-דומייניו.
+        policies:
+          reject_media: דחיית מדיה
+          reject_reports: דחיית דו"חות
+          silence: הגבלה
+          suspend: השעייה
+        policy: מדיניות
+        reason: סיבה פומבית
+        title: מדיניות תוכן
+      dashboard:
+        instance_accounts_dimension: חשבונות בעלי העוקבים הרבים ביותר
+        instance_accounts_measure: חשבונות מאופסנים
+        instance_followers_measure: עוקבינו שם
+        instance_follows_measure: עוקביהם כאן
+        instance_languages_dimension: שפות מובילות
+        instance_media_attachments_measure: קבצי מדיה מאופסנים
+        instance_reports_measure: דו"חות אודותיהם
+        instance_statuses_measure: חצרוצים מאופסנים
       delivery:
+        all: הכל
+        clear: ניקוי שגיאות משלוח
         failing: נכשל
+        restart: אתחול משלוח מחדש
+        stop: הפסקת משלוח
+        unavailable: לא זמין
+      delivery_available: משלוח זמין
+      delivery_error_days: ימי שגיאת משלוח
+      delivery_error_hint: אם לא התאפשר משלוח במשך %{count} ימים, הוא יסומן אוטומטית כבלתי ניתן למשלוח.
+      destroyed_msg: מידע מ-%{domain} נמצא עתה בתור למחיקה מיידית.
+      empty: לא נמצאו דומיינים.
+      known_accounts:
+        many: "%{count} חשבונות ידועים"
+        one: חשבון ידוע %{count}
+        other: "%{count} חשבונות ידועים"
+        two: "%{count} חשבונות ידועים"
+      moderation:
+        all: הכל
+        limited: מוגבלים
+        title: ניהול קהילה
+      private_comment: הערה פרטית
+      public_comment: תגובה פומבית
+      purge: טיהור
+      purge_description_html: אם יש יסוד להניח שדומיין זה מנותק לעד, ניתן למחוק את כל רשומות החשבונות והמידע המשוייך לדומיין זה משטח האפסון שלך. זה עשוי לקחת זמן מה.
       title: שרתים מוכרים
+      total_blocked_by_us: חסום על ידינו
+      total_followed_by_them: נעקב על ידם
+      total_followed_by_us: נעקב על ידינו
+      total_reported: דוחות אודותיהם
+      total_storage: קבצי מדיה מצורפים
+      totals_time_period_hint_html: הסכומים המוצגים להלן כוללים מידע מכל הזמנים.
+    invites:
+      deactivate_all: להשבית הכל
+      filter:
+        all: כל ההזמנות
+        available: זמין
+        expired: פג תוקף
+        title: מסנן
+      title: הזמנות
+    ip_blocks:
+      add_new: צור כלל
+      created_msg: כלל IP חדש הוסף בהצלחה
+      delete: למחוק
+      expires_in:
+        '1209600': שבועיים
+        '15778476': 6 חודשים
+        '2629746': חודש אחד
+        '31556952': שנה אחת
+        '86400': יום אחד
+        '94670856': 3 שנים
+      new:
+        title: יצירת כלל IP
+      no_ip_block_selected: שום כלל IP לא שונה כי שום כלל IP לא נבחר
+      title: כללי IP
+    relationships:
+      title: היחסים של %{acct}
+    relays:
+      add_new: הוספת ממסר חדש
+      delete: מחיקה
+      description_html: "<strong>ממסר פדרטיבי</strong> הוא שרת מתווך שמחליף כמויות גדולות של חצרוצים פומביים בין שרתים שרשומים ומפרסמים אליו. <strong>הוא יכול לעזור לשרתים קטנים ובינוניים לגלות תוכן מהפדרציה</strong>, מה שאחרת היה דורש ממשתמשים מקומיים לעקוב ידנית אחרי אנשים בשרתים מרוחקים."
+      disable: השבתה
+      disabled: מושבת
+      enable: לאפשר
+      enable_hint: מרגע שאופשר, השרת שלך יירשם לכל החצרוצים הפומביים מהממסר הזה, ויתחיל לשלוח את חצרוציו הפומביים לממסר.
+      enabled: מאופשר
+      inbox_url: קישורית ממסר
+      pending: ממתין לאישור הממסר
+      save_and_enable: שמור והפעל
+      setup: הגדר חיבור לממסר
+      signatures_not_enabled: ממסרים לא עובדים נכון כשמאופשרים מצב מאובטח או מצב פדרציה מוגבל
+      status: מצב
+      title: ממסרים
     report_notes:
+      created_msg: הערה על דו"ח נוצרה בהצלחה!
+      destroyed_msg: הערה על דו"ח נמחקה בהצלחה!
       today_at: היום, ב%{time}
     reports:
+      account:
+        notes:
+          many: "%{count} הערות"
+          one: הערה %{count}
+          other: "%{count} הערות"
+          two: "%{count} הערות"
+      action_log: ביקורת יומן
+      action_taken_by: פעולה בוצעה ע"י
       actions:
         delete_description_html: הפוסטים המדווחים יימחקו ותרשם עבירה על מנת להקל בהעלאה של דיווחים עתידיים על אותה חשבון.
+        mark_as_sensitive_description_html: המדיה בחצרוצים מדווחים תסומן כרגישה ועבירה תרשם כדי לעזור לך להסלים באינטראקציות עתידיות עם אותו החשבון.
+        other_description_html: ראו אפשרויות נוספות לשליטה בהתנהגות החשבון וכדי לבצע התאמות בתקשורת עם החשבון המדווח.
         resolve_description_html: אף פעולה לא תבוצע נגד החשבון עליו דווח, לא תירשם עבירה, והדיווח ייסגר.
+        silence_description_html: הפרופיל יהיה גלוי אך ורק לאלה שכבר עוקבים אחריו או לאלה שיחפשו אותו ידנית, מה שיגביל מאד את תפוצתו. ניתן תמיד להחזיר את המצב לקדמותו.
+        suspend_description_html: הפרופיל וכל תכולתו יחסמו לכל גישה עד שבסופו של דבר ימחקו. כל תקשורת עם החשבון תהיה בלתי אפשרית. ניתן לביטול תוך 30 יום.
+      actions_description_html: בחר/י איזו פעולה לבצע על מנת לפתור את הדו"ח. אם תופעל פעולת ענישה כנגד החשבון המדווח, הודעת דוא"ל תשלח אליהם, אלא אם נבחרה קטגוריית ה<strong>ספאם</strong>.
       add_to_report: הוספת פרטים לדיווח
       are_you_sure: 100% על בטוח?
+      assign_to_self: הקצה אלי
+      assigned: מנחה מוקצה
+      by_target_domain: דומיין החשבון המדווח
       category: קטגוריה
+      category_description_html: הסיבה בגללה חשבון זה ו/או תוכנו דווחו תצוטט בתקשורת עם החשבון המדווח
       comment:
         none: ללא
       comment_description_html: 'על מנת לספק עוד מידע, %{name} כתב\ה:'
+      created_at: מדווח
+      delete_and_resolve: מחיקת חצרוצים
+      forwarded: קודם
+      forwarded_to: קודם ל-%{domain}
       mark_as_resolved: סימון כפתור
+      mark_as_sensitive: סימון כרגיש
+      mark_as_unresolved: סימון כלא פתור
       no_one_assigned: אף אחד
       notes:
+        create: הוספת הערה
+        create_and_resolve: פתרון עם הערה
+        create_and_unresolve: פתיחה מחדש עם הערה
+        delete: מחיקה
+        placeholder: תאר/י אילו פעולות ננקטו, או עדכונים קשורים אחרים...
         title: הערות
+      notes_description_html: צפייה והשארת הערות למנחים אחרים או לעצמך העתידי
+      quick_actions_description_html: 'נקוט/י פעולה מהירה או גלול/י למטה לצפייה בתוכן המדווח:'
+      remote_user_placeholder: המשתמש המרוחק מ-%{instance}
+      reopen: פתיחת דו"ח מחדש
       report: 'דווח על #%{id}'
       reported_account: חשבון מדווח
       reported_by: דווח על ידי
       resolved: פתור
+      resolved_msg: הדו"ח נפתר בהצלחה!
+      skip_to_actions: דלג/י לפעולות
       status: הודעה
       statuses: התוכן עליו דווח
+      statuses_description_html: התוכן הפוגע יצוטט בתקשורת עם החשבון המדווח
+      target_origin: מקור החשבון המדווח
       title: דיווחים
+      unassign: ביטול הקצאה
       unresolved: לא פתור
+      updated_at: עודכן
       view_profile: צפה בפרופיל
+    rules:
+      add_new: הוספת כלל
+      delete: מחיקה
+      description_html: בעוד הרוב טוען שקרא והסכים לתנאי השימוש, אנשים לא נוטים לקרוא אותם עד הסוף עד שמתעוררת בעיה. <strong>כדי שיקל לראות את כללי השרת במבט, יש לספקם כרשימת נקודות.</strong> כדאי לשמור על הכללים קצרים ופשוטים, אבל מאידך גם לא לפצל אותם ליותר מדי נקודות נפרדות.
+      edit: עריכת כלל
+      empty: שום כללי שרת לא הוגדרו עדיין.
+      title: כללי שרת
     settings:
+      activity_api_enabled:
+        desc_html: מספר החצרוצים שפורסמו מקומית, משתמשים פעילים, והרשמות חדשות בדליים שבועיים
+        title: פרסום סטטיסטיקות מקובצות עבור פעילות משתמשים בממשק
+      bootstrap_timeline_accounts:
+        desc_html: הפרדת משתמשים מרובים בפסיק. למשתמשים אלה מובטח שהם יכללו בהמלצות המעקב
+        title: המלצה על חשבונות אלה למשתמשים חדשים
       contact_information:
         email: נא להקליד כתובת דוא"ל פומבית
         username: נא להכניס שם משתמש
+      custom_css:
+        desc_html: שינוי המראה בעזרת CSS הנטען בכל דף
+        title: CSS יחודי
+      default_noindex:
+        desc_html: משפיע על כל המשתמשים שלא שינו את ההגדרה בעצמם
+        title: לא לכלול משתמשים במנוע החיפוש כברירת מחדל
+      domain_blocks:
+        all: לכולם
+        disabled: לאף אחד
+        title: צפיה בחסימת דומיינים
+        users: למשתמשים מקומיים מחוברים
+      domain_blocks_rationale:
+        title: הצגת רציונל
+      hero:
+        desc_html: מוצגת בדף הראשי. מומלץ לפחות 600x100px. אם לא נבחר, מוצגת במקום תמונה מוקטנת מהשרת
+        title: תמונת גיבור
+      mascot:
+        desc_html: מוצגת בכל מיני דפים. מומלץ לפחות 293×205px. אם לא נבחר, מוצג במקום קמע ברירת המחדל
+        title: תמונת קמע
+      peers_api_enabled:
+        desc_html: שמות דומיינים ששרת זה נתקל בהם ברחבי הפדרציה
+        title: פרסם רשימה של שרתים שנתגלו דרך הממשק
+      preview_sensitive_media:
+        desc_html: תצוגה מקדימה של קישוריות לאתרים אחרים יוצגו כתמונה מוקטנת אפילו אם המדיה מסומנת כרגישה
+        title: הצגת מדיה רגישה בתצוגה מקדימה של OpenGraph
+      profile_directory:
+        desc_html: הרשאה למשתמשים להתגלות
+        title: הרשאה לספריית פרופילים
       registrations:
         closed_message:
-          desc_html: מוצג על הדף הראשי כאשר ההרשמות סגורות<br>ניתן להשתמש בתגיות HTML
+          desc_html: מוצג על הדף הראשי כאשר ההרשמות סגורות. ניתן להשתמש בתגיות HTML
           title: מסר סגירת הרשמות
+        deletion:
+          desc_html: הרשאה לכולם למחוק את חשבונם
+          title: פתיחת מחיקת חשבון
+        min_invite_role:
+          disabled: אף אחד
+          title: אפשר הזמנות לפי
+        require_invite_text:
+          desc_html: כאשר הרשמות דורשות אישור ידני, הפיכת טקסט ה"מדוע את/ה רוצה להצטרף" להכרחי במקום אופציונלי
+          title: אלץ משתמשים חדשים למלא סיבת הצטרפות
+      registrations_mode:
+        modes:
+          approved: נדרש אישור הרשמה
+          none: אף אחד לא יכול להרשם
+          open: כל אחד יכול להרשם
+        title: מצב הרשמות
+      show_known_fediverse_at_about_page:
+        desc_html: כאשר לא מופעל, מגביל את הפיד הפומבי המקושר מדף הנחיתה להצגת תוכן מקומי בלבד
+        title: הכללת תוכן פדרטיבי בדף הפיד הפומבי הבלתי מאומת
+      show_staff_badge:
+        desc_html: הצג תג צוות בדף המשתמש
+        title: הצג תג צוות
       site_description:
         desc_html: מוצג כפסקה על הדף הראשי ומשמש כתגית מטא. ניתן להשתמש בתגיות HTML, ובמיוחד ב־<code> &lt; a&gt; </code> ו־<code> &lt; em&gt; </code> .
         title: תיאור האתר
       site_description_extended:
-        desc_html: מוצג על עמוד המידע הנוסף<br>ניתן להשתמש בתגיות HTML
+        desc_html: מקום טוב להצגת כללים, הנחיות, ודברים אחרים שמבדלים אותך ממופעים אחרים. ניתן להשתמש בתגיות HTML
         title: תיאור אתר מורחב
+      site_short_description:
+        desc_html: מוצג בעמודה הצידית ובמטא תגים. מתאר מהו מסטודון ומה מיחד שרת זה בפסקה בודדת.
+        title: תאור שרת קצר
+      site_terms:
+        desc_html: ניתן לכתוב מדיניות פרטיות, תנאי שירות ושאר מסמכים חוקיים בעצמך. ניתן להשתמש בתגי HTML
+        title: תנאי שירות יחודיים
       site_title: כותרת האתר
+      thumbnail:
+        desc_html: משמש לתצוגה מקדימה דרך OpenGraph והממשק. מומלץ 1200x630px
+        title: תמונה ממוזערת מהשרת
+      timeline_preview:
+        desc_html: הצגת קישורית לפיד הפומבי מדף הנחיתה והרשאה לממשק לגשת לפיד הפומבי ללא אימות
+        title: הרשאת גישה בלתי מאומתת לפיד הפומבי
       title: הגדרות אתר
+      trendable_by_default:
+        desc_html: משפיע על האשתגיות שלא נאסרו קודם לכן
+        title: הרשאה להאשתגיות להופיע בנושאים החמים ללא אישור מוקדם
+      trends:
+        desc_html: הצגה פומבית של תוכן שנסקר בעבר ומופיע כרגע בנושאים החמים
+        title: נושאים חמים
+    site_uploads:
+      delete: מחיקת קובץ שהועלה
+      destroyed_msg: העלאת אתר נמחקה בהצלחה!
     statuses:
+      back_to_account: חזרה לדף החשבון
       back_to_report: חזרה לעמוד הדיווח
       batch:
         remove_from_report: הסרה מהדיווח
         report: דווח
+      deleted: מחוקים
+      media:
+        title: מדיה
+      no_status_selected: לא בוצעו שינויים בחצרוצים שכן לא נבחרו חצרוצים
+      title: חצרוצי חשבון
+      with_media: עם מדיה
+    strikes:
+      actions:
+        delete_statuses: "%{name} מחק/ה את חצרוציו של %{target}"
+        disable: "%{name} הקפיא/ה את חשבונו של %{target}"
+        mark_statuses_as_sensitive: "%{name} סימנה את חצרוציו של %{target} כרגישים"
+        none: "%{name} שלח/ה אזהרה ל-%{target}"
+        sensitive: "%{name} סימן/ה את חשבונו של %{target} כרגיש"
+        silence: "%{name} הגביל/ה את חשבונו/ה של %{target}"
+        suspend: "%{name} השעה/תה את חשבונו/ה של %{target}"
+      appeal_approved: עורער
+      appeal_pending: בהמתנה לערעור
+    system_checks:
+      database_schema_check:
+        message_html: נדרשות הגירות מבני נתונים. אנא הריצו אותן כדי להבטיח שהיישום מתנהג כצפוי
+      elasticsearch_running_check:
+        message_html: לא ניתן להתחבר לחיפוש אלסטיק. בדקו בבקשה הוא רץ, או בטלו את חיפוש הטקסט המלא
+      elasticsearch_version_check:
+        message_html: 'גרסת חיפוש אלסטיק לא מתאימה: %{value}'
+        version_comparison: גרסת חיפוש אלסטיק %{running_version} רצה בעוד גרסא %{required_version} נדרשת
+      rules_check:
+        action: ניהול כללי שרת
+        message_html: לא הוגדרו שום כללי שרת.
+      sidekiq_process_check:
+        message_html: שום הליכי Sidekiq לא רצים עבור %{value} תור(ות). בחנו בבקשה את הגדרות Sidekiq
+    tags:
+      review: סקירת מצב
+      updated_msg: הגדרות האשתג עודכנו בהצלחה
     title: ניהול
+    trends:
+      allow: לאפשר
+      approved: אישור
+      disallow: לא לאשר
+      links:
+        allow: אישור קישורית
+        allow_provider: אישור מפרסם
+        description_html: בקישוריות אלה נעשה כרגע שימוש על ידי חשבונות רבים שהשרת שלך רואה חצרוצים מהם. זה עשוי לסייע למשתמשיך לברר מה קורה בעולם. שום קישוריות לא יוצגו עד שתאשרו את המפרסם. ניתן גם לאפשר או לדחות קישוריות ספציפיות.
+        disallow: לא לאשר קישורית
+        disallow_provider: לא לאשר מפרסם
+        shared_by_over_week:
+          many: הופץ על ידי %{count} אנשים בשבוע האחרון
+          one: הופץ על ידי אדם אחד בשבוע האחרון
+          other: הופץ על ידי %{count} אנשים בשבוע האחרון
+          two: הופץ על ידי %{count} אנשים בשבוע האחרון
+        title: קישוריות חמות
+        usage_comparison: הופץ %{today} פעמים היום, לעומת %{yesterday} אתמול
+      only_allowed: רק כאלה שהותרו
+      pending_review: בהמתנה לבדיקה
+      preview_card_providers:
+        allowed: קישוריות ממפרסם זה יכולות להכלל בנושאים החמים
+        description_html: אלה הם דומיינים מהם קישוריות מופצות תדיר לשרת שלך. קישוריות לא יכללו בנושאים החמים אלא אם דומיין הקישורית יאושר. אישורך (או דחייתך) יכלול גם תת-דומיינים.
+        rejected: קישוריות ממפרסם זה לא תכללנה בנושאים החמים
+        title: מפרסמים
+      rejected: דחוי
+      statuses:
+        allow: הרשאת חצרוץ
+        allow_account: הרשאת מחבר/ת
+        description_html: אלו הם חצרוצים שהשרת שלך מכיר וזוכים להדהודים וחיבובים רבים כרגע. זה עשוי למשתמשיך החדשים והחוזרים למצוא עוד נעקבים. החצרוצים לא מוצגים עד שיאושר המחבר/ת, והמחבר/ת יאשרו שחשבונים יומלץ לאחרים. ניתן לאשר או לדחות חצרוצים ספציפיים.
+        disallow: לא לאשר חצרוץ
+        disallow_account: לא לאשר מחבר/ת
+        not_discoverable: המחבר/ת לא בחר/ה לאפשר את גילויים
+        shared_by:
+          many: הודהד וחובב %{friendly_count} פעמים
+          one: הודהד או חובב פעם אחת
+          other: הודהד וחובב %{friendly_count} פעמים
+          two: הודהד וחובב %{friendly_count} פעמים
+        title: חצרוצים חמים
+      tags:
+        current_score: ציון נוכחי %{score}
+        dashboard:
+          tag_accounts_measure: שימושים יחודיים
+          tag_languages_dimension: שפות מובילות
+          tag_servers_dimension: שרתים מובילים
+          tag_servers_measure: שרתים שונים
+          tag_uses_measure: כלל השימושים
+        description_html: אלו הן האשתגיות שמופיעות הרבה כרגע בחצרוצים המגיעים לשרת. זה עשוי לעזור למשתמשיך למצוא על מה אנשים מרבים לדבר כרגע. שום האשתגיות לא יוצגו בפומבי עד שתאושרנה.
+        listable: ניתנות להצעה
+        not_listable: לא תוצענה
+        not_trendable: לא תופענה תחת נושאים חמים
+        not_usable: לא שמישות
+        peaked_on_and_decaying: הגיע לשיא ב-%{date}, ודועך עכשיו
+        title: האשתגיות חמות
+        trendable: עשויה להופיע תחת נושאים חמים
+        trending_rank: 'מדורגת #%{rank}'
+        usable: ניתנת לשימוש
+        usage_comparison: שומשה %{today} פעמים היום, לעומת %{yesterday} אתמול
+        used_by_over_week:
+          many: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+          one: הוצגה על ידי משתמש בודד במשך השבוע שעבר
+          other: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+          two: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
+      title: נושאים חמים
+      trending: נושאים חמים
+    warning_presets:
+      add_new: הוספת חדש
+      delete: למחוק
+      edit_preset: ערוך/י טקסט מוכן מראש לאזהרה
+      empty: לא הגדרת עדיין שום טקסט מוכן מראש לאזהרה.
+      title: ניהול טקסטים מוכנים מראש לאזהרות
+  admin_mailer:
+    new_appeal:
+      actions:
+        delete_statuses: כדי למחוק את חצרוציהם
+        disable: כדי להקפיא את חשבונם
+        mark_statuses_as_sensitive: כדי לסמן את חצרוציהם כרגישים
+        none: אזהרה
+        sensitive: כדי לסמן את חשבונם כרגיש
+        silence: כדי להגביל את חשבונם
+        suspend: כדי להשעות את חשבונם
+      body: "%{target} מערערים על החלטת מנהלי הקהילה ב-%{action_taken_by} מתאריך %{date}, שהיה %{type}. הם כתבו:"
+      next_steps: ניתן לאשר את הערער כדי להפוך את החלטת מנהלי הקהילה, או להתעלם ממנו.
+      subject: "%{username} מערערים על החלטת מנהלי הקהילה במופע %{instance}"
+    new_pending_account:
+      body: פרטי החשבון החדש מובאים להלן. ניתן לאשר או לדחות את הבקשה.
+      subject: חשבון חדש מובא לסקירה ב-%{instance} (%{username})
+    new_report:
+      body: "%{reporter} דיווחו על %{target}"
+      body_remote: מישהם מהמופע %{domain} דיווחו על %{target}
+      subject: דו"ח חדש מהמופע %{instance} (#%{id})
+    new_trends:
+      body: 'הפריטים הבאים זקוקים לסקירה לפני שניתן יהיה להציגם פומבית:'
+      new_trending_links:
+        no_approved_links: אין כרגע שום קישוריות חמות מאושרות.
+        requirements: כל אחד מהמועמדים האלה עשוי לעבור את הקישורית החמה המאושרת מדרגה %{rank}, שהיא כרגע %{lowest_link_title} עם ציון של %{lowest_link_score}.
+        title: נושאים חמים
+      new_trending_statuses:
+        no_approved_statuses: אין כרגע שום חצרוצים חמים מאושרים.
+        requirements: כל אחד מהמועמדים האלה עשוי לעבור החצרוץ החם המאושר מדרגה %{rank}, שההא כרגע %{lowest_status_url} עם ציון של %{lowest_status_score}.
+        title: חצרוצים לוהטים
+      new_trending_tags:
+        no_approved_tags: אין כרגע שום האשתגיות חמות מאושרות.
+        requirements: כל אחת מהמועמדות האלה עשויה לעבור את ההאשתגית החמה המאושרת מדרגה %{rank}, שהיא כרגע %{lowest_tag_name} עם ציון של %{lowest_tag_score}.
+        title: האשתגיות חמות
+      subject: נושאים חמים חדשים מוכנים לסקירה ב-%{instance}
+  aliases:
+    add_new: יצירת שם נרדף
+    created_msg: שם נרדף חדש נוצר בהצלחה. ניתן להתחיל עכשיו את המעבר מהחשבון הישן.
+    deleted_msg: שם נרדף הוסר בהצלחה. מעבר מהחשבון ההוא לזה לא אפשרי יותר.
+    empty: אין לך שמות נרדפים.
+    hint_html: אם ברצונך לעבור מחשבון אחר לחשבון הזה, כאן ניתן ליצור שם נרדף, הנדרש לפני שאפשר יהיה להמשיך עם העברת עוקבים מהחשבון הישן לזה. הפעולה עצמה <strong>הפיכה ובלתי מזיקה</strong>. <strong>הגירת החשבון מופעלת מהחשבון הישן</strong>.
+    remove: הסרת שם נרדף
+  appearance:
+    advanced_web_interface: ממשק ווב מתקדם
+    advanced_web_interface_hint: 'אם ברצונך לעשות שימוש במלוא רוחב המסך, ממשק הווב המתקדם מאפשר לך להגדיר עמודות רבות ושונות כדי לראות בו זמנית כמה מידע שתרצה/י: פיד הבית, התראות, פרהסיה ומספר כלשהו של רשימות והאשתגיות.'
+    animations_and_accessibility: הנפשות ונגישות
+    confirmation_dialogs: חלונות אישור
+    discovery: גילוי
+    localization:
+      body: מסטודון מתורגם על ידי מתנדבים.
+      guide_link: https://crowdin.com/project/mastodon
+      guide_link_text: כולם יכולים לתרום.
+    sensitive_content: תוכן רגיש
+    toot_layout: פריסת חצרוץ
   application_mailer:
+    notification_preferences: שינוי העדפות דוא"ל
+    salutation: "%{name},"
     settings: 'שינוי הגדרות דוא"ל: %{link}'
     view: 'תצוגה:'
+    view_profile: צפיה בפרופיל
+    view_status: הצגת חצרוץ
   applications:
+    created: ישום נוצר בהצלחה
+    destroyed: ישום נמחק בהצלחה
     invalid_url: כתובת הקישורית אינה חוקית
+    regenerate_token: יצירת אסימון גישה מחדש
+    token_regenerated: אסימון גישה יוצר מחדש בהצלחה
+    warning: זהירות רבה נדרשת עם מידע זה. אין לחלוק אותו אף פעם עם אף אחד!
+    your_token: אסימון הגישה שלך
   auth:
+    apply_for_account: בקשת הזמנה
+    change_password: סיסמא
+    checkbox_agreement_html: אני מסכים/ה ל<a href="%{rules_path}" target="_blank">כללי השרת</a> ול<a href="%{terms_path}" target="_blank">תנאי השימוש</a>
+    checkbox_agreement_without_rules_html: אני מסכים/ה ל<a href="%{terms_path}" target="_blank">תנאי השימוש</a>
+    delete_account: מחיקת חשבון
+    delete_account_html: אם ברצונך למחוק את החשבון, ניתן <a href="%{path}">להמשיך כאן</a>. תתבקש/י לספק אישור נוסף.
+    description:
+      prefix_invited_by_user: "@%{name} מזמין אותך להצטרף לשרת זה במסטודון!"
+      prefix_sign_up: הרשם/י למסטודון היום!
+      suffix: כבעל/ת חשבון, תוכל/י לעקוב אחרי אנשים, לפרסם עדכונים ולהחליף מסרים עם משתמשים מכל שרת מסטודון ועוד!
     didnt_get_confirmation: לא התקבלו הוראות אימות?
+    dont_have_your_security_key: אין לך מפתח אבטחה?
     forgot_password: הנשתכחה סיסמתך?
+    invalid_reset_password_token: אסימון איפוס הסיסמא לא תקין או פג תוקף. נא לבקש אחד חדש.
+    link_to_otp: נא להכניס את קוד האימות הדו-גורמי מהטלפון או את קוד האחזור
+    link_to_webauth: נא להשתמש במכשיר מפתח האבטחה
     log_in_with: התחבר באמצעות
     login: כניסה
     logout: יציאה
+    migrate_account: מעבר לחשבון אחר
+    migrate_account_html: אם ברצונך להכווין את החשבון לעבר חשבון אחר, ניתן <a href="%{path}">להגדיר זאת כאן</a>.
+    or_log_in_with: או התחבר באמצעות
+    providers:
+      cas: CAS
+      saml: SAML
     register: הרשמה
+    registration_closed: "%{instance} לא מקבל חברים חדשים"
     resend_confirmation: שלח הוראות אימות בשנית
     reset_password: איפוס סיסמא
     security: החלפת סיסמא
     set_new_password: שינוי סיסמא
+    setup:
+      email_below_hint_html: אם כתובת הדוא"ל להלן לא נכונה, ניתן לשנותה כאן ולקבל דוא"ל אישור חדש.
+      email_settings_hint_html: דוא"ל האישור נשלח ל-%{email}. אם כתובת הדוא"ל הזו לא נכונה, ניתן לשנותה בהגדרות החשבון.
+      title: הגדרות
     status:
+      account_status: מצב חשבון
+      confirming: ממתין שדוא"ל האישור יושלם.
       functional: החשבון שלכם פעיל לגמרי.
+      pending: בקשתך ממתינה לאישור על ידי הצוות שלנו. זה עשוי לקחת זמן מה. דוא"ל יישלח אליך אם בקשתך התקבלה.
       redirecting_to: חשבונכם לא פעיל כעת מכיוון שמפנה ל%{acct}.
+      view_strikes: צפיה בעברות קודמות שנרשמו נגד חשבונך
+    too_fast: הטופס הוגש מהר מדי, נסה/י שוב.
+    trouble_logging_in: בעיה להתחבר לאתר?
+    use_security_key: שימוש במפתח אבטחה
   authorize_follow:
+    already_following: את/ה כבר עוקב/ת אחרי חשבון זה
+    already_requested: כבר נשלחה בקשת מעקב לחשבון זה
     error: למרבה הצער, היתה שגיאה בחיפוש החשבון המרוחק
     follow: לעקוב
+    follow_request: 'שלחת בקשת מעקב ל:'
+    following: 'הצלחה! הינך עוקב עכשיו אחרי:'
+    post_follow:
+      close: או, פשוט לסגור חלון זה.
+      return: הצג את פרופיל המשתמש
+      web: מעבר לווב
     title: לעקוב אחרי %{acct}
+  challenge:
+    confirm: המשך
+    hint_html: "<strong>טיפ:</strong> לא נבקש את סיסמתך שוב בשעה הקרובה."
+    invalid_password: סיסמא שגויה
+    prompt: אשר/י סיסמא להמשך
+  crypto:
+    errors:
+      invalid_key: זהו לא מפתח Ed25519 או Curve25519 קביל
+      invalid_signature: היא לא חתימת Ed25519 קבילה
+  date:
+    formats:
+      default: "%b %d, %Y"
+      with_month_name: "%B %d, %Y"
   datetime:
     distance_in_words:
       about_x_hours: "%{count} שעות"
@@ -208,116 +1039,653 @@ he:
       x_minutes: "%{count} דקות"
       x_months: "%{count} חודשים"
       x_seconds: "%{count} שניות"
+  deletes:
+    challenge_not_passed: המידע שהכנסת לא היה נכון
+    confirm_password: נא להכניס את הסיסמא הנוכחית כדי לוודא את זהותך
+    confirm_username: נא להכניס את שם המשתמש כדאי לאשר את הפעולה
+    proceed: מחיקת חשבון
+    success_msg: חשבונך נמחק בהצלחה
+    warning:
+      before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
+      caches: מידע שהוטמן על ידי שרתים אחרים עשוי להתמיד
+      data_removal: חצרוציך וכל מידע אחר יוסרו לתמיד
+      email_change_html: ניתן <a href="%{path}">לשנות את כתובת הדוא"ל שלך</a> מבלי למחוק את החשבון
+      email_contact_html: אם הוא עדיין לא הגיע, ניתן לקבל עזרה על ידי משלוח דואל ל-<a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: אם לא מתקבל דוא"ל האישור, ניתן <a href="%{path}">לבקש אותו שוב</a>
+      irreversible: לא ניתן יהיה לשחזר או להפעיל מחדש את חשבונך
+      more_details_html: לפרטים נוספים, ראו את <a href="%{terms_path}">מדיניות הפרטיות</a>.
+      username_available: שם המשתמש שלך שוב יהיה זמין
+      username_unavailable: שם המשתמש שלך יישאר בלתי זמין
+  directories:
+    directory: מדריך פרופילים
+    explanation: גלו משתמשים בהתבסס על תחומי העניין שלהם
+    explore_mastodon: חקור את %{title}
+  disputes:
+    strikes:
+      action_taken: הפעולה שבוצעה
+      appeal: ערער
+      appeal_approved: הערעור על פסילה זו התקבל
+      appeal_rejected: ערעור זה נדחה
+      appeal_submitted_at: ערעור הוגש
+      appealed_msg: הערעור שלך הוגש. במידה ויאושר, תיודע.
+      appeals:
+        submit: הגש ערעור
+      associated_report: הדו"ח המשויך
+      created_at: מתאריך
+      description_html: אלו הן הפעולות שננקטו כנגד חשבונך והאזהרות שנשלחו אליך על ידי צוות %{instance}.
+      recipient: הנמען
+      status: 'חצרוץ #%{id}'
+      status_removed: החצרוץ כבר הוסר מהמערכת
+      title: "%{action} מתאריך %{date}"
+      title_actions:
+        delete_statuses: הסרת חצרוץ
+        disable: הקפאת חשבון
+        mark_statuses_as_sensitive: סימון חצרוצים כרגישים
+        none: אזהרה
+        sensitive: סימו חשבון כרגיש
+        silence: הגבלת חשבון
+        suspend: השעית חשבון
+      your_appeal_approved: ערעורך התקבל
+      your_appeal_pending: הגשת ערעור
+      your_appeal_rejected: ערעורך נדחה
+  domain_validator:
+    invalid_domain: הוא לא שם דומיין קביל
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': הבקשה שהגשת לא תקינה.
     '403': חסרות לך הרשאות לצפיה בעמוד זה.
     '404': הדף המבוקש לא קיים.
-    '406': This page is not available in the requested format.
+    '406': הדף לא זמין בפורמט המבוקש.
     '410': הדף המבוקש כבר לא קיים.
     '422':
       content: בדיקת אבטחה נכשלה. החסמת עוגיותיך מפנינו?
       title: בדיקת בטיחות נכשלה
     '429': הוחנק
-    '500': 
-    '503': The page could not be served due to a temporary server failure.
+    '500':
+      content: אנו מצטערות, אבל משהו השתבש בצד שלנו.
+      title: דף זה אינו נכון
+    '503': לא ניתן להציג דף זה עקב תקלת שרת זמנית.
+    noscript_html: על מנת להשתמש ביישום הווב של מסטודון, נא לאפשר שימוש בג'אווהסקריפט. לחילופין אפשר לנסות את אחת ה<a href="%{apps_path}">אפליקציות הילידיות</a> שלנו המתאימה לסביבתך.
+  existing_username_validator:
+    not_found: לא נמצא משתמש מקומי בשם זה
+    not_found_multiple: לא נמצאו %{usernames}
   exports:
+    archive_takeout:
+      date: תאריך
+      download: הורדת הארכיון שלך
+      hint_html: ניתן לבקש ארכיון של <strong>חצרוציך וקבצי המדיה</strong> שלך. המידע המיוצא יהיה בפורמט אקטיביטיפאב, שיכול להיקרא על ידי כל תוכנה התומכת בו. ניתן לבקש ארכיון מדי 7 ימים.
+      in_progress: מייצר את הארכיון שלך...
+      request: לבקש את הארכיון שלך
+      size: גודל
     blocks: רשימת חסימות
+    bookmarks: סימניות
+    csv: CSV
+    domain_blocks: חסימות דומיינים
+    lists: רשימות
     mutes: רשימת השתקות
     storage: אחסון מדיה
+  featured_tags:
+    add_new: הוספת חדש
+    errors:
+      limit: המספר המירבי של האשתגיות כבר מוצג
+    hint_html: "<strong>מהן האשתגיות נבחרות?</strong> הן מוצגות במובלט בפרופיל הפומבי שלך ומאפשר לאנשים לעיין בחצרוציך הפומביים המסמונים בהאשתגיות אלה. הן כלי אדיר למעקב אחר עבודות יצירה ופרוייקטים לטווח ארוך."
+  filters:
+    contexts:
+      account: פרופילים
+      home: בית ורשימות
+      notifications: התראות
+      public: פידים פומביים
+      thread: שיחות
+    edit:
+      title: ערוך מסנן
+    errors:
+      invalid_context: לא סופק הקשר או הקשר לא תקין
+      invalid_irreversible: סינון בלתי הפיך עובד רק בהקשר פיד הבית או התראות
+    index:
+      delete: למחוק
+      empty: אין לך מסננים.
+      title: מסננים
+    new:
+      title: הוספת מסנן חדש
+  footer:
+    developers: מפתחות
+    more: עוד…
+    resources: משאבים
+    trending_now: נושאים חמים
   generic:
+    all: הכל
     changes_saved_msg: השינויים נשמרו בהצלחה!
+    copy: להעתיק
+    delete: למחוק
+    none: כלום
+    order_by: מיין לפי
     save_changes: שמור שינויים
+    today: היום
+    validation_errors:
+      many: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+      one: משהו עדיין לא בסדר! נא לעיין בשגיאה להלן
+      other: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+      two: משהו עדיין לא בסדר! נא לעיין ב-%{count} השגיאות להלן
+  html_validator:
+    invalid_markup: 'מכיל קוד HTML לא תקין: %{error}'
   imports:
+    errors:
+      over_rows_processing_limit: מכיל יותר מ-%{count} עמודות
+    modes:
+      merge: מיזוג
+      merge_long: שמירת רשומות קיימות והוספת חדשות
+      overwrite: דריסה
+      overwrite_long: החלף רשומות נוכחיות בחדשות
     preface: ניתן ליבא מידע מסויים כגון כל הנעקבים או המשתמשים החסומים לתוך חשבונך על שרת זה, מתוך קבצים שנוצרו על ידי יצוא משרת אחר כגון רשימת הנעקבים והחסומים שלך.
     success: כל המידע יובא בהצלחה, ויעובד בזמן הקרוב
     types:
       blocking: רשימת חסימות
+      bookmarks: סימניות
+      domain_blocking: רשימת שמות מתחם חסומים
       following: רשימת נעקבים
       muting: רשימת השתקות
     upload: יבוא
+  in_memoriam_html: לזכר.
+  invites:
+    delete: ביטול הפעלה
+    expired: פג תוקף
+    expires_in:
+      '1800': חצי שעה
+      '21600': 6 שעות
+      '3600': שעה
+      '43200': 12 שעות
+      '604800': שבוע
+      '86400': יום אחד
+    expires_in_prompt: לעולם לא
+    generate: צור קישור להזמנה
+    invited_by: הוזמנת ע"י
+    max_uses:
+      many: "%{count} שימושים"
+      one: שימוש אחד
+      other: "%{count} שימושים"
+      two: "%{count} שימושים"
+    max_uses_prompt: ללא הגבלה
+    prompt: צור ושתף קישורים לאחרים על מנת להעניק גישה לשרת זה
+    table:
+      expires_at: פוקעת ב
+      uses: שימושים
+    title: הזמנת אנשים
+  lists:
+    errors:
+      limit: הגעת למספר הרשימות המירבי.
+  login_activities:
+    authentication_methods:
+      otp: יישומון אימות דו-שלבי
+      password: סיסמא
+      sign_in_token: קוד אימות בדוא"ל
+      webauthn: מפתחות אבטחה
+    description_html: אם את/ה רואה פעילות שאינך מזהה, אנא שנה/י את סיסמתך והפעל/י אימות דו-גורמי.
+    empty: הסטוריית אימותים אינה זמינה
+    failed_sign_in_html: נסיון כניסה כושל בשיטת %{method} מכתובת %{ip} (%{browser})
+    successful_sign_in_html: נסיון כניסה מוצלח בשיטה %{method} מכתובת %{ip} (%{browser})
+    title: הסטוריית אימותים
   media_attachments:
     validations:
       images_and_video: לא ניתן להוסיף וידאו לחצרוץ שכבר מכיל תמונות
+      not_ready: לא ניתן להצמיד קבצים שהעלאתם לא הסתיימה. נסה/י שוב בעוד רגע!
       too_many: לא ניתן להוסיף יותר מארבעה קבצים
   migrations:
+    acct: עבר אל
+    cancel: ביטול הפניה
+    cancel_explanation: ביטול ההפניה יפעיל מחדש את החשבון הנוכחי, אבל לא יחזיר את העוקבים שהועברו לחשבון החדש.
+    cancelled_msg: ההפניה בוטלה בהצלחה.
+    errors:
+      already_moved: זה אותו החשבון שכבר עברת אליו
+      missing_also_known_as: לא שם נרדף של החשבון הזה
+      move_to_self: לא יכול להיות החשבון הנוכחי
+      not_found: לא נמצאו
+      on_cooldown: את/ה בתקופת צינון
+    followers_count: עוקבים בזמן המעבר
+    incoming_migrations: מעבר לחשבון אחר
+    incoming_migrations_html: כדי לעבור מחשבון אחר לחשבון זה, עליך ראשית <a href="%{path}">ליצור שם נרדף לחשבון</a>.
+    moved_msg: חשבונך מופנה עתה ל-%{acct} וכל עוקביך מועברים לשם.
     not_redirecting: חשבונכם לא מפנה לשום חשבון אחר כעת.
+    on_cooldown: חשבונך היגר לאחרונה. אפשרות זו תאופשר מחדש בעוד %{count} ימים.
+    past_migrations: הגירות עבר
+    proceed_with_move: העברת עוקבים
     redirected_msg: חשבונכם כעת מפנה ל%{acct}.
     redirecting_to: חשבונכם מפנה ל%{acct}.
     set_redirect: הגדר הפניה
+    warning:
+      backreference_required: ראשית יש להגדיר את החשבון החדש כך שיצביע לאחור לעבר חשבון זה
+      before: 'לפני שנמשיך, נא לקרוא בזהירות את ההערות הבאות:'
+      cooldown: לאחר המעבר ישנה תקופת המתנה בה לא ניתן לעבור שוב
+      disabled_account: חשבונך הנוכחי לא יהיה שמיש לחלוטין לאחר מכן. עם זאת, ניתן יהיה לגשת ליצוא המידע, וכמו כן להפעילו מחדש.
+      followers: פעולה זו תעביר את כל העוקבים מהחשבון הנוכחי לחשבון החדש
+      only_redirect_html: לחילופין, ניתן להסתפק ב<a href="%{path}">הכוונה מחדש בפרופילך</a>.
+      other_data: שום מידע לא יועבר אוטומטית
+      redirect: פרופיל חשבונך הנוכחי יעודכן עם הודעת הכוונה מחדש ויוחרג מחיפושים
+  moderation:
+    title: ניהול קהילה
+  move_handler:
+    carry_blocks_over_text: חשבון זה עבר מ-%{acct}, אותו חסמת בעבר.
+    carry_mutes_over_text: חשבון זה עבר מ-%{acct}, אותו השתקת בעבר.
+    copy_account_note_text: 'חשבון זה הועבר מ-%{acct}, הנה הערותיך הקודמות לגביהם:'
   notification_mailer:
     admin:
       sign_up:
         subject: "%{name} נרשמו"
     digest:
+      action: הצגת כל ההתראות
       body: להלן סיכום זריז של הדברים שקרו על מאז ביקורך האחרון ב-%{since}
       mention: "%{name} פנה אליך ב:"
+      new_followers_summary:
+        many: חוץ מזה, נוספו לך %{count} עוקבים חדשים בזמן שלא היית! מדהים!
+        one: חוץ מזה, נוסף לך עוקב חדש בזמן שלא היית! הידד!
+        other: חוץ מזה, נוספו לך %{count} עוקבים חדשים בזמן שלא היית! מדהים!
+        two: חוץ מזה, נוספו לך %{count} עוקבים חדשים בזמן שלא היית! מדהים!
+      subject:
+        many: "%{count} התראות חדשות מאז ביקורך האחרון 🐘"
+        one: "התראה חדשה אחת מאז ביקורך האחרון 🐘"
+        other: "%{count} התראות חדשות מאז ביקורך האחרון 🐘"
+        two: "%{count} התראות חדשות מאז ביקורך האחרון 🐘"
+      title: בהעדרך...
     favourite:
       body: 'חצרוצך חובב על ידי %{name}:'
       subject: חצרוצך חובב על ידי %{name}
+      title: חיבוב חדש
     follow:
       body: "%{name} עכשיו במעקב אחריך!"
       subject: "%{name} עכשיו במעקב אחריך"
+      title: עוקב/ת חדש/ה
     follow_request:
+      action: ניהול בקשות מעקב
       body: התקבלה בקשת מעקב מ־%{name}
       subject: 'בקשת מעקב בהמתנה: %{name}'
+      title: בקשת מעקב חדשה
     mention:
+      action: תגובה
       body: 'התקבלה פניה עבורך מאת %{name} ב:'
       subject: התקבלה פניה עבורך מאת %{name}
+      title: אזכור חדש
+    poll:
+      subject: סקר מאת %{name} הסתיים
     reblog:
       body: 'חצרוצך הודהד על ידי %{name}:'
       subject: חצרוצך הודהד על ידי%{name}
+      title: הדהוד חדש
+    status:
+      subject: "%{name} בדיוק חצרץ"
     update:
       subject: "%{name} ערכו פוסט"
+  notifications:
+    email_events: ארועים להתראות דוא"ל
+    email_events_hint: 'בחר/י ארועים עבורים תרצה/י לקבל התראות:'
+    other_settings: הגדרות התראות אחרות
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: מליארד
+          million: מליון
+          quadrillion: קוואדריליון
+          thousand: אלף
+          trillion: טריליון
+  otp_authentication:
+    code_hint: על מנת לאשר, נא להכניס את הקוד שיוצר על ידי יישום האימות שלך
+    description_html: אם אופשר <strong>אימות דו-גורמי</strong> בעזרת אפליקציית אימות, כניסה לאתר תדרוש שימוש בטלפון ליצירת אסימוני כניסה עבורך.
+    enable: לאפשר
+    instructions_html: "<strong>נא לסרוק את קוד ה-QR בעזרת Google Authenticator או יישום TOTP דומה בטלפונך</strong>. מעתה ואילך, יישום זה ייצר אסימונים שיש להזין בזמן הכניסה לאתר."
+    manual_instructions: 'אם לא ניתן לסרוק את קוד ה-QR ויש להכניסו ידנית, הנה הסוד כטקסט:'
+    setup: הגדרה
+    wrong_code: הקוד שהוכנס אינו תקין! האם זמן השרת וזמן המכשיר נכונים?
   pagination:
+    newer: חדש יותר
     next: הבא
+    older: ישן יותר
     prev: הקודם
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: כבר הצבעת בסקר זה
+      duplicate_options: מכיל פריטים כפולים
+      duration_too_long: רחוק מדי בעתיד
+      duration_too_short: מוקדם מדי
+      expired: סקר זה כבר הסתיים
+      invalid_choice: ההצבעה שנבחרה אינה קיימת
+      over_character_limit: לא יכולים להיות יותר מ-%{max} תוים כל אחד
+      too_few_options: חייב להכיל יותר מפריט אחד
+      too_many_options: לא יכול להכיל יותר מ-%{max} פריטים
+  preferences:
+    other: שונות
+    posting_defaults: ברירות מחדל לחצרוץ
+    public_timelines: פידים פומביים
+  reactions:
+    errors:
+      limit_reached: גבול מספר התגובות השונות הושג
+      unrecognized_emoji: הוא לא אמוג'י מוכר
+  relationships:
+    activity: רמת פעילות
+    dormant: רדומים
+    follow_selected_followers: עקוב אחר הנעקבים שנבחרו
+    followers: עוקבים
+    following: נעקבים
+    invited: הוזמנו
+    last_active: פעילות אחרונה
+    most_recent: העדכניות ביותר
+    moved: הועברו
+    mutual: הדדיים
+    primary: עיקריים
+    relationship: יחסים
+    remove_selected_domains: הסר את כל העוקבים משמות המתחם שסומנו
+    remove_selected_followers: הסר את העוקבים שסומנו
+    remove_selected_follows: בטל מעקב אחר המשתמשים שסומנו
+    status: מצב חשבון
   remote_follow:
     acct: נא להקליד שם_משתמש@קהילה מהם ברצונך לעקוב
     missing_resource: לא ניתן למצוא קישורית להפניה לחשבונך
+    no_account_html: אין לך חשבון? ניתן <a href='%{sign_up_path}' target='_blank'>להרשם כאן</a>
     proceed: להמשיך ולעקוב
     prompt: 'לעקוב אחרי:'
+    reason_html: "<strong>למה שלב זה הכרחי?</strong> <code>%{instance}</code> עשוי לא להיות השרת בו את/ה רשום/ה, כך שנצטרך קודם כל להעביר אותך לשרת הבית."
+  remote_interaction:
+    favourite:
+      proceed: המשך לחיבוב
+      prompt: 'ברצונך לחבב חצרוץ זה:'
+    reblog:
+      proceed: המשיכו להדהוד
+      prompt: 'ברצונך להדהד חצרוץ זה:'
+    reply:
+      proceed: המשיבו לתגובה
+      prompt: 'ברצונך להשיב לחצרוץ זה:'
+  reports:
+    errors:
+      invalid_rules: לא מתייחס לכללים קבילים
+  scheduled_statuses:
+    over_daily_limit: חרגת מהמספר המקסימלי של חצרוצים מתוזמנים להיום, שהוא %{limit}
+    over_total_limit: חרגת מהמספר המקסימלי של חצרוצים מתוזמנים, שהוא %{limit}
+    too_soon: תאריך התזמון חייב להיות בעתיד
+  sessions:
+    activity: פעילות אחרונה
+    browser: דפדפן
+    browsers:
+      alipay: Alipay
+      blackberry: בלקברי
+      chrome: כרום
+      edge: מייקרוסופט אדג'
+      electron: אלקטרון
+      firefox: פיירפוקס
+      generic: דפדפן לא ידוע
+      ie: אינטרנט אקספלורר
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: אופרה
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: דפדפן QQ
+      safari: ספארי
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: חיבור נוכחי
+    description: "%{browser} על %{platform}"
+    explanation: אלה הם הדפדפנים המחוברים כרגע לחשבון המסטודון שלך.
+    ip: IP
+    platforms:
+      adobe_air: אדובה אייר
+      android: אנדרואיד
+      blackberry: בלקברי
+      chrome_os: Chrome OS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: לינוקס
+      mac: macOS
+      other: סביבה לא ידועה
+      windows: חלונות
+      windows_mobile: חלונות מובייל
+      windows_phone: טלפון חלונות
+    revoke: שלילה
+    revoke_success: החיבור נשלל בהצלחה
+    title: מכשירים מחוברים
+    view_authentication_history: צפיה בהיסטוריית התחברויות לחשבונך
   settings:
+    account: חשבון
+    account_settings: הגדרות חשבון
+    aliases: שמות נרדפים לחשבון
+    appearance: תצוגה
     authorized_apps: ישומים מאושרים
     back: חזרה למסטודון
+    delete: מחיקת חשבון
+    development: פיתוח
     edit_profile: עריכת פרופיל
     export: יצוא מידע
+    featured_tags: האשתגיות נבחרות
     import: יבוא
+    import_and_export: יבוא ויצוא
+    migrate: הגירת חשבון
+    notifications: התראות
     preferences: העדפות
+    profile: פרופיל
+    relationships: נעקבים ועוקבים
+    statuses_cleanup: מחיקת חצרוצים אוטומטית
+    strikes: עבירות מנהלתיות
     two_factor_authentication: אימות דו-שלבי
+    webauthn_authentication: מפתחות אבטחה
   statuses:
+    attached:
+      audio:
+        many: "%{count} אודיו"
+        one: אודיו %{count}
+        other: "%{count} אודיו"
+        two: "%{count} אודיו"
+      description: 'מצורף: %{attached}'
+      image:
+        many: "%{count} תמונות"
+        one: תמונה %{count}
+        other: "%{count} תמונות"
+        two: "%{count} תמונות"
+      video:
+        many: "%{count} סרטונים"
+        one: סרטון %{count}
+        other: "%{count} סרטונים"
+        two: "%{count} סרטונים"
+    boosted_from_html: הודהד מ-%{acct_link}
+    content_warning: 'אזהרת תוכן: %{warning}'
     default_language: זהה לשפת ממשק
+    disallowed_hashtags:
+      many: 'מכיל את ההאשתגיות האסורות: %{tags}'
+      one: 'מכיל את ההאשתג האסור: %{tags}'
+      other: 'מכיל את ההאשתגיות האסורות: %{tags}'
+      two: 'מכיל את ההאשתגיות האסורות: %{tags}'
+    edited_at_html: נערך ב-%{date}
+    errors:
+      in_reply_not_found: נראה שהחצרוץ שאת/ה מנסה להגיב לו לא קיים.
     open_in_web: פתח ברשת
     over_character_limit: חריגה מגבול התווים של %{max}
+    pin_errors:
+      direct: לא ניתן לקבע חצרוצים שנראותם מוגבלת למכותבים בלבד
+      limit: הגעת למספר החצרוצים המוצמדים המירבי.
+      ownership: חצרוצים של אחרים לא יכולים להיות מוצמדים
+      reblog: אין אפשרות להצמיד הדהודים
+    poll:
+      total_people:
+        many: "%{count} אנשים"
+        one: איש/ה %{count}
+        other: "%{count} אנשים"
+        two: "%{count} אנשים"
+      total_votes:
+        many: "%{count} קולות"
+        one: קול %{count}
+        other: "%{count} קולות"
+        two: "%{count} קולות"
+      vote: הצבעה
     show_more: עוד
+    show_newer: הצג חדשים יותר
+    show_older: הצג ישנים יותר
+    show_thread: הצג שרשור
+    sign_in_to_participate: הכנס כדי להשתתף בשיחה
+    title: '%{name}: "%{quote}"'
     visibilities:
+      direct: ישיר
       private: לעוקבים בלבד
       private_long: להצגה לעוקבים בלבד
       public: פומבי
       public_long: כולם יוכלו לקרוא
       unlisted: מוסתר
       unlisted_long: פומבי, אבל לא להצגה בפיד הציבורי
+  statuses_cleanup:
+    enabled: מחק חצרוצים ישנים אוטומטית
+    enabled_hint: מוחק אוטומטית את חצרוציך לכשהגיעו לסף גיל שנקבע מראש, אלא אם הם תואמים את אחת ההחרגות למטה
+    exceptions: החרגות
+    explanation: היות ומחיקת חצרוצים היא פעולה יקרה במשאבים, היא נעשית לאט לאורך זמן כאשר השרת לא עסוק במשימות אחרות. לכן, ייתכן שהחצרוצים שלך ימחקו מעט אחרי שיגיעו לסף הגיל שהוגדר.
+    ignore_favs: התעלם ממחובבים
+    ignore_reblogs: התעלם מהדהודים
+    interaction_exceptions: החרגות מבוססות אינטראקציות
+    interaction_exceptions_explanation: שים.י לב שאין עֲרֻבָּה למחיקת חצרוצים אם הם יורדים מתחת לסף החיבובים או ההדהודים לאחר הסריקה הראשונית.
+    keep_direct: שמירת הודעות ישירות
+    keep_direct_hint: לא מוחק אך אחת מההודעות הישירות שלך
+    keep_media: שמור חצרוצים עם מדיה
+    keep_media_hint: לא מוחק את חצרוציך שמצורפים אליהם קבצי מדיה
+    keep_pinned: שמור חצרוצים מוצמדים
+    keep_pinned_hint: לא מוחק אף אחד מהחצרוצים המוצמדים שלך
+    keep_polls: שמור סקרים
+    keep_polls_hint: לא מוחר אף אחד מהסקרים שלך
+    keep_self_bookmark: שמור חצרוצים שסימנת
+    keep_self_bookmark_hint: לא מוחק חצרוצים שסימנת
+    keep_self_fav: שמור חצרומים שחיבבת
+    keep_self_fav_hint: לא מוחק חצרוצים שלך אם חיבבת אותם
+    min_age:
+      '1209600': שבועיים
+      '15778476': חצי שנה
+      '2629746': חודש
+      '31556952': שנה
+      '5259492': חודשיים
+      '604800': שבוע
+      '63113904': שנתיים
+      '7889238': 3 חודשים
+    min_age_label: סף גיל
+    min_favs: השאר חצרוצים מחובבים לפחות
+    min_favs_hint: לא מוחק מי מחצרוציך שקיבלו לפחות את המספר הזה של חיבובים. להשאיר ריק כדי למחוק חצרוצים ללא קשר למספר החיבובים שקיבלו
+    min_reblogs: שמור חצרוצים מהודהדים לפחות
+    min_reblogs_hint: לא מוחק מי מחצרוציך שקיבלו לפחות את המספר הזה של הדהודים. להשאיר ריק כדי למחוק חצרוצים ללא קשר למספר ההדהודים שקיבלו
   stream_entries:
+    pinned: חצרוץ מוצמד
     reblogged: הודהד
     sensitive_content: תוכן רגיש
+  tags:
+    does_not_match_previous_name: לא תואם את השם האחרון
+  terms:
+    title: תנאי שימוש ומדיניות פרטיות ב-%{instance}
+  themes:
+    contrast: מסטודון (ניגודיות גבוהה)
+    default: מסטודון (כהה)
+    mastodon-light: מסטודון (בהיר)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
       time: "%H:%M"
   two_factor_authentication:
+    add: הוספה
     disable: כיבוי
+    disabled_success: אימות דו-גורמי בוטל בהצלחה
+    edit: עריכה
+    enabled: אימות דו-גורמי הופעל
     enabled_success: אימות דו-שלבי הופעל בהצלחה
     generate_recovery_codes: ייצור קודי אחזור
     lost_recovery_codes: קודי האחזור מאפשרים אחזור גישה לחשבון במידה ומכשירך אבד. במידה וקודי האחזור אבדו, ניתן לייצרם מחדש כאן. תוקף קודי האחזור הישנים יפוג.
+    methods: שיטות אימות דו-גורמי
+    otp: יישום אימות
+    recovery_codes: קודי אחזור
     recovery_codes_regenerated: קודי האחזור יוצרו בהצלחה
     recovery_instructions_html: במידה והגישה למכשירך תאבד, ניתן לייצר קודי אחזור למטה על מנת לאחזר גישה לחשבונך בכל עת. <strong>נא לשמור על קודי הגישה במקום בטוח</strong>. לדוגמא על ידי הדפסתם ושמירתם עם מסמכים חשובים אחרים, או שימוש בתוכנה ייעודית לניהול סיסמאות וסודות.
+    webauthn: מפתחות אבטחה
   user_mailer:
+    appeal_approved:
+      action: מעבר לחשבונך
+      explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} התקבל. חשבונך חזר להיות נקי מכל רבב.
+      subject: ערעורך מתאריך %{date} התקבל
+      title: הערעור התקבל
+    appeal_rejected:
+      explanation: הערעור על העברה שנרשמה כנגד חשבונך ב-%{strike_date} שהגשת ב-%{appeal_date} נדחה.
+      subject: ערעורך מתאריך %{date} נדחה
+      title: הערעור נדחה
+    backup_ready:
+      explanation: ביקשת גיבוי מלא של חשבון המסטודון שלך. הוא מוכן להורדה!
+      subject: הארכיון שלך מוכן להורדה
+      title: הוצאת ארכיון
+    suspicious_sign_in:
+      change_password: שינוי הסיסמא שלך
+      details: 'הנה פרטי ההתחברות:'
+      explanation: זיהינו התחברות לחשבונך מכתובת IP חדשה.
+      further_actions_html: אם לא את/ה התחברת, אנו ממליצים שתבצע/י %{action} מיידית ותאפשר/י אימות דו גורמי על מנת לשמור על החשבון בטוח.
+      subject: נרשמה גישה לחשבונך מכתובת IP חדשה
+      title: התחברות חדשה
     warning:
+      appeal: הגשת ערעור
+      appeal_description: אם את/ה מאמין/ה שזו טעות, ניתן להגיש ערעור לצוות של %{instance}.
       categories:
         spam: ספאם
+        violation: התוכן מפר את כללי הקהילה הבאים
+      explanation:
+        delete_statuses: כמה מחצרוציך מפרים אחד או יותר מכללי הקהילה וכתוצאה הוסרו על ידי מנחי הקהילה של %{instance}.
+        disable: אינך יכול/ה יותר להשתמש בחשבונך, אבל הפרופיל ושאר המידע נשארו על עומדם. ניתן לבקש גיבוי של המידע, לשנות את הגדרות החשבון או למחוק אותו.
+        mark_statuses_as_sensitive: כמה מחצרוציך סומנו כרגישים על ידי מנחי הקהילה של %{instance}. זה אומר שאנשים יצטרכו להקיש על המדיה בחצרוצים לפני שתופיע תצוגה מקדימה. ניתן לסמן את המידע כרגיש בעצמך בחצרוציך העתידיים.
+        sensitive: מעתה ואילך כל קבצי המדיה שיועלו על ידך יסומנו כרגישים ויוסתרו מאחורי אזהרה.
+        silence: ניתן עדיין להשתמש בחשבונך אבל רק אנשים שכבר עוקבים אחריך יראו את חצרוציך בשרת זה, וייתכן שתוחרג/י מאמצעי גילוי משתמשים. עם זאת, אחרים יוכלו עדיין לעקוב אחריך.
+        suspend: לא ניתן יותר להשתמש בחשבונך, ופרופילך וכל מידע אחר לא נגישים יותר. ניתן עדיין להתחבר על מנת לבקש גיבוי של המידע שלך עד שיוסר סופית בעוד כ-30 יום, אבל מידע מסויים ישמר על מנת לוודא שלא תחמוק/י מההשעיה.
       reason: 'סיבה:'
+      statuses: 'חצרוצים מצוטטים:'
       subject:
         delete_statuses: הפוסטים שלכם ב%{acct} הוסרו
+        disable: חשבונך %{acct} הוקפא
+        mark_statuses_as_sensitive: חצרוציך ב-%{acct} סומנו כרגישים
+        none: אזהרה עבור %{acct}
+        sensitive: חצרוציך ב-%{acct} יסומנו כרגישים מעתה ואילך
+        silence: חשבונך %{acct} הוגבל
+        suspend: חשבונך %{acct} הושעה
       title:
         delete_statuses: פוסטים שהוסרו
+        disable: חשבון קפוא
+        mark_statuses_as_sensitive: חצרוצים סומנו כרגישים
+        none: אזהרה
+        sensitive: החשבון סומן כרגיש
+        silence: חשבון מוגבל
+        suspend: חשבון מושעה
+    welcome:
+      edit_profile_action: הגדרת פרופיל
+      edit_profile_step: תוכל.י להתאים אישית את הפרויל באמצעות העלאת יצגן (אוואטר), כותרת, שינוי כינוי ועוד. אם תרצה.י לסקור את עוקביך/ייך החדשים לפני שתרשה.י להם לעקוב אחריך/ייך, תוכל.י לנעול את החשבון לשם כך.
+      explanation: הנה כמה טיפים לעזור לך להתחיל
+      final_action: התחל/ילי לחצרץ
+      final_step: 'התחל/ילי לחצרץ ! אפילו ללא עוקבים ייתכן שהחצרוצים הפומביים של יצפו ע"י אחרים, למשל בציר הזמן המקומי או בתגי הקבצה (האשטגים). כדאי להציג את עצמך תחת התג #introductions או #היוש'
+      full_handle: שם המשתמש המלא שלך
+      full_handle_hint: זה מה שתאמר.י לחברייך כדי שיוכלו לשלוח לך הודעה או לעקוב אחרייך ממופע אחר.
+      review_preferences_action: שנה הגדרות
+      review_preferences_step: וודא לקבוע את העדפותייך, למשל איזה הודעות דוא"ל תרצה/י לקבל, או איזו רמת פרטיות תרצה כברירת מחדל לחצרוצים שלך. אם אין לך בעיה עם זה, תוכל לאפשר הפעלה אוטומטית של הנפשות GIF
+      subject: ברוכים הבאים למסטודון
+      tip_federated_timeline: ציר הזמן הפדרטיבי הוא מבט לכל הפדיברס, אך הוא כולל רק אנשים שחבריך למופע הספציפי שהתחברת אליו נרשמו אליו, כך שהוא לא שלם.
+      tip_following: את.ה כבר עוקב.ת אחר האדמין (מנהל השרת) כברירת מחדל. על מנת למצוא עוד אנשים מעניינים, בדוק את צירי הזמן המקומי והפדרטיבי.
+      tip_local_timeline: ציר הזמן המקומי מספק מבט לאנשים במופע זה (%{instance}). אלו הם שכנייך המידיים !
+      tip_mobile_webapp: אם דפדפן הנייד שלך מאפשר את הוספת מסטודון למסך הבית שלך, תוכל לקבל התראות בדחיפה (push). במובנים רבים אפשרות זאת מתנהגת כמו ישומון !
+      tips: טיפים
+      title: ברוך/ה הבא/ה, %{name} !
   users:
+    follow_limit_reached: לא תוכל לעקוב אחר יותר מ %{limit} אנשים
     invalid_otp_token: קוד דו-שלבי שגוי
+    otp_lost_help_html: אם איבדת גישה לשניהם, ניתן ליצור קשר ב-%{email}
+    seamless_external_login: את.ה מחובר דרך שירות חיצוני, לכן אפשרויות הסיסמא והדוא"ל לא מאופשרות.
+    signed_in_as: 'מחובר בתור:'
+  verification:
+    explanation_html: 'ניתן <strong>לאמת את עצמך כבעלים של הקישורית במטא-נתונים של פרופילך</strong>. כדי לעשות זאת, האתר המקושם חייב להכיל קישורית חוזרת לפרופיל המסטודון שלך. הקישורית החוזרת <strong>חייבת</strong> להכיל תכונת <code>rel="me"</code>. התוכן הטקסטואלי של הקישורית לא משנה. הנה דוגמא:'
+    verification: אימות
+  webauthn_credentials:
+    add: הוספת מפתח אבטחה חדש
+    create:
+      error: היתה בעיה בהוספת מפתח האבטחה. נסה שנית.
+      success: מפתח האבטחה הוסף בהצלחה.
+    delete: למחוק
+    delete_confirmation: האם אתה בטוח שברצונך למחוק מפתח אבטחה זה?
+    description_html: אם יאופשר <strong>אימות במפתח אבטחה</strong>, כניסה לאתר תדרוש שימוש באחד ממפתחות האבטחה שלך.
+    destroy:
+      error: היתה בעיה במחיקת מפתח האבטחה. נסה בשנית.
+      success: מפתח האבטחה נמחק בהצלחה.
+    invalid_credential: אסימון אבטחה לא תקין
+    nickname_hint: הכנס.י כינוי למפתח האבטחה החדש שלך
+    not_enabled: לא אפשרת את WebAuthn עדיין
+    not_supported: דפדפן זה לא תומך במפתחות אבטחה
+    otp_required: על מנת להשתמש במפתחות אבטחה אנא אפשר.י אימות דו-שלבי קודם.
+    registered_on: נרשם ב %{date}
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 0a1fd439c..d91dd28b5 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -722,7 +722,7 @@ hu:
         title: Stáb-jelvény megjelenítése
       site_description:
         desc_html: Rövid bemutatkozás a főoldalon és a meta fejlécekben. Írd le, mi teszi ezt a szervert különlegessé! Használhatod a <code>&lt;a&gt;</code> és <code>&lt;em&gt;</code> HTML tageket.
-        title: A szerver bemutatása
+        title: Kiszolgáló leírása
       site_description_extended:
         desc_html: Ide teheted például a közösségi és egyéb szabályzatot, útmutatókat és mindent, ami egyedivé teszi szerveredet. HTML-tageket is használhatsz
         title: További egyéni információk
diff --git a/config/locales/it.yml b/config/locales/it.yml
index c0e802f84..ed3fc3785 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -802,6 +802,7 @@ it:
           other: Condiviso da %{count} persone nell'ultima settimana
         title: Link in tendenza
         usage_comparison: Condiviso %{today} volte oggi, rispetto a %{yesterday} ieri
+      only_allowed: Solo consentiti
       pending_review: Revisione in sospeso
       preview_card_providers:
         allowed: I link da questa fonte possono essere in tendenza
@@ -843,6 +844,7 @@ it:
           one: Usato da una persona nell'ultima settimana
           other: Usato da %{count} persone nell'ultima settimana
       title: Tendenze
+      trending: Di tendenza
     warning_presets:
       add_new: Aggiungi nuovo
       delete: Cancella
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 192cd0b8f..547bfcce0 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -804,6 +804,7 @@ ku:
           other: Di nava hefteya dawî de ji aliyê %{count} ve hate parvekirin
         title: Girêdanên di rojevê de
         usage_comparison: Îro %{today} car hate parvekirin, li gorî %{yesterday} duh
+      only_allowed: Tenê yên mafdayî
       pending_review: Li benda nirxandinê ye
       preview_card_providers:
         allowed: Girêdanên ji vê weşangerê dikarin bibin rojev
@@ -845,6 +846,7 @@ ku:
           one: Di nava hefteya dawî de ji aliyê kesekî ve hatiye bikaranîn
           other: Di nava hefteya dawî de ji %{count} kes ve hatiye bikaranîn
       title: Rojev
+      trending: Rojev
     warning_presets:
       add_new: Yeka nû tevlî bike
       delete: Jê bibe
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c97a183f9..61e15c679 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -817,6 +817,7 @@ lv:
           zero: Pēdējās nedēļas laikā kopīgoja %{count} personas
         title: Populārākās saites
         usage_comparison: Šodien kopīgots %{today} reizes, salīdzinot ar %{yesterday} vakar
+      only_allowed: Tikai atļautās
       pending_review: Gaida pārskatīšanu
       preview_card_providers:
         allowed: Šī publicētāja saites var mainīties
@@ -860,6 +861,7 @@ lv:
           other: Pēdējās nedēļas laikā izmantoja %{count} personas
           zero: Pēdējās nedēļas laikā izmantoja %{count} personas
       title: Tendences
+      trending: Tendences
     warning_presets:
       add_new: Pievienot jaunu
       delete: Dzēst
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1a83cc022..e647b4c01 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -16,6 +16,7 @@ pt-BR:
     contact: Contato
     contact_missing: Não definido
     contact_unavailable: Não disponível
+    continue_to_web: Continuar no aplicativo web
     discover_users: Descubra usuários
     documentation: Documentação
     federation_hint_html: Com uma conta em %{instance} você vai poder seguir e interagir com pessoas de qualquer canto do fediverso.
@@ -163,6 +164,10 @@ pt-BR:
       not_subscribed: Não inscrito
       pending: Revisão pendente
       perform_full_suspension: Banir
+      previous_strikes: Ataques anteriores
+      previous_strikes_description_html:
+        one: Esta conta tem <strong>um</strong> ataque.
+        other: Esta conta tem <strong>%{count}</strong> ataques.
       promote: Promover
       protocol: Protocolo
       public: Público
@@ -203,6 +208,7 @@ pt-BR:
       silence: Silenciar
       silenced: Silenciado
       statuses: Toots
+      strikes: Ataques anteriores
       subscribe: Inscrever-se
       suspend: Suspender
       suspended: Banido
@@ -225,6 +231,7 @@ pt-BR:
       whitelisted: Permitido
     action_logs:
       action_types:
+        approve_appeal: Aprovar recurso
         approve_user: Aprovar Usuário
         assigned_to_self_report: Adicionar relatório
         change_email_user: Editar e-mail do usuário
@@ -243,6 +250,7 @@ pt-BR:
         destroy_domain_allow: Excluir domínio permitido
         destroy_domain_block: Excluir Bloqueio de Domínio
         destroy_email_domain_block: Excluir bloqueio de domínio de e-mail
+        destroy_instance: Limpar Domínio
         destroy_ip_block: Excluir regra de IP
         destroy_status: Excluir Status
         destroy_unavailable_domain: Deletar domínio indisponível
@@ -275,6 +283,7 @@ pt-BR:
         update_status: Editar Status
       actions:
         approve_appeal_html: "%{name} aprovou o recurso de decisão de moderação de %{target}"
+        approve_user_html: "%{name} aprovado inscrição de %{target}"
         assigned_to_self_report_html: "%{name} atribuiu o relatório %{target} para si"
         change_email_user_html: "%{name} alterou o endereço de e-mail do usuário %{target}"
         confirm_user_html: "%{name} confirmou o endereço de e-mail do usuário %{target}"
@@ -292,6 +301,7 @@ pt-BR:
         destroy_domain_allow_html: "%{name} bloqueou federação com domínio %{target}"
         destroy_domain_block_html: "%{name} deixou de bloquear domínio %{target}"
         destroy_email_domain_block_html: "%{name} adicionou domínio de e-mail %{target} à lista branca"
+        destroy_instance_html: "%{name} purgou o domínio %{target}"
         destroy_ip_block_html: "%{name} excluiu regra para o IP %{target}"
         destroy_status_html: "%{name} excluiu post de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
@@ -304,6 +314,7 @@ pt-BR:
         enable_user_html: "%{name} ativou o login para %{target}"
         memorialize_account_html: "%{name} transformou a conta de %{target} em um memorial"
         promote_user_html: "%{name} promoveu o usuário %{target}"
+        reject_appeal_html: "%{name} rejeitou recurso de decisão de moderação de %{target}"
         reject_user_html: "%{name} rejeitou a inscrição de %{target}"
         remove_avatar_user_html: "%{name} removeu a imagem de perfil de %{target}"
         reopen_report_html: "%{name} reabriu a denúncia %{target}"
@@ -360,6 +371,7 @@ pt-BR:
       enable: Ativar
       enabled: Ativado
       enabled_msg: Emoji ativado com sucesso
+      image_hint: PNG ou GIF até %{size}
       list: Listar
       listed: Listado
       new:
@@ -381,6 +393,18 @@ pt-BR:
       media_storage: Armazenamento de mídia
       new_users: novos usuários
       opened_reports: denúncias abertas
+      pending_appeals_html:
+        one: "<strong>%{count}</strong> recurso pendente"
+        other: "<strong>%{count}</strong> recursos pendentes"
+      pending_reports_html:
+        one: "<strong>%{count}</strong> relatório pendente"
+        other: "<strong>%{count}</strong> relatórios pendentes"
+      pending_tags_html:
+        one: "<strong>%{count}</strong> hashtag pendente"
+        other: "<strong>%{count}</strong> hashtags pendentes"
+      pending_users_html:
+        one: "<strong>%{count}</strong> usuário pendente"
+        other: "<strong>%{count}</strong> usuários pendentes"
       resolved_reports: denúncias solucionadas
       software: Software
       sources: Origem das inscrições
@@ -391,6 +415,7 @@ pt-BR:
       website: Site
     disputes:
       appeals:
+        empty: Nenhum recurso encontrado.
         title: Apelações
     domain_allows:
       add_new: Permitir domínio
@@ -427,13 +452,22 @@ pt-BR:
       view: Ver domínios bloqueados
     email_domain_blocks:
       add_new: Adicionar novo
+      attempts_over_week:
+        one: "%{count} tentativa na última semana"
+        other: "%{count} tentativas de inscrição na última semana"
       created_msg: Domínio de e-mail adicionado à lista negra com sucesso
       delete: Excluir
+      dns:
+        types:
+          mx: Registro MX
       domain: Domínio
       new:
         create: Adicionar domínio
         resolve: Resolver domínio
         title: Nova entrada de lista negra de e-mail
+      no_email_domain_block_selected: Nenhum bloco de domínio de e-mail foi alterado, pois nenhum foi selecionado
+      resolved_dns_records_hint_html: O nome de domínio resolve os seguintes domínios MX, que são responsáveis finais por aceitar o e-mail. Bloquear um domínio MX bloqueará inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Cuidado para não bloquear os principais provedores de e-mail.</strong>
+      resolved_through_html: Resolvido através de %{domain}
       title: Lista de negra de e-mail
     follow_recommendations:
       description_html: "<strong>A recomendação de contas ajuda os novos usuários a encontrar rapidamente conteúdo interessante</strong>. Quando um usuário ainda não tiver interagido o suficiente para gerar recomendações de contas, essas contas serão recomendadas. Essas recomendações são recalculadas diariamente a partir de uma lista de contas com alto engajamento e maior número de seguidores locais em uma dada língua."
@@ -445,21 +479,56 @@ pt-BR:
       unsuppress: Restaurar recomendação de contas
     instances:
       availability:
+        description_html:
+          one: Se a entrega ao domínio falhar <strong>%{count} dia</strong> sem sucesso, nenhuma tentativa de entrega será feita a menos que uma entrega <em>de</em> do domínio seja recebida.
+          other: Se a entrega ao domínio falhar em <strong>%{count} dias diferentes</strong> sem sucesso, nenhuma tentativa de entrega será feita a menos que uma entrega <em>de</em> do domínio seja recebida.
+        failure_threshold_reached: Limite de falhas atingido em %{date}.
+        failures_recorded:
+          one: Falha na tentativa em %{count} dia.
+          other: Tentativas falhas em %{count} dias diferentes.
+        no_failures_recorded: Sem falhas no registro.
         title: Disponibilidade
+        warning: A última tentativa de se conectar a este servidor não foi bem sucedida
       back_to_all: Todas
+      back_to_limited: Limitado
       back_to_warning: Aviso
       by_domain: Domínio
       confirm_purge: Você tem certeza de que deseja excluir permanentemente os dados deste domínio?
       content_policies:
+        comment: Nota interna
+        description_html: Você pode definir políticas de conteúdo que serão aplicadas a todas as contas deste domínio e a qualquer um dos seus subdomínios.
+        policies:
+          reject_media: Rejeitar mídia
+          reject_reports: Rejeitar relatórios
+          silence: Limite
+          suspend: Suspender
         policy: Políticas
+        reason: Razão pública
+        title: Políticas de conteúdo
+      dashboard:
+        instance_accounts_dimension: Contas mais seguidas
+        instance_accounts_measure: contas armazenadas
+        instance_followers_measure: nossos seguidores lá
+        instance_follows_measure: seus seguidores aqui
+        instance_languages_dimension: Idiomas principais
+        instance_media_attachments_measure: anexos de mídia armazenados
+        instance_reports_measure: relatórios sobre eles
+        instance_statuses_measure: publicações armazenadas
       delivery:
         all: Todos
         clear: Limpar erros de entrega
+        failing: Falhando
         restart: Reiniciar a entrega
         stop: Parar entrega
         unavailable: Indisponível
       delivery_available: Envio disponível
+      delivery_error_days: Dias de erro de entrega
+      delivery_error_hint: Se a entrega não for possível durante %{count} dias, será automaticamente marcada como não realizável.
+      destroyed_msg: Dados de %{domain} agora estão na fila para exclusão iminente.
       empty: Nenhum domínio encontrado.
+      known_accounts:
+        one: "%{count} conta conhecida"
+        other: "%{count} contas conhecidas"
       moderation:
         all: Todos
         limited: Limitados
@@ -467,12 +536,14 @@ pt-BR:
       private_comment: Comentário privado
       public_comment: Comentário público
       purge: Limpar
+      purge_description_html: Se você acredita que este domínio está offline definitivamente, você pode excluir todos os registros de conta e dados associados deste domínio do seu armazenamento. Isso pode demorar um pouco.
       title: Federação
       total_blocked_by_us: Bloqueado por nós
       total_followed_by_them: Seguidos por eles
       total_followed_by_us: Seguidos por nós
       total_reported: Denúncias sobre eles
       total_storage: Mídias anexadas
+      totals_time_period_hint_html: Os totais exibidos abaixo incluem dados para todo o tempo.
     invites:
       deactivate_all: Desativar todos
       filter:
@@ -517,6 +588,7 @@ pt-BR:
     report_notes:
       created_msg: Nota de denúncia criada com sucesso!
       destroyed_msg: Nota de denúncia excluída com sucesso!
+      today_at: Hoje às %{time}
     reports:
       account:
         notes:
@@ -742,6 +814,14 @@ pt-BR:
       body: "%{reporter} denunciou %{target}"
       body_remote: Alguém da instância %{domain} reportou %{target}
       subject: Nova denúncia sobre %{instance} (#%{id})
+    new_trends:
+      new_trending_statuses:
+        title: Publicações em alta
+      new_trending_tags:
+        no_approved_tags: No momento, não há hashtags de tendências aprovadas.
+        requirements: 'Qualquer um desses candidatos poderia ultrapassar a hashtag de tendência aprovada #%{rank} , que é atualmente #%{lowest_tag_name} com uma pontuação de %{lowest_tag_score}.'
+        title: Hashtags em alta
+      subject: Novas tendências para revisão em %{instance}
   aliases:
     add_new: Criar alias
     created_msg: Um novo alias foi criado com sucesso. Agora você pode iniciar a mudança da conta antiga.
@@ -793,6 +873,7 @@ pt-BR:
     invalid_reset_password_token: Código de alteração de senha é inválido ou expirou. Por favor, solicite um novo.
     link_to_otp: Digite um código de duas etapas do seu telefone ou um código de recuperação
     link_to_webauth: Use seu dispositivo de chave de segurança
+    log_in_with: Iniciar sessão com
     login: Entrar
     logout: Sair
     migrate_account: Mudar-se para outra conta
@@ -814,8 +895,10 @@ pt-BR:
     status:
       account_status: Status da conta
       confirming: Confirmação por e-mail pendente.
+      functional: Sua conta está totalmente operacional.
       pending: Sua solicitação está com revisão pendente por parte de nossa equipe. Você receberá um e-mail se ela for aprovada.
       redirecting_to: Sua conta está inativa porque atualmente está redirecionando para %{acct}.
+      view_strikes: Veja os ataques anteriores contra a sua conta
     too_fast: O formulário foi enviado muito rapidamente, tente novamente.
     trouble_logging_in: Problemas para entrar?
     use_security_key: Usar chave de segurança
@@ -851,8 +934,10 @@ pt-BR:
       about_x_years: "%{count}a"
       almost_x_years: "%{count}a"
       half_a_minute: Agora
+      less_than_x_minutes: "%{count}min"
       less_than_x_seconds: Agora
       over_x_years: "%{count}a"
+      x_days: "%{count}dias"
       x_minutes: "%{count}min"
       x_months: "%{count}m"
       x_seconds: "%{count}seg"
@@ -879,11 +964,32 @@ pt-BR:
     explore_mastodon: Explore o %{title}
   disputes:
     strikes:
+      action_taken: Ações tomadas
+      appeal: Recurso
+      appeal_approved: Este recurso foi contestado e não é mais válido
+      appeal_rejected: O recurso foi rejeitado
+      appeal_submitted_at: Recurso enviado
+      appealed_msg: Seu recurso foi enviado. Se ele for aprovado, você será notificado.
+      appeals:
+        submit: Enviar recurso
+      associated_report: Relatório associado
+      created_at: Datado
+      description_html: Estas são ações tomadas contra sua conta e avisos que foram enviados a você pela equipe de %{instance}.
+      recipient: Endereçado para
+      status: 'Postagem #%{id}'
+      status_removed: Postagem já removida do sistema
+      title: "%{action} de %{date}"
       title_actions:
+        delete_statuses: Remoção de publicações
+        disable: Congelamento de conta
+        mark_statuses_as_sensitive: Marcar as postagens como sensíveis
         none: Aviso
         sensitive: Marcar a conta como sensível
         silence: Limitação da conta
         suspend: Suspensão de conta
+      your_appeal_approved: Seu recurso foi aprovado
+      your_appeal_pending: Você submeteu um recurso
+      your_appeal_rejected: Seu recurso foi rejeitado
   domain_validator:
     invalid_domain: não é um nome de domínio válido
   errors:
@@ -1008,6 +1114,7 @@ pt-BR:
     authentication_methods:
       otp: autenticação de dois fatores
       password: senha
+      sign_in_token: código de segurança do e-mail
       webauthn: chaves de segurança
     description_html: Se você vir atividades suspeitas ou não reconhecidas, considere alterar sua senha e ativar a autenticação de dois fatores.
     empty: Sem histórico de autenticação disponível
@@ -1057,6 +1164,9 @@ pt-BR:
     carry_mutes_over_text: Este usuário mudou de %{acct}, que você havia silenciado.
     copy_account_note_text: 'Este usuário saiu de %{acct}, aqui estão suas notas anteriores sobre ele:'
   notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} se inscreveu"
     digest:
       action: Ver todas as notificações
       body: Aqui está um breve resumo das mensagens que você perdeu desde o seu último acesso em %{since}
@@ -1064,6 +1174,9 @@ pt-BR:
       new_followers_summary:
         one: Você tem um novo seguidor! Uia!
         other: Você tem %{count} novos seguidores! AÊÊÊ!
+      subject:
+        one: "Uma nova notificação desde o seu último acesso 🐘"
+        other: "%{count} novas notificações desde o seu último acesso 🐘"
       title: Enquanto você estava ausente...
     favourite:
       body: "%{name} favoritou seu toot:"
@@ -1091,6 +1204,8 @@ pt-BR:
       title: Novo boost
     status:
       subject: "%{name} acabou de postar"
+    update:
+      subject: "%{name} editou uma publicação"
   notifications:
     email_events: Eventos para notificações por e-mail
     email_events_hint: 'Selecione os eventos que deseja receber notificações:'
@@ -1172,6 +1287,9 @@ pt-BR:
     reply:
       proceed: Continue para responder
       prompt: 'Você responderá este toot:'
+  reports:
+    errors:
+      invalid_rules: não faz referência a regras válidas
   scheduled_statuses:
     over_daily_limit: Você excedeu o limite de %{limit} toots agendados para esse dia
     over_total_limit: Você excedeu o limite de %{limit} toots agendados
@@ -1238,6 +1356,7 @@ pt-BR:
     profile: Perfil
     relationships: Seguindo e seguidores
     statuses_cleanup: Exclusão automatizada de publicações
+    strikes: Moderação de ataques
     two_factor_authentication: Autenticação de dois fatores
     webauthn_authentication: Chaves de segurança
   statuses:
@@ -1254,9 +1373,11 @@ pt-BR:
         other: "%{count} vídeos"
     boosted_from_html: Boost de %{acct_link}
     content_warning: 'Aviso de Conteúdo: %{warning}'
+    default_language: Igual ao idioma da interface
     disallowed_hashtags:
       one: 'continha hashtag não permitida: %{tags}'
       other: 'continha hashtags não permitidas: %{tags}'
+    edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: O toot que você quer responder parece não existir.
     open_in_web: Abrir no navegador
@@ -1420,6 +1541,7 @@ pt-BR:
     formats:
       default: "%H:%M em %d de %b de %Y"
       month: "%b de %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Adicionar
     disable: Desativar
@@ -1438,15 +1560,27 @@ pt-BR:
   user_mailer:
     appeal_approved:
       action: Acessar perfil
+      explanation: O recurso do ataque contra sua conta em %{strike_date} que você submeteu em %{appeal_date} foi aprovado. Sua conta está novamente em situação regular.
+      subject: Seu recurso de %{date} foi aprovado
       title: Contestação aprovada
     appeal_rejected:
+      explanation: O recurso do ataque contra sua conta em %{strike_date} que você submeteu em %{appeal_date} foi rejeitado.
+      subject: Seu recurso de %{date} foi rejeitado
       title: Contestação rejeitada
     backup_ready:
       explanation: Você pediu um backup completo da sua conta no Mastodon. E agora está pronto para ser baixado!
       subject: Seu arquivo está pronto para ser baixado
       title: Baixar arquivo
+    suspicious_sign_in:
+      change_password: Altere sua senha
+      details: 'Aqui estão os detalhes do acesso:'
+      explanation: Detectamos um login em sua conta a partir de um novo endereço IP.
+      further_actions_html: Se não foi você, recomendamos que você %{action} imediatamente e ative a autenticação de dois fatores para manter sua conta segura.
+      subject: Sua conta foi acessada a partir de um novo endereço IP
+      title: Um novo login
     warning:
       appeal: Enviar uma contestação
+      appeal_description: Se você acredita que isso é um erro, você pode enviar um apelo para a equipe de %{instance}.
       categories:
         spam: Spam
         violation: O conteúdo viola as seguintes diretrizes da comunidade
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index f196d525f..fa8d33b58 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -802,6 +802,7 @@ pt-PT:
           other: Partilhado por %{count} pessoas na última semana
         title: Links em destaque
         usage_comparison: Partilhado %{today} vezes hoje, em comparação com %{yesterday} ontem
+      only_allowed: Apenas permitidos
       pending_review: Pendente de revisão
       preview_card_providers:
         allowed: Links deste editor poderão ser incluídos nos destaques
@@ -843,6 +844,7 @@ pt-PT:
           one: Utilizada por uma pessoa na última semana
           other: Utilizada por %{count} pessoas na última semana
       title: Tendências
+      trending: Em destaque
     warning_presets:
       add_new: Adicionar novo
       delete: Eliminar
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index b89237b1e..2e0632648 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -44,7 +44,7 @@ ca:
         inbox_url: Copia l'URL de la pàgina principal del relay que vols utilitzar
         irreversible: Les publicacions filtrades desapareixeran de manera irreversible, fins i tot si el filtre s'elimina més tard
         locale: L'idioma de la interfície d’usuari, els correus i les notificacions push
-        locked: Controla manualment qui et pot seguir i aprovar les peticions
+        locked: Controla manualment qui et pot seguir, aprovant sol·licituds
         password: Utilitza com a mínim 8 caràcters
         phrase: Es combinarà independentment del format en el text o l'avís de contingut de la publicació
         scopes: API permeses per accedir a l'aplicació. Si selecciones un àmbit de nivell superior, no cal que en seleccions un d'individual.
@@ -143,16 +143,16 @@ ca:
         inbox_url: URL de la safata d'entrada del relay
         irreversible: Cau en lloc d'ocultar
         locale: Idioma de la interfície
-        locked: Torna aquest compte privat
+        locked: Requereix sol·licituds de seguiment
         max_uses: Nombre màxim d'usos
         new_password: Contrasenya nova
         note: Biografia
         otp_attempt: Codi de dos factors
         password: Contrasenya
         phrase: Paraula clau o frase
-        setting_advanced_layout: Activar l’interfície web avançada
+        setting_advanced_layout: Activa la interfície web avançada
         setting_aggregate_reblogs: Agrupar impulsos en les línies de temps
-        setting_always_send_emails: Envia sempre notificacions per correu electrònic
+        setting_always_send_emails: Envia'm sempre notificacions per correu electrònic
         setting_auto_play_gif: Reproduir automàticament els GIFs animats
         setting_boost_modal: Mostrar la finestra de confirmació abans d'impulsar
         setting_crop_images: Retalla les imatges en publicacions no ampliades a 16x9
@@ -160,14 +160,14 @@ ca:
         setting_default_privacy: Privacitat de les publicacions
         setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostrar la finestra de confirmació abans d'esborrar una publicació
-        setting_disable_swiping: Desactivar les animacions
+        setting_disable_swiping: Desactiva les animacions
         setting_display_media: Visualització multimèdia
         setting_display_media_default: Per defecte
         setting_display_media_hide_all: Amaga-ho tot
         setting_display_media_show_all: Mostra-ho tot
         setting_expand_spoilers: Sempre ampliar les publicacions marcades amb advertències de contingut
         setting_hide_network: Amagar la teva xarxa
-        setting_noindex: Desactivar la indexació dels motors de cerca
+        setting_noindex: Desactiva la indexació dels motors de cerca
         setting_reduce_motion: Reduir el moviment de les animacions
         setting_show_application: Revelar l'aplicació utilitzada per fer les publicacions
         setting_system_font_ui: Utilitzar el tipus de lletra predeterminat del sistema
@@ -187,8 +187,8 @@ ca:
       featured_tag:
         name: Etiqueta
       interactions:
-        must_be_follower: Blocar les notificacions de persones que no et segueixen
-        must_be_following: Blocar les notificacions de persones que no segueixes
+        must_be_follower: Bloqueja les notificacions de persones que no em segueixen
+        must_be_following: Bloqueja les notificacions de persones no seguides
         must_be_following_dm: Blocar els missatges directes de persones que no segueixes
       invite:
         comment: Comenta
@@ -203,11 +203,11 @@ ca:
         severity: Regla
       notification_emails:
         appeal: Algú ha apel·lat una decisió de moderació
-        digest: Enviar un resum per correu electrònic
+        digest: Envia'm un resum per correu electrònic
         favourite: Algú marca com a preferit el teu estat
-        follow: Algú t'ha seguit
-        follow_request: Envia un correu electrònic si algú sol·licita seguir-te
-        mention: Algú t'ha esmentat
+        follow: Algú et segueix
+        follow_request: Algú sol·licita seguir-te
+        mention: Algú et menciona
         pending_account: Un nou compte necessita revisió
         reblog: Algú comparteix el teu estat
         report: Nou informe és emés
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index 68ff7898e..77b46ad2b 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -165,6 +165,8 @@ cy:
         comment: Sylw
       invite_request:
         text: Pam hoffech ymuno?
+      ip_block:
+        severity: Rheol
       notification_emails:
         digest: Anfonwch e-byst crynhoi
         favourite: Anfon e-bost pan mae rhywun yn ffefrynnu eich statws
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 36d7cbf67..6faf1842a 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -2,27 +2,146 @@
 he:
   simple_form:
     hints:
+      account_alias:
+        acct: נא לציין משתמש@דומיין של החשבון ממנו תרצה/י לעבור
+      account_migration:
+        acct: נא לציין משתמש@דומיין של החשבון אליו תרצה/י לעבור
+      account_warning_preset:
+        text: ניתן להשתמש בתחביר חצרוצי, כגון קישוריות, האשתגיות ואזכורים
+        title: אופציונלי. בלתי נראה למקבל ההודעה
+      admin_account_action:
+        include_statuses: המשתמש יראה אילו חצרוצים גרמו לפעולה או לאזהרה
+        send_email_notification: המשתמש יקבל הסבר מה קרה לחשבונם
+        text_html: אופציונלי. ניתן להשתמש בתחביר חצרוצי. ניתן <a href="%{path}">להוסיף הגדרות אזהרה</a> כדי לחסוך זמן
+        type_html: נא לבחור מה לעשות עם <strong>%{acct}</strong>
+        types:
+          disable: מנעי מהמשתמש להשתמש בחשבונם, מבלי למחוק או להסתיר את תוכנו.
+          none: השתמשי בזה כדי לשלוח למשתמש אזהרה, מבלי לגרור פעולות נוספות.
+          sensitive: אלצי את כל קבצי המדיה המצורפים על ידי המשתמש להיות מסומנים כרגישים.
+          silence: מנעי מהמשתמש להיות מסוגל לחצרץ בנראות פומבית, החביאי את חצרוציהם והתראותיהם מאנשים שלא עוקבים אחריהם.
+          suspend: מנעי כל התקשרות עם חשבון זה ומחקי את תוכנו. ניתן לשחזור תוך 30 יום.
+        warning_preset_id: אופציונלי. ניתן עדיין להוסיף טקסט ייחודי לסוף ההגדרה
+      announcement:
+        all_day: אם נבחר, רק התאריכים בטווח הזמן יוצגו
+        ends_at: אופציונלי. הכרזות יוסרו באופן אוטומטי בזמן זה
+        scheduled_at: נא להשאיר ריק כדי לפרסם את ההכרזה באופן מיידי
+        starts_at: אופציונלי. במקרה שהכרזתך כבולה לטווח זמן ספציפי
+        text: ניתן להשתמש בתחביר חצרוצי. נא לשים לב לשטח שתתפוס ההכרזה על מסך המשתמש
+      appeal:
+        text: ניתן לערער על עברה רק פעם אחת
       defaults:
+        autofollow: אנשים שיצטרפו בעזרת ההזמנה יעקבו אחריך באופן אוטומטי
         avatar: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן ל-%{dimensions}px
+        bot: איתות לאחרים שהחשבון מבצע בעיקר פעולות אוטומטיות ועשוי לא להיות מנוטר
+        context: הקשר אחד או יותר בהם יופעל המסנן
+        current_password: מסיבות אבטחה נא להזין את הסיסמא של החשבון הנוכחי
+        current_username: על מנת לאשר, נא להכניס את שם המשתמש של החשבון הנוכחי
         digest: נשלח לאחר תקופה ארוכה של אי-פעילות עם סיכום איזכורים שקיבלת בהעדרך
+        discoverable: אשר/י לחשבונך להתגלות לזרים על ידי המלצות, נושאים חמים ושאר דרכים
+        email: דוא"ל אישור יישלח אליך
+        fields: ניתן להציג עד ארבעה פריטים כטבלה בפרופילך
         header: PNG, GIF או JPG. מקסימום %{size}. גודל התמונה יוקטן %{dimensions}px
+        inbox_url: נא להעתיק את הקישורית מדף הבית של הממסר בו תרצה/י להשתמש
+        irreversible: חצרוצים מסוננים יעלמו באופן בלתי הפיך, אפילו אם מאוחר יותר יוסר המסנן
+        locale: שפת ממשק המשתמש, הדוא"ל וההתראות בדחיפה
         locked: מחייב אישור עוקבים באופן ידני. פרטיות ההודעות תהיה עוקבים-בלבד אלא אם יצוין אחרת
+        password: נא להשתמש בלפחות 8 תוים
+        phrase: התאמה תמצא ללא תלות באזהרת תוכן בחצרוץ
+        scopes: לאיזה ממשק יורשה היישום לגשת. בבחירת תחום כללי, אין צורך לבחור ממשקים ספציפיים.
+        setting_aggregate_reblogs: לא להראות הדהודים של חצרוצים שהודהדו לאחרונה (משפיע רק על הדהודים שהתקבלו לא מזמן)
+        setting_always_send_emails: בדרך כלל התראות דוא"ל לא יישלחו בזמן שימוש פעיל במסטודון
+        setting_default_sensitive: מדיה רגישה מוסתרת כברירת מחדל וניתן להציגה בקליק
+        setting_display_media_default: הסתרת מדיה המסומנת כרגישה
+        setting_display_media_hide_all: הסתר מדיה תמיד
+        setting_display_media_show_all: גלה מדיה תמיד
+        setting_hide_network: עוקבייך ונעקבייך יוסתרו בפרופילך
         setting_noindex: משפיע על הפרופיל הציבורי שלך ועמודי ההודעות
+        setting_show_application: היישום בו נעשה שימוש כדי לחצרץ יופיע בתצוגה המפורטת של החצרוץ
+        setting_use_blurhash: הגראדיינטים מבוססים על תוכן התמונה המוסתרת, אבל מסתירים את כל הפרטים
+        setting_use_pending_items: הסתר עדכוני פיד מאחורי קליק במקום לגלול את הפיד אוטומטית
+        username: שם המשתמש שלך יהיה ייחודי ב-%{domain}
+        whole_word: אם מילת מפתח או ביטוי הם אלפאנומריים בלבד, הם יופעלו רק אם נמצאה התאמה למילה שלמה
+      domain_allow:
+        domain: דומיין זה יוכל לייבא מידע משרת זה והמידע המגיע ממנו יעובד ויאופסן
+      email_domain_block:
+        domain: זה יכול להיות שם הדומיין המופיע בכתובת הדוא"ל או רשומת ה-MX בה הוא משתמש. הם ייבדקו בהרשמה.
+        with_dns_records: ייעשה נסיון למצוא את רשומות ה-DNS של דומיין נתון והתוצאות ייחסמו גם הן
+      featured_tag:
+        name: 'אולי תרצה/י להשתמש באחד מאלה:'
+      form_challenge:
+        current_password: את.ה נכנס. ת לאזור מאובטח
       imports:
         data: קובץ CSV שיוצא משרת מסטודון אחר
+      invite_request:
+        text: זה יעזור לנו בסקירת הבקשה שלך
+      ip_block:
+        comment: רשות. זכור/י מדוע הוספת את הכלל הזה.
+        expires_in: כתובות IP הם משאב מוגבל, לפעמים הם משותפים ולעתים קרובות מחליפים ידיים. לכן, חסימות IP לצמיתות לא מומלצות.
+        ip: נא להכניס כתובת IPv4 או IPv6. ניתן לחסום תחומים שלמים על ידי שימוש בתחביר CIDR. זהירות לא לנעול את עצמכם בחוץ!
+        severities:
+          no_access: חסימת גישה לכל המשאבים
+          sign_up_requires_approval: הרשמות חדשות ידרשו את אישורך
+        severity: נא לבחור מה יקרה לבקשות מכתובת IP זו
+      rule:
+        text: נא לתאר את הכלל או הדרישה למשתמשים משרת זה. על התיאור להיות קצר ובהיר
       sessions:
-        otp: נא להקליד קוד אימות דו-שלבי ממכשירך או קוד אחזור גישה.
+        otp: 'נא להקליד קוד אימות דו-שלבי ממכשירך או להשתמש באחד מקודי אחזור הגישה שלך:'
+        webauthn: אם זהו מכשיר USB יש לוודא שהוא מוכנס, ואם יש צורך, להקיש עליו.
+      tag:
+        name: ניתן רק להחליף בין אותיות קטנות וגדולות, למשל כדי לשפר את הקריאות
+      user:
+        chosen_languages: אם פעיל, רק חצרוצים בשפות הנבחרות יוצגו לפידים הפומביים
     labels:
+      account:
+        fields:
+          name: תווית
+          value: תוכן
+      account_alias:
+        acct: שם משתמש של החשבון הישן
+      account_migration:
+        acct: שם משתמש של החשבון החדש
+      account_warning_preset:
+        text: טקסט קבוע מראש
+        title: כותרת
+      admin_account_action:
+        include_statuses: כלול חצרוצים מדווחים בהודעת הדוא"ל
+        send_email_notification: יידע את המשתמש באמצעות דוא"ל
+        text: התראה בהתאמה אישית
+        type: פעולה
+        types:
+          disable: הקפא
+          none: שלח התרעה
+          sensitive: רגיש
+          silence: הגבלה
+          suspend: השעייה
+        warning_preset_id: השתמש/י בטקסט מוכן מראש לאזהרה
+      announcement:
+        all_day: אירוע למשך כל היום
+        ends_at: סוף האירוע
+        scheduled_at: תיזמון פרסום
+        starts_at: תחילת האירוע
+        text: הכרזה
+      appeal:
+        text: הסבר מדוע יש להפוך את ההחלטה
       defaults:
+        autofollow: להזמין מעקב אחרי חשבונך
         avatar: תמונת פרופיל
+        bot: זהו חשבון מסוג בוט
+        chosen_languages: סינון שפות
         confirm_new_password: אישור סיסמא חדשה
         confirm_password: אישור סיסמא
+        context: סינון לפי הקשר
         current_password: סיסמא נוכחית
         data: מידע
+        discoverable: הצע חשבון לאחרים
         display_name: שם להצגה
         email: כתובת דוא"ל
         expires_in: תפוגה לאחר
+        fields: מטא-נתונים על הפרופיל
         header: ראשה
+        honeypot: "%{label} (לא למלא)"
+        inbox_url: קישורית לתיבת ממסר
+        irreversible: הסרה במקום הסתרה
         locale: שפה
         locked: הפוך חשבון לפרטי
         max_uses: מספר מרבי של שימושים
@@ -30,31 +149,82 @@ he:
         note: אודות
         otp_attempt: קוד אימות דו-שלבי
         password: סיסמא
+        phrase: מילת מפתח או ביטוי
+        setting_advanced_layout: אפשר ממשק ווב מתקדם
+        setting_aggregate_reblogs: קבץ הדהודים זהים
+        setting_always_send_emails: תמיד שלח התראות לדוא"ל
         setting_auto_play_gif: ניגון אוטומטי של גיפים
         setting_boost_modal: הצגת דיאלוג אישור לפני הדהוד
+        setting_crop_images: קטום תמונות בחצרוצים לא מורחבים ל 16 על 9
+        setting_default_language: שפת חצרוץ
         setting_default_privacy: פרטיות ההודעות
         setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה
         setting_delete_modal: להראות תיבת אישור לפני מחיקת חיצרוץ
+        setting_disable_swiping: ביטול החלקת-צד
+        setting_display_media: תצוגת מדיה
+        setting_display_media_default: ברירת מחדל
+        setting_display_media_hide_all: להסתיר הכל
+        setting_display_media_show_all: להציג הכול
+        setting_expand_spoilers: להרחיב תמיד חצרוצים מסומנים באזהרת תוכן
+        setting_hide_network: להחביא את הגרף החברתי שלך
         setting_noindex: לבקש הסתרה ממנועי חיפוש
         setting_reduce_motion: הפחתת תנועה בהנפשות
+        setting_show_application: הצגת הישום ששימש לחצרוץ
         setting_system_font_ui: להשתמש בגופן ברירת המחדל של המערכת
         setting_theme: ערכת העיצוב של האתר
+        setting_trends: הצגת הנושאים החמים
         setting_unfollow_modal: להראות תיבת אישור לפני הפסקת מעקב אחרי אחרים
+        setting_use_blurhash: הצגת גראדיינטים צבעוניים למדיה מוסתרת
+        setting_use_pending_items: מצב איטי
         severity: חומרה
+        sign_in_token_attempt: קוד אבטחה
         type: סוג יבוא
         username: שם משתמש
+        username_or_email: שם משתמש או דוא"ל
+        whole_word: מילה שלמה
+      email_domain_block:
+        with_dns_records: לכלול רשומות MX וכתובות IP של הדומיין
+      featured_tag:
+        name: האשתג
       interactions:
         must_be_follower: חסימת התראות משאינם עוקבים
         must_be_following: חסימת התראות משאינם נעקבים
         must_be_following_dm: חסימת הודעות ישירות מכותבים שאינם במעקב
+      invite:
+        comment: הערה
+      invite_request:
+        text: למה תרצה/י להצטרף?
+      ip_block:
+        comment: הערה
+        ip: IP
+        severities:
+          no_access: חסימת גישה
+          sign_up_requires_approval: הגבלת הרשמות
+        severity: כלל
       notification_emails:
+        appeal: מישהם מערערים על החלטת מנהל קהילה
         digest: שליחת הודעות דוא"ל מסכמות
         favourite: שליחת דוא"ל כשמחבבים חצרוץ
         follow: שליחת דוא"ל כשנוספות עוקבות
         follow_request: שליחת דוא"ל כשמבקשים לעקוב
         mention: שליחת דוא"ל כשפונים אלייך
+        pending_account: נדרשת סקירה של חשבון חדש
         reblog: שליחת דוא"ל כשמהדהדים חצרוץ שלך
+        report: דו"ח חדש הוגש
+        trending_tag: נושאים חמים חדשים דורשים סקירה
+      rule:
+        text: כלל
+      tag:
+        listable: הרשה/י להאשתג זה להופיע בחיפושים והצעות
+        name: האשתג
+        trendable: הרשה/י להאשתג זה להופיע תחת נושאים חמים
+        usable: הרשה/י לחצרוצים להכיל האשתג זה
     'no': לא
+    recommended: מומלץ
     required:
+      mark: "*"
       text: שדה חובה
+    title:
+      sessions:
+        webauthn: נא להשתמש באחד ממפתחות האבטחה שלך כדי להכנס
     'yes': כן
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 0df4f2df1..993961667 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -174,7 +174,7 @@ hu:
         setting_theme: Megjelenítési sablon
         setting_trends: Mai trend mutatása
         setting_unfollow_modal: Megerősítés kérése mielőtt abbahagyod valaki követését
-        setting_use_blurhash: Rejtett média helyett homály mutatása
+        setting_use_blurhash: Színátmenetek megjelenítése a rejtett médiáknál
         setting_use_pending_items: Lassú mód
         severity: Súlyosság
         sign_in_token_attempt: Biztonsági kód
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 7c8cdeadc..f1870ab9a 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -2,39 +2,61 @@
 sl:
   simple_form:
     hints:
+      account_alias:
+        acct: Določite uporabniškoime@domena računa, od katerega se želite preseliti
+      account_migration:
+        acct: Določite uporabniškoime@domena računa, na katerega se želite preseliti
       account_warning_preset:
-        text: Lahko uporabite skladnjo tuta, kot so URL-ji, ključniki in omembe
+        text: Lahko uporabite skladnjo objave, kot so URL-ji, ključniki in omembe
         title: Neobvezno. Ni vidno prejemniku
       admin_account_action:
+        include_statuses: Uporabnik vidi, katere objave so povzročile dejanje moderiranja ali opozorilo
         send_email_notification: Uporabnik bo prejel razlago, kaj se je zgodilo z njihovim računom
-        text_html: Neobvezno. Lahko uporabite skladnjo tuta. <a href="%{path}">Prednastavite opozorila</a>, da prihranite čas
+        text_html: Neobvezno. Lahko uporabite skladnjo objave. <a href="%{path}">Prednastavite opozorila</a>, da prihranite čas
         type_html: Izberite, kaj boste storili z <strong>%{acct}</strong>
+        types:
+          disable: Preprečite uporabniku, da uporablja svoj račun, vendar ne izbrišite ali skrijte njegove vsebine.
+          none: Uporabite to, da pošljete opozorilo uporabnik, ne da bi sprožili kakšno drugo dejanje.
+          sensitive: Vsilite, da so vse medijske priponke tega uporabnika označene kot občutljive.
+          silence: Prepreči uporabniku, da lahko objavlja javno, skrije njihove objave in obvestila pred osebami, ki mu ne sledijo.
+          suspend: Prepreči vsakršno interakcijo od ali do tega računa in izbriše njegovo vsebino. Povratno v roku 30 dni.
         warning_preset_id: Neobvezno. Še vedno lahko dodate besedilo po meri na konec prednastavitve
+      announcement:
+        all_day: Če je potrjeno, bodo prikazani le datumi časovnega obsega
+        ends_at: Neobvezno. Obvestilo bo samodejno neobjavljeno v navedenem času
+        scheduled_at: Pustite prazno, da objavite obvestilo takoj
+        starts_at: Neobvezno. V primeru, da je vaše obvestilo vezano na določen časovni obseg
+        text: Uporabite lahko skladnjo objav. Pazite na prostor, ki ga zavzame obvestilo na zaslonu uporabnika
+      appeal:
+        text: Na ukrep se lahko pritožite le enkrat
       defaults:
         autofollow: Osebe, ki se prijavijo prek povabila, vas bodo samodejno sledile
         avatar: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
         bot: Ta račun v glavnem opravlja samodejna dejanja in morda ni pod nadzorom
         context: En ali več kontekstov, kjer naj se uporabi filter
+        current_password: Iz varnostnih razlogov vnesite geslo trenutnega računa
         current_username: Za potrditev vnesite uporabniško ime trenutnega računa
         digest: Pošlje se le po dolgem obdobju nedejavnosti in samo, če ste prejeli osebna sporočila v vaši odsotnosti
+        discoverable: Dovolite, da vaš račun odkrijejo neznanci prek priporočil, trendov in drugih funkcij
         email: Poslali vam bomo potrditveno e-pošto
         fields: Na svojem profilu lahko imate do 4 predmete prikazane kot tabelo.
         header: PNG, GIF ali JPG. Največ %{size}. Zmanjšana bo na %{dimensions}px
         inbox_url: Kopirajte URL naslov s prve strani releja, ki ga želite uporabiti
-        irreversible: Filtrirani trobi bodo nepovratno izginili, tudi če je filter kasneje odstranjen
+        irreversible: Filtrirane objave bodo nepovratno izginile, tudi če je filter kasneje odstranjen
         locale: Jezik uporabniškega vmesnika, e-poštnih sporočil in potisnih obvestil
         locked: Zahteva, da ročno odobrite sledilce
         password: Uporabite najmanj 8 znakov
-        phrase: Se bo ujemal, ne glede na začetnice v tekstu ali opozorilo o vsebini troba
+        phrase: Se bo ujemal, ne glede na začetnice v besedilu ali opozorilo o vsebini objave
         scopes: Do katerih API-jev bo imel program dostop. Če izberete obseg najvišje ravni, vam ni treba izbrati posameznih.
-        setting_aggregate_reblogs: Ne prikažite novih spodbud za tute, ki so bili nedavno spodbujeni (vpliva samo na novo prejete spodbude)
+        setting_aggregate_reblogs: Ne prikažite novih izpostavitev za objave, ki so bile nedavno izpostavljene (vpliva samo na novo prejete izpostavitve)
+        setting_always_send_emails: Običajno e-obvestila ne bodo poslana, če ste na Mastodonu dejavni
         setting_default_sensitive: Občutljivi mediji so privzeto skriti in jih je mogoče razkriti s klikom
         setting_display_media_default: Skrij medij, ki je označen kot občutljiv
         setting_display_media_hide_all: Vedno skrij vse medije
         setting_display_media_show_all: Vedno pokaži medij, ki je označen kot občutljiv
         setting_hide_network: Kogar spremljate in kdo vas spremlja ne bo prikazano na vašem profilu
-        setting_noindex: Vpliva na vaš javni profil in na strani s stanjem
-        setting_show_application: Aplikacija, ki jo uporabljate za tutanje, bo prikazana v podrobnem pogledu vaših tutov
+        setting_noindex: Vpliva na vaš javni profil in na strani z objavami
+        setting_show_application: Aplikacija, ki jo uporabljate za objavljanje, bo prikazana v podrobnem pogledu vaših objav
         setting_use_blurhash: Gradienti temeljijo na barvah skrite vizualne slike, vendar zakrivajo vse podrobnosti
         setting_use_pending_items: Skrij posodobitev časovnice za klikom namesto samodejnega posodabljanja
         username: Vaše uporabniško ime bo edinstveno na %{domain}
@@ -43,6 +65,7 @@ sl:
         domain: Ta domena bo lahko prejela podatke s tega strežnika, dohodni podatki z nje pa bodo obdelani in shranjeni
       email_domain_block:
         domain: To je lahko ime domene, ki se pokaže v e-poštnem naslovu, ali zapis MX, ki ga uporablja. Ob prijavi bo preverjeno.
+        with_dns_records: Poskus razrešitve zapisov DNS danih domen bo izveden in rezultati bodo prav tako blokirani
       featured_tag:
         name: 'Morda boste želeli uporabiti eno od teh:'
       form_challenge:
@@ -53,14 +76,21 @@ sl:
         text: To nam bo pomagalo pregledati vašo prijavo
       ip_block:
         comment: Neobvezno. Spomnite se, zakaj ste dodali to pravilo.
+        expires_in: Naslovi IP so končno imejen vir, včasij si jih delimo in pogosto menjajo rabo. Zato nedoločeni bloki IP niso priporočeni.
+        ip: Vnesite naslov IPv4 oz. IPv6. S skladnjo CIDR lahko blokirate celotne obsege. Pazite, da se ne zaklenete ven!
         severities:
           no_access: Blokiraj dostop do vseh virov
           sign_up_requires_approval: Za nove registracije bo potrebna vaša odobritev
         severity: Izberite, kaj se bo zgodilo z zahtevami iz tega IP-naslova
+      rule:
+        text: Opišite pravilo ali zahtevo za uporabnike na tem strežniku. Poskusite biti kratki in jasni
       sessions:
         otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaših obnovitvenih kod:'
+        webauthn: Če gre za ključek USB, ga ne pozabite vstaviti in, če je potrebno, tapniti.
+      tag:
+        name: Spremenite lahko le npr. velikost črk (velike/male), da je bolj berljivo
       user:
-        chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazani samo trobi v izbranih jezikih
+        chosen_languages: Ko je označeno, bodo v javnih časovnicah prikazane samo objave v izbranih jezikih
     labels:
       account:
         fields:
@@ -121,23 +151,25 @@ sl:
         password: Geslo
         phrase: Ključna beseda ali fraza
         setting_advanced_layout: Omogoči napredni spletni vmesnik
-        setting_aggregate_reblogs: Skupinske spodbude na časovnicah
+        setting_aggregate_reblogs: Skupinske izpostavitve na časovnicah
+        setting_always_send_emails: Vedno pošlji e-obvestila
         setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov
-        setting_boost_modal: Pred sunkom pokaži potrditveno okno
+        setting_boost_modal: Pred izpostavljanjem pokaži potrditveno okno
         setting_crop_images: Obreži slike v nerazširjenih objavah v razmerju 16:9
         setting_default_language: Jezik objavljanja
         setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
-        setting_delete_modal: Pred brisanjem troba prikaži okno za pritrditev
+        setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
+        setting_disable_swiping: Onemogoči poteze drsanja
         setting_display_media: Prikaz medijev
         setting_display_media_default: Privzeto
         setting_display_media_hide_all: Skrij vse
         setting_display_media_show_all: Prikaži vse
-        setting_expand_spoilers: Vedno razširi trobe, označene z opozorili o vsebini
+        setting_expand_spoilers: Vedno razširi objave, označene z opozorili o vsebini
         setting_hide_network: Skrij svoje omrežje
         setting_noindex: Odsotnost indeksiranja iskalnikov
         setting_reduce_motion: Zmanjšanje premikanja v animacijah
-        setting_show_application: Razkrij aplikacijo za pošiljanje tutov
+        setting_show_application: Razkrij aplikacijo za pošiljanje objav
         setting_system_font_ui: Uporabi privzeto pisavo sistema
         setting_theme: Tema strani
         setting_trends: Pokaži današnje trende
@@ -170,13 +202,14 @@ sl:
           sign_up_requires_approval: Omeji število prijav
         severity: Pravilo
       notification_emails:
+        appeal: Nekdo se je pritožil na odločitev moderatorja
         digest: Pošlji izvlečke e-pošt
-        favourite: Pošlji e-pošto, ko nekdo doda vaše stanje med priljubljene
+        favourite: Pošlji e-pošto, ko nekdo doda vašo objavo med priljubljene
         follow: Pošlji e-pošto, ko vas nekdo sledi
         follow_request: Pošlji e-pošto, ko vam nekdo želi slediti
         mention: Pošlji e-pošto, ko vas nekdo omeni
         pending_account: Pošlji e-pošto, ko je potreben pregled novega računa
-        reblog: Pošlji e-pošto, ko nekdo sune vaše stanje
+        reblog: Pošlji e-sporočilo, ko nekdo izpostavi vašo objavo
         report: Novo poročilo je oddano
         trending_tag: Nov trend zahteva pregled
       rule:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index f33b31831..4d023b77d 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -27,6 +27,8 @@ uk:
         scheduled_at: Залиште поля незаповненими, щоб опублікувати оголошення відразу
         starts_at: Необов'язково. У разі якщо оголошення прив'язується до певного періоду часу
         text: Ви можете використовувати той же синтаксис, що і в постах. Будьте завбачливі щодо місця, яке займе оголошення на екрані користувачів
+      appeal:
+        text: Ви можете оскаржити рішення лише один раз
       defaults:
         autofollow: Люди, що зареєструвалися за вашим запрошенням, автоматично підпишуться на вас
         avatar: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
@@ -35,6 +37,7 @@ uk:
         current_password: Для цілей безпеки, будь ласка, введіть пароль поточного облікового запису
         current_username: Для підтвердження, будь ласка, введіть ім'я користувача поточного облікового запису
         digest: Буде послано тільки після довгого періоду неактивності, та тільки якщо ви отримаєте персональне повідомлення у цей період
+        discoverable: Дозволити знаходити ваш обліковий запис стороннім людям за допомогою рекомендацій, трендів та інших функцій
         email: Вам надійде електронний лист з підтвердженням
         fields: До 4 елементів може бути відображено як таблиця у вашому профілі
         header: PNG, GIF, або JPG. Максимум - %{size}. Буде зменшено до %{dimensions}px
@@ -46,6 +49,7 @@ uk:
         phrase: Шукає без врахування регістру у тексті дмуха або у його попередженні про вміст
         scopes: Які API додатку буде дозволено використовувати. Якщо ви виберете самий верхній, нижчестоящі будуть обрані автоматично.
         setting_aggregate_reblogs: Не показувати передмухи для дмухів, які нещодавно вже були передмухнуті (не вплине на вже отримані передмухи)
+        setting_always_send_emails: Зазвичай, під час активного користування Mastodon, сповіщення не будуть відправлятися електронною поштою
         setting_default_sensitive: Дражливі медіа приховані за промовчанням та можуть бути розкрити кліком
         setting_display_media_default: Приховувати медіа, помічені як дражливі
         setting_display_media_hide_all: Завжди приховувати медіа
@@ -60,6 +64,7 @@ uk:
       domain_allow:
         domain: Цей домен зможе отримувати дані з цього серверу. Вхідні дані будуть оброблені та збережені
       email_domain_block:
+        domain: Це може бути доменне ім'я, яке відображується в адресі електронної пошти, або використовуваний запис MX. Вони будуть перевірятися при реєстрації.
         with_dns_records: Спроба визначення DNS-записів заданого домену буде здійснена, а результати також будуть занесені до чорного списку
       featured_tag:
         name: 'Можливо, ви захочете використовувати один з цих:'
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index cf7564542..fe38db82f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1,16 +1,16 @@
 ---
 sl:
   about:
-    about_hashtag_html: To so javni tuti, označeni z <strong>#%{hashtag}</strong>. Z njimi se lahko povežete, če imate račun kjerkoli v fediverse-u.
+    about_hashtag_html: To so javne objave, označene z <strong>#%{hashtag}</strong>. Z njimi se lahko povežete, če imate račun kjerkoli v fediverzumu.
     about_mastodon_html: Mastodon je socialno omrežje, ki temelji na odprtih spletnih protokolih in prosti ter odprtokodni programski opremi. Je decentraliziran, kot e-pošta.
     about_this: O Mastodonu
-    active_count_after: dejaven
+    active_count_after: dejavnih
     active_footnote: Aktivni mesečni uporabniki (AMU)
     administered_by: 'Upravlja:'
     api: API (programerski vmesnik aplikacije)
     apps: Mobilne aplikacije
     apps_platforms: Uporabljajte Mastodon iz iOS, Android ali iz drugih platform
-    browse_directory: Brskajte po imeniku profilov in filtriranje po interesih
+    browse_directory: Brskajte po imeniku profilov in jih filtrirajte po interesih
     browse_local_posts: Prebrskaj živi tok javnih objav s tega strežnika
     browse_public_posts: Brskajte javnih objav v živo na Mastodonu
     contact: Kontakt
@@ -19,7 +19,7 @@ sl:
     continue_to_web: Nadaljuj v spletno aplikacijo
     discover_users: Odkrijte uporabnike
     documentation: Dokumentacija
-    federation_hint_html: Z računom na %{instance} boste lahko spremljali ljudi na kateremkoli Mastodon strežniku.
+    federation_hint_html: Z računom na %{instance} boste lahko spremljali osebe na poljubnem strežniku Mastodon.
     get_apps: Poskusite mobilno aplikacijo
     hosted_on: Mastodon gostuje na %{domain}
     instance_actor_flash: |
@@ -37,7 +37,7 @@ sl:
     status_count_after:
       few: stanja
       one: stanje
-      other: stanj
+      other: objav
       two: stanja
     status_count_before: Ki so avtorji
     tagline: Sledite prijateljem in odkrijte nove
@@ -46,7 +46,13 @@ sl:
     unavailable_content_description:
       domain: Strežnik
       reason: Razlog
+      rejecting_media: 'Medijske datoteke s teh strežnikov ne bodo obdelane ali shranjene, nobene ogledne sličice ne bodo prikazane, kar bo zahtevalo ročno klikanje po izvorni datoteki:'
+      rejecting_media_title: Filtrirane datoteke
+      silenced: 'Objave s teh strežnikov bodo skrite v javnih časovnicah ter pogovorih in nobena obvestila ne bodo izdelana iz interakcij njihovih uporabnikov, razen če jim sledite:'
       silenced_title: Omejeni strežniki
+      suspended: 'Nobeni podatki s teh strežnikov ne bodo obdelani, shranjeni ali izmenjani, zaradi česar je nemogoča kakršna koli interakcija ali komunikacija z uporabniki s teh strežnikov:'
+      suspended_title: Suspendirani strežniki
+    unavailable_content_html: Mastodon vam splošno omogoča ogled vsebin in interakcijo z uporabniki iz vseh drugih strežnikov v fediverzumu. To so izjeme, opravljene na tem strežniku.
     user_count_after:
       few: uporabniki
       one: uporabnik
@@ -56,6 +62,8 @@ sl:
     what_is_mastodon: Kaj je Mastodon?
   accounts:
     choices_html: "%{name} izbire:"
+    endorsements_hint: Osebe, ki jim sledite, lahko podprete prek spletnega vmesnika in prikazane bodo tukaj.
+    featured_tags_hint: Izpostavite lahko določene ključnike, ki bodo prikazani na tem mestu.
     follow: Sledi
     followers:
       few: Sledilci
@@ -63,6 +71,7 @@ sl:
       other: Sledilcev
       two: Sledilca
     following: Sledim
+    instance_actor_flash: Ta račun je navidezni akter, ki se uporablja za predstavljanje strežnika samega in ne posameznega uporabnika. Uporablja se za namene federacije in se ne sme začasno ustaviti.
     joined: Se je pridružil na %{date}
     last_active: zadnja dejavnost
     link_verified_on: Lastništvo te povezave je bilo preverjeno na %{date}
@@ -77,13 +86,15 @@ sl:
     posts:
       few: Tuti
       one: Tut
-      other: Tutov
+      other: Objav
       two: Tuta
-    posts_tab_heading: Tuti
-    posts_with_replies: Tuti in odgovori
+    posts_tab_heading: Objave
+    posts_with_replies: Objave in odgovori
     roles:
       admin: Skrbnik
       bot: Robot
+      group: Skupina
+      moderator: Mod
     unavailable: Profil ni na voljo
     unfollow: Prenehaj slediti
   admin:
@@ -97,6 +108,7 @@ sl:
     accounts:
       add_email_domain_block: Blokiraj domeno e-pošte
       approve: Odobri
+      approved_msg: Uspešno odobrena aplikacija prijave uporabnika %{username}
       are_you_sure: Ali ste prepričani?
       avatar: Podoba
       by_domain: Domena
@@ -114,7 +126,9 @@ sl:
       delete: Izbriši podatke
       deleted: Izbrisano
       demote: Degradiraj
+      destroyed_msg: Podatki uporabnika %{username} so zdaj v vrsti za trajen izbris
       disable: Onemogoči
+      disable_sign_in_token_auth: Onemogoči overjanje z žetonom po e-pošti
       disable_two_factor_authentication: Onemogoči 2FA
       disabled: Onemogočeno
       display_name: Prikazno ime
@@ -123,7 +137,9 @@ sl:
       email: E-pošta
       email_status: Stanje e-pošte
       enable: Omogoči
+      enable_sign_in_token_auth: Omogoči overjanje z žetonom po e-pošti
       enabled: Omogočeno
+      enabled_msg: Uspešno odmrznjen račun uporabnika %{username}
       followers: Sledilci
       follows: Sledi
       header: Glava
@@ -140,6 +156,8 @@ sl:
       login_status: Stanje prijave
       media_attachments: Predstavnostne priloge
       memorialize: Spremenite v spomin
+      memorialized: Spomenificirano
+      memorialized_msg: Uspešno preoblikovan %{username} v spominski račun
       moderation:
         active: Dejaven
         all: Vse
@@ -154,14 +172,24 @@ sl:
       not_subscribed: Ni naročen
       pending: Čakanje na pregled
       perform_full_suspension: Suspendiraj
+      previous_strikes: Predhodni ukrepi
+      previous_strikes_description_html:
+        few: Ta račun ima <strong>%{count}</strong> ukrepe.
+        one: Ta račun ima <strong>%{count}</strong> ukrep.
+        other: Ta račun ima <strong>%{count}</strong> ukrepov.
+        two: Ta račun ima <strong>%{count}</strong> ukrepa.
       promote: Promoviraj
       protocol: Protokol
       public: Javen
       push_subscription_expires: Naročnina PuSH preteče
       redownload: Osveži profil
+      redownloaded_msg: Uspešno osvežen profil %{username} iz izvirnika
       reject: Zavrni
+      rejected_msg: Uspešno zavrnjena aplikacija prijave uporabnika %{username}
       remove_avatar: Odstrani podobo
       remove_header: Odstrani glavo
+      removed_avatar_msg: Uspešno odstranjena slika avatarja uporabnika %{username}
+      removed_header_msg: Uspešno odstranjena naslovna slika uporabnika %{username}
       resend_confirmation:
         already_confirmed: Ta uporabnik je že potrjen
         send: Ponovno pošlji potrditveno e-pošto
@@ -180,21 +208,32 @@ sl:
       search_same_ip: Drugi uporabniki z istim IP
       security_measures:
         only_password: Samo geslo
+        password_and_2fa: Geslo in 2FA
+      sensitive: Občutljivo
+      sensitized: Označeno kot občutljivo
       shared_inbox_url: URL mape "Prejeto v skupni rabi"
       show:
-        created_reports: Narejene prijave
+        created_reports: Opravljene prijave
         targeted_reports: Prijavili drugi
       silence: Utišaj
       silenced: Utišan
-      statuses: Stanja
+      statuses: Objave
+      strikes: Predhodni ukrepi
       subscribe: Naroči
       suspend: Suspendiraj
       suspended: Suspendiran
+      suspension_irreversible: Podatki tega računa so bili nepovrazno izbrisani. Račun lahko vrnete iz suspenza, da bo ponovno uporaben, vendar preteklih podatkov ne boste mogli obnoviti.
+      suspension_reversible_hint_html: Račun je bil suspendiran, podatki pa bodo v celoti odstranjeni %{date}. Do takrat je mogoče račun obnoviti brez negativnih posledic. Če želite takoj odstraniti vse podatke računa, lahko to storite spodaj.
       title: Računi
+      unblock_email: Odblokiraj e-poštni naslov
+      unblocked_email_msg: E-poštni naslov uporabnika %{username} uspešno odblokiran
       unconfirmed_email: Nepotrjena e-pošta
+      undo_sensitized: Ni občutljivo
       undo_silenced: Razveljavi utišanje
       undo_suspension: Razveljavi suspendiranje
+      unsilenced_msg: Uspešno razveljavljena omejitev računa uporabnika %{username}
       unsubscribe: Odjavi se od naročnine
+      unsuspended_msg: Uspešno preklican suspenz računa uporabnika %{username}
       username: Uporabniško ime
       view_domain: Pokaži povzetek za domeno
       warn: Opozori
@@ -202,28 +241,109 @@ sl:
       whitelisted: Na belem seznamu
     action_logs:
       action_types:
+        approve_appeal: Odobri pritožbo
         approve_user: Odobri uporabnika
-        assigned_to_self_report: Dodeli poročilo
+        assigned_to_self_report: Dodeli prijavo
         change_email_user: Spremeni e-poštni naslov uporabnika
         confirm_user: Potrdi uporabnika
         create_account_warning: Ustvari opozorilo
         create_announcement: Ustvari obvestilo
+        create_custom_emoji: Ustvari emodži po meri
+        create_domain_allow: Ustvari odobritev domene
+        create_domain_block: Ustvari blokado domene
+        create_email_domain_block: Ustvari blokado domene e-pošte
         create_ip_block: Ustvari pravilo IP
         create_unavailable_domain: Ustvari domeno, ki ni na voljo
+        demote_user: Ponižaj uporabnika
         destroy_announcement: Izbriši obvestilo
+        destroy_custom_emoji: Izbriši emodži po meri
         destroy_domain_allow: Izbriši odobritev domene
         destroy_domain_block: Izbriši blokado domene
+        destroy_email_domain_block: Izbriši blokado domene e-pošte
+        destroy_instance: Očisti domeno
         destroy_ip_block: Izbriši pravilo IP
         destroy_status: Izbriši objavo
+        destroy_unavailable_domain: Izbriši domeno, ki ni na voljo
+        disable_2fa_user: Onemogoči
+        disable_custom_emoji: Onemogoči emodži po meri
+        disable_sign_in_token_auth_user: Onemogoči overjanje z žetonom po e-pošti za uporabnika
         disable_user: Onemogoči uporabnika
+        enable_custom_emoji: Omogoči emodži po meri
+        enable_sign_in_token_auth_user: Omogoči overjanje z žetonom po e-pošti za uporabnika
         enable_user: Omogoči uporabnika
+        memorialize_account: Spomenificiraj račun
+        promote_user: Povišaj uporabnika
+        reject_appeal: Zavrni pritožbo
         reject_user: Zavrni uporabnika
         remove_avatar_user: Odstrani avatar
         reopen_report: Ponovno odpri prijavo
         reset_password_user: Ponastavi geslo
+        resolve_report: Razreši prijavo
+        sensitive_account: Občutljivi račun
         silence_account: Omeji račun
+        suspend_account: Začasno prekini račun
+        unassigned_report: Prekliči dodelitev prijave
+        unblock_email_account: Odblokiraj e-poštni naslov
+        unsensitive_account: Ni občutljiv račun
+        unsilence_account: Razveljavi omejitev računa
+        unsuspend_account: Prekliči začasno prekinitev računa
+        update_announcement: Posodobi objavo
+        update_custom_emoji: Posodobi emodži po meri
+        update_domain_block: Posodobi blokado domene
         update_status: Posodobi objavo
-      deleted_status: "(izbrisano stanje)"
+      actions:
+        approve_appeal_html: "%{name} je ugodil pritožbi uporabnika %{target} na moderatorsko odločitev"
+        approve_user_html: "%{name} je odobril/a registracijo iz %{target}"
+        assigned_to_self_report_html: "%{name} je dodelil/a prijavo %{target} sebi"
+        change_email_user_html: "%{name} je spremenil/a naslov e-pošte uporabnika %{target}"
+        confirm_user_html: "%{name} je potrdil/a naslov e-pošte uporabnika %{target}"
+        create_account_warning_html: "%{name} je poslal/a opozorilo %{target}"
+        create_announcement_html: "%{name} je ustvarila/a novo obvestilo %{target}"
+        create_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
+        create_domain_allow_html: "%{name} je dovolil/a federacijo z domeno %{target}"
+        create_domain_block_html: "%{name} je blokiral/a domeno %{target}"
+        create_email_domain_block_html: "%{name} je dal/a na črni seznam e-pošto domene %{target}"
+        create_ip_block_html: "%{name} je ustvaril/a pravilo za IP %{target}"
+        create_unavailable_domain_html: "%{name} je prekinil/a dostavo v domeno %{target}"
+        demote_user_html: "%{name} je ponižal/a uporabnika %{target}"
+        destroy_announcement_html: "%{name} je izbrisal/a obvestilo %{target}"
+        destroy_custom_emoji_html: "%{name} je uničil/a emotikone %{target}"
+        destroy_domain_allow_html: "%{name} ni dovolil/a federacije z domeno %{target}"
+        destroy_domain_block_html: "%{name} je odblokiral/a domeno %{target}"
+        destroy_email_domain_block_html: "%{name} je odblokiral/a e-pošto domene %{target}"
+        destroy_instance_html: "%{name} je očistil/a domeno %{target}"
+        destroy_ip_block_html: "%{name} je izbrisal/a pravilo za IP %{target}"
+        destroy_status_html: "%{name} je odstranil/a objavo uporabnika %{target}"
+        destroy_unavailable_domain_html: "%{name} je nadaljeval/a dostav v domeno %{target}"
+        disable_2fa_user_html: "%{name} je onemogočil/a dvofaktorsko zahtevo za uporabnika %{target}"
+        disable_custom_emoji_html: "%{name} je onemogočil/a emotikone %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} je onemogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
+        disable_user_html: "%{name} je onemogočil/a prijavo za uporabnika %{target}"
+        enable_custom_emoji_html: "%{name} je omogočil/a emotikone %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} je omogočil/a overjanje z žetonom po e-pošti za uporabnika %{target}"
+        enable_user_html: "%{name} je omogočil/a prijavo za uporabnika %{target}"
+        memorialize_account_html: "%{name} je spremenil/a račun uporabnika %{target} v spominsko stran"
+        promote_user_html: "%{name} je povišal/a uporabnika %{target}"
+        reject_appeal_html: "%{name} je zavrnil/a pritožbo uporabnika %{target} na moderatorsko odločitev"
+        reject_user_html: "%{name} je zavrnil/a registracijo iz %{target}"
+        remove_avatar_user_html: "%{name} je odstranil podobo (avatar) uporabnika %{target}"
+        reopen_report_html: "%{name} je ponovno odprl/a prijavo %{target}"
+        reset_password_user_html: "%{name} je ponastavil/a geslo uporabnika %{target}"
+        resolve_report_html: "%{name} je razrešil/a prijavo %{target}"
+        sensitive_account_html: "%{name} je označil/a medije računa %{target}'s kot občutljive"
+        silence_account_html: "%{name} je omejil/a račun uporabnika %{target}"
+        suspend_account_html: "%{name} je suspendiral/a račun uporabnika %{target}"
+        unassigned_report_html: "%{name} je preklical dodelitev prijave uporabnika %{target}"
+        unblock_email_account_html: "%{name} je odblokiral/a e-poštni naslov uporabnika %{target}"
+        unsensitive_account_html: "%{name} je odznačil/a medije računa %{target}'s kot občutljive"
+        unsilence_account_html: "%{name} je preklical omejitev računa %{target}"
+        unsuspend_account_html: "%{name} je preklical suspenz računa %{target}"
+        update_announcement_html: "%{name} je posodobil/a objavo %{target}"
+        update_custom_emoji_html: "%{name} je posodobil/a emotikone %{target}"
+        update_domain_block_html: "%{name} je posodobil/a domenski blok za %{target}"
+        update_status_html: "%{name} je posodobil/a objavo uporabnika %{target}"
+      deleted_status: "(izbrisana objava)"
+      empty: Ni najdenih zapisnikov.
       filter_by_action: Filtriraj po dejanjih
       filter_by_user: Filtriraj po uporabnikih
       title: Dnevnik revizije
@@ -238,8 +358,12 @@ sl:
         title: Novo obvestilo
       publish: Objavi
       published_msg: Obvestilo je bilo uspešno objavljeno!
+      scheduled_for: Načrtovano ob %{time}
+      scheduled_msg: Obvestilo ima načrtovano objavo!
       title: Obvestila
       unpublish: Umakni iz objave
+      unpublished_msg: Obvestilo je bilo uspešno umaknjeno!
+      updated_msg: Obvestilo je bilo uspešno posodobljeno!
     custom_emojis:
       assign_category: Dodeli kategorijo
       by_domain: Domena
@@ -262,11 +386,13 @@ sl:
       listed: Navedeno
       new:
         title: Dodaj nove emotikone
+      not_permitted: Nimate pravic za izvedbo tega dejanja.
       overwrite: Prepiši
       shortcode: Kratka koda
       shortcode_hint: Najmanj 2 znaka, samo alfanumerični znaki in podčrtaji
       title: Emotikoni po meri
       uncategorized: Brez kategorije
+      unlist: Ne prikaži na seznamu
       unlisted: Neuvrščeni
       update_failed_msg: Tega emotikona ni bilo mogoče posodobiti
       updated_msg: Emotikon je uspešno posodobljen!
@@ -274,12 +400,41 @@ sl:
     dashboard:
       active_users: dejavnih uporabnikov
       interactions: interakcij
+      media_storage: Shramba za medije
       new_users: novih uporabnikov
-      opened_reports: odprtih poročil
+      opened_reports: odprtih prijav
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> čakajoče pritožbe"
+        one: "<strong>%{count}</strong> čakajoča pritožba"
+        other: "<strong>%{count}</strong> čakajočih pritožb"
+        two: "<strong>%{count}</strong> čakajoči pritožbi"
+      pending_reports_html:
+        few: "<strong>%{count}</strong> čakajoče prijave"
+        one: "<strong>%{count}</strong> čakajoča prijava"
+        other: "<strong>%{count}</strong> čakajočih prijav"
+        two: "<strong>%{count}</strong> čakajoči prijavi"
+      pending_tags_html:
+        few: "<strong>%{count}</strong> čakajoči ključniki"
+        one: "<strong>%{count}</strong> čakajoči ključnik"
+        other: "<strong>%{count}</strong> čakajočih ključnikov"
+        two: "<strong>%{count}</strong> čakajoča ključnika"
+      pending_users_html:
+        few: "<strong>%{count}</strong> čakajoči uporabniki"
+        one: "<strong>%{count}</strong> čakajoči uporabnik"
+        other: "<strong>%{count}</strong> čakajočih uporabnikov"
+        two: "<strong>%{count}</strong> čakajoča uporabnika"
+      resolved_reports: razrešenih prijav
       software: Programska oprema
+      sources: Viri registracij
       space: Uporaba prostora
       title: Nadzorna plošča
+      top_languages: Najbolj dejavni jeziki
+      top_servers: Najbolj dejavni strežniki
       website: Spletišče
+    disputes:
+      appeals:
+        empty: Ni najdenih pritožb.
+        title: Pritožbe
     domain_allows:
       add_new: Dodaj domeno na beli seznam
       created_msg: Domena je bila uspešno dodana na beli seznam
@@ -301,15 +456,25 @@ sl:
           silence: Utišaj
           suspend: Suspendiraj
         title: Nov domenski blok
+      obfuscate: Zakrij ime domene
+      obfuscate_hint: Delno zakrij ime domene na seznamu, če je omogočeno oglaševanje omejitev seznama domen
       private_comment: Zasebni komentar
+      private_comment_hint: Komentar o tej omejitvi domene za interno uporabo moderatorjev.
       public_comment: Javni komentar
+      public_comment_hint: Komentar o tej omejitvi domene za širšo javnost, če je omogočeno oglaševanje seznama omejitev domene.
       reject_media: Zavrni predstavnostne datoteke
       reject_media_hint: Odstrani lokalno shranjene predstavnostne datoteke in zavrača prenašanje le-teh v prihodnosti. Za suspenzije ni pomembno
       reject_reports: Zavrnjene prijave
       reject_reports_hint: Prezri vse prijave, ki pridejo iz te domene. Za suspenzije ni pomembno
       undo: Razveljavi domenski blok
+      view: Pokaži domenski blok
     email_domain_blocks:
       add_new: Dodaj novo
+      attempts_over_week:
+        few: "%{count} poskusi prijave zadnji teden"
+        one: "%{count} poskus prijave zadnji teden"
+        other: "%{count} poskusov prijave zadnji teden"
+        two: "%{count} poskusa prijave zadnji teden"
       created_msg: Domena e-pošte je bila uspešno dodana na črni seznam
       delete: Izbriši
       dns:
@@ -321,26 +486,44 @@ sl:
         resolve: Razreši domeno
         title: Nov vnos e-pošte na črni seznam
       no_email_domain_block_selected: Nobena domena e-računa ni bila spremenjena, ker nobena ni bila izbrana
+      resolved_dns_records_hint_html: Ime domene se razreši na naslednje domene MX, ki so končno odgovorne za sprejemanje e-pošte. Blokiranje domene MX bo blokiralo prijave s poljubnega e-poštnega naslova, ki uporablja isto domeno MX, tudi če je vidno ime domene drugačno. <strong>Pazite, da ne blokirate večjih ponudnikov e-pošte.</strong>
       resolved_through_html: Razrešeno prek %{domain}
       title: Črni seznam e-pošt
     follow_recommendations:
+      description_html: "<strong>Sledi priporočilom pomaga novim uporabnikom, da hitro najdejo zanimivo vsebino</strong>. Če uporabnik ni dovolj komuniciral z drugimi, da bi oblikoval prilagojena priporočila za sledenje, se namesto tega priporočajo ti računi. Dnevno se ponovno izračunajo iz kombinacije računov z najvišjimi nedavnimi angažiranostmi in najvišjim številom krajevnih sledilcev za določen jezik."
       language: Za jezik
       status: Stanje
+      suppress: Zatri sledenje priporočilom
+      suppressed: Zatrto
+      title: Sledi priporočilom
+      unsuppress: Obnovi sledenje priporočilom
     instances:
       availability:
+        description_html:
+          few: Če dostava v domeno spodleti <strong>%{count} različne dni</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          one: Če dostava v domeno spodleti <strong>%{count} dan</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          other: Če dostava v domeno spodleti <strong>%{count} različne dni</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
+          two: Če dostava v domeno spodleti <strong>%{count} različna dneva</strong> brez uspeha, ne bo nadaljnjih poskusov dostopa, razen če je prejeta dostava <em>iz</em> domene.
         failure_threshold_reached: Prag neuspelih poskusov dosežen %{date}.
+        failures_recorded:
+          few: Neuspeli poskusi %{count} različnih dni.
+          one: Neuspel poskus %{count} različen dan.
+          other: Neuspeli poskusi %{count} različnih dni.
+          two: Neuspeli poskusi %{count} različnih dni.
         no_failures_recorded: Ni zabeleženih neuspelih poskusov.
         title: Razpoložljivost
+        warning: Zadnji poskus povezave na ta strežnik je spodletel
       back_to_all: Vse
       back_to_limited: Omejeno
       back_to_warning: Opozorilo
       by_domain: Domena
+      confirm_purge: Ali ste prepričani, da želite trajno izbrisati podatke s te domene?
       content_policies:
         comment: Interna opomba
         description_html: Določite lahko pravila (t.i. politike), ki bodo veljale za vse račune te domene ter vseh njenih poddomen.
         policies:
           reject_media: Zavrni večpredstavnost
-          reject_reports: Zarvni poročila
+          reject_reports: Zavrni prijave
           silence: Omeji
           suspend: Suspendiraj
         policy: Pravila
@@ -353,26 +536,38 @@ sl:
         instance_follows_measure: njihovih sledilcev tukaj
         instance_languages_dimension: Naj jeziki
         instance_media_attachments_measure: shranjenih predstavnostnih priponk
-        instance_reports_measure: poročil o njih
+        instance_reports_measure: prijav o njih
         instance_statuses_measure: shanjenih objav
       delivery:
         all: Vse
         clear: Počisti napake dostave
+        failing: Spodletuje
+        restart: Ponovno zaženi dostavo
         stop: Ustavi dostavo
         unavailable: Ni na voljo
       delivery_available: Na voljo je dostava
+      delivery_error_days: Dnevi napak pri dostavi
+      delivery_error_hint: Če dostava ni možna %{count} dni, bo samodejno označeno kot nedostavljivo.
+      destroyed_msg: Podatki iz %{domain} so zdaj v vrsti za takojšnje brisanje.
+      empty: Ni zadetkov med domenami.
+      known_accounts:
+        few: "%{count} znani računi"
+        one: "%{count} znan račun"
+        other: "%{count} znani računi"
+        two: "%{count} znana računa"
       moderation:
         all: Vse
         limited: Omejeno
         title: Moderiranje
       private_comment: Zasebni komentar
       public_comment: Javni komentar
+      purge: Očisti
       purge_description_html: Če menite, da je ta domena trajno nedosegljiva, lahko v svoji shrambi izbrišete vse zapise računov in povezane podatke iz te domene. To lahko vzame nekaj časa.
       title: Federacija
       total_blocked_by_us: Blokirano iz naše strani
       total_followed_by_them: Oni ti sledijo
       total_followed_by_us: Mi ti sledimo
-      total_reported: Poročila o njih
+      total_reported: Prijave o njih
       total_storage: Predstavnostne priloge
       totals_time_period_hint_html: Spodaj prikazani seštevki vključujejo podatke za celotno obdobje.
     invites:
@@ -381,9 +576,11 @@ sl:
         all: Vse
         available: Razpoložljivo
         expired: Potekel
+        title: Filter
       title: Povabila
     ip_blocks:
       add_new: Ustvari pravilo
+      created_msg: Uspešno dodano novo pravilo IP
       delete: Izbriši
       expires_in:
         '1209600': 2 tedna
@@ -394,36 +591,63 @@ sl:
         '94670856': 3 leta
       new:
         title: Ustvari novo pravilo IP
+      no_ip_block_selected: Nobeno pravilo IP ni bilo spremenjeno, ker nobeno ni bilo izbrano
       title: IP-pravila
+    relationships:
+      title: Odnosi računa %{acct}
     relays:
       add_new: Dodaj nov rele
       delete: Izbriši
-      description_html: "<strong>Rele federacije</strong> je posredniški strežnik, ki si izmenjuje velike količine javnih tutov med strežniki, ki so se naročili in objavili na njem. <strong>Majhnim in srednjim strežnikom lahko pomaga pri odkrivanju vsebine iz sistema fediverse</strong>, kar bi sicer zahtevalo, da lokalni uporabniki ročno sledijo druge osebe na oddaljenih strežnikih."
+      description_html: "<strong>Rele federacije</strong> je posredniški strežnik, ki si izmenjuje velike količine javnih objav med strežniki, ki so se naročili in objavili na njem. <strong>Majhnim in srednjim strežnikom lahko pomaga pri odkrivanju vsebine iz sistema fediverse</strong>, kar bi sicer zahtevalo, da lokalni uporabniki ročno sledijo druge osebe na oddaljenih strežnikih."
       disable: Onemogoči
       disabled: Onemogočeno
       enable: Omogoči
-      enable_hint: Ko je omogočen, se bo vaš strežnik naročil na vse javne tute iz tega releja in začel pošiljati javne tute tega strežnika.
+      enable_hint: Ko je omogočen, se bo vaš strežnik naročil na vse javne objave iz tega releja in začel pošiljati javne objave tega strežnika.
       enabled: Omogočeno
       inbox_url: URL releja
       pending: Čakanje na odobritev releja
       save_and_enable: Shrani in omogoči
       setup: Nastavi povezavo releja
+      signatures_not_enabled: Posredovanja ne bodo delovala pravilno, ko je omogočen varni način ali omejen način federacije
       status: Stanje
       title: Releji
     report_notes:
       created_msg: Opomba o prijavi je uspešno ustvarjena!
       destroyed_msg: Opomba o prijavi je uspešno izbrisana!
+      today_at: Danes ob %{time}
     reports:
+      account:
+        notes:
+          few: "%{count} opombe"
+          one: "%{count} opomba"
+          other: "%{count} opomb"
+          two: "%{count} opombi"
+      action_log: Revizijski zapisnik
       action_taken_by: Dejanje, ki ga je sprejel
+      actions:
+        delete_description_html: Prijavljene objave bodo izbrisane in ukrep bo zabeležen, da vam pomaga stopnjevati ukrepe ob naslednjih kršitvah z istega računa.
+        mark_as_sensitive_description_html: Mediji v prijavljenih objavah bodo označeni kot občutljivi in ukrep bo zabeležen, da vam pomaga stopnjevati ukrepe ob naslednjih kršitvah z istega računa.
+        other_description_html: Oglejte si več možnosti za nadzor vedenja računa in prilagodite komunikacijo s prijavljenim računom.
+        resolve_description_html: Proti prijavljenemu računu ne bo izvedeno nobeno dejanje, noben ukrep ne bo zabeležen in prijava bo zaprta.
+        silence_description_html: Profil bo viden samo tistim, ki mu že sledijo ali ga ročno poiščejo, s čimer bo resno omejen njegov doseg. To je vedno možno povrniti.
+        suspend_description_html: Profil in vsa njegova vsebina bodo postali nedosegljivi, dokler niso dokončno izbrisani. Interakcija z računom ne bo možna. Povrnitev je možna v času 30 dni.
+      actions_description_html: Odločite se, katere ukrepe boste sprejeli za rešitev te prijave. Če sprejmete kazenski ukrep proti prijavljenemu računu, mu bo poslano e-poštno obvestilo, razen če je izbrana kategorija <strong>Neželena pošta</strong>.
+      add_to_report: Dodaj več v prijavo
       are_you_sure: Ali ste prepričani?
       assign_to_self: Dodeli meni
       assigned: Dodeljen moderator
+      by_target_domain: Domena prijavljenega računa
       category: Kategorija
+      category_description_html: Razlog, zakaj je ta račun in/ali vsebina prijavljena, bo naveden v komunikaciji z računom iz prijave
       comment:
         none: Brez
+      comment_description_html: 'V pojasnilo je %{name} zapisal/a:'
       created_at: Prijavljeno
       delete_and_resolve: Izbriši objave
+      forwarded: Posredovano
+      forwarded_to: Posredovano na %{domain}
       mark_as_resolved: Označi kot rešeno
+      mark_as_sensitive: Označi, kot občutljivo
       mark_as_unresolved: Označi kot nerešeno
       no_one_assigned: Nihče
       notes:
@@ -431,17 +655,22 @@ sl:
         create_and_resolve: Razreši z opombo
         create_and_unresolve: Ponovo odpri z opombo
         delete: Izbriši
-        placeholder: Opišite dejanja, ki ste jih izvedli, ali katere koli druge posodobitve...
+        placeholder: Opišite dejanja, ki ste jih izvedli, ali katere koli druge posodobitve ...
         title: Zapiski
-      quick_actions_description_html: 'Opravite hitro dejanje ali podrsajte navzdol, da si ogledate poročano vsebino:'
+      notes_description_html: Pokaži in pusti opombe drugim moderatorjem in sebi v prihodnosti
+      quick_actions_description_html: 'Opravite hitro dejanje ali podrsajte navzdol, da si ogledate prijavljeno vsebino:'
+      remote_user_placeholder: oddaljeni uporabnik iz %{instance}
       reopen: Ponovno odpri prijavo
       report: 'Prijavi #%{id}'
       reported_account: Prijavljeni račun
-      reported_by: Prijavljen od
+      reported_by: Prijavil/a
       resolved: Razrešeni
       resolved_msg: Prijava je uspešno razrešena!
       skip_to_actions: Preskoči na dejanja
       status: Stanje
+      statuses: Prijavljena vsebina
+      statuses_description_html: Žaljiva vsebina bo citirana v komunikaciji z računom iz prijave
+      target_origin: Izvor prijavljenega računa
       title: Prijave
       unassign: Odstopljeni
       unresolved: Nerešeni
@@ -450,12 +679,13 @@ sl:
     rules:
       add_new: Dodaj pravilo
       delete: Izbriši
+      description_html: Večina trdi, da so prebrali in da se strinjajo s pogoji rabe storitve, vendar le-teh ponavadi ne preberejo, dokler ne pride do težav. <strong>Poenostavite in naredite pravila svojega strežnika vidna na prvi pogled tako, da jih izpišete v označenem seznamu.</strong>Posamezna pravila skušajte ohraniti kratka in enostavna, ne razbijajte pa jih v preveč različnih točk.
       edit: Uredi pravilo
       empty: Zaenkrat še ni opredeljenih pravil.
       title: Pravila strežnika
     settings:
       activity_api_enabled:
-        desc_html: Številke lokalno objavljenih stanj, aktivnih uporabnikov in novih registracij na tedenskih seznamih
+        desc_html: Številke lokalno objavljenih objav, aktivnih uporabnikov in novih registracij na tedenskih seznamih
         title: Objavi združeno statistiko o dejavnosti uporabnikov
       bootstrap_timeline_accounts:
         desc_html: Več uporabniških imen ločite z vejico. Deluje samo na lokalnih in odklenjenih računih. Privzeto, ko je prazno, je pri vseh lokalnih skrbnikih.
@@ -466,6 +696,16 @@ sl:
       custom_css:
         desc_html: Spremeni videz z naloženim CSS na vsaki strani
         title: CSS po meri
+      default_noindex:
+        desc_html: Vpliva na vse uporabnike, ki niso sami spremenili te nastavitve
+        title: Privzeto izvzemi uporabnike iz indeksiranja iskalnika
+      domain_blocks:
+        all: Vsem
+        disabled: Nikomur
+        title: Domenske bloke pokaži
+        users: Prijavljenim krajevnim uporabnikom
+      domain_blocks_rationale:
+        title: Pokaži razlago
       hero:
         desc_html: Prikazano na sprednji strani. Priporoča se vsaj 600x100px. Ko ni nastavljen, se vrne na sličico strežnika
         title: Slika junaka
@@ -491,6 +731,9 @@ sl:
         min_invite_role:
           disabled: Nihče
           title: Dovoli vabila od
+        require_invite_text:
+          desc_html: Če registracije zahtevajo ročno potrditev, nastavite vnos besedila pod »Zakaj se želite pridružiti?« za obveznega
+          title: Zahteva, da novi uprorabniki navedejo razlog, zakaj se želijo registrirati
       registrations_mode:
         modes:
           approved: Potrebna je odobritev za prijavo
@@ -498,7 +741,7 @@ sl:
           open: Vsakdo se lahko prijavi
         title: Način registracije
       show_known_fediverse_at_about_page:
-        desc_html: Ko preklopite, bo prikazal tute vseh znanih fediverse-ov v predogledu. V nasprotnem primeru bodo prikazani samo lokalni tuti.
+        desc_html: Ko preklopite, bo prikazal objave vseh znanih fediverzumov v predogledu. V nasprotnem primeru bodo prikazane samo krajevne objave.
         title: Pokaži znane fediverse-e v predogledu časovnice
       show_staff_badge:
         desc_html: Prikaži značko osebja na uporabniški strani
@@ -523,18 +766,54 @@ sl:
         desc_html: Prikaži javno časovnico na ciljni strani
         title: Predogled časovnice
       title: Nastavitve strani
+      trendable_by_default:
+        desc_html: Velja za ključnike, ki niso bili poprej onemogočeni
+        title: Dovoli, da so ključniki v trendu brez predhodnega pregleda
       trends:
+        desc_html: Javno prikaži poprej pregledano vsebino, ki je trenutno v trendu
         title: Trendi
+    site_uploads:
+      delete: Izbriši naloženo datoteko
+      destroyed_msg: Prenos na strežnik uspešno izbrisan!
     statuses:
       back_to_account: Nazaj na stran računa
+      back_to_report: Nazaj na stran prijave
       batch:
-        remove_from_report: Odstrani iz poročila
+        remove_from_report: Odstrani iz prijave
+        report: Poročaj
       deleted: Izbrisano
       media:
         title: Mediji
-      no_status_selected: Nobeno stanje ni bilo spremenjeno, ker ni bilo izbrano nobeno
-      title: Stanja računa
+      no_status_selected: Nobena objava ni bila spremenjena, ker ni bila nobena izbrana
+      title: Objave računa
       with_media: Z mediji
+    strikes:
+      actions:
+        delete_statuses: "%{name} je izbrisal/a objave uporabnika %{target}"
+        disable: "%{name} je zamrznil/a račun uporabnika %{target}"
+        mark_statuses_as_sensitive: "%{name} je označil/a objave računa %{target} kot občutljive"
+        none: "%{name} je poslal/a opozorilo %{target}"
+        sensitive: "%{name} je označil/a račun %{target} kot občutljiv"
+        silence: "%{name} je omejil/a račun uporabnika %{target}"
+        suspend: "%{name} je suspendiral/a račun uporabnika %{target}"
+      appeal_approved: Pritoženo
+      appeal_pending: Čakajoč na ugovor
+    system_checks:
+      database_schema_check:
+        message_html: Na čakanju so migracije zbirke podatkov. Prosimo, izvedite jih, da zagotovite, da se program vede pričakovano
+      elasticsearch_running_check:
+        message_html: Povezava z Elasticsearch ni uspela. Preverite, da deluje, ali onemogočite iskanje po vsem besedilu
+      elasticsearch_version_check:
+        message_html: 'Nezdružljiva različica Elasticsearch: %{value}'
+        version_comparison: Izvaja se Elasticsearch %{running_version}, zahtevana pa je različica %{required_version}
+      rules_check:
+        action: Upravljaj pravila strežnika
+        message_html: Nobenih pravil strežnika niste določili.
+      sidekiq_process_check:
+        message_html: Noben proces Sidekiq ne poteka za %{value} vrst. Preglejte svojo prilagoditev Sidekiq
+    tags:
+      review: Stanje pregleda
+      updated_msg: Nastavitve ključnikov uspešno posodobljene
     title: Upravljanje
     trends:
       allow: Dovoli
@@ -542,21 +821,83 @@ sl:
       disallow: Ne dovoli
       links:
         allow: Dovoli povezavo
+        allow_provider: Dovoli izdajatelja
+        description_html: To so povezave, ki jih trenutno veliko delijo računi, iz katerih vaš strežnik vidi objave. Vašim uporabnikom lahko pomaga izvedeti, kaj se dogaja po svetu. Nobene povezave niso javno prikazane, dokler ne odobrite izdajatelja. Posamezne povezave lahko tudi dovolite ali zavrnete.
+        disallow: Ne dovoli povezave
+        disallow_provider: Ne dovoli izdajatelja
+        shared_by_over_week:
+          few: Delile %{count} osebe v zadnjem tednu
+          one: Delila %{count} oseba v zadnjem tednu
+          other: Delilo %{count} oseb v zadnjem tednu
+          two: Delili %{count} osebi v zadnjem tednu
+        title: Povezave v trendu
+        usage_comparison: Danes deljeno %{today}-krat, včeraj pa %{yesterday}-krat
+      only_allowed: Samo dovoljeni
       pending_review: Čakajoče na pregled
+      preview_card_providers:
+        allowed: Povezave tega izdajatelja so lahko v trendu
+        description_html: To so domene, iz katerih se povezave pogosto delijo na vašem strežniku. Povezave ne bodo javno objavljene, razen če je domena povezave odobrena. Vaša odobritev (ali zavrnitev) se nanaša na poddomene.
+        rejected: Povezave tega izdajatelja ne bodo v trendu
+        title: Izdajatelji
+      rejected: Zavrnjen
+      statuses:
+        allow: Dovoli objavo
+        allow_account: Dovoli avtorja
+        description_html: To so objave, za katere vaš strežnik ve, da so trenutno v skupni rabi in med priljubljenimi. Vašim novim uporabnikom in uporabnikom, ki se vračajo, lahko pomaga najti več oseb, ki jim bodo sledili. Nobena objava ni javno prikazana, dokler avtorja ne odobrite in avtor ne dovoli, da se njegov račun predlaga drugim. Posamezne objave lahko tudi dovolite ali zavrnete.
+        disallow: Ne dovoli objave
+        disallow_account: Ne dovoli avtorja
+        not_discoverable: Avtor ni dovolil, da bi ga bilo moč odkriti
+        shared_by:
+          few: Deljeno ali priljubljeno %{friendly_count}-krat
+          one: Deljeno ali priljubljeno %{friendly_count}-krat
+          other: Deljeno ali priljubljeno %{friendly_count}-krat
+          two: Deljeno ali priljubljeno %{friendly_count}-krat
+        title: Trendne objave
       tags:
+        current_score: Trenutni rezultat %{score}
         dashboard:
+          tag_accounts_measure: enkratnih uporab
           tag_languages_dimension: Naj jeziki
           tag_servers_dimension: Naj strežniki
+          tag_servers_measure: različnih strežnikov
+          tag_uses_measure: uporab skupaj
+        description_html: To so ključniki, ki se trenutno pojavljajo v številnih objavah, ki jih vidi vaš strežnik. Uporabnikom lahko pomaga ugotoviti, o čem ljudje trenutno največ govorijo. Noben ključnik ni javno prikazan, dokler ga ne odobrite.
+        listable: Je moč predlagati
+        not_listable: Ne bo predlagano
+        not_trendable: Se ne bo pojavilo med trendi
+        not_usable: Ni mogoče uporabiti
+        peaked_on_and_decaying: Vrh dne %{date}, zdaj v upadu
+        title: Ključniki v trendu
+        trendable: Se lahko pojavi med trendi
+        trending_rank: 'V trendu #%{rank}'
+        usable: Je moč uporabiti
+        usage_comparison: Danes uporabljeno %{today}-krat, včeraj pa %{yesterday}-krat
+        used_by_over_week:
+          few: Uporabile %{count} osebe v zadnjem tednu
+          one: Uporabila %{count} oseba v zadnjem tednu
+          other: Uporabilo %{count} oseb v zadnjem tednu
+          two: Uporabili %{count} osebi v zadnjem tednu
       title: Trendi
+      trending: V porastu
     warning_presets:
       add_new: Dodaj novo
       delete: Izbriši
       edit_preset: Uredi prednastavitev opozoril
+      empty: Zaenkrat še niste določili nobenih opozorilnih prednastavitev.
       title: Upravljaj prednastavitev opozoril
   admin_mailer:
     new_appeal:
       actions:
+        delete_statuses: brisanje njihovih objav,
+        disable: zamrznitev njihovega računa,
+        mark_statuses_as_sensitive: označitev njihovih objav kot občutljivih,
         none: opozorilo
+        sensitive: označitev njihovega računa kot občutljivega,
+        silence: omejitev njihovega računa,
+        suspend: suspenz njihovega računa,
+      body: "%{target} se pritožuje na moderatorsko odločitev %{action_taken_by} z dne %{date}, ki je bila %{type}. Zapisal/a je:"
+      next_steps: Pritožbi lahko ugodite in s tem razveljavite moderatorsko odločitev ali pa jo prezrete.
+      subject: "%{username} se je pritožil na moderatorsko odločitev na %{instance}"
     new_pending_account:
       body: Podrobnosti o novem računu so navedene spodaj. To aplikacijo lahko odobrite ali zavrnete.
       subject: Nov račun za pregled na %{instance} (%{username})
@@ -564,22 +905,47 @@ sl:
       body: "%{reporter} je prijavil %{target}"
       body_remote: Nekdo iz %{domain} je prijavil %{target}
       subject: Nove prijave za %{instance} (#%{id})
+    new_trends:
+      body: 'Naslednji elementi potrebujejo pregled, preden jih je možno javno prikazati:'
+      new_trending_links:
+        no_approved_links: Trenutno ni odobrenih povezav v trendu.
+        requirements: Vsak od teh kandidatov bi lahko presegel odobreno povezavo v trendu št. %{rank}, ki je trenutno %{lowest_link_title} z rezultatom %{lowest_link_score}.
+        title: Povezave v trendu
+      new_trending_statuses:
+        no_approved_statuses: Trenutno ni odobrenih objav v trendu.
+        requirements: Vsak od teh kandidatov bi lahko presegel odobreno trendno objavo št. %{rank}, ki je trenutno %{lowest_status_url} z rezultatom %{lowest_status_score}.
+        title: Trendne objave
+      new_trending_tags:
+        no_approved_tags: Trenutno ni odobrenih ključnikov v trendu.
+        requirements: Vsak od teh kandidatov bi lahko presegel odobreni ključnik v trendu št. %{rank}, ki je trenutno %{lowest_tag_name} z rezultatom %{lowest_tag_score}.
+        title: Ključniki v trendu
+      subject: Novi trendi za pregled na %{instance}
+  aliases:
+    add_new: Ustvari vzdevek
+    created_msg: Uspešno ustvarjen novi vzdevek. Zdaj lahko pričnete s selitvijo s starega računa.
+    deleted_msg: Uspešno odstranjen vzdevek. Selitev iz tistega računa na tega ne bo več možna.
+    empty: Nimate vzdevkov.
+    hint_html: Če se želite preseliti iz drugega računa v tega, lahko tukaj ustvarite vzdevek, ki je potreben, preden lahko nadaljujete s selitvijo sledilcev iz starega računa v tega. To dejanje je samo po sebi <strong>neškodljivo in povratno</strong>. <strong>Selitev računa sprožite iz starega računa</strong>.
+    remove: Razveži vzdevek
   appearance:
     advanced_web_interface: Napredni spletni vmesnik
     advanced_web_interface_hint: 'Če želite uporabiti celotno širino zaslona, vam napredni spletni vmesnik omogoča, da si nastavite več različnih stolpcev in da si hkrati ogledate toliko informacij, kot želite: domačo stran, obvestila, združeno časovnico, poljubno število seznamov in ključnikov.'
     animations_and_accessibility: Animacije in dostopnost
     confirmation_dialogs: Potrditvena okna
+    discovery: Odkrito
     localization:
       body: Mastodon prevajamo prostovoljci.
       guide_link: https://crowdin.com/project/mastodon
       guide_link_text: Vsakdo lahko prispeva.
     sensitive_content: Občutljiva vsebina
+    toot_layout: Postavitev objave
   application_mailer:
     notification_preferences: Spremenite e-poštne nastavitve
+    salutation: "%{name},"
     settings: 'Spremenite e-poštne nastavitve: %{link}'
     view: 'Pogled:'
     view_profile: Ogled profila
-    view_status: Ogled stanja
+    view_status: Pokaži objavo
   applications:
     created: Aplikacija je bila uspešno ustvarjena
     destroyed: Aplikacija je bila uspešno izbrisana
@@ -595,9 +961,16 @@ sl:
     checkbox_agreement_without_rules_html: Strinjam se s <a href="%{terms_path}" target="_blank">pogoji storitve</a>
     delete_account: Izbriši račun
     delete_account_html: Če želite izbrisati svoj račun, lahko nadaljujete <a href="%{path}">tukaj</a>. Prosili vas bomo za potrditev.
+    description:
+      prefix_invited_by_user: "@%{name} vas vabi, da se pridružite temu strežniku Mastodon!"
+      prefix_sign_up: Še danes se priključite Mastodonu!
+      suffix: Z računom boste lahko sledili osebam, objavljali posodobitve in izmenjevali sporočila z uporabniki s poljubnega strežnika Mastodon in še veliko več!
     didnt_get_confirmation: Niste prejeli navodil za potrditev?
+    dont_have_your_security_key: Ali imate svoj varnostni ključ?
     forgot_password: Ste pozabili svoje geslo?
     invalid_reset_password_token: Žeton za ponastavitev gesla je neveljaven ali je potekel. Zahtevajte novo.
+    link_to_otp: Vnesite dvofaktorsko kodo s svojega telefona ali obnovitveno kodo
+    link_to_webauth: Vnesite svojo napravo za varnostni ključ
     log_in_with: Prijavi se s
     login: Prijava
     logout: Odjava
@@ -622,10 +995,14 @@ sl:
       confirming: Čakanje na potrditev e-pošte.
       functional: Vaš račun je polno opravilen.
       pending: Naše osebje preverja vašo prijavo. To lahko traja nekaj časa. Če bo vaša prijava odobrena, boste prejeli e-pošto.
+      redirecting_to: Vaš račun ni dejaven, ker trenutno preusmerja na račun %{acct}.
+      view_strikes: Pokaži pretekle ukrepe proti mojemu računu
+    too_fast: Obrazec oddan prehitro, poskusite znova.
     trouble_logging_in: Težave pri prijavi?
     use_security_key: Uporabi varnostni ključ
   authorize_follow:
     already_following: Temu računu že sledite
+    already_requested: Temu računu ste že poslali zahtevo po sledenju
     error: Na žalost je prišlo do napake pri iskanju oddaljenega računa
     follow: Sledi
     follow_request: 'Prošnjo za sledenje se poslali:'
@@ -637,32 +1014,87 @@ sl:
     title: Sledi %{acct}
   challenge:
     confirm: Nadaljuj
+    hint_html: "<strong>Namig:</strong> naslednjo uro vas ne bomo več vprašali po vašem geslu."
     invalid_password: Neveljavno geslo
     prompt: Potrdite geslo za nadaljevanje
+  crypto:
+    errors:
+      invalid_key: ni veljaven ključ Ed25519 ali Curve25519
+      invalid_signature: ni veljaven podpis Ed25519
+  date:
+    formats:
+      default: "%d %b %Y"
+      with_month_name: "%B %d %Y"
   datetime:
     distance_in_words:
+      about_x_hours: "%{count} u"
+      about_x_months: "%{count} m"
+      about_x_years: "%{count} l"
+      almost_x_years: "%{count} l"
       half_a_minute: Pravkar
+      less_than_x_minutes: "%{count} min"
       less_than_x_seconds: Pravkar
+      over_x_years: "%{count} l"
+      x_days: "%{count} d"
+      x_minutes: "%{count} min"
+      x_months: "%{count} m"
+      x_seconds: "%{count} s"
   deletes:
+    challenge_not_passed: Podatki, ki ste jih vnesli, niso pravilni
     confirm_password: Vnesite svoje trenutno geslo, da potrdite svojo identiteto
     confirm_username: Vnesite svoje uporabniško ime, da potrdite postopek
     proceed: Izbriši račun
     success_msg: Vaš račun je bil uspešno izbrisan
+    warning:
+      before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
+      caches: Vsebina, ki jo medpomnijo drugi strežniki, lahko vztraja
+      data_removal: Vaše objave in drugi podatki bodo trajno odstranjeni
+      email_change_html: <a href="%{path}">Svoj e-naslov lahko spremenite</a> brez izbrisa svojega računa
+      email_contact_html: Če še vedno ni dostavljeno, lahko za pomoč pošljete e-sporočilo na naslov <a href="mailto:%{email}">%{email}</a>
+      email_reconfirmation_html: Če niste prejeli potrditvenega e-sporočila, lahko <a href="%{path}">znova zaprosite zanj</a>
+      irreversible: Vašega računa ne boste mogli obnoviti ali ponovno aktivirati
+      more_details_html: Za podrobnosti glejte <a href="%{terms_path}">politiko zasebnosti</a>.
+      username_available: Vaše uporabniško ime bo znova na voljo
+      username_unavailable: Vaše uporabniško ime še vedno ne bo na voljo
   directories:
     directory: Imenik profilov
     explanation: Odkrijte uporabnike glede na njihove interese
     explore_mastodon: Razišči %{title}
   disputes:
     strikes:
+      action_taken: Izvedeno dejanje
+      appeal: Pritoži se
+      appeal_approved: Pritožba na ukrep je bila uspešna in ukrep ni več veljaven
+      appeal_rejected: Pritožba je bila zavržena
+      appeal_submitted_at: Pritožba oddana
+      appealed_msg: Vaša pritožba je oddana. Če bo odobrena, boste o tem obveščeni.
+      appeals:
+        submit: Pošlji pritožbo
+      associated_report: Povezana prijava
+      created_at: Datum
+      description_html: To so dejanja, izvedena proti vašemu računu ter opozorila, ki so vam jih poslali sodelavci %{instance}.
+      recipient: Naslovljeno na
+      status: 'Objava #%{id}'
+      status_removed: Objava je že odstranjena iz sistema
+      title: "%{action} dne %{date}"
       title_actions:
         delete_statuses: Odstranitev objave
+        disable: Zamrznitev računa
+        mark_statuses_as_sensitive: Označevanje objav kot občutljivih
         none: Opozorilo
+        sensitive: Označevanj računa kot občutljivega
         silence: Omejitev računa
+        suspend: Suspenz računa
+      your_appeal_approved: Vaša pritožba je bila odobrena
+      your_appeal_pending: Oddali ste pritožbo
+      your_appeal_rejected: Vaša pritožba je bila zavržena
+  domain_validator:
+    invalid_domain: ni veljavno ime domene
   errors:
-    '400': The request you submitted was invalid or malformed.
+    '400': Zahteva, ki ste jo oddali, je neveljavna ali nepravilno oblikovana.
     '403': Nimate dovoljenja za ogled te strani.
     '404': Iskana stran ne obstaja.
-    '406': This page is not available in the requested format.
+    '406': Ta stran ni na voljo v zahtevani obliki.
     '410': Iskana stran ne obstaja več.
     '422':
       content: Varnostno preverjanje ni uspelo. Ali blokirate piškotke?
@@ -671,7 +1103,7 @@ sl:
     '500':
       content: Žal nam je, toda na našem koncu je prišlo do napake.
       title: Ta stran ni pravilna
-    '503': The page could not be served due to a temporary server failure.
+    '503': Strani ni mogoče postreči zaradi začasne odpovedi strežnika.
     noscript_html: Če želite uporabljati spletno aplikacijo Mastodon, omogočite JavaScript. Druga možnost je, da za svojo platformo poskusite eno od <a href="%{apps_path}">lastnih aplikacij</a> za Mastodon.
   existing_username_validator:
     not_found: s tem uporabniškim imenom ni bilo mogoče najti lokalnega uporabnika
@@ -680,12 +1112,13 @@ sl:
     archive_takeout:
       date: Datum
       download: Prenesi svoj arhiv
-      hint_html: Zahtevate lahko arhiv vaših <strong>tutov in naloženih medijev</strong>. Izvoženi podatki bodo v formatu ActivityPub, ki ga bo mogoče brati s katerokoli skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
+      hint_html: Zahtevate lahko arhiv vaših <strong>objav in naloženih medijev</strong>. Izvoženi podatki bodo v zapisu ActivityPub, ki ga bo mogoče brati s poljubno skladno programsko opremo. Arhiv lahko zahtevate vsakih 7 dni.
       in_progress: Prevajanje arhiva...
       request: Zahtevajte svoj arhiv
       size: Velikost
     blocks: Blokirate
     bookmarks: Zaznamki
+    csv: CSV
     domain_blocks: Bloki domene
     lists: Seznami
     mutes: Utišate
@@ -694,6 +1127,7 @@ sl:
     add_new: Dodaj novo
     errors:
       limit: Ste že dodali največje število ključnikov
+    hint_html: "<strong>Kaj so izpostavljeni ključniki?</strong> Prikazani so vidno na vašem javnem profilu in ljudem omogočajo brskanje po vaših javnih objavah posebej pod temi ključniki. So odlično orodje za spremljanje ustvarjalnih del ali dolgoročnih projektov."
   filters:
     contexts:
       account: Profili
@@ -708,6 +1142,7 @@ sl:
       invalid_irreversible: Nepovratno filtriranje deluje le v kontekstu doma ali obvestil
     index:
       delete: Izbriši
+      empty: Nimate filtrov.
       title: Filtri
     new:
       title: Dodaj nov filter
@@ -733,6 +1168,8 @@ sl:
   html_validator:
     invalid_markup: 'vsebuje neveljavno oznako HTML: %{error}'
   imports:
+    errors:
+      over_rows_processing_limit: vsebuje več kot %{count} vrstic
     modes:
       merge: Združi
       merge_long: Ohrani obstoječe zapise in dodaj nove
@@ -777,18 +1214,61 @@ sl:
       limit: Dosegli ste največje število seznamov
   login_activities:
     authentication_methods:
+      otp: aplikacija za dvoravenjsko overjanje
       password: geslo
+      sign_in_token: varnostna koda po e-pošti
       webauthn: varnostni ključi
+    description_html: Če opazite dejavnost, ki je ne prepoznate kot svoje, razmislite o spremembi svojega gesla in omogočanju dvoravenskega overjanja.
+    empty: Zgodovina overjanja ni na voljo
+    failed_sign_in_html: Spodletela prijava z metodo %{method} iz %{ip} (%{browser})
+    successful_sign_in_html: Uspešna prijava z metodo %{method} iz %{ip} (%{browser})
+    title: Zgodovina overjanja
   media_attachments:
     validations:
-      images_and_video: Videoposnetka ni mogoče priložiti stanju, ki že vsebuje slike
+      images_and_video: Videoposnetka ni mogoče priložiti objavi, ki že vsebuje slike
+      not_ready: Datotek, katerih obdelava ni dokončana, ni mogoče pripeti. Poskusite znova kmalu!
       too_many: Ni možno priložiti več kot 4 datoteke
   migrations:
     acct: username@domain novega računa
+    cancel: Prekliči preusmeritev
+    cancel_explanation: Preklic preusmeritve ponovno aktivira vaš trenutni račun, vendar ne povrne sledilcev, ki so bili preseljeni na tisti račun.
+    cancelled_msg: Preusmeritev je bila uspešno preklicana.
+    errors:
+      already_moved: je isti račun, na katerega ste se že preselili
+      missing_also_known_as: ni vzdevek za ta račun
+      move_to_self: ne more biti trenutni račun
+      not_found: ni mogoče najti
+      on_cooldown: Ste na ohlajanju
+    followers_count: Sledilcev ob času selitve
+    incoming_migrations: Selitev iz drugega računa
+    incoming_migrations_html: Če se želite preseliti iz drugega računa na tega, morate najprej <a href="%{path}">ustvariti vzdevek računa</a>.
+    moved_msg: Vaš račun se zdaj preusmerja na %{acct} in vaši sledilci so preseljeni.
+    not_redirecting: Vaš račun trenutno ne preusmerja na noben drug račun.
+    on_cooldown: Nedavno ste migrirali svoj račun. Funkcija bo znova na voljo čez %{count} dni.
+    past_migrations: Pretekle migracije
     proceed_with_move: Premakni sledilce
+    redirected_msg: Vaš račun se zdaj preusmerja na %{acct}.
+    redirecting_to: Vaš račun se preusmerja na %{acct}.
+    set_redirect: Nastavi preusmeritev
+    warning:
+      backreference_required: Novi račun je potrebno najprej prilagoditi, da se bo skliceval nazaj na tega
+      before: 'Pred nadaljevanjem previdno preberite naslednje opombe:'
+      cooldown: Po selitvi sledi čakalna doba, v kateri računa ne boste mogli ponovno seliti
+      disabled_account: Vaš trenutni račun zatem ne bo polno uporaben. Vendar pa boste imeli dostop do izvoza podatkov kot tudi do ponovne aktivacije.
+      followers: S tem dejanjem boste preselili vse sledilce iz trenutnega računa na novi račun
+      only_redirect_html: Namesto tega lahko <a href="%{path}">na svojem profilu zgolj vzpostavite preusmeritev</a>.
+      other_data: Nobeni drugi podatki se ne bodo preselili samodejno
+      redirect: Profil vašega trenutnega računa bo posodobljen z obvestilom o preusmeritvi in bo izključen iz iskanj
   moderation:
     title: Moderiranje
+  move_handler:
+    carry_blocks_over_text: Ta uporabnik se je preselil iz računa %{acct}, ki ste ga blokirali.
+    carry_mutes_over_text: Ta uporabnik se je preselil iz računa %{acct}, ki ste ga utišali.
+    copy_account_note_text: 'Ta uporabnik se je preselil iz %{acct}, tukaj so vaše poprejšnje opombe o njem:'
   notification_mailer:
+    admin:
+      sign_up:
+        subject: "%{name} se je vpisal/a"
     digest:
       action: Prikaži vsa obvestila
       body: Tukaj je kratek povzetek sporočil, ki ste jih zamudili od vašega zadnjega obiska v %{since}
@@ -798,10 +1278,15 @@ sl:
         one: Prav tako ste pridobili enega novega sledilca, ko ste bili odsotni! Juhu!
         other: Prav tako ste pridobili %{count} novih sledilcev, ko ste bili odsotni! Juhu!
         two: Prav tako ste pridobili %{count} nova sledilca, ko ste bili odsotni! Juhu!
+      subject:
+        few: "%{count} nova obvestila od vašega zadnjega obiska 🐘"
+        one: "%{count} novo obvestilo od vašega zadnjega obiska 🐘"
+        other: "%{count} novih obvestil od vašega zadnjega obiska 🐘"
+        two: "%{count} novi obvestili od vašega zadnjega obiska 🐘"
       title: V vaši odsotnosti...
     favourite:
-      body: "%{name} je vzljubil/a vaše stanje:"
-      subject: "%{name} je vzljubil/a vaše stanje"
+      body: "%{name} je vzljubil/a vašo objavo:"
+      subject: "%{name} je vzljubil/a vašo objavo"
       title: Novo priljubljeno
     follow:
       body: "%{name} vam sedaj sledi!"
@@ -817,19 +1302,44 @@ sl:
       body: "%{name} vas je omenil/a v:"
       subject: "%{name} vas je omenil/a"
       title: Nova omemba
+    poll:
+      subject: Anketa, ki jo je pripravil/a %{name}, se je iztekla
     reblog:
-      body: "%{name} je spodbudil/a vaše stanje:"
-      subject: "%{name} je spodbudil/a vaše stanje"
-      title: Nova spodbuda
+      body: 'Vašo objavo je izpostavil/a %{name}:'
+      subject: "%{name} je izpostavil/a vašo objavo"
+      title: Nova izpostavitev
+    status:
+      subject: "%{name} je pravkar objavil/a"
     update:
       subject: "%{name} je uredil(a) objavo"
+  notifications:
+    email_events: Dogodki za e-obvestila
+    email_events_hint: 'Izberite dogodke, za katere želite prejmati obvestila:'
+    other_settings: Druge nastavitve obvestil
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
   otp_authentication:
+    code_hint: Za potrditev vnesite kodo, ki jo je ustvarila aplikacija za preverjanje pristnosti
+    description_html: Če omogočite <strong>dvofaktorsko preverjanje pristnosti</strong> z aplikacijo za overjanje, boste za prijavo morali imeti pri sebi svoj telefon, s katerim boste ustvarili žetone za vstop.
     enable: Omogoči
+    instructions_html: "<strong>Skenirajte to QR-kodo z Google Authenticator ali s podobno aplikacijo TOTP na vašem telefnu</strong>. Od zdaj naprej bo ta aplikacija ustvarjala žetone, ki jih boste morali vnesti ob prijavi."
+    manual_instructions: 'Če ne morete skenirati QR-kode in jo morate vnesti ročno, je tu skrivnost v tekstovni obliki:'
+    setup: Vzpostavi
+    wrong_code: Vnesena koda je neveljavna! Ali sta čas strežnika in čas naprave pravilna?
   pagination:
     newer: Novejše
     next: Naprej
     older: Starejše
     prev: Nazaj
+    truncate: "&hellip;"
   polls:
     errors:
       already_voted: Na tej anketi ste že glasovali
@@ -837,6 +1347,7 @@ sl:
       duration_too_long: je predaleč v prihodnosti
       duration_too_short: je prezgodaj
       expired: Glasovanje se je že zaključilo
+      invalid_choice: Izbrana možnost glasovanja ne obstaja
       over_character_limit: ne more biti daljše od %{max} znakov
       too_few_options: mora imeti več kot en element
       too_many_options: ne more vsebovati več kot %{max} elementov
@@ -844,10 +1355,17 @@ sl:
     other: Ostalo
     posting_defaults: Privzete nastavitev objavljanja
     public_timelines: Javne časovnice
+  reactions:
+    errors:
+      limit_reached: Dosežena omejitev različnih reakcij/odzivov
+      unrecognized_emoji: ni prepoznan emotikon
   relationships:
     activity: Dejavnost računa
     dormant: Skrit
     follow_selected_followers: Sledi izbranim sledilcem
+    followers: Sledilci
+    following: Sledi
+    invited: Vabljeni
     last_active: Zadnja dejavnost
     most_recent: Najnovejša
     moved: Prestavljeno
@@ -868,19 +1386,19 @@ sl:
   remote_interaction:
     favourite:
       proceed: Nadaljuj s priljubljenim
-      prompt: 'Ali želite vzljubiti ta tut:'
+      prompt: 'Želite vzljubiti to objavo:'
     reblog:
-      proceed: Nadaljuj s spodbudo
-      prompt: 'Ali želite spodbuditi ta tut:'
+      proceed: Nadaljuj s izpostavljanjem
+      prompt: 'Želite izpostaviti to objavo:'
     reply:
       proceed: Nadaljuj z odgovorom
-      prompt: 'Ali želite odgovoriti na ta tut:'
+      prompt: 'Želite odgovoriti na to objavo:'
   reports:
     errors:
       invalid_rules: se ne sklicuje na veljavna pravila
   scheduled_statuses:
-    over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih tutov
-    over_total_limit: Presegli ste omejitev %{limit} načrtovanih tutov
+    over_daily_limit: Za ta dan ste presegli omejitev %{limit} načrtovanih objav
+    over_total_limit: Presegli ste omejitev %{limit} načrtovanih objav
     too_soon: Načrtovani datum mora biti v prihodnosti
   sessions:
     activity: Zadnja dejavnost
@@ -923,6 +1441,7 @@ sl:
     revoke: Prekliči
     revoke_success: Seja je bila uspešno preklicana
     title: Seje
+    view_authentication_history: Oglejte si zgodovino overjanja za vaš račun
   settings:
     account: Račun
     account_settings: Nastavitve računa
@@ -942,10 +1461,17 @@ sl:
     preferences: Nastavitve
     profile: Profil
     relationships: Sledenja in sledilci
+    statuses_cleanup: Samodejno brisanje objav
+    strikes: Ukrepi morediranja
     two_factor_authentication: Dvofaktorsko overjanje
     webauthn_authentication: Varnostni ključi
   statuses:
     attached:
+      audio:
+        few: "%{count} zvočni posnetki"
+        one: "%{count} zvočni posnetek"
+        other: "%{count} zvočnih posnetkov"
+        two: "%{count} zvočna posnetka"
       description: 'Priloženo: %{attached}'
       image:
         few: "%{count} slike"
@@ -957,21 +1483,30 @@ sl:
         one: "%{count} video posnetek"
         other: "%{count} video posnetkov"
         two: "%{count} video posnetka"
-    boosted_from_html: Spodbujeno iz %{acct_link}
+    boosted_from_html: Izpostavljeno z računa %{acct_link}
     content_warning: 'Opozorilo o vsebini: %{warning}'
+    default_language: Enak kot jezik vmesnika
     disallowed_hashtags:
       few: 'vsebuje nedovoljene ključnike: %{tags}'
       one: 'vsebuje nedovoljeni ključnik: %{tags}'
       other: 'vsebuje nedovoljenih ključnikov: %{tags}'
       two: 'vsebuje nedovoljena ključnika: %{tags}'
     edited_at_html: Urejeno %{date}
+    errors:
+      in_reply_not_found: Objava, na katero želite odgovoriti, ne obstaja.
     open_in_web: Odpri na spletu
     over_character_limit: omejitev %{max} znakov je presežena
     pin_errors:
-      limit: Pripeli ste največje število tutov
-      ownership: Trob nekoga drugega ne more biti pripet
-      reblog: Spodbuda ne more biti pripeta
+      direct: Objav, ki so vidne samo omenjenum uporabnikom, ni mogoče pripenjati
+      limit: Pripeli ste največje število objav
+      ownership: Objava nekoga drugega ne more biti pripeta
+      reblog: Izpostavitev ne more biti pripeta
     poll:
+      total_people:
+        few: "%{count} osebe"
+        one: "%{count} Oseba"
+        other: "%{count} oseb"
+        two: "%{count} osebi"
       total_votes:
         few: "%{count} glasovi"
         one: "%{count} glas"
@@ -983,7 +1518,9 @@ sl:
     show_older: Pokaži starejše
     show_thread: Pokaži nit
     sign_in_to_participate: Prijavite se, če želite sodelovati v pogovoru
+    title: "%{name}: »%{quote}«"
     visibilities:
+      direct: Neposredno
       private: Samo sledilci
       private_long: Prikaži samo sledilcem
       public: Javno
@@ -991,22 +1528,46 @@ sl:
       unlisted: Ni prikazano
       unlisted_long: Vsi lahko vidijo, vendar ni objavljeno na javnih časovnicah
   statuses_cleanup:
+    enabled: Samodejno izbriši stare objave
+    enabled_hint: Samodejno izbriše vaše objave, ko dosežejo določen starostni prag, razen če ne ustrezajo eni od spodnjih izjem
+    exceptions: Izjeme
+    explanation: Ker je brisanje objav draga operacija, se to postopoma izvaja počasi, ko strežnik sicer ni zaseden. Zaradi tega se lahko vaše objave izbrišejo nekaj časa po tem, ko dosežejo starostni prag.
+    ignore_favs: Prezri priljubljene
+    ignore_reblogs: Prezri izpostavitve
+    interaction_exceptions: Izjeme na osnovi interakcije
+    interaction_exceptions_explanation: Upoštevajte, da ni nobene garancije za objave, ki bodo izbrisane, če padejo pod prag priljubljenosti ali izpostavljenosti, ko so ga že enkrat presegle.
+    keep_direct: Ohrani neposredna sporočila
+    keep_direct_hint: Ne izbriše nobenega izmed vaših neposrednih sporočil
+    keep_media: Ohrani objave z medijskimi priponkami
+    keep_media_hint: Ne izbriše nobene vaših objav, ki imajo medijske priponke
+    keep_pinned: Ohrani pripete objave
+    keep_pinned_hint: Ne izbriše nobene od vaših pripetih objav
     keep_polls: Ohrani ankete
     keep_polls_hint: Ne izbriše vaših anket
+    keep_self_bookmark: Ohrani objave z zaznamki
+    keep_self_bookmark_hint: Ne izbriše vaših lastnih objav, če ste jih postavili med zaznamke
+    keep_self_fav: Ohrani priljubljene objave
+    keep_self_fav_hint: Ne izbriše vaših lastnih objav, če ste jih postavili med priljubljene
     min_age:
       '1209600': 2 tedna
       '15778476': 6 mesecev
       '2629746': 1 mesec
       '31556952': 1 leto
       '5259492': 2 meseca
-      '604800': 1 week
+      '604800': 1 teden
       '63113904': 2 leti
       '7889238': 3 mesece
     min_age_label: Starostna meja
+    min_favs: Obrži objave priljubljene vsaj
+    min_favs_hint: Ne izbriše nobene od vaših objav, ki je prejela vsaj takšno količino priljubljenih. Pustite prazno, če želite izbrisati objave ne glede na število všečkov
+    min_reblogs: Obdrži objave izpostavljene vsaj
+    min_reblogs_hint: Ne izbriše nobene od vaših objav, ki je bila vsaj tolikokrat podprta. Pustite prazno, če želite izbrisati objave ne glede na število izpostavitev
   stream_entries:
-    pinned: Pripet trob
-    reblogged: spodbujen
+    pinned: Pripeta objava
+    reblogged: izpostavljeno
     sensitive_content: Občutljiva vsebina
+  tags:
+    does_not_match_previous_name: se ne ujema s prejšnjim imenom
   terms:
     body_html: |
       <h2>Pravilnik o zasebnosti</h2>
@@ -1094,34 +1655,76 @@ sl:
     contrast: Mastodon (Visok kontrast)
     default: Mastodon (Temna)
     mastodon-light: Mastodon (Svetla)
+  time:
+    formats:
+      default: "%b %d %Y, %H:%M"
+      month: "%b %Y"
+      time: "%H:%M"
   two_factor_authentication:
     add: Dodaj
     disable: Onemogoči
+    disabled_success: Dvofaktorsko preverjanje pristnosti je uspešno onemogočeno
     edit: Uredi
     enabled: Dvofaktorsko preverjanje pristnosti je omogočeno
     enabled_success: Dvofaktorsko preverjanje pristnosti je uspešno omogočeno
     generate_recovery_codes: Ustvari kode za obnovitev
     lost_recovery_codes: Obnovitvene kode vam omogočajo, da ponovno pridobite dostop do svojega računa, če izgubite telefon. Če ste izgubili obnovitvene kode, jih lahko obnovite tukaj. Vaše stare obnovitvene kode bodo neveljavne.
+    methods: Dvofaktorske metode
+    otp: Avtentikacijska aplikacija
     recovery_codes: Varnostna kopija obnovitvenih kod
     recovery_codes_regenerated: Obnovitvene kode so bile uspešno regenerirane
     recovery_instructions_html: Če kdaj izgubite dostop do telefona, lahko uporabite eno od spodnjih obnovitvenih kod, da ponovno pridobite dostop do svojega računa. <strong>Shranite obnovitvene kode</strong>. Lahko jih natisnete in shranite z drugimi pomembnimi dokumenti.
     webauthn: Varnostni ključi
   user_mailer:
+    appeal_approved:
+      action: Pojdite na svoj račun
+      explanation: Pritožbi na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bilo ugodeno. Vaš račun je znova nesporen.
+      subject: Vaši pritožbi z dne %{date} je bilo ugodeno
+      title: Pritožbi ugodeno
+    appeal_rejected:
+      explanation: Pritožba na ukrep proti vašemu računu z dne %{strike_date}, ki ste jo oddali dne %{appeal_date}, je bila zavrnjena.
+      subject: Vaša pritožba z dne %{date} je bila zavrnjena
+      title: Pritožba zavrnjena
     backup_ready:
       explanation: Zahtevali ste popolno varnostno kopijo računa Mastodon. Zdaj je pripravljen za prenos!
       subject: Vaš arhiv je pripravljen za prenos
       title: Prevzem arhiva
+    suspicious_sign_in:
+      change_password: spremenite svoje geslo
+      details: 'Tukaj so podrobnosti prijave:'
+      explanation: Zaznali smo prijavo v vaš račun z novega naslova IP.
+      further_actions_html: Če to niste bili vi, priporočamo da takoj ukrepate (%{action}) in omogočite dvo-ravensko overjanje (2FA), da ohranite račun varen.
+      subject: Do vašega računa je bil opravljen dostop z novega naslova IP
+      title: Nova prijava
     warning:
+      appeal: Pošlji pritožbo
+      appeal_description: Če menite, da gre za napako, lahko pošljete pritožbo osebju %{instance}.
+      categories:
+        spam: Neželeno
+        violation: Vsebina krši naslednja navodila skupnosti
+      explanation:
+        delete_statuses: Za nekatere vaših objav se je izkazalo, da kršijo eno ali več pravil skupnosti, zato so jih moderatorji %{instance} posledično odstranili.
+        disable: Svojega računa ne morete več uporabljati, vendar vaš profil in drugi podatki ostajajo nedotaknjeni. Zahtevate lahko varnostno kopiranje svojih podatkov, spremenite nastavitve računa ali izbrišete svoj račun.
+        mark_statuses_as_sensitive: Nekatere vaše objave so moderatorji %{instance} označili kot občutljive. To pomeni, da se bodo morale osebe dotakniti medijskih vsebin v objavah, preden se prikaže predogled. Med objavljanjem v prihodnosti lahko sami označite medijske vsebine kot občutljive.
+        sensitive: Odslej bodo vse vaše naložene medijske datoteke označene kot občutljive in skrite za opozorilom, ki ga je potrebno klikniti.
+        silence: Še vedno lahko uporabljate svoj račun, vendar bodo samo osebe, ki vas že spremljajo, videle vaše objave na tem strežniku in morda boste izključeni iz različnih funkcij odkrivanja. Vendar vam lahko drugi še vedno ročno sledijo.
+        suspend: Ne morete več uporabljati svojega računa, vaš profil in drugi podatki pa niso več dostopni. Še vedno se lahko prijavite in zahtevate varnostno kopijo svojih podatkov, dokler podatki niso v celoti odstranjeni v približno 30 dneh, vendar bomo ohranili nekaj osnovnih podatkov, da preprečimo, da bi se izognili suspenzu.
       reason: 'Razlog:'
+      statuses: 'Citirane objave:'
       subject:
+        delete_statuses: Vaše objave na %{acct} so bile odstranjene
         disable: Vaš račun %{acct} je zamrznjen
+        mark_statuses_as_sensitive: Vaše objave na računu %{acct} so bile označene kot občutljive
         none: Opozorila za %{acct}
+        sensitive: Vaše objave na računu %{acct} bodo odslej označene kot občutljive
         silence: Vaš račun %{acct} je omejen
         suspend: Vaš račun %{acct} je suspendiran
       title:
         delete_statuses: Objave odstranjene
         disable: Račun je zamrznjen
+        mark_statuses_as_sensitive: Objave, označene kot občuljive
         none: Opozorilo
+        sensitive: Račun je označen kot občutljiv
         silence: Račun je omejen
         suspend: Račun je suspendiran
     welcome:
@@ -1153,10 +1756,17 @@ sl:
   webauthn_credentials:
     add: Dodaj nov varnostni ključ
     create:
+      error: Pri dodajanju vašega varnostnega ključa je prišlo do težav. Poskusite znova.
       success: Vaš varnostni ključ je bil uspešno dodan.
     delete: Izbriši
     delete_confirmation: Ali ste prepričani, da želite izbrisati ta varnostni ključ?
+    description_html: Če omogočite <strong>overjanje z varnostnim ključem</strong>, boste morali ob prijavi uporabiti enega od svojih varnostnih ključev.
     destroy:
+      error: Pri brisanju vašega varnostnega ključa je prišlo do težav. Poskusite znova.
       success: Vaš varnostni ključ je bil uspešno izbrisan.
     invalid_credential: Neveljaven varnostni ključ
+    nickname_hint: Vnesite vzdevek svojega novega varnostnega ključa
+    not_enabled: Niste še omogočili WebAuthn
     not_supported: Ta brskalnik ne podpira varnostnih ključev
+    otp_required: Za uporabo varnostnih ključev morate najprej omogočiti 2FA (dvostopenjsko overjanje).
+    registered_on: Datum registracije %{date}
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 5fb25d2db..cee5cecfb 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -406,7 +406,7 @@ th:
       undo: ไม่อนุญาตการติดต่อกับภายนอกกับโดเมน
     domain_blocks:
       add_new: เพิ่มการปิดกั้นโดเมนใหม่
-      created_msg: กำลังประมวลผลการปิดกั้นโดเมน
+      created_msg: ตอนนี้กำลังประมวลผลการปิดกั้นโดเมน
       destroyed_msg: เลิกทำการปิดกั้นโดเมนแล้ว
       domain: โดเมน
       edit: แก้ไขการปิดกั้นโดเมน
@@ -578,6 +578,7 @@ th:
         create_and_unresolve: เปิดใหม่โดยมีหมายเหตุ
         delete: ลบ
         title: หมายเหตุ
+      quick_actions_description_html: 'ดำเนินการอย่างรวดเร็วหรือเลื่อนลงเพื่อดูเนื้อหาที่รายงาน:'
       remote_user_placeholder: ผู้ใช้ระยะไกลจาก %{instance}
       reopen: เปิดรายงานใหม่
       report: 'รายงาน #%{id}'
@@ -652,7 +653,7 @@ th:
           title: ต้องให้ผู้ใช้ใหม่ป้อนเหตุผลที่จะเข้าร่วม
       registrations_mode:
         modes:
-          approved: ต้องมีการอนุมัติสำหรับการลงทะเบียน
+          approved: ต้องการการอนุมัติสำหรับการลงทะเบียน
           none: ไม่มีใครสามารถลงทะเบียน
           open: ใครก็ตามสามารถลงทะเบียน
         title: โหมดการลงทะเบียน
@@ -738,6 +739,7 @@ th:
           other: แบ่งปันโดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
         title: ลิงก์ที่กำลังนิยม
         usage_comparison: แบ่งปัน %{today} ครั้งวันนี้ เทียบกับ %{yesterday} เมื่อวานนี้
+      only_allowed: อนุญาตเท่านั้น
       pending_review: การตรวจทานที่รอดำเนินการ
       preview_card_providers:
         allowed: ลิงก์จากผู้เผยแพร่นี้สามารถขึ้นแนวโน้ม
@@ -773,6 +775,7 @@ th:
         used_by_over_week:
           other: ใช้โดย %{count} คนในช่วงสัปดาห์ที่ผ่านมา
       title: แนวโน้ม
+      trending: กำลังนิยม
     warning_presets:
       add_new: เพิ่มใหม่
       delete: ลบ
@@ -794,6 +797,7 @@ th:
       subject: "%{username} กำลังอุทธรณ์การตัดสินใจในการควบคุมใน %{instance}"
     new_pending_account:
       body: รายละเอียดของบัญชีใหม่อยู่ด้านล่าง คุณสามารถอนุมัติหรือปฏิเสธใบสมัครนี้
+      subject: บัญชีใหม่สำหรับตรวจทานใน %{instance} (%{username})
     new_report:
       body: "%{reporter} ได้รายงาน %{target}"
       body_remote: ใครสักคนจาก %{domain} ได้รายงาน %{target}
@@ -891,7 +895,7 @@ th:
     error: น่าเสียดาย มีข้อผิดพลาดในการค้นหาบัญชีระยะไกล
     follow: ติดตาม
     follow_request: 'คุณได้ส่งคำขอติดตามไปยัง:'
-    following: 'สำเร็จ! คุณกำลังติดตาม:'
+    following: 'สำเร็จ! ตอนนี้คุณกำลังติดตาม:'
     post_follow:
       close: หรือคุณสามารถปิดหน้าต่างนี้
       return: แสดงโปรไฟล์ของผู้ใช้
@@ -934,6 +938,7 @@ th:
       caches: เนื้อหาที่ได้รับการแคชโดยเซิร์ฟเวอร์อื่น ๆ อาจยังคงอยู่
       data_removal: จะเอาโพสต์และข้อมูลอื่น ๆ ของคุณออกโดยถาวร
       email_change_html: คุณสามารถ <a href="%{path}">เปลี่ยนที่อยู่อีเมลของคุณ</a> ได้โดยไม่ต้องลบบัญชีของคุณ
+      email_contact_html: หากอีเมลยังคงมาไม่ถึง คุณสามารถส่งอีเมลถึง <a href="mailto:%{email}">%{email}</a> สำหรับความช่วยเหลือ
       email_reconfirmation_html: หากคุณไม่ได้รับอีเมลยืนยัน คุณสามารถ <a href="%{path}">ขออีเมลอีกครั้ง</a>
       irreversible: คุณจะไม่สามารถคืนค่าหรือเปิดใช้งานบัญชีของคุณใหม่
       more_details_html: สำหรับรายละเอียดเพิ่มเติม ดู <a href="%{terms_path}">นโยบายความเป็นส่วนตัว</a>
@@ -956,6 +961,7 @@ th:
       description_html: นี่คือการกระทำที่ใช้กับบัญชีของคุณและคำเตือนที่ส่งถึงคุณโดยพนักงานของ %{instance}
       recipient: ส่งถึง
       status: 'โพสต์ #%{id}'
+      status_removed: เอาโพสต์ออกจากระบบไปแล้ว
       title: "%{action} จาก %{date}"
       title_actions:
         delete_statuses: การเอาโพสต์ออก
@@ -984,6 +990,7 @@ th:
       content: เราขออภัย แต่มีบางอย่างผิดพลาดในส่วนของเรา
       title: หน้านี้ไม่ถูกต้อง
     '503': ไม่สามารถให้บริการหน้าได้เนื่องจากเซิร์ฟเวอร์ล้มเหลวชั่วคราว
+    noscript_html: เพื่อใช้แอปพลิเคชันเว็บ Mastodon โปรดเปิดใช้งาน JavaScript หรืออีกวิธีหนึ่ง ลองหนึ่งใน <a href="%{apps_path}">แอปเนทีฟ</a> สำหรับ Mastodon สำหรับแพลตฟอร์มของคุณ
   existing_username_validator:
     not_found: ไม่พบผู้ใช้ในเซิร์ฟเวอร์ที่มีชื่อผู้ใช้นั้น
     not_found_multiple: ไม่พบ %{usernames}
@@ -1094,6 +1101,7 @@ th:
   migrations:
     acct: ย้ายไปยัง
     cancel: ยกเลิกการเปลี่ยนเส้นทาง
+    cancel_explanation: การยกเลิกการเปลี่ยนเส้นทางจะเปิดใช้งานบัญชีปัจจุบันของคุณใหม่ แต่จะไม่นำผู้ติดตามที่ได้รับการย้ายไปยังบัญชีนั้นกลับมา
     cancelled_msg: ยกเลิกการเปลี่ยนเส้นทางสำเร็จ
     errors:
       missing_also_known_as: ไม่ใช่นามแฝงของบัญชีนี้
@@ -1106,7 +1114,7 @@ th:
     on_cooldown: คุณเพิ่งโยกย้ายบัญชีของคุณ ฟังก์ชันนี้จะพร้อมใช้งานอีกครั้งในอีก %{count} วัน
     past_migrations: การโยกย้ายที่ผ่านมา
     proceed_with_move: ย้ายผู้ติดตาม
-    redirected_msg: บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
+    redirected_msg: ตอนนี้บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
     redirecting_to: บัญชีของคุณกำลังเปลี่ยนเส้นทางไปยัง %{acct}
     set_redirect: ตั้งการเปลี่ยนเส้นทาง
     warning:
@@ -1136,8 +1144,8 @@ th:
       subject: "%{name} ได้ชื่นชอบโพสต์ของคุณ"
       title: รายการโปรดใหม่
     follow:
-      body: "%{name} กำลังติดตามคุณ!"
-      subject: "%{name} กำลังติดตามคุณ"
+      body: ตอนนี้ %{name} กำลังติดตามคุณ!
+      subject: ตอนนี้ %{name} กำลังติดตามคุณ
       title: ผู้ติดตามใหม่
     follow_request:
       action: จัดการคำขอติดตาม
@@ -1424,6 +1432,9 @@ th:
     suspicious_sign_in:
       change_password: เปลี่ยนรหัสผ่านของคุณ
       details: 'นี่คือรายละเอียดของการลงชื่อเข้า:'
+      explanation: เราตรวจพบการลงชื่อเข้าบัญชีของคุณจากที่อยู่ IP ใหม่
+      further_actions_html: หากนี่ไม่ใช่คุณ เราแนะนำให้คุณ %{action} ทันทีและเปิดใช้งานการรับรองความถูกต้องด้วยสองปัจจัยเพื่อรักษาบัญชีของคุณให้ปลอดภัย
+      subject: มีการเข้าถึงบัญชีของคุณจากที่อยู่ IP ใหม่
       title: การลงชื่อเข้าใหม่
     warning:
       appeal: ส่งการอุทธรณ์
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index cb2b7c720..72937cbca 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -170,6 +170,12 @@ uk:
       not_subscribed: Не підписані
       pending: Відгук в очікуванні
       perform_full_suspension: Призупинити
+      previous_strikes: Попередні скарги
+      previous_strikes_description_html:
+        few: У цього облікового запису є <strong>%{count}</strong> скарги.
+        many: У цього облікового запису є <strong>%{count}</strong> скарг.
+        one: У цього облікового запису є <strong>одна</strong> скарга.
+        other: У цього облікового запису є <strong>%{count}</strong> скарг.
       promote: Просунути
       protocol: Протокол
       public: Публічний
@@ -210,6 +216,7 @@ uk:
       silence: Глушення
       silenced: Заглушені
       statuses: Статуси
+      strikes: Попередні скарги
       subscribe: Підписатися
       suspend: Призупинити
       suspended: Призупинені
@@ -392,6 +399,11 @@ uk:
       media_storage: Медіасховище
       new_users: нові користувачі
       opened_reports: звітів відкрито
+      pending_appeals_html:
+        few: "<strong>%{count}</strong> апеляції в черзі"
+        many: "<strong>%{count}</strong> апеляцій в черзі"
+        one: "<strong>%{count}</strong> апеляція в черзі"
+        other: "<strong>%{count}</strong> апеляції в черзі"
       pending_reports_html:
         few: "<strong>%{count}</strong> звіти у черзі"
         many: "<strong>%{count}</strong> звітів у черзі"
@@ -481,6 +493,12 @@ uk:
       unsuppress: Відновити поради щодо підписок
     instances:
       availability:
+        failures_recorded:
+          few: Невдалих спроб за %{count} різні дні.
+          many: Невдалих спроб за %{count} різних днів.
+          one: Невдалих спроб за %{count} день.
+          other: Невдалих спроб за %{count} різних днів.
+        no_failures_recorded: Проблем щодо запису немає.
         title: Доступність
       back_to_all: Усі
       back_to_limited: Обмежені
@@ -784,6 +802,7 @@ uk:
         disallow_provider: Заборонити публікатора
         title: Популярні посилання
         usage_comparison: Сьогодні поширено %{today} разів, у порівнянні з %{yesterday} вчора
+      only_allowed: Тільки дозволене
       pending_review: Очікує перевірки
       preview_card_providers:
         allowed: Посилання цього публікатора можуть бути популярними
@@ -1551,6 +1570,7 @@ uk:
         silence: Ви й надалі можете користуватися своїм обліковим записом, але ваші дописи на цьому сервері бачитимуть лише ті люди, які вже стежать за вами, а вас може бути виключено з різних можливостей виявлення. Проте, інші можуть почати стежити за вами вручну.
         suspend: Ви більше не можете користуватися своїм обліковим записом, а ваші інші дані більше недоступні. Ви досі можете увійти, щоб надіслати запит на отримання резервної копії своїх даних до повного видалення впродовж приблизно 30 днів, але ми збережемо деякі основні дані, щоб унеможливити ухилення вами від призупинення.
       reason: 'Причина:'
+      statuses: 'Цитовані дописи:'
       subject:
         delete_statuses: Ваші дописи на %{acct} були вилучені
         disable: Ваш обліковий запис %{acct} було заморожено
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9515ffad8..2deb4ccbd 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -29,7 +29,7 @@ zh-CN:
     logged_in_as_html: 您当前以 %{username} 登录。
     logout_before_registering: 您已登录。
     privacy_policy: 隐私政策
-    rules: 实例规则
+    rules: 服务器规则
     rules_html: 如果你想要在此Mastodon服务器上拥有一个账户，你必须遵守相应的规则，摘要如下：
     see_whats_happening: 看看有什么新鲜事
     server_stats: 服务器统计数据：
@@ -646,8 +646,8 @@ zh-CN:
         desc_html: 本站一周内的嘟文数、活跃用户数以及新用户数
         title: 公开用户活跃度的统计数据
       bootstrap_timeline_accounts:
-        desc_html: 用半角逗号分隔多个用户名。只能添加来自本站且未开启保护的帐户。如果留空，则默认关注本站所有的管理员。
-        title: 新用户默认关注
+        desc_html: 用半角逗号分隔多个用户名。这些账户一定会在推荐关注中展示。
+        title: 新用户推荐关注
       contact_information:
         email: 用于联系的公开电子邮件地址
         username: 用于联系的公开用户名
diff --git a/package.json b/package.json
index dec94cb21..69283b698 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "atrament": "0.2.4",
     "arrow-key-navigation": "^1.2.0",
     "autoprefixer": "^9.8.8",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "babel-loader": "^8.2.5",
     "babel-plugin-lodash": "^3.3.4",
     "babel-plugin-preval": "^5.1.0",
@@ -68,7 +68,7 @@
     "favico.js": "^0.3.10",
     "file-loader": "^6.2.0",
     "font-awesome": "^4.7.0",
-    "glob": "^7.2.0",
+    "glob": "^8.0.1",
     "history": "^4.10.1",
     "http-link-header": "^1.0.4",
     "immutable": "^4.0.0",
@@ -116,7 +116,7 @@
     "react-textarea-autosize": "^8.3.3",
     "react-toggle": "^4.1.2",
     "redis": "^4.1.0",
-    "redux": "^4.1.2",
+    "redux": "^4.2.0",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.4.1",
     "regenerator-runtime": "^0.13.9",
diff --git a/yarn.lock b/yarn.lock
index 91d5c1a00..5c514add2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2454,12 +2454,13 @@ axe-core@^4.3.5:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.5.tgz#78d6911ba317a8262bfee292aeafcc1e04b49cc5"
   integrity sha512-WKTW1+xAzhMS5dJsxWkliixlO/PqC4VhmO9T4juNYcaTg9jzWiJsou6m5pxWYGfigWbwzJWeFY6z47a+4neRXA==
 
-axios@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
-    follow-redirects "^1.14.8"
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
 
 axobject-query@^2.2.0:
   version "2.2.0"
@@ -2767,6 +2768,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
@@ -5117,10 +5125,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.8:
-  version "1.14.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
-  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
+follow-redirects@^1.0.0, follow-redirects@^1.14.9:
+  version "1.14.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -5141,6 +5149,15 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -5333,7 +5350,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5345,6 +5362,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
+  integrity sha512-cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@~7.1.1:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -7463,6 +7492,13 @@ minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -9402,10 +9438,10 @@ redux-thunk@^2.4.1:
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
   integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
 
-redux@^4.0.0, redux@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
-  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
+redux@^4.0.0, redux@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13"
+  integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==
   dependencies:
     "@babel/runtime" "^7.9.2"