about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/features/account_timeline/index.js2
-rw-r--r--app/javascript/mastodon/features/followers/index.js2
-rw-r--r--app/javascript/mastodon/features/following/index.js2
-rw-r--r--app/javascript/mastodon/locales/ar.json20
-rw-r--r--app/javascript/mastodon/locales/ast.json16
-rw-r--r--app/javascript/mastodon/locales/bg.json6
-rw-r--r--app/javascript/mastodon/locales/bn.json6
-rw-r--r--app/javascript/mastodon/locales/br.json8
-rw-r--r--app/javascript/mastodon/locales/ca.json26
-rw-r--r--app/javascript/mastodon/locales/co.json22
-rw-r--r--app/javascript/mastodon/locales/cs.json24
-rw-r--r--app/javascript/mastodon/locales/cy.json10
-rw-r--r--app/javascript/mastodon/locales/da.json6
-rw-r--r--app/javascript/mastodon/locales/de.json26
-rw-r--r--app/javascript/mastodon/locales/el.json22
-rw-r--r--app/javascript/mastodon/locales/en.json32
-rw-r--r--app/javascript/mastodon/locales/eo.json10
-rw-r--r--app/javascript/mastodon/locales/es-AR.json22
-rw-r--r--app/javascript/mastodon/locales/es.json22
-rw-r--r--app/javascript/mastodon/locales/et.json12
-rw-r--r--app/javascript/mastodon/locales/eu.json12
-rw-r--r--app/javascript/mastodon/locales/fa.json50
-rw-r--r--app/javascript/mastodon/locales/fi.json6
-rw-r--r--app/javascript/mastodon/locales/fr.json44
-rw-r--r--app/javascript/mastodon/locales/ga.json10
-rw-r--r--app/javascript/mastodon/locales/gl.json26
-rw-r--r--app/javascript/mastodon/locales/he.json6
-rw-r--r--app/javascript/mastodon/locales/hi.json6
-rw-r--r--app/javascript/mastodon/locales/hr.json6
-rw-r--r--app/javascript/mastodon/locales/hu.json22
-rw-r--r--app/javascript/mastodon/locales/hy.json130
-rw-r--r--app/javascript/mastodon/locales/id.json6
-rw-r--r--app/javascript/mastodon/locales/io.json6
-rw-r--r--app/javascript/mastodon/locales/is.json22
-rw-r--r--app/javascript/mastodon/locales/it.json130
-rw-r--r--app/javascript/mastodon/locales/ja.json24
-rw-r--r--app/javascript/mastodon/locales/ka.json6
-rw-r--r--app/javascript/mastodon/locales/kab.json224
-rw-r--r--app/javascript/mastodon/locales/kk.json6
-rw-r--r--app/javascript/mastodon/locales/kn.json6
-rw-r--r--app/javascript/mastodon/locales/ko.json22
-rw-r--r--app/javascript/mastodon/locales/lt.json6
-rw-r--r--app/javascript/mastodon/locales/lv.json6
-rw-r--r--app/javascript/mastodon/locales/mk.json6
-rw-r--r--app/javascript/mastodon/locales/ml.json6
-rw-r--r--app/javascript/mastodon/locales/mr.json6
-rw-r--r--app/javascript/mastodon/locales/ms.json6
-rw-r--r--app/javascript/mastodon/locales/nl.json12
-rw-r--r--app/javascript/mastodon/locales/nn.json12
-rw-r--r--app/javascript/mastodon/locales/no.json14
-rw-r--r--app/javascript/mastodon/locales/oc.json10
-rw-r--r--app/javascript/mastodon/locales/pl.json22
-rw-r--r--app/javascript/mastodon/locales/pt-BR.json38
-rw-r--r--app/javascript/mastodon/locales/pt-PT.json22
-rw-r--r--app/javascript/mastodon/locales/ro.json34
-rw-r--r--app/javascript/mastodon/locales/ru.json22
-rw-r--r--app/javascript/mastodon/locales/sc.json6
-rw-r--r--app/javascript/mastodon/locales/sk.json6
-rw-r--r--app/javascript/mastodon/locales/sl.json6
-rw-r--r--app/javascript/mastodon/locales/sq.json286
-rw-r--r--app/javascript/mastodon/locales/sr-Latn.json6
-rw-r--r--app/javascript/mastodon/locales/sr.json6
-rw-r--r--app/javascript/mastodon/locales/sv.json10
-rw-r--r--app/javascript/mastodon/locales/szl.json457
-rw-r--r--app/javascript/mastodon/locales/ta.json6
-rw-r--r--app/javascript/mastodon/locales/tai.json457
-rw-r--r--app/javascript/mastodon/locales/te.json6
-rw-r--r--app/javascript/mastodon/locales/th.json114
-rw-r--r--app/javascript/mastodon/locales/tr.json6
-rw-r--r--app/javascript/mastodon/locales/uk.json10
-rw-r--r--app/javascript/mastodon/locales/ur.json6
-rw-r--r--app/javascript/mastodon/locales/vi.json558
-rw-r--r--app/javascript/mastodon/locales/whitelist_szl.json2
-rw-r--r--app/javascript/mastodon/locales/whitelist_tai.json2
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json24
-rw-r--r--app/javascript/mastodon/locales/zh-HK.json12
-rw-r--r--app/javascript/mastodon/locales/zh-TW.json12
77 files changed, 2309 insertions, 977 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 6740e8adb..5ea907a1f 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -22,7 +22,7 @@ const mapStateToProps = (state, { params: { accountId }, withReplies = false })
   const path = withReplies ? `${accountId}:with_replies` : accountId;
 
   return {
-    remote: !!state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username']),
+    remote: !!(state.getIn(['accounts', accountId, 'acct']) !== state.getIn(['accounts', accountId, 'username'])),
     remoteUrl: state.getIn(['accounts', accountId, 'url']),
     isAccount: !!state.getIn(['accounts', accountId]),
     statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList),
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 439161118..ae00d13d3 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -20,7 +20,7 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
 
 const mapStateToProps = (state, props) => ({
-  remote: !!state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username']),
+  remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
   remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
   isAccount: !!state.getIn(['accounts', props.params.accountId]),
   accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 2d2ed7be4..666ec7a7f 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -20,7 +20,7 @@ import MissingIndicator from 'mastodon/components/missing_indicator';
 import TimelineHint from 'mastodon/components/timeline_hint';
 
 const mapStateToProps = (state, props) => ({
-  remote: !!state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username']),
+  remote: !!(state.getIn(['accounts', props.params.accountId, 'acct']) !== state.getIn(['accounts', props.params.accountId, 'username'])),
   remoteUrl: state.getIn(['accounts', props.params.accountId, 'url']),
   isAccount: !!state.getIn(['accounts', props.params.accountId]),
   accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index e1871b31a..4decd3f74 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "أضفه أو أزله من القائمة",
   "account.badges.bot": "روبوت",
   "account.badges.group": "فريق",
@@ -40,6 +42,10 @@
   "account.unfollow": "إلغاء المتابعة",
   "account.unmute": "إلغاء الكتم عن @{name}",
   "account.unmute_notifications": "إلغاء كتم إخطارات @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "يرجى إعادة المحاولة بعد {retry_time, time, medium}.",
   "alert.rate_limited.title": "المعدل محدود",
   "alert.unexpected.message": "لقد طرأ هناك خطأ غير متوقّع.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "عرض الإعدادات",
   "column_header.unpin": "فك التدبيس",
   "column_subheading.settings": "الإعدادات",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "عن بُعد فقط",
   "compose_form.direct_message_warning": "لن يَظهر هذا التبويق إلا للمستخدمين المذكورين.",
   "compose_form.direct_message_warning_learn_more": "اقرأ المزيد",
   "compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.",
@@ -111,7 +117,7 @@
   "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": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
@@ -161,7 +167,7 @@
   "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": "نظرا لوجود خطأ في التعليمات البرمجية أو مشكلة توافق مع المتصفّح، تعذر عرض هذه الصفحة بشكل صحيح.",
   "error.unexpected_crash.next_steps": "حاول إعادة إنعاش الصفحة. إن لم تُحلّ المشكلة ، يمكنك دائمًا استخدام ماستدون عبر متصفّح آخر أو تطبيق أصلي.",
   "errors.unexpected_crash.copy_stacktrace": "انسخ تتبع الارتباطات إلى الحافظة",
   "errors.unexpected_crash.report_issue": "الإبلاغ عن خلل",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "للردّ",
   "keyboard_shortcuts.requests": "لفتح قائمة طلبات المتابعة",
   "keyboard_shortcuts.search": "للتركيز على البحث",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "لإظهار/إخفاء حقلCW",
   "keyboard_shortcuts.start": "لفتح عمود \"هيا نبدأ\"",
   "keyboard_shortcuts.toggle_hidden": "لعرض أو إخفاء النص مِن وراء التحذير",
   "keyboard_shortcuts.toggle_sensitivity": "لعرض/إخفاء الوسائط",
@@ -415,9 +421,9 @@
   "time_remaining.moments": "لحظات متبقية",
   "time_remaining.seconds": "{number, plural, one {# ثانية} other {# ثوانٍ}} متبقية",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
+  "timeline_hint.resources.followers": "المتابِعون",
   "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.resources.statuses": "التبويقات القديمة",
   "trends.count_by_accounts": "{count} {rawCount, plural, zero {} one {شخص واحد} two {شخصين} few {أشخاص} many {أشخاص} other {أشخاص}} تتحدّث",
   "trends.trending_now": "المتداولة الآن",
   "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 2d4f73975..80d1d4aac 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -1,10 +1,12 @@
 {
-  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
+  "account.add_or_remove_from_list": "Amestar o desaniciar de les llistes",
   "account.badges.bot": "Robó",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Anubrir tolo de {domain}",
-  "account.blocked": "Blocked",
+  "account.blocked": "Bloquiada",
   "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Encaboxar la solicitú de siguimientu",
   "account.direct": "Unviar un mensaxe direutu a @{name}",
@@ -14,12 +16,12 @@
   "account.follow": "Siguir",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti usuariu entá.",
-  "account.follows": "Follows",
+  "account.follows": "Sigue",
   "account.follows.empty": "Esti usuariu entá nun sigue a naide.",
   "account.follows_you": "Síguete",
   "account.hide_reblogs": "Anubrir les comparticiones de @{name}",
-  "account.last_status": "Last active",
-  "account.link_verified_on": "Ownership of this link was checked on {date}",
+  "account.last_status": "Cabera actividá",
+  "account.link_verified_on": "La propiedá d'esti enllaz foi comprobada'l {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": "Mentar a @{name}",
@@ -40,6 +42,10 @@
   "account.unfollow": "Dexar de siguir",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "Asocedió un fallu inesperáu.",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index e8bf05b13..7fa980202 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Добави или премахни от списъците",
   "account.badges.bot": "бот",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Не следвай",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 7f27f58f2..c5f08a40e 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "তালিকাতে যুক্ত বা অপসারণ করুন",
   "account.badges.bot": "বট",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "অনুসরণ না করতে",
   "account.unmute": "@{name} র কার্যকলাপ আবার দেখুন",
   "account.unmute_notifications": "@{name} র প্রজ্ঞাপন দেখুন",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "{retry_time, time, medium} -এর পরে আবার প্রচেষ্টা করুন।",
   "alert.rate_limited.title": "হার সীমিত",
   "alert.unexpected.message": "সমস্যা অপ্রত্যাশিত.",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index ae7283573..e6ad55fb9 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
@@ -40,6 +42,10 @@
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
   "account.unmute_notifications": "Diguzhat kemennoù a @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
   "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
@@ -259,7 +265,7 @@
   "lists.subheading": "Ho listennoù",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "O kargañ...",
-  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
+  "media_gallery.toggle_visible": "Toggle visibility",
   "missing_indicator.label": "Digavet",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index d5e5ce565..3ad7158fc 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
   "account.block": "Bloqueja @{name}",
   "account.block_domain": "Amaga-ho tot de {domain}",
   "account.blocked": "Bloquejat",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Navega més en el perfil original",
   "account.cancel_follow_request": "Anul·la la sol·licitud de seguiment",
   "account.direct": "Missatge directe @{name}",
   "account.domain_blocked": "Domini ocult",
@@ -40,6 +42,10 @@
   "account.unfollow": "Deixa de seguir",
   "account.unmute": "Treure silenci de @{name}",
   "account.unmute_notifications": "Activar notificacions de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Si us plau torna-ho a provar després de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Límit de freqüència",
   "alert.unexpected.message": "S'ha produït un error inesperat.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostra la configuració",
   "column_header.unpin": "No fixis",
   "column_subheading.settings": "Configuració",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Només local",
   "community.column_settings.media_only": "Només multimèdia",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Només remot",
   "compose_form.direct_message_warning": "Aquest tut només serà enviat als usuaris esmentats.",
   "compose_form.direct_message_warning_learn_more": "Aprèn més",
   "compose_form.hashtag_warning": "Aquesta tut no es mostrarà en cap etiqueta ja que no està llistat. Només els tuts públics poden ser cercats per etiqueta.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "respondre",
   "keyboard_shortcuts.requests": "per a obrir la llista de sol·licituds de seguiment",
   "keyboard_shortcuts.search": "per a centrar la cerca",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "mostrar/amagar el camp CW",
   "keyboard_shortcuts.start": "per a obrir la columna \"Començar\"",
   "keyboard_shortcuts.toggle_hidden": "per a mostrar o amagar text sota CW",
   "keyboard_shortcuts.toggle_sensitivity": "per a mostrar o amagar contingut multimèdia",
@@ -350,7 +356,7 @@
   "report.target": "Informes {target}",
   "search.placeholder": "Cercar",
   "search_popout.search_format": "Format de cerca avançada",
-  "search_popout.tips.full_text": "Text simple recupera publicacions que has escrit, les marcades com a favorites, les impulsades o en les que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
+  "search_popout.tips.full_text": "Text simple recupera publicacions que has escrit, les marcades com a preferides, les impulsades o en les que has estat esmentat, així com usuaris, noms d'usuari i etiquetes.",
   "search_popout.tips.hashtag": "etiqueta",
   "search_popout.tips.status": "tut",
   "search_popout.tips.text": "El text simple retorna coincidències amb els noms de visualització, els noms d'usuari i les etiquetes",
@@ -366,7 +372,7 @@
   "status.bookmark": "Marcador",
   "status.cancel_reblog_private": "Desfer l'impuls",
   "status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
-  "status.copy": "Copia l'enllaç al tut",
+  "status.copy": "Copia l'enllaç a l'estat",
   "status.delete": "Esborrar",
   "status.detailed_status": "Visualització detallada de la conversa",
   "status.direct": "Missatge directe @{name}",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minuts}} restants",
   "time_remaining.moments": "Moments restants",
   "time_remaining.seconds": "{number, plural, one {# segon} other {# segons}} restants",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} dels altres servidors no son mostrats.",
+  "timeline_hint.resources.followers": "Seguidors",
+  "timeline_hint.resources.follows": "Seguiments",
+  "timeline_hint.resources.statuses": "Tuts més antics",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persona} other {persones}} parlant-hi",
   "trends.trending_now": "Ara en tendència",
   "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 76b4abd50..93c26a19c 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Aghjunghje o toglie da e liste",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppu",
   "account.block": "Bluccà @{name}",
   "account.block_domain": "Piattà u duminiu {domain}",
   "account.blocked": "Bluccatu",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Vede di più nant'à u prufile uriginale",
   "account.cancel_follow_request": "Annullà a dumanda d'abbunamentu",
   "account.direct": "Missaghju direttu @{name}",
   "account.domain_blocked": "Duminiu piattatu",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ùn siguità più",
   "account.unmute": "Ùn piattà più @{name}",
   "account.unmute_notifications": "Ùn piattà più nutificazione da @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Pruvate ancu dop'à {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ghjettu limitatu",
   "alert.unexpected.message": "Un prublemu inaspettatu hè accadutu.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mustrà i parametri",
   "column_header.unpin": "Spuntarulà",
   "column_subheading.settings": "Parametri",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Solu lucale",
   "community.column_settings.media_only": "Solu media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Solu distante",
   "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
   "compose_form.direct_message_warning_learn_more": "Amparà di più",
   "compose_form.hashtag_warning": "Stu statutu ùn hè \"Micca listatu\" è ùn sarà micca listatu indè e circate da hashtag. Per esse vistu in quesse, u statutu deve esse \"Pubblicu\".",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "risponde",
   "keyboard_shortcuts.requests": "per apre a lista di dumande d'abbunamentu",
   "keyboard_shortcuts.search": "fucalizà nant'à l'area di circata",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "per mustrà/piattà u campu CW",
   "keyboard_shortcuts.start": "per apre a culonna \"per principià\"",
   "keyboard_shortcuts.toggle_hidden": "vede/piattà u testu daretu à l'avertimentu CW",
   "keyboard_shortcuts.toggle_sensitivity": "vede/piattà i media",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuta ferma} other {# minute fermanu}} left",
   "time_remaining.moments": "Ci fermanu qualchi mumentu",
   "time_remaining.seconds": "{number, plural, one {# siconda ferma} other {# siconde fermanu}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} da l'altri servori ùn so micca affissati·e.",
+  "timeline_hint.resources.followers": "Abbunati",
+  "timeline_hint.resources.follows": "Abbunamenti",
+  "timeline_hint.resources.statuses": "Statuti più anziani",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} parlanu",
   "trends.trending_now": "Tindenze d'avà",
   "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 0b092a9c7..593311167 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Přidat nebo odstranit ze seznamů",
   "account.badges.bot": "Robot",
   "account.badges.group": "Skupina",
   "account.block": "Zablokovat uživatele @{name}",
   "account.block_domain": "Skrýt vše ze serveru {domain}",
   "account.blocked": "Blokováno",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Více na původním profilu",
   "account.cancel_follow_request": "Zrušit žádost o sledování",
   "account.direct": "Poslat uživateli @{name} přímou zprávu",
   "account.domain_blocked": "Doména skryta",
@@ -40,6 +42,10 @@
   "account.unfollow": "Přestat sledovat",
   "account.unmute": "Odkrýt uživatele @{name}",
   "account.unmute_notifications": "Odkrýt oznámení od uživatele @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Zkuste to prosím znovu za {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rychlost omezena",
   "alert.unexpected.message": "Objevila se neočekávaná chyba.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Zobrazit nastavení",
   "column_header.unpin": "Odepnout",
   "column_subheading.settings": "Nastavení",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Pouze místní",
   "community.column_settings.media_only": "Pouze média",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Pouze vzdálené",
   "compose_form.direct_message_warning": "Tento toot bude odeslán pouze zmíněným uživatelům.",
   "compose_form.direct_message_warning_learn_more": "Zjistit více",
   "compose_form.hashtag_warning": "Tento toot nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné tooty mohou být vyhledány podle hashtagu.",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "Nahlásit problém",
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Odmítnout",
-  "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.",
+  "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, {domain} si myslí, že budete chtít následující požadavky na sledování zkontrolovat ručně.",
   "getting_started.developers": "Vývojáři",
   "getting_started.directory": "Adresář profilů",
   "getting_started.documentation": "Dokumentace",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "odpovědět",
   "keyboard_shortcuts.requests": "otevření seznamu požadavků o sledování",
   "keyboard_shortcuts.search": "zaměření na hledání",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "zobrazit/skrýt pole CW",
   "keyboard_shortcuts.start": "otevření sloupce „začínáme“",
   "keyboard_shortcuts.toggle_hidden": "zobrazení/skrytí textu za varováním o obsahu",
   "keyboard_shortcuts.toggle_sensitivity": "zobrazení/skrytí médií",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {Zbývá # minuta} few {Zbývají # minuty} many {Zbývá # minut} other {Zbývá # minut}}",
   "time_remaining.moments": "Zbývá několik sekund",
   "time_remaining.seconds": "{number, plural, one {Zbývá # sekunda} few {Zbývají # sekundy} many {Zbývá # sekund} other {Zbývá # sekund}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z jiných serveru se nezobrazuje.",
+  "timeline_hint.resources.followers": "Sledující",
+  "timeline_hint.resources.follows": "Sleduje",
+  "timeline_hint.resources.statuses": "Starší tooty",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {člověk} few {lidé} many {lidí} other {lidí}} hovoří",
   "trends.trending_now": "Aktuální trendy",
   "ui.beforeunload": "Pokud Mastodon opustíte, váš koncept se ztratí.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 0dbc91b8d..5a1085389 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Ychwanegu neu Dileu o'r rhestrau",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grŵp",
@@ -40,6 +42,10 @@
   "account.unfollow": "Dad-ddilyn",
   "account.unmute": "Dad-dawelu @{name}",
   "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Ceisiwch eto ar ôl {retry_time, time, medium}.",
   "alert.rate_limited.title": "Cyfradd gyfyngedig",
   "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Dangos gosodiadau",
   "column_header.unpin": "Dadbinio",
   "column_subheading.settings": "Gosodiadau",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Lleol yn unig",
   "community.column_settings.media_only": "Cyfryngau yn unig",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Anghysbell yn unig",
   "compose_form.direct_message_warning": "Mi fydd y tŵt hwn ond yn cael ei anfon at y defnyddwyr sy'n cael eu crybwyll.",
   "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
   "compose_form.hashtag_warning": "Ni fydd y tŵt hwn wedi ei restru o dan unrhyw hashnod gan ei fod heb ei restru. Dim ond tŵtiau cyhoeddus gellid chwilota amdanynt drwy hashnod.",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 5fb6ea4d7..9354308cc 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
@@ -40,6 +42,10 @@
   "account.unfollow": "Følg ikke længere",
   "account.unmute": "Fjern dæmpningen af @{name}",
   "account.unmute_notifications": "Fjern dæmpningen af notifikationer fra @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Prøv venligst igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Gradsbegrænset",
   "alert.unexpected.message": "Der opstod en uventet fejl.",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5220772cd..57aa1769a 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "@{name} blockieren",
   "account.block_domain": "Alles von {domain} blockieren",
   "account.blocked": "Blockiert",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
   "account.cancel_follow_request": "Folgeanfrage abbrechen",
   "account.direct": "Direktnachricht an @{name}",
   "account.domain_blocked": "Domain versteckt",
@@ -40,6 +42,10 @@
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
   "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium}.",
   "alert.rate_limited.title": "Anfragelimit überschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Einstellungen anzeigen",
   "column_header.unpin": "Lösen",
   "column_subheading.settings": "Einstellungen",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Nur lokal",
   "community.column_settings.media_only": "Nur Medien",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Nur entfernt",
   "compose_form.direct_message_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.",
   "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags entdeckbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
@@ -114,7 +120,7 @@
   "confirmations.mute.explanation": "Dies wird Beiträge von dieser Person und Beiträge, die diese Person erwähnen, ausblenden, aber es wird der Person trotzdem erlauben, deine Beiträge zu sehen und dir zu folgen.",
   "confirmations.mute.message": "Bist du dir sicher, dass du {name} stummschalten möchtest?",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
-  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest? Favorisierungen, geteilte Beiträge und Antworten werden verloren gehen.",
+  "confirmations.redraft.message": "Bist du dir sicher, dass du diesen Tröt löschen und neu erstellen möchtest? Favs, geteilte Beiträge und Antworten werden verloren gehen.",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt antwortest wird es die gesamte Nachricht verwerfen, die du gerade schreibst. Möchtest du wirklich fortfahren?",
   "confirmations.unfollow.confirm": "Entfolgen",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "antworten",
   "keyboard_shortcuts.requests": "Liste der Folge-Anfragen öffnen",
   "keyboard_shortcuts.search": "Suche fokussieren",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "um CW-Feld anzuzeigen/auszublenden",
   "keyboard_shortcuts.start": "\"Erste Schritte\"-Spalte öffnen",
   "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen",
   "keyboard_shortcuts.toggle_sensitivity": "Medien hinter einer Inhaltswarnung verstecken/anzeigen",
@@ -350,7 +356,7 @@
   "report.target": "{target} melden",
   "search.placeholder": "Suche",
   "search_popout.search_format": "Fortgeschrittenes Suchformat",
-  "search_popout.tips.full_text": "Einfache Texteingabe gibt Beiträge, die du geschrieben, favorisiert und geteilt hast zurück. Außerdem auch Beiträge in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen oder Hashtags.",
+  "search_popout.tips.full_text": "Einfache Texteingabe gibt Tröts, die du geschrieben, gefavt und geteilt hast zurück. Außerdem auch Tröts, in denen du erwähnt wurdest, aber auch passende Nutzernamen, Anzeigenamen, oder Hashtags.",
   "search_popout.tips.hashtag": "Hashtag",
   "search_popout.tips.status": "Beitrag",
   "search_popout.tips.text": "Einfache Texteingabe gibt Anzeigenamen, Benutzernamen und Hashtags zurück",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# Minute} other {# Minuten}} verbleibend",
   "time_remaining.moments": "Schließt in Kürze",
   "time_remaining.seconds": "{number, plural, one {# Sekunde} other {# Sekunden}} verbleibend",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
+  "timeline_hint.resources.followers": "Follower",
+  "timeline_hint.resources.follows": "Folgt",
+  "timeline_hint.resources.statuses": "Ältere Toots",
   "trends.count_by_accounts": "{count} {rawCount, plural, eine {Person} other {Personen}} reden darüber",
   "trends.trending_now": "In den Trends",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 31d289207..f6e3c07c4 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Προσθήκη ή Αφαίρεση από λίστες",
   "account.badges.bot": "Μποτ",
   "account.badges.group": "Ομάδα",
   "account.block": "Αποκλεισμός @{name}",
   "account.block_domain": "Απόκρυψη όλων από {domain}",
   "account.blocked": "Αποκλεισμένος/η",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ",
   "account.cancel_follow_request": "Ακύρωση αιτήματος παρακολούθησης",
   "account.direct": "Προσωπικό μήνυμα προς @{name}",
   "account.domain_blocked": "Κρυμμένος τομέας",
@@ -40,6 +42,10 @@
   "account.unfollow": "Διακοπή παρακολούθησης",
   "account.unmute": "Διακοπή αποσιώπησης @{name}",
   "account.unmute_notifications": "Διακοπή αποσιώπησης ειδοποιήσεων του/της @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Παρακαλούμε δοκίμασε ξανά αφού περάσει η {retry_time, time, medium}.",
   "alert.rate_limited.title": "Περιορισμός συχνότητας",
   "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Εμφάνιση ρυθμίσεων",
   "column_header.unpin": "Ξεκαρφίτσωμα",
   "column_subheading.settings": "Ρυθμίσεις",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Τοπικά μόνο",
   "community.column_settings.media_only": "Μόνο πολυμέσα",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Απομακρυσμένα μόνο",
   "compose_form.direct_message_warning": "Αυτό το τουτ θα σταλεί μόνο στους αναφερόμενους χρήστες.",
   "compose_form.direct_message_warning_learn_more": "Μάθετε περισσότερα",
   "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "απάντηση",
   "keyboard_shortcuts.requests": "άνοιγμα λίστας αιτημάτων παρακολούθησης",
   "keyboard_shortcuts.search": "εστίαση αναζήτησης",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "εμφάνιση/απόκρυψη πεδίου CW",
   "keyboard_shortcuts.start": "άνοιγμα κολώνας \"Ξεκινώντας\"",
   "keyboard_shortcuts.toggle_hidden": "εμφάνιση/απόκρυψη κειμένου πίσω από την προειδοποίηση",
   "keyboard_shortcuts.toggle_sensitivity": "εμφάνιση/απόκρυψη πολυμέσων",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "απομένουν {number, plural, one {# λεπτό} other {# λεπτά}}",
   "time_remaining.moments": "Απομένουν στιγμές",
   "time_remaining.seconds": "απομένουν {number, plural, one {# δευτερόλεπτο} other {# δευτερόλεπτα}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} από άλλους διακομιστές δεν εμφανίζονται.",
+  "timeline_hint.resources.followers": "Ακόλουθοι",
+  "timeline_hint.resources.follows": "Ακολουθεί",
+  "timeline_hint.resources.statuses": "Παλαιότερα τουτ",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {άτομο μιλάει} other {άτομα μιλάνε}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 95df50be1..9d89e31e8 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -113,7 +113,7 @@
   "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 toot?",
+  "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.domain_block.confirm": "Block entire domain",
@@ -124,7 +124,7 @@
   "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 toot and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.",
+  "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",
@@ -137,7 +137,7 @@
   "directory.local": "From {domain} only",
   "directory.new_arrivals": "New arrivals",
   "directory.recently_active": "Recently active",
-  "embed.instructions": "Embed this toot on your website by copying the code below.",
+  "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",
@@ -166,7 +166,7 @@
   "empty_column.hashtag": "There is nothing in this hashtag yet.",
   "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
   "empty_column.home.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new toots, they will appear here.",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
@@ -223,12 +223,12 @@
   "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 toot in one of the columns",
+  "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 toot",
+  "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",
@@ -269,7 +269,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
@@ -297,13 +297,13 @@
   "navigation_bar.preferences": "Preferences",
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
-  "notification.favourite": "{name} favourited your toot",
+  "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 toot",
+  "notification.reblog": "{name} boosted your status",
   "notifications.clear": "Clear notifications",
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "notifications.column_settings.alert": "Desktop notifications",
@@ -334,7 +334,7 @@
   "poll.voted": "You voted for this answer",
   "poll_button.add_poll": "Add a poll",
   "poll_button.remove_poll": "Remove poll",
-  "privacy.change": "Adjust toot privacy",
+  "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Visible for mentioned users only",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Visible for followers only",
@@ -361,9 +361,9 @@
   "report.target": "Reporting {target}",
   "search.placeholder": "Search",
   "search_popout.search_format": "Advanced search format",
-  "search_popout.tips.full_text": "Simple text returns toots you have written, favourited, boosted, or have been mentioned in, as well as matching usernames, display names, and hashtags.",
+  "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": "toot",
+  "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",
@@ -372,12 +372,12 @@
   "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 {result} other {results}}",
   "status.admin_account": "Open moderation interface for @{name}",
-  "status.admin_status": "Open this toot in the moderation interface",
+  "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 toot",
+  "status.copy": "Copy link to status",
   "status.delete": "Delete",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
@@ -390,7 +390,7 @@
   "status.more": "More",
   "status.mute": "Mute @{name}",
   "status.mute_conversation": "Mute conversation",
-  "status.open": "Expand this toot",
+  "status.open": "Expand this status",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
   "status.read_more": "Read more",
@@ -433,7 +433,7 @@
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add images, a video or an audio file",
+  "upload_button.label": "Add media ({formats})",
   "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",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index fff7508ae..9f902c522 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
   "account.badges.bot": "Roboto",
   "account.badges.group": "Grupo",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ne plu sekvi",
   "account.unmute": "Malsilentigi @{name}",
   "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Bonvolu reprovi post {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mesaĝkvante limigita",
   "alert.unexpected.message": "Neatendita eraro okazis.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Montri agordojn",
   "column_header.unpin": "Depingli",
   "column_subheading.settings": "Agordado",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Nur loka",
   "community.column_settings.media_only": "Nur aŭdovidaĵoj",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Nur malproksima",
   "compose_form.direct_message_warning": "Tiu mesaĝo estos sendita nur al menciitaj uzantoj.",
   "compose_form.direct_message_warning_learn_more": "Lerni pli",
   "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index a5ccea076..c94e15878 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Agregar o quitar de las listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
   "account.block_domain": "Ocultar todo de {domain}",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Explorar más en el perfil original",
   "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
   "account.domain_blocked": "Dominio oculto",
@@ -40,6 +42,10 @@
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Por favor, reintentá después de las {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tarifa limitada",
   "alert.unexpected.message": "Ocurrió un error.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostrar configuración",
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.settings": "Configuración",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Sólo local",
   "community.column_settings.media_only": "Sólo medios",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Sólo remoto",
   "compose_form.direct_message_warning": "Este toot sólo será enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprendé más",
   "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.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "para abrir la lista de solicitudes de seguimiento",
   "keyboard_shortcuts.search": "para enfocar la búsqueda",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "para mostrar/ocultar el campo \"CW\"",
   "keyboard_shortcuts.start": "para abrir la columna \"Introducción\"",
   "keyboard_shortcuts.toggle_hidden": "para mostrar/ocultar el texto detrás de la advertencia de contenido",
   "keyboard_shortcuts.toggle_sensitivity": "para mostrar/ocultar los medios",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural,one {queda # minuto} other {quedan # minutos}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural,one {queda # segundo} other {quedan # segundos}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
+  "timeline_hint.resources.followers": "Seguidores",
+  "timeline_hint.resources.follows": "Siguiendo",
+  "timeline_hint.resources.statuses": "Toots antiguos",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persona} other {personas}} hablando",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index a3a7a110d..f46dd6092 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Agregar o eliminar de listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
   "account.block_domain": "Ocultar todo de {domain}",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Cancelar la solicitud de seguimiento",
   "account.direct": "Mensaje directo a @{name}",
   "account.domain_blocked": "Dominio oculto",
@@ -40,6 +42,10 @@
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications": "Dejar de silenciar las notificaciones de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Por favor reintente después de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tarifa limitada",
   "alert.unexpected.message": "Hubo un error inesperado.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostrar ajustes",
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.settings": "Ajustes",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Solo local",
   "community.column_settings.media_only": "Solo media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Solo remoto",
   "compose_form.direct_message_warning": "Este toot solo será enviado a los usuarios mencionados.",
   "compose_form.direct_message_warning_learn_more": "Aprender mas",
   "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.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores",
   "keyboard_shortcuts.search": "para poner el foco en la búsqueda",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "para mostrar/ocultar el campo CW",
   "keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
   "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
   "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar medios",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
+  "timeline_hint.resources.followers": "Seguidores",
+  "timeline_hint.resources.follows": "Seguidos",
+  "timeline_hint.resources.statuses": "Toots más antiguos",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persona} other {personas}} hablando",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index bedba181d..7328b2474 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ära jälgi",
   "account.unmute": "Ära vaigista @{name}",
   "account.unmute_notifications": "Ära vaigista teateid kasutajalt @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Palun proovi uuesti pärast {retry_time, time, medium}.",
   "alert.rate_limited.title": "Piiratud",
   "alert.unexpected.message": "Tekkis ootamatu viga.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Näita sätteid",
   "column_header.unpin": "Eemalda kinnitus",
   "column_subheading.settings": "Sätted",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Ainult kohalik",
   "community.column_settings.media_only": "Ainult meedia",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Ainult kaug",
   "compose_form.direct_message_warning": "See tuut saadetakse ainult mainitud kasutajatele.",
   "compose_form.direct_message_warning_learn_more": "Vaata veel",
   "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "Teavita veast",
   "follow_request.authorize": "Autoriseeri",
   "follow_request.reject": "Hülga",
-  "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.",
+  "follow_requests.unlocked_explanation": "Kuigi Teie konto pole lukustatud, soovitab {domain} personal siiski manuaalselt üle vaadata jälgimistaotlused nendelt kontodelt.",
   "getting_started.developers": "Arendajad",
   "getting_started.directory": "Profiili kataloog",
   "getting_started.documentation": "Dokumentatsioon",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index f9bd3e090..f122cb2a6 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
   "account.badges.bot": "Bot-a",
   "account.badges.group": "Taldea",
@@ -40,6 +42,10 @@
   "account.unfollow": "Utzi jarraitzeari",
   "account.unmute": "Desmututu @{name}",
   "account.unmute_notifications": "Desmututu @{name}(r)en jakinarazpenak",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Saiatu {retry_time, time, medium} barru.",
   "alert.rate_limited.title": "Abiadura mugatua",
   "alert.unexpected.message": "Ustekabeko errore bat gertatu da.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Erakutsi ezarpenak",
   "column_header.unpin": "Desfinkatu",
   "column_subheading.settings": "Ezarpenak",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Lokala soilik",
   "community.column_settings.media_only": "Multimedia besterik ez",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Urrunekoa soilik",
   "compose_form.direct_message_warning": "Toot hau aipatutako erabiltzaileei besterik ez zaie bidaliko.",
   "compose_form.direct_message_warning_learn_more": "Ikasi gehiago",
   "compose_form.hashtag_warning": "Toot hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan toot publikoak besterik ez dira agertzen.",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "Eman arazoaren berri",
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
-  "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.",
+  "follow_requests.unlocked_explanation": "Zure kontua blokeatuta ez badago ere, {domain} domeinuko arduradunek uste dute kontu hauetako jarraipen eskariak agian eskuz begiratu nahiko dituzula.",
   "getting_started.developers": "Garatzaileak",
   "getting_started.directory": "Profil-direktorioa",
   "getting_started.documentation": "Dokumentazioa",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 714e8a30d..91236538e 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "افزودن یا برداشتن از فهرست‌ها",
   "account.badges.bot": "ربات",
   "account.badges.group": "گروه",
   "account.block": "مسدودسازی @{name}",
   "account.block_domain": "نهفتن همه چیز از {domain}",
   "account.blocked": "مسدود",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "مرور بیش‌تر روی نمایهٔ اصلی",
   "account.cancel_follow_request": "لغو درخواست پیگیری",
   "account.direct": "پیام خصوصی به @{name}",
   "account.domain_blocked": "دامنهٔ نهفته",
@@ -28,7 +30,7 @@
   "account.mute_notifications": "خموشاندن اعلان‌ها از @{name}",
   "account.muted": "خموش",
   "account.never_active": "هرگز",
-  "account.posts": "نوشته‌ها",
+  "account.posts": "بوق",
   "account.posts_with_replies": "نوشته‌ها و پاسخ‌ها",
   "account.report": "گزارش @{name}",
   "account.requested": "منتظر پذیرش. برای لغو درخواست پی‌گیری کلیک کنید",
@@ -40,6 +42,10 @@
   "account.unfollow": "پایان پیگیری",
   "account.unmute": "رفع خموشی @{name}",
   "account.unmute_notifications": "رفع خموشی اعلان‌ها از @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "لطفاً پس از {retry_time, time, medium} دوباره بیازمایید.",
   "alert.rate_limited.title": "محدودیت تعداد",
   "alert.unexpected.message": "خطایی غیرمنتظره رخ داد.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "نمایش تنظیمات",
   "column_header.unpin": "رهاکردن",
   "column_subheading.settings": "تنظیمات",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "تنها محلّی",
   "community.column_settings.media_only": "فقط رسانه",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "تنها دوردست",
   "compose_form.direct_message_warning": "این بوق تنها به کاربرانی که از آن‌ها نام برده شده فرستاده خواهد شد.",
   "compose_form.direct_message_warning_learn_more": "بیشتر بدانید",
   "compose_form.hashtag_warning": "از آن‌جا که این بوق فهرست‌نشده است، در نتایج جست‌وجوی هشتگ‌ها پیدا نخواهد شد. تنها بوق‌های عمومی را می‌توان با جست‌وجوی هشتگ یافت.",
@@ -108,7 +114,7 @@
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این فهرست را برای همیشه پاک کنید؟",
   "confirmations.domain_block.confirm": "نهفتن تمام دامنه",
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید تمام دامنهٔ {domain} را مسدود کنید؟ در بیشتر موارد مسدودسازی یا خموشاندن چند حساب خاص کافی است و توصیه می‌شود. پس از این کار شما هیچ نوشته‌ای را از این دامنه در فهرست نوشته‌های عمومی یا اعلان‌هایتان نخواهید دید. پیگیرانتان از این دامنه هم حذف خواهند شد.",
-  "confirmations.logout.confirm": "خروج",
+  "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
   "confirmations.mute.confirm": "خموشاندن",
   "confirmations.mute.explanation": "این کار فرسته‌های آن‌ها و فرسته‌هایی را که از آن‌ها نام برده پنهان می‌کند، ولی آن‌ها همچنان اجازه دارند فرسته‌های شما را ببینند و شما را پی بگیرند.",
@@ -144,7 +150,7 @@
   "emoji_button.symbols": "نمادها",
   "emoji_button.travel": "سفر و مکان",
   "empty_column.account_timeline": "هیچ بوقی این‌جا نیست!",
-  "empty_column.account_unavailable": "نمایهٔ ناموجود",
+  "empty_column.account_unavailable": "نمایهٔ موجود نیست",
   "empty_column.blocks": "هنوز کسی را مسدود نکرده‌اید.",
   "empty_column.bookmarked_statuses": "هنوز هیچ بوق نشان‌شده‌ای ندارید. وقتی بوقی را نشان‌کنید، این‌جا دیده خواهد شد.",
   "empty_column.community": "فهرست نوشته‌های محلی خالی است. چیزی بنویسید تا چرخش بچرخد!",
@@ -167,9 +173,9 @@
   "errors.unexpected_crash.report_issue": "گزارش مشکل",
   "follow_request.authorize": "اجازه دهید",
   "follow_request.reject": "رد کنید",
-  "follow_requests.unlocked_explanation": "با یان که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
+  "follow_requests.unlocked_explanation": "با این که حسابتان قفل نیست، کارکنان {domain} فکر کردند که ممکن است بخواهید درخواست‌ها از این حساب‌ها را به صورت دستی بازبینی کنید.",
   "getting_started.developers": "توسعه‌دهندگان",
-  "getting_started.directory": "فهرست گزیدهٔ کاربران",
+  "getting_started.directory": "فهرست نمایه",
   "getting_started.documentation": "مستندات",
   "getting_started.heading": "آغاز کنید",
   "getting_started.invite": "دعوت از دیگران",
@@ -180,7 +186,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": "هیچ‌کدام از این‌ها",
@@ -218,14 +224,14 @@
   "keyboard_shortcuts.description": "توضیح",
   "keyboard_shortcuts.direct": "برای گشودن ستون پیغام‌های مستقیم",
   "keyboard_shortcuts.down": "برای پایین رفتن در فهرست",
-  "keyboard_shortcuts.enter": "برای گشودن نوشته",
+  "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.legend": "برای نمایش این نشانه",
   "keyboard_shortcuts.local": "برای گشودن فهرست نوشته‌های محلی",
   "keyboard_shortcuts.mention": "برای نام‌بردن از نویسنده",
   "keyboard_shortcuts.muted": "برای گشودن فهرست کاربران خموش",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "برای پاسخ",
   "keyboard_shortcuts.requests": "برای گشودن فهرست درخواست‌های پیگیری",
   "keyboard_shortcuts.search": "برای تمرکز روی جستجو",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "نمایش/نهفتن زمینهٔ هشدار محتوا",
   "keyboard_shortcuts.start": "برای گشودن ستون «آغاز کنید»",
   "keyboard_shortcuts.toggle_hidden": "برای نمایش/نهفتن نوشتهٔ پشت هشدار محتوا",
   "keyboard_shortcuts.toggle_sensitivity": "برای نمایش/نهفتن رسانه",
@@ -286,13 +292,13 @@
   "navigation_bar.preferences": "ترجیحات",
   "navigation_bar.public_timeline": "نوشته‌های همه‌جا",
   "navigation_bar.security": "امنیت",
-  "notification.favourite": "‫{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}‬ وضعیتتان را تقویت کرد",
   "notifications.clear": "پاک‌کردن اعلان‌ها",
   "notifications.clear_confirmation": "مطمئنید می‌خواهید همهٔ اعلان‌هایتان را برای همیشه پاک کنید؟",
   "notifications.column_settings.alert": "اعلان‌های میزکار",
@@ -350,13 +356,13 @@
   "report.target": "در حال گزارش {target}",
   "search.placeholder": "جستجو",
   "search_popout.search_format": "راهنمای جستجوی پیشرفته",
-  "search_popout.tips.full_text": "جستجوی متنی ساده می‌تواند بوق‌هایی که شما نوشته‌اید، پسندیده‌اید، بازبوقیده‌اید، یا در آن‌ها از شما نام برده شده است را پیدا کند. همچنین نام‌های کاربری، نام نمایش‌یافته، و هشتگ‌ها را هم شامل می‌شود.",
-  "search_popout.tips.hashtag": "برچسب",
+  "search_popout.tips.full_text": "جست‌وجوی متنی ساده وضعیت‌هایی که که نوشته، برگزیده، تقویت‌کرده یا در آن‌ها اشاره‌شده‌اید را به اضافهٔ نام‌های کاربری، نام‌های نمایشی و برچسب‌های مطابق برمی‌گرداند.",
+  "search_popout.tips.hashtag": "هشتگ",
   "search_popout.tips.status": "بوق",
   "search_popout.tips.text": "جستجوی متنی ساده برای نام‌ها، نام‌های کاربری، و برچسب‌ها",
   "search_popout.tips.user": "کاربر",
   "search_results.accounts": "افراد",
-  "search_results.hashtags": "برچسب‌ها",
+  "search_results.hashtags": "هشتگ‌ها",
   "search_results.statuses": "بوق‌ها",
   "search_results.statuses_fts_disabled": "جستجوی محتوای بوق‌ها در این کارساز ماستودون فعال نشده است.",
   "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
@@ -406,7 +412,7 @@
   "suggestions.header": "شاید این هم برایتان جالب باشد…",
   "tabs_bar.federated_timeline": "همگانی",
   "tabs_bar.home": "خانه",
-  "tabs_bar.local_timeline": "محلّی",
+  "tabs_bar.local_timeline": "بومی",
   "tabs_bar.notifications": "اعلان‌ها",
   "tabs_bar.search": "جستجو",
   "time_remaining.days": "{number, plural, one {# روز} other {# روز}} باقی مانده",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}} باقی مانده",
   "time_remaining.moments": "زمان باقی‌مانده",
   "time_remaining.seconds": "{number, plural, one {# ثانیه} other {# ثانیه}} باقی مانده",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} از دیگر کارسازها نمایش داده نمی‌شوند.",
+  "timeline_hint.resources.followers": "پی‌گیر",
+  "timeline_hint.resources.follows": "پی می‌گیرد",
+  "timeline_hint.resources.statuses": "بوق‌های قدیمی‌تر",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {نفر نوشته است} other {نفر نوشته‌اند}}",
   "trends.trending_now": "پرطرفدار",
   "ui.beforeunload": "اگر از ماستودون خارج شوید پیش‌نویس شما از دست خواهد رفت.",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 3ff7a3cb1..1a3c2b3f8 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
   "account.badges.group": "Ryhmä",
@@ -40,6 +42,10 @@
   "account.unfollow": "Lakkaa seuraamasta",
   "account.unmute": "Poista käyttäjän @{name} mykistys",
   "account.unmute_notifications": "Poista mykistys käyttäjän @{name} ilmoituksilta",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Yritä uudestaan {retry_time, time, medium} jälkeen.",
   "alert.rate_limited.title": "Määrää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fe98a8e97..be2cdd2de 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.bot": "Robot",
   "account.badges.group": "Groupe",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.blocked": "Bloqué·e",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "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.domain_blocked": "Domaine bloqué",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer @{name}",
   "account.unmute_notifications": "Ne plus masquer les notifications de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
   "alert.rate_limited.title": "Taux limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Afficher les paramètres",
   "column_header.unpin": "Désépingler",
   "column_subheading.settings": "Paramètres",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Local seulement",
   "community.column_settings.media_only": "Média uniquement",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Distant seulement",
   "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyé aux personnes mentionnées. Cependant, l’administration de votre instance et des instances réceptrices pourront inspecter ce message.",
   "compose_form.direct_message_warning_learn_more": "En savoir plus",
   "compose_form.hashtag_warning": "Ce pouet ne sera pas listé dans les recherches par hashtag car sa visibilité est réglée sur « non listé ». Seuls les pouets avec une visibilité « publique » peuvent être recherchés par hashtag.",
@@ -103,7 +109,7 @@
   "confirmations.block.confirm": "Bloquer",
   "confirmations.block.message": "Voulez-vous vraiment bloquer {name} ?",
   "confirmations.delete.confirm": "Supprimer",
-  "confirmations.delete.message": "Voulez-vous vraiment supprimer ce pouet ?",
+  "confirmations.delete.message": "Confirmez-vous la suppression de ce pouet ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.domain_block.confirm": "Bloquer tout le domaine",
@@ -114,7 +120,7 @@
   "confirmations.mute.explanation": "Cela masquera ses messages et les messages le ou la mentionnant, mais cela lui permettra quand même de voir vos messages et de vous suivre.",
   "confirmations.mute.message": "Voulez-vous vraiment masquer {name} ?",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
-  "confirmations.redraft.message": "Voulez-vous vraiment supprimer ce pouet pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
+  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer ce statut pour le ré-écrire ? Ses partages ainsi que ses mises en favori seront perdu·e·s et ses réponses seront orphelines.",
   "confirmations.reply.confirm": "Répondre",
   "confirmations.reply.message": "Répondre maintenant écrasera le message que vous rédigez actuellement. Voulez-vous vraiment continuer ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
@@ -213,12 +219,12 @@
   "keyboard_shortcuts.back": "revenir en arrière",
   "keyboard_shortcuts.blocked": "ouvrir la liste des comptes bloqués",
   "keyboard_shortcuts.boost": "partager",
-  "keyboard_shortcuts.column": "cibler un pouet d’une des colonnes",
+  "keyboard_shortcuts.column": "pour focaliser un statut dans l’une des colonnes",
   "keyboard_shortcuts.compose": "cibler la zone de rédaction",
   "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 pouet",
+  "keyboard_shortcuts.enter": "pour ouvrir le statut",
   "keyboard_shortcuts.favourite": "ajouter aux favoris",
   "keyboard_shortcuts.favourites": "ouvrir la liste des favoris",
   "keyboard_shortcuts.federated": "ouvrir le fil public global",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "répondre",
   "keyboard_shortcuts.requests": "ouvrir la liste de demandes d’abonnement",
   "keyboard_shortcuts.search": "cibler la zone de recherche",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "pour afficher/masquer le champ CW",
   "keyboard_shortcuts.start": "ouvrir la colonne « Pour commencer »",
   "keyboard_shortcuts.toggle_hidden": "déplier/replier le texte derrière un CW",
   "keyboard_shortcuts.toggle_sensitivity": "afficher/cacher les médias",
@@ -324,13 +330,13 @@
   "poll_button.add_poll": "Ajouter un sondage",
   "poll_button.remove_poll": "Supprimer le sondage",
   "privacy.change": "Ajuster la confidentialité du message",
-  "privacy.direct.long": "N’envoyer qu’aux personnes mentionnées",
+  "privacy.direct.long": "Visible uniquement par les comptes mentionnés",
   "privacy.direct.short": "Direct",
-  "privacy.private.long": "Seul·e·s vos abonné·e·s verront vos statuts",
+  "privacy.private.long": "Visible uniquement par vos abonné·e·s",
   "privacy.private.short": "Abonné·e·s uniquement",
-  "privacy.public.long": "Afficher dans les fils publics",
+  "privacy.public.long": "Visible par tou·te·s, affiché dans les fils publics",
   "privacy.public.short": "Public",
-  "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
+  "privacy.unlisted.long": "Visible par tou·te·s, mais pas dans les fils publics",
   "privacy.unlisted.short": "Non listé",
   "refresh": "Actualiser",
   "regeneration_indicator.label": "Chargement…",
@@ -352,7 +358,7 @@
   "search_popout.search_format": "Recherche avancée",
   "search_popout.tips.full_text": "Un texte normal retourne les pouets que vous avez écris, mis en favori, partagés, ou vous mentionnant, ainsi que les identifiants, les noms affichés, et les hashtags des personnes et messages correspondant.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "pouet",
+  "search_popout.tips.status": "statuts",
   "search_popout.tips.text": "Un texte simple renvoie les noms affichés, les identifiants et les hashtags correspondants",
   "search_popout.tips.user": "utilisateur·ice",
   "search_results.accounts": "Comptes",
@@ -361,7 +367,7 @@
   "search_results.statuses_fts_disabled": "La recherche de pouets par leur contenu n'est pas activée sur ce serveur Mastodon.",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
-  "status.admin_status": "Ouvrir ce pouet dans l’interface de modération",
+  "status.admin_status": "Ouvrir ce statut dans l’interface de modération",
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
@@ -379,7 +385,7 @@
   "status.more": "Plus",
   "status.mute": "Masquer @{name}",
   "status.mute_conversation": "Masquer la conversation",
-  "status.open": "Voir les détails du pouet",
+  "status.open": "Déplier ce statut",
   "status.pin": "Épingler sur le profil",
   "status.pinned": "Pouet épinglé",
   "status.read_more": "En savoir plus",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} restantes",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} restantes",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
+  "timeline_hint.resources.followers": "Les abonnés",
+  "timeline_hint.resources.follows": "Les abonnements",
+  "timeline_hint.resources.statuses": "Les anciens pouets",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {personne discute} other {personnes discutent}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index cc82ee481..e893095b4 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
@@ -259,7 +265,7 @@
   "lists.subheading": "Your lists",
   "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Hide {number, plural, one {image} other {images}}",
+  "media_gallery.toggle_visible": "Hide media",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
@@ -422,7 +428,7 @@
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add images, a video or an audio file",
+  "upload_button.label": "Add media ({formats})",
   "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",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index c3140182c..c29488b89 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Engadir ou eliminar das listaxes",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Agochar todo de {domain}",
   "account.blocked": "Bloqueada",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
   "account.cancel_follow_request": "Desbotar solicitude de seguimento",
   "account.direct": "Mensaxe directa @{name}",
   "account.domain_blocked": "Dominio agochado",
@@ -40,6 +42,10 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Deixar de silenciar a @{name}",
   "account.unmute_notifications": "Deixar de silenciar as notificacións de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Téntao novamente após {retry_time, time, medium}.",
   "alert.rate_limited.title": "Límite de intentos",
   "alert.unexpected.message": "Ocorreu un erro non agardado.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Amosar axustes",
   "column_header.unpin": "Desapegar",
   "column_subheading.settings": "Axustes",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Só local",
   "community.column_settings.media_only": "Só multimedia",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Só remoto",
   "compose_form.direct_message_warning": "Este toot só será enviado ás usuarias mencionadas.",
   "compose_form.direct_message_warning_learn_more": "Coñecer máis",
   "compose_form.hashtag_warning": "Este toot non aparecerá baixo ningún cancelo (hashtag) porque non está listado. Só se poden procurar toots públicos por cancelos.",
@@ -156,7 +162,7 @@
   "empty_column.hashtag": "Aínda non hai nada con este cancelo.",
   "empty_column.home": "A túa cronoloxía inicial está baleira! Visita {public} ou emprega a procura para atopar outras usuarias.",
   "empty_column.home.public_timeline": "a cronoloxía pública",
-  "empty_column.list": "Aínda non hai nada en esta lista. Cando as usuarias incluídas na lista publiquen mensaxes, aparecerán aquí.",
+  "empty_column.list": "Aínda non hai nada nesta listaxe. Cando os usuarios incluídas na listaxe publiquen mensaxes, amosaranse aquí.",
   "empty_column.lists": "Aínda non tes listaxes. Cando crees unha, amosarase aquí.",
   "empty_column.mutes": "Aínda non silenciaches a ningúnha usuaria.",
   "empty_column.notifications": "Aínda non tes notificacións. Interactúa con outras para comezar unha conversa.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "para abrir a listaxe das peticións de seguimento",
   "keyboard_shortcuts.search": "para destacar a procura",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "mostrar/ocultar campo CW",
   "keyboard_shortcuts.start": "para abrir a columna dos \"primeiros pasos\"",
   "keyboard_shortcuts.toggle_hidden": "para amosar/agochar texto detrás do aviso de contido (AC)",
   "keyboard_shortcuts.toggle_sensitivity": "para amosar/agochar contido multimedia",
@@ -292,7 +298,7 @@
   "notification.mention": "{name} mencionoute",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Unha enquisa na que votaches rematou",
-  "notification.reblog": "{name} promoveu o teu estado",
+  "notification.reblog": "{name} compartiu o teu estado",
   "notifications.clear": "Limpar notificacións",
   "notifications.clear_confirmation": "Tes a certeza de querer limpar de xeito permanente todas as túas notificacións?",
   "notifications.column_settings.alert": "Notificacións de escritorio",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutos}} restantes",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo} other {# segundos}} restantes",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "Non se mostran {resource} desde outros servidores.",
+  "timeline_hint.resources.followers": "Seguidoras",
+  "timeline_hint.resources.follows": "Seguindo",
+  "timeline_hint.resources.statuses": "Toots antigos",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoa} other {persoas}} falando",
   "trends.trending_now": "Tendencias actuais",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 4b65cd967..4a2754e64 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "הוסף או הסר מהרשימות",
   "account.badges.bot": "בוט",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "הפסקת מעקב",
   "account.unmute": "הפסקת השתקת @{name}",
   "account.unmute_notifications": "להפסיק הסתרת הודעות מעם @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 3c7fe6df4..0ca745020 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "सूची में जोड़ें या हटाए",
   "account.badges.bot": "बॉट",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "अनफॉलो करें",
   "account.unmute": "अनम्यूट @{name}",
   "account.unmute_notifications": "@{name} के नोटिफिकेशन अनम्यूट करे",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "कृप्या {retry_time, time, medium} के बाद दुबारा कोशिश करें",
   "alert.rate_limited.title": "सीमित दर",
   "alert.unexpected.message": "एक अप्रत्याशित त्रुटि हुई है!",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index f12450d7b..48f776982 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Prestani slijediti",
   "account.unmute": "Poništi utišavanje @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index eb824f4ae..2ea401870 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Hozzáadás vagy eltávolítás a listáról",
   "account.badges.bot": "Bot",
   "account.badges.group": "Csoport",
   "account.block": "@{name} letiltása",
   "account.block_domain": "Minden elrejtése innen: {domain}",
   "account.blocked": "Letiltva",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
   "account.cancel_follow_request": "Követési kérelem törlése",
   "account.direct": "Közvetlen üzenet @{name} számára",
   "account.domain_blocked": "Rejtett domain",
@@ -40,6 +42,10 @@
   "account.unfollow": "Követés vége",
   "account.unmute": "@{name} némítás feloldása",
   "account.unmute_notifications": "@{name} némított értesítéseinek feloldása",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Próbáld újra {retry_time, time, medium} után.",
   "alert.rate_limited.title": "Forgalomkorlátozás",
   "alert.unexpected.message": "Váratlan hiba történt.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Beállítások mutatása",
   "column_header.unpin": "Kitűzés eltávolítása",
   "column_subheading.settings": "Beállítások",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Csak helyi",
   "community.column_settings.media_only": "Csak média",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Csak távoli",
   "compose_form.direct_message_warning": "Ezt a tülköt csak a benne megemlített felhasználók láthatják majd.",
   "compose_form.direct_message_warning_learn_more": "Tudj meg többet",
   "compose_form.hashtag_warning": "Ez a tülköd nem fog megjelenni semmilyen hashtag alatt mivel listázatlan. Csak nyilvános tülkök kereshetőek hashtaggel.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "válasz",
   "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": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "CW mező mutatása/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",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# perc} other {# perc}} van hátra",
   "time_remaining.moments": "Pillanatok vannak hátra",
   "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "más szerverekről származó {resource} tartalmakat nem mutatjuk.",
+  "timeline_hint.resources.followers": "Követő",
+  "timeline_hint.resources.follows": "Követett",
+  "timeline_hint.resources.statuses": "Régi tülkök",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {résztvevő} other {résztvevő}} beszélget",
   "trends.trending_now": "Most felkapott",
   "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 5520f7041..4c1547a69 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Աւելացնել կամ հեռացնել ցանկերից",
   "account.badges.bot": "Բոտ",
   "account.badges.group": "Խումբ",
@@ -18,7 +20,7 @@
   "account.follows.empty": "Այս օգտատէրը դեռ ոչ մէկի չի հետեւում։",
   "account.follows_you": "Հետեւում է քեզ",
   "account.hide_reblogs": "Թաքցնել @{name}֊ի տարածածները",
-  "account.last_status": "Վերջին անգամ ակտիւ էր",
+  "account.last_status": "Վերջին թութը",
   "account.link_verified_on": "Սոյն յղման տիրապետումը ստուգուած է՝ {date}֊ին",
   "account.locked_info": "Սոյն հաշուի գաղտնիութեան մակարդակը նշուած է որպէս՝ փակ։ Հաշուի տէրն ընտրում է, թէ ով կարող է հետեւել իրեն։",
   "account.media": "Մեդիա",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ապահետեւել",
   "account.unmute": "Ապալռեցնել @{name}֊ին",
   "account.unmute_notifications": "Միացնել ծանուցումները @{name}֊ից",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Փորձէք  որոշ ժամանակ անց՝ {retry_time, time, medium}։",
   "alert.rate_limited.title": "Գործողութիւնների յաճախութիւնը գերազանցում է թոյլատրելին",
   "alert.unexpected.message": "Անսպասելի սխալ տեղի ունեցաւ։",
@@ -59,7 +65,7 @@
   "column.direct": "Հասցէագրուած հաղորդագրութիւններ",
   "column.directory": "Զննել անձնական էջերը",
   "column.domain_blocks": "Թաքցուած տիրոյթները",
-  "column.favourites": "Հավանածներ",
+  "column.favourites": "Հաւանածներ",
   "column.follow_requests": "Հետեւելու հայցեր",
   "column.home": "Հիմնական",
   "column.lists": "Ցանկեր",
@@ -69,27 +75,27 @@
   "column.public": "Դաշնային հոսք",
   "column_back_button.label": "Ետ",
   "column_header.hide_settings": "Թաքցնել կարգավորումները",
-  "column_header.moveLeft_settings": "Տեղաշարժել սյունը ձախ",
-  "column_header.moveRight_settings": "Տեղաշարժել սյունը աջ",
+  "column_header.moveLeft_settings": "Տեղաշարժել սիւնը ձախ",
+  "column_header.moveRight_settings": "Տեղաշարժել սիւնը աջ",
   "column_header.pin": "Ամրացնել",
   "column_header.show_settings": "Ցուցադրել կարգավորումները",
   "column_header.unpin": "Հանել",
   "column_subheading.settings": "Կարգավորումներ",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Միայն ներքին",
   "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Միայն հեռակա",
   "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Իմանալ ավելին",
   "compose_form.hashtag_warning": "Այս թութը չի հաշվառվի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարավոր է որոնել պիտակներով։",
-  "compose_form.lock_disclaimer": "Քո հաշիվը {locked} չէ։ Յուրաքանչյուր ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսված գրառումները։",
+  "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_single": "Հարցումը դարձնել եզակի ընտրությամբ",
+  "compose_form.poll.switch_to_multiple": "Հարցումը դարձնել բազմակի ընտրութեամբ",
+  "compose_form.poll.switch_to_single": "Հարցումը դարձնել եզակի ընտրութեամբ",
   "compose_form.publish": "Թթել",
   "compose_form.publish_loud": "Թթե՜լ",
   "compose_form.sensitive.hide": "Նշել մեդիան որպէս դիւրազգաց",
@@ -125,24 +131,24 @@
   "conversation.with": "{names}֊երի հետ",
   "directory.federated": "Յայտնի դաշնեզերքից",
   "directory.local": "{domain} տիրոյթից միայն",
-  "directory.new_arrivals": "Նորութիւններ",
+  "directory.new_arrivals": "Նորեկներ",
   "directory.recently_active": "Վերջերս ակտիւ",
-  "embed.instructions": "Այս թութը քո կայքում ներդնելու համար կարող ես պատճենել ներքոհիշյալ կոդը։",
+  "embed.instructions": "Այս թութը քո կայքում ներդնելու համար կարող ես պատճէնել ներքինանալ կոդը։",
   "embed.preview": "Ահա, թե ինչ տեսք կունենա այն՝",
   "emoji_button.activity": "Զբաղմունքներ",
   "emoji_button.custom": "Հատուկ",
   "emoji_button.flags": "Դրոշներ",
   "emoji_button.food": "Կերուխում",
   "emoji_button.label": "Էմոջի ավելացնել",
-  "emoji_button.nature": "Բնություն",
+  "emoji_button.nature": "Բնութիւն",
   "emoji_button.not_found": "Նման էմոջիներ դեռ չեն հայտնաբերվել։ (╯°□°)╯︵ ┻━┻",
   "emoji_button.objects": "Առարկաներ",
   "emoji_button.people": "Մարդիկ",
   "emoji_button.recent": "Հաճախ օգտագործվող",
   "emoji_button.search": "Որոնել…",
-  "emoji_button.search_results": "Որոնման արդյունքներ",
+  "emoji_button.search_results": "Որոնման արդիւնքներ",
   "emoji_button.symbols": "Նշաններ",
-  "emoji_button.travel": "Ուղեւորություն եւ տեղանքներ",
+  "emoji_button.travel": "Ուղեւորութիւն եւ տեղանքներ",
   "empty_column.account_timeline": "Այստեղ թթեր չկա՛ն։",
   "empty_column.account_unavailable": "Անձնական էջը հասանելի չի",
   "empty_column.blocks": "Դու դեռ ոչ մէկի չես արգելափակել։",
@@ -152,31 +158,31 @@
   "empty_column.domain_blocks": "Թաքցուած տիրոյթներ դեռ չկան։",
   "empty_column.favourited_statuses": "Դու դեռ չունես որեւէ հաւանած թութ։ Երբ հաւանես, դրանք կերեւան այստեղ։",
   "empty_column.favourites": "Այս թութը ոչ մէկ դեռ չի հաւանել։ Հաւանողները կերեւան այստեղ, երբ նշեն թութը հաւանած։",
-  "empty_column.follow_requests": "Դու դեռ չունես որեւէ հետևելու հայտ։ Բոլոր նման հայտերը կհայտնվեն այստեղ։",
+  "empty_column.follow_requests": "Դու դեռ չունես որեւէ հետեւելու յայտ։ Բոլոր նման յայտերը կը յայտնուեն այստեղ։",
   "empty_column.hashtag": "Այս պիտակով դեռ ոչինչ չկա։",
   "empty_column.home": "Քո հիմնական հոսքը դատա՛րկ է։ Այցելի՛ր {public}ը կամ օգտվիր որոնումից՝ այլ մարդկանց հանդիպելու համար։",
   "empty_column.home.public_timeline": "հրապարակային հոսք",
   "empty_column.list": "Այս ցանկում դեռ ոչինչ չկա։ Երբ ցանկի անդամներից որեւէ մեկը նոր թութ գրի, այն կհայտնվի այստեղ։",
   "empty_column.lists": "Դուք դեռ չունեք ստեղծած ցանկ։ Ցանկ ստեղծելուն պես այն կհայտնվի այստեղ։",
   "empty_column.mutes": "Առայժմ ոչ ոքի չեք լռեցրել։",
-  "empty_column.notifications": "Ոչ մի ծանուցում դեռ չունես։ Բզիր մյուսներին՝ խոսակցությունը սկսելու համար։",
-  "empty_column.public": "Այստեղ բան չկա՛։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգույցներից էակների՝ այն լցնելու համար։",
-  "error.unexpected_crash.explanation": "Մեր ծրագրակազմում վրիպակի կամ դիտարկչի անհամատեղելիության պատճառով այս էջը չի կարող լիարժեք պատկերվել։",
+  "empty_column.notifications": "Ոչ մի ծանուցում դեռ չունես։ Բզիր միւսներին՝ խօսակցութիւնը սկսելու համար։",
+  "empty_column.public": "Այստեղ բան չկա՛յ։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգոյցներից էակների՝ այն լցնելու համար։",
+  "error.unexpected_crash.explanation": "Մեր ծրագրակազմում վրիպակի կամ դիտարկչի անհամատեղելիութեան պատճառով այս էջը չի կարող լիարժէք պատկերուել։",
   "error.unexpected_crash.next_steps": "Փորձիր թարմացնել էջը։ Եթե դա չօգնի ապա կարող ես օգտվել Մաստադոնից ուրիշ դիտարկիչով կամ հավելվածով։",
   "errors.unexpected_crash.copy_stacktrace": "Պատճենել սթաքթրեյսը սեղմատախտակին",
   "errors.unexpected_crash.report_issue": "Զեկուցել խնդրի մասին",
   "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.",
+  "follow_requests.unlocked_explanation": "Այս հարցումը ուղարկված է հաշվից, որի համար {domain}-ի անձնակազմը միացրել է ձեռքով ստուգում։",
   "getting_started.developers": "Մշակողներ",
-  "getting_started.directory": "Օգտատերերի շտեմարան",
+  "getting_started.directory": "Օգտատէրերի շտեմարան",
   "getting_started.documentation": "Փաստաթղթեր",
   "getting_started.heading": "Ինչպես սկսել",
-  "getting_started.invite": "Հրավիրել մարդկանց",
+  "getting_started.invite": "Հրաւիրել մարդկանց",
   "getting_started.open_source_notice": "Մաստոդոնը բաց ելատեքստով ծրագրակազմ է։ Կարող ես ներդրում անել կամ վրեպներ զեկուցել ԳիթՀաբում՝ {github}։",
-  "getting_started.security": "Հաշվի կարգավորումներ",
-  "getting_started.terms": "Ծառայության պայմանները",
-  "hashtag.column_header.tag_mode.all": "և {additional}",
+  "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": "Առաջարկներ չկան",
@@ -188,34 +194,34 @@
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
-  "home.hide_announcements": "Թաքցնել հայտարարությունները",
-  "home.show_announcements": "Ցուցադրել հայտարարությունները",
+  "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 {# րոպե}}",
   "introduction.federation.action": "Հաջորդ",
   "introduction.federation.federated.headline": "Դաշնային",
-  "introduction.federation.federated.text": "Դաշտնեզերքի հարևան հանգույցների հանրային գրառումները կհայտնվեն դաշնային հոսքում։",
+  "introduction.federation.federated.text": "Դաշնեզերքի հարեւան հանգոյցների հանրային գրառումները կը յայտնուեն դաշնային հոսքում։",
   "introduction.federation.home.headline": "Հիմնական",
-  "introduction.federation.home.text": "Այն անձանց թթերը ում հետևում ես, կհայտնվի հիմնական հոսքում։ Դու կարող ես հետևել ցանկացած անձի ցանկացած հանգույցից։",
+  "introduction.federation.home.text": "Այն անձանց թթերը ում հետևում ես, կը յայտնուեն հիմնական հոսքում։ Դու կարող ես հետեւել ցանկացած անձի ցանկացած հանգոյցից։",
   "introduction.federation.local.headline": "Տեղային",
-  "introduction.federation.local.text": "Տեղական հոսքում կարող ես տեսնել քո հանգույցի բոլոր հանրային գրառումները։",
+  "introduction.federation.local.text": "Տեղական հոսքում կարող ես տեսնել քո հանգոյցի բոլոր հանրային գրառումները։",
   "introduction.interactions.action": "Finish toot-orial!",
   "introduction.interactions.favourite.headline": "Նախընտրելի",
   "introduction.interactions.favourite.text": "Փոխանցիր հեղինակին որ քեզ դուր է եկել իր թութը հավանելով այն։",
   "introduction.interactions.reblog.headline": "Տարածել",
-  "introduction.interactions.reblog.text": "Կիսիր այլ օգտատերերի թութերը քո հետևորդների հետ տարածելով դրանք քո անձնական էջում։",
+  "introduction.interactions.reblog.text": "Կիսիր այլ օգտատէրերի թութերը քո հետեւողների հետ տարածելով դրանք քո անձնական էջում։",
   "introduction.interactions.reply.headline": "Պատասխանել",
-  "introduction.interactions.reply.text": "Արձագանքիր ուրիշների և քո թթերին, դրանք կդարսվեն մեկ ընհանուր քննարկման շղթայով։",
+  "introduction.interactions.reply.text": "Արձագանքիր ուրիշների եւ քո թթերին, դրանք կը դարսուեն մէկ ընդհանուր քննարկման շղթայով։",
   "introduction.welcome.action": "Գնացի՜նք։",
   "introduction.welcome.headline": "Առաջին քայլեր",
-  "introduction.welcome.text": "Դաշնեզերքը ողջունում է ձեզ։ Շուտով կկարողանաս ուղարկել նամակներ ու շփվել տարբեր հանգույցների ընկերներիդ հետ։ Բայց մտապահիր {domain} հանգույցը, այն յուրահատուկ է, այստեղ է պահվում քո հաշիվը։",
+  "introduction.welcome.text": "Դաշնեզերքը ողջունում է ձեզ։ Շուտով կը կարողանաս ուղարկել նամակներ ու շփուել տարբեր հանգոյցների ընկերներիդ հետ։ Բայց մտապահիր {domain} հանգոյցը, այն իւրայատուկ է, այստեղ է պահւում քո հաշիւը։",
   "keyboard_shortcuts.back": "ետ նավարկելու համար",
   "keyboard_shortcuts.blocked": "արգելափակված օգտատերերի ցանկը բացելու համար",
   "keyboard_shortcuts.boost": "տարածելու համար",
-  "keyboard_shortcuts.column": "սյուներից մեկի վրա սեւեռվելու համար",
+  "keyboard_shortcuts.column": "սիւներից մէկի վրայ սեւեռուելու համար",
   "keyboard_shortcuts.compose": "շարադրման տիրույթին սեւեռվելու համար",
-  "keyboard_shortcuts.description": "Նկարագրություն",
+  "keyboard_shortcuts.description": "Նկարագրութիւն",
   "keyboard_shortcuts.direct": "հասցեագրված գրվածքների հոսքը բացելու համար",
   "keyboard_shortcuts.down": "ցանկով ներքեւ շարժվելու համար",
   "keyboard_shortcuts.enter": "թութը բացելու համար",
@@ -230,7 +236,7 @@
   "keyboard_shortcuts.mention": "հեղինակին նշելու համար",
   "keyboard_shortcuts.muted": "լռեցված օգտատերերի ցանկը բացելու համար",
   "keyboard_shortcuts.my_profile": "սեփական էջին անցնելու համար",
-  "keyboard_shortcuts.notifications": "ծանուցումեների սյունակը բացելու համար",
+  "keyboard_shortcuts.notifications": "ծանուցումների սիւնակը բացելու համար",
   "keyboard_shortcuts.open_media": "ցուցադրել մեդիան",
   "keyboard_shortcuts.pinned": "ամրացուած թթերի ցանկը բացելու համար",
   "keyboard_shortcuts.profile": "հեղինակի անձնական էջը բացելու համար",
@@ -257,7 +263,7 @@
   "lists.new.title_placeholder": "Նոր ցանկի վերնագիր",
   "lists.search": "Փնտրել քո հետեւած մարդկանց մեջ",
   "lists.subheading": "Քո ցանկերը",
-  "load_pending": "{count, plural, one {# նոր նյութ} other {# նոր նյութ}}",
+  "load_pending": "{count, plural, one {# նոր նիւթ} other {# նոր նիւթ}}",
   "loading_indicator.label": "Բեռնվում է…",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
   "missing_indicator.label": "Չգտնվեց",
@@ -272,23 +278,23 @@
   "navigation_bar.discover": "Բացայայտել",
   "navigation_bar.domain_blocks": "Թաքցուած տիրոյթներ",
   "navigation_bar.edit_profile": "Խմբագրել անձնական էջը",
-  "navigation_bar.favourites": "Հավանածներ",
+  "navigation_bar.favourites": "Հաւանածներ",
   "navigation_bar.filters": "Լռեցուած բառեր",
   "navigation_bar.follow_requests": "Հետեւելու հայցեր",
   "navigation_bar.follows_and_followers": "Հետեւածներ եւ հետեւողներ",
-  "navigation_bar.info": "Այս հանգույցի մասին",
+  "navigation_bar.info": "Այս հանգոյցի մասին",
   "navigation_bar.keyboard_shortcuts": "Ստեղնաշարի կարճատներ",
   "navigation_bar.lists": "Ցանկեր",
   "navigation_bar.logout": "Դուրս գալ",
   "navigation_bar.mutes": "Լռեցրած օգտատերեր",
   "navigation_bar.personal": "Անձնական",
   "navigation_bar.pins": "Ամրացված թթեր",
-  "navigation_bar.preferences": "Նախապատվություններ",
+  "navigation_bar.preferences": "Նախապատուութիւններ",
   "navigation_bar.public_timeline": "Դաշնային հոսք",
-  "navigation_bar.security": "Անվտանգություն",
+  "navigation_bar.security": "Անվտանգութիւն",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
-  "notification.follow_request": "{name} քեզ հետևելու հայց է ուղարկել",
+  "notification.follow_request": "{name} քեզ հետեւելու հայց է ուղարկել",
   "notification.mention": "{name} նշեց քեզ",
   "notification.own_poll": "Հարցումդ աւարտուեց",
   "notification.poll": "Հարցումը, ուր դու քուէարկել ես, աւարտուեց։",
@@ -296,7 +302,7 @@
   "notifications.clear": "Մաքրել ծանուցումները",
   "notifications.clear_confirmation": "Վստա՞հ ես, որ ուզում ես մշտապես մաքրել քո բոլոր ծանուցումները։",
   "notifications.column_settings.alert": "Աշխատատիրույթի ծանուցումներ",
-  "notifications.column_settings.favourite": "Հավանածներից՝",
+  "notifications.column_settings.favourite": "Հաւանածներից՝",
   "notifications.column_settings.filter_bar.advanced": "Ցուցադրել բոլոր կատեգորիաները",
   "notifications.column_settings.filter_bar.category": "Արագ զտման վահանակ",
   "notifications.column_settings.filter_bar.show": "Ցուցադրել",
@@ -306,7 +312,7 @@
   "notifications.column_settings.poll": "Հարցման արդիւնքները՝",
   "notifications.column_settings.push": "Հրելու ծանուցումներ",
   "notifications.column_settings.reblog": "Տարածածներից՝",
-  "notifications.column_settings.show": "Ցուցադրել սյունում",
+  "notifications.column_settings.show": "Ցուցադրել սիւնում",
   "notifications.column_settings.sound": "Ձայն հանել",
   "notifications.filter.all": "Բոլորը",
   "notifications.filter.boosts": "Տարածածները",
@@ -323,7 +329,7 @@
   "poll.voted": "Դու քուէարկել ես այս տարբերակի համար",
   "poll_button.add_poll": "Աւելացնել հարցում",
   "poll_button.remove_poll": "Հեռացնել հարցումը",
-  "privacy.change": "Կարգավորել թթի գաղտնիությունը",
+  "privacy.change": "Կարգաւորել թթի գաղտնիութիւնը",
   "privacy.direct.long": "Թթել միայն նշված օգտատերերի համար",
   "privacy.direct.short": "Հասցեագրված",
   "privacy.private.long": "Թթել միայն հետեւողների համար",
@@ -345,7 +351,7 @@
   "report.forward": "Փոխանցել {target}֊ին",
   "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
   "report.hint": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-  "report.placeholder": "Լրացուցիչ մեկնաբանություններ",
+  "report.placeholder": "Լրացուցիչ մեկնաբանութիւններ",
   "report.submit": "Ուղարկել",
   "report.target": "Բողոքել {target}֊ի մասին",
   "search.placeholder": "Փնտրել",
@@ -359,7 +365,7 @@
   "search_results.hashtags": "Պիտակներ",
   "search_results.statuses": "Թթեր",
   "search_results.statuses_fts_disabled": "Այս հանգոյցում միացուած չէ ըստ բովանդակութեան թթեր փնտրելու հնարաւորութիւնը։",
-  "search_results.total": "{count, number} {count, plural, one {արդյունք} other {արդյունք}}",
+  "search_results.total": "{count, number} {count, plural, one {արդիւնք} other {արդիւնք}}",
   "status.admin_account": "Բացել @{name} օգտատիրոջ մոդերացիայի դիմերէսը։",
   "status.admin_status": "Բացել այս գրառումը մոդերատորի դիմերէսի մէջ",
   "status.block": "Արգելափակել @{name}֊ին",
@@ -374,11 +380,11 @@
   "status.favourite": "Հավանել",
   "status.filtered": "Զտված",
   "status.load_more": "Բեռնել ավելին",
-  "status.media_hidden": "մեդիաբովանդակությունը թաքցված է",
+  "status.media_hidden": "մեդիաբովանդակութիւնը թաքցուած է",
   "status.mention": "Նշել @{name}֊ին",
   "status.more": "Ավելին",
   "status.mute": "Լռեցնել @{name}֊ին",
-  "status.mute_conversation": "Լռեցնել խոսակցությունը",
+  "status.mute_conversation": "Լռեցնել խօսակցութիւնը",
   "status.open": "Ընդարձակել այս թութը",
   "status.pin": "Ամրացնել անձնական էջում",
   "status.pinned": "Ամրացված թութ",
@@ -386,13 +392,13 @@
   "status.reblog": "Տարածել",
   "status.reblog_private": "Տարածել սեփական լսարանին",
   "status.reblogged_by": "{name} տարածել է",
-  "status.reblogs.empty": "Այս թութը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ որևէ մեկը տարածի։",
+  "status.reblogs.empty": "Այս թութը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ որեւէ մէկը տարածի։",
   "status.redraft": "Ջնջել եւ վերակազմել",
   "status.remove_bookmark": "Հեռացնել էջանիշերից",
   "status.reply": "Պատասխանել",
   "status.replyAll": "Պատասխանել թելին",
   "status.report": "Բողոքել @{name}֊ից",
-  "status.sensitive_warning": "Կասկածելի բովանդակություն",
+  "status.sensitive_warning": "Կասկածելի բովանդակութիւն",
   "status.share": "Կիսվել",
   "status.show_less": "Պակաս",
   "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
@@ -400,7 +406,7 @@
   "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
   "status.show_thread": "Բացել շղթան",
   "status.uncached_media_warning": "Անհասանելի",
-  "status.unmute_conversation": "Ապալռեցնել խոսակցությունը",
+  "status.unmute_conversation": "Ապալռեցնել խօսակցութիւնը",
   "status.unpin": "Հանել անձնական էջից",
   "suggestions.dismiss": "Անտեսել առաջարկը",
   "suggestions.header": "Միգուցե քեզ հետաքրքրի…",
@@ -412,8 +418,8 @@
   "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 {# վայրկյան}} անց",
+  "time_remaining.moments": "Մնացել է մի քանի վարկեան",
+  "time_remaining.seconds": "{number, plural, one {# վարկեան} other {# վարկեան}} անց",
   "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
   "timeline_hint.resources.followers": "Followers",
   "timeline_hint.resources.follows": "Follows",
@@ -424,26 +430,26 @@
   "upload_area.title": "Քաշիր ու նետիր՝ վերբեռնելու համար",
   "upload_button.label": "Ավելացնել մեդիա",
   "upload_error.limit": "Ֆայլի վերբեռնման սահմանաչափը գերազանցված է։",
-  "upload_error.poll": "Հարցումների հետ ֆայլ կցել հնարավոր չէ։",
-  "upload_form.audio_description": "Նկարագրիր ձայնագրության բովանդակությունը լսողական խնդիրներով անձանց համար",
-  "upload_form.description": "Նկարագրություն ավելացրու տեսողական խնդիրներ ունեցողների համար",
+  "upload_error.poll": "Հարցումների հետ նիշք կցել հնարաւոր չէ։",
+  "upload_form.audio_description": "Նկարագրիր ձայնագրութեան բովանդակութիւնը լսողական խնդիրներով անձանց համար",
+  "upload_form.description": "Նկարագիր՝ տեսողական խնդիրներ ունեցողների համար",
   "upload_form.edit": "Խմբագրել",
   "upload_form.undo": "Հետարկել",
-  "upload_form.video_description": "Նկարագրիր տեսանյութը լսողական կամ տեսողական խնդիրներով անձանց համար",
+  "upload_form.video_description": "Նկարագրիր տեսանիւթը լսողական կամ տեսողական խնդիրներով անձանց համար",
   "upload_modal.analyzing_picture": "Լուսանկարի վերլուծում…",
   "upload_modal.apply": "Կիրառել",
-  "upload_modal.description_placeholder": "Ճկուն շագանակագույն աղվեսը ցատկում է ծույլ շան վրայով",
+  "upload_modal.description_placeholder": "Բել դղյակի ձախ ժամն օֆ ազգությանը ցպահանջ չճշտած վնաս էր եւ փառք։",
   "upload_modal.detect_text": "Հայտնբերել տեքստը նկարից",
   "upload_modal.edit_media": "Խմբագրել մեդիան",
-  "upload_modal.hint": "Սեղմեք և տեղաշարժեք նախատեսքի վրայի շրջանակը ընտրելու այն կետը որը միշտ տեսանելի կլինի մանրապատկերներում։",
+  "upload_modal.hint": "Սեղմէք եւ տեղաշարժէք նախադիտման շրջանակը՝ որ ընտրէք մանրապատկերում միշտ տեսանելի կէտը։",
   "upload_modal.preview_label": "Նախադիտում ({ratio})",
   "upload_progress.label": "Վերբեռնվում է…",
-  "video.close": "Փակել  տեսագրությունը",
+  "video.close": "Փակել  տեսագրութիւնը",
   "video.download": "Ներբեռնել ֆայլը",
   "video.exit_fullscreen": "Անջատել լիաէկրան դիտումը",
-  "video.expand": "Ընդարձակել տեսագրությունը",
+  "video.expand": "Ընդարձակել տեսագրութիւնը",
   "video.fullscreen": "Լիաէկրան",
-  "video.hide": "Թաքցնել տեսագրությունը",
+  "video.hide": "Թաքցնել տեսագրութիւնը",
   "video.mute": "Լռեցնել ձայնը",
   "video.pause": "Դադար տալ",
   "video.play": "Նվագել",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index df3775cf9..f3080d4fc 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Tambah atau Hapus dari daftar",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
@@ -40,6 +42,10 @@
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications": "Munculkan notifikasi dari @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Tolong ulangi setelah {retry_time, time, medium}.",
   "alert.rate_limited.title": "Batasan tingkat",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index a7bc54e85..05c8ffd02 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ne plus sequar",
   "account.unmute": "Ne plus celar @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index ada0a37af..547b6c061 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Bæta á eða fjarlægja af listum",
   "account.badges.bot": "Róbót",
   "account.badges.group": "Hópur",
   "account.block": "Útiloka @{name}",
   "account.block_domain": "Fela allt frá {domain}",
   "account.blocked": "Útilokaður",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Skoða nánari upplýsingar á notandasniðinu",
   "account.cancel_follow_request": "Hætta við beiðni um að fylgjast með",
   "account.direct": "Bein skilaboð til @{name}",
   "account.domain_blocked": "Lén falið",
@@ -40,6 +42,10 @@
   "account.unfollow": "Hætta að fylgja",
   "account.unmute": "Hætta að þagga niður í @{name}",
   "account.unmute_notifications": "Hætta að þagga tilkynningar frá @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Prófaðu aftur eftir {retry_time, time, medium}.",
   "alert.rate_limited.title": "Með takmörkum",
   "alert.unexpected.message": "Upp kom óvænt villa.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Birta stillingar",
   "column_header.unpin": "Losa",
   "column_subheading.settings": "Stillingar",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Einungis staðvært",
   "community.column_settings.media_only": "Einungis myndskrár",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Einungis fjartengt",
   "compose_form.direct_message_warning": "Þetta tíst verður aðeins sent á notendur sem minnst er á.",
   "compose_form.direct_message_warning_learn_more": "Kanna nánar",
   "compose_form.hashtag_warning": "Þetta tíst verður ekki talið með undir nokkru myllumerki þar sem það er óskráð. Einungis er hægt að leita að opinberum tístum eftir myllumerkjum.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "að svara",
   "keyboard_shortcuts.requests": "að opna lista yfir fylgjendabeiðnir",
   "keyboard_shortcuts.search": "að setja virkni í leit",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "til að birta/fela reit með aðvörun vegna efnis",
   "keyboard_shortcuts.start": "að opna \"komast í gang\" dálk",
   "keyboard_shortcuts.toggle_hidden": "að birta/fela texta á bak við aðvörun vegna efnis",
   "keyboard_shortcuts.toggle_sensitivity": "að birta/fela myndir",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# mínúta} other {# mínútur}} eftir",
   "time_remaining.moments": "Tími eftir",
   "time_remaining.seconds": "{number, plural, one {# sekúnda} other {# sekúndur}} eftir",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} frá öðrum netþjónum er ekki birt.",
+  "timeline_hint.resources.followers": "Fylgjendur",
+  "timeline_hint.resources.follows": "Fylgist með",
+  "timeline_hint.resources.statuses": "Eldri tíst",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {aðili} other {aðilar}} að tala",
   "trends.trending_now": "Í umræðunni núna",
   "ui.beforeunload": "Drögin tapast ef þú ferð út úr Mastodon.",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 1fab8f17c..03597e06f 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,26 +1,28 @@
 {
-  "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
+  "account.add_or_remove_from_list": "Aggiungi o Rimuovi dagli elenchi",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppo",
   "account.block": "Blocca @{name}",
-  "account.block_domain": "Nascondi tutto da {domain}",
+  "account.block_domain": "Blocca dominio {domain}",
   "account.blocked": "Bloccato",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Annulla richiesta di seguire",
-  "account.direct": "Invia messaggio privato a @{name}",
-  "account.domain_blocked": "Dominio nascosto",
+  "account.browse_more_on_origin_server": "Naviga di più sul profilo originale",
+  "account.cancel_follow_request": "Annulla richiesta di seguirti",
+  "account.direct": "Messaggio diretto a @{name}",
+  "account.domain_blocked": "Dominio bloccato",
   "account.edit_profile": "Modifica profilo",
-  "account.endorse": "Metti in evidenza sul profilo",
+  "account.endorse": "Mostra sul profilo",
   "account.follow": "Segui",
   "account.followers": "Seguaci",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
   "account.follows": "Segue",
   "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.follows_you": "Ti segue",
-  "account.hide_reblogs": "Nascondi condivisioni da @{name}",
+  "account.hide_reblogs": "Nascondi incrementi da @{name}",
   "account.last_status": "Ultima attività",
   "account.link_verified_on": "La proprietà di questo link è stata controllata il {date}",
-  "account.locked_info": "Il livello di privacy di questo account è impostato a \"bloccato\". Il proprietario esamina manualmente le richieste di seguirlo.",
+  "account.locked_info": "Lo stato di privacy del profilo è impostato a bloccato. Il proprietario revisiona manualmente chi lo può seguire.",
   "account.media": "Media",
   "account.mention": "Menziona @{name}",
   "account.moved_to": "{name} si è trasferito su:",
@@ -31,17 +33,21 @@
   "account.posts": "Toot",
   "account.posts_with_replies": "Toot e risposte",
   "account.report": "Segnala @{name}",
-  "account.requested": "In attesa di approvazione",
+  "account.requested": "In attesa di approvazione. Clicca per annullare la richiesta di seguire",
   "account.share": "Condividi il profilo di @{name}",
-  "account.show_reblogs": "Mostra condivisioni da @{name}",
+  "account.show_reblogs": "Mostra incrementi da @{name}",
   "account.unblock": "Sblocca @{name}",
-  "account.unblock_domain": "Non nascondere {domain}",
-  "account.unendorse": "Non mettere in evidenza sul profilo",
+  "account.unblock_domain": "Sblocca il dominio {domain}",
+  "account.unendorse": "Non mostrare sul profilo",
   "account.unfollow": "Smetti di seguire",
   "account.unmute": "Non silenziare @{name}",
-  "account.unmute_notifications": "Non silenziare più le notifiche da @{name}",
-  "alert.rate_limited.message": "Riprova dopo {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Numero massimo di richieste superato",
+  "account.unmute_notifications": "Non silenziare le notifiche da @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
+  "alert.rate_limited.message": "Sei pregato di riprovare tra {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Intervallo limitato",
   "alert.unexpected.message": "Si è verificato un errore inatteso.",
   "alert.unexpected.title": "Oops!",
   "announcement.announcement": "Annuncio",
@@ -51,37 +57,37 @@
   "bundle_column_error.retry": "Riprova",
   "bundle_column_error.title": "Errore di rete",
   "bundle_modal_error.close": "Chiudi",
-  "bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.",
+  "bundle_modal_error.message": "Qualcosa è andato storto durante il caricamento di questo componente.",
   "bundle_modal_error.retry": "Riprova",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
-  "column.community": "Timeline locale",
+  "column.community": "Fuso orario locale",
   "column.direct": "Messaggi diretti",
-  "column.directory": "Sfoglia profili",
-  "column.domain_blocks": "Domini nascosti",
-  "column.favourites": "Apprezzati",
-  "column.follow_requests": "Richieste di amicizia",
+  "column.directory": "Naviga profili",
+  "column.domain_blocks": "Domini bloccati",
+  "column.favourites": "Preferiti",
+  "column.follow_requests": "Richieste di seguirti",
   "column.home": "Home",
-  "column.lists": "Liste",
+  "column.lists": "Elenchi",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
-  "column.pins": "Toot fissati in cima",
-  "column.public": "Timeline federata",
+  "column.pins": "Toot in evidenza",
+  "column.public": "Fuso orario federato",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
   "column_header.moveLeft_settings": "Sposta colonna a sinistra",
   "column_header.moveRight_settings": "Sposta colonna a destra",
-  "column_header.pin": "Fissa in cima",
+  "column_header.pin": "Evidenzia",
   "column_header.show_settings": "Mostra impostazioni",
-  "column_header.unpin": "Non fissare in cima",
+  "column_header.unpin": "Non mettere in evidenza",
   "column_subheading.settings": "Impostazioni",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Solo media",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "Questo toot sarà mandato solo a tutti gli utenti menzionati.",
-  "compose_form.direct_message_warning_learn_more": "Per saperne di più",
-  "compose_form.hashtag_warning": "Questo toot non è listato, quindi non sarà trovato nelle ricerche per hashtag. Solo i toot pubblici possono essere cercati per hashtag.",
-  "compose_form.lock_disclaimer": "Il tuo account non è {bloccato}. Chiunque può decidere di seguirti per vedere i tuoi post per soli seguaci.",
+  "community.column_settings.local_only": "Solo Locale",
+  "community.column_settings.media_only": "Solo Media",
+  "community.column_settings.remote_only": "Solo Remoto",
+  "compose_form.direct_message_warning": "Questo toot sarà inviato solo agli utenti menzionati.",
+  "compose_form.direct_message_warning_learn_more": "Scopri di più",
+  "compose_form.hashtag_warning": "Questo toot non sarà elencato sotto alcun hashtag poiché senza elenco. Solo i toot pubblici possono essere ricercati per hashtag.",
+  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per vedere i tuoi post solo per seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "A cosa stai pensando?",
   "compose_form.poll.add_option": "Aggiungi una scelta",
@@ -95,58 +101,58 @@
   "compose_form.sensitive.hide": "Segna media come sensibile",
   "compose_form.sensitive.marked": "Questo media è contrassegnato come sensibile",
   "compose_form.sensitive.unmarked": "Questo media non è contrassegnato come sensibile",
-  "compose_form.spoiler.marked": "Il testo è nascosto dall'avviso",
+  "compose_form.spoiler.marked": "Il testo è nascosto dietro l'avviso",
   "compose_form.spoiler.unmarked": "Il testo non è nascosto",
-  "compose_form.spoiler_placeholder": "Content warning",
+  "compose_form.spoiler_placeholder": "Scrivi qui il tuo avviso",
   "confirmation_modal.cancel": "Annulla",
   "confirmations.block.block_and_report": "Blocca & Segnala",
   "confirmations.block.confirm": "Blocca",
   "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
   "confirmations.delete.confirm": "Cancella",
-  "confirmations.delete.message": "Sei sicuro di voler cancellare questo status?",
+  "confirmations.delete.message": "Sei sicuro di voler cancellare questo toot?",
   "confirmations.delete_list.confirm": "Cancella",
   "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?",
-  "confirmations.domain_block.confirm": "Nascondi intero dominio",
-  "confirmations.domain_block.message": "Sei davvero sicuro che vuoi bloccare l'intero {domain}? Nella maggior parte dei casi, pochi blocchi o silenziamenti mirati sono sufficienti e preferibili. Non vedrai nessun contenuto di quel dominio né nelle timeline pubbliche né nelle notifiche. I tuoi seguaci di quel dominio saranno eliminati.",
-  "confirmations.logout.confirm": "Esci",
-  "confirmations.logout.message": "Sei sicuro di voler uscire?",
+  "confirmations.domain_block.confirm": "Blocca l'intero dominio",
+  "confirmations.domain_block.message": "Sei davvero, davvero sicuro di voler bloccare l'intero {domain}? In molti casi pochi blocchi di destinazione o muti sono sufficienti e preferibili. Non vedrai il contenuto da quel dominio in alcuna linea temporale pubblica o nelle tue notifiche. i tuoi seguaci saranno rimossi da quel dominio.",
+  "confirmations.logout.confirm": "Disconnettiti",
+  "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.mute.confirm": "Silenzia",
-  "confirmations.mute.explanation": "I post scritti da loro e quelli che li menzionano saranno nascosti, ma loro continueranno a vedere i tuoi post e a poterti seguire.",
+  "confirmations.mute.explanation": "Questo nasconderà i post da loro ed i post che li menzionano, ma consentirà ancora loro di vedere i tuoi post e di seguirti.",
   "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
-  "confirmations.redraft.confirm": "Cancella e riscrivi",
-  "confirmations.redraft.message": "Sei sicuro di voler cancellare questo stato e riscriverlo? Perderai tutte le risposte, condivisioni e preferiti.",
+  "confirmations.redraft.confirm": "Cancella e rivali",
+  "confirmations.redraft.message": "Sei sicuro di voler eliminare questo toot e riscriverlo? I preferiti e gli incrementi saranno persi e le risposte al post originale saranno perse.",
   "confirmations.reply.confirm": "Rispondi",
-  "confirmations.reply.message": "Se rispondi ora, il messaggio che stai componendo sarà sovrascritto. Sei sicuro di voler continuare?",
+  "confirmations.reply.message": "Rispondere ora sovrascriverà il messaggio che stai correntemente componendo. Sei sicuro di voler procedere?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
-  "confirmations.unfollow.message": "Sei sicuro che non vuoi più seguire {name}?",
+  "confirmations.unfollow.message": "Sei sicuro di non voler più seguire {name}?",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
   "conversation.with": "Con {names}",
-  "directory.federated": "Da un fediverso noto",
+  "directory.federated": "Da un fediverse noto",
   "directory.local": "Solo da {domain}",
   "directory.new_arrivals": "Nuovi arrivi",
   "directory.recently_active": "Attivo di recente",
-  "embed.instructions": "Inserisci questo status nel tuo sito copiando il codice qui sotto.",
+  "embed.instructions": "Incorpora questo toot sul tuo sito web copiando il codice sotto.",
   "embed.preview": "Ecco come apparirà:",
   "emoji_button.activity": "Attività",
   "emoji_button.custom": "Personalizzato",
-  "emoji_button.flags": "Bandiere",
-  "emoji_button.food": "Cibo e bevande",
+  "emoji_button.flags": "Segnalazioni",
+  "emoji_button.food": "Cibo & Bevande",
   "emoji_button.label": "Inserisci emoji",
   "emoji_button.nature": "Natura",
   "emoji_button.not_found": "Nessun emojos!! (╯°□°)╯︵ ┻━┻",
   "emoji_button.objects": "Oggetti",
   "emoji_button.people": "Persone",
-  "emoji_button.recent": "Usati di frequente",
+  "emoji_button.recent": "Usati frequentemente",
   "emoji_button.search": "Cerca...",
   "emoji_button.search_results": "Risultati della ricerca",
   "emoji_button.symbols": "Simboli",
-  "emoji_button.travel": "Viaggi e luoghi",
-  "empty_column.account_timeline": "Non ci sono toot qui!",
+  "emoji_button.travel": "Viaggi & Luoghi",
+  "empty_column.account_timeline": "Nessun toot qui!",
   "empty_column.account_unavailable": "Profilo non disponibile",
-  "empty_column.blocks": "Non hai ancora bloccato nessun utente.",
-  "empty_column.bookmarked_statuses": "Non hai ancora nessun toot tra i segnalibri. Quando ne aggiungerai qualcuno, comparirà qui.",
+  "empty_column.blocks": "Non hai ancora bloccato alcun utente.",
+  "empty_column.bookmarked_statuses": "Non hai ancora segnato alcun toot. Quando ne segni uno, sarà mostrato qui.",
   "empty_column.community": "La timeline locale è vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
   "empty_column.direct": "Non hai ancora nessun messaggio privato. Quando ne manderai o riceverai qualcuno, apparirà qui.",
   "empty_column.domain_blocks": "Non vi sono domini nascosti.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "per rispondere",
   "keyboard_shortcuts.requests": "per aprire l'elenco delle richieste di seguirti",
   "keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "per mostrare/nascondere il campo CW",
   "keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"",
   "keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
   "keyboard_shortcuts.toggle_sensitivity": "mostrare/nascondere media",
@@ -274,7 +280,7 @@
   "navigation_bar.edit_profile": "Modifica profilo",
   "navigation_bar.favourites": "Apprezzati",
   "navigation_bar.filters": "Parole silenziate",
-  "navigation_bar.follow_requests": "Richieste di amicizia",
+  "navigation_bar.follow_requests": "Richieste di seguirti",
   "navigation_bar.follows_and_followers": "Seguiti e seguaci",
   "navigation_bar.info": "Informazioni su questo server",
   "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
@@ -301,7 +307,7 @@
   "notifications.column_settings.filter_bar.category": "Filtro rapido",
   "notifications.column_settings.filter_bar.show": "Mostra",
   "notifications.column_settings.follow": "Nuovi seguaci:",
-  "notifications.column_settings.follow_request": "Nuove richieste di essere seguito:",
+  "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.mention": "Menzioni:",
   "notifications.column_settings.poll": "Risultati del sondaggio:",
   "notifications.column_settings.push": "Notifiche push",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} left",
   "time_remaining.moments": "Restano pochi istanti",
   "time_remaining.seconds": "{number, plural, one {# secondo} other {# secondi}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.statuses": "Older toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource] da altri server non sono mostrati.",
+  "timeline_hint.resources.followers": "Seguaci",
+  "timeline_hint.resources.follows": "Segue",
+  "timeline_hint.resources.statuses": "Toot meno recenti",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persona ne sta} other {persone ne stanno}} parlando",
   "trends.trending_now": "Di tendenza ora",
   "ui.beforeunload": "La bozza andrà persa se esci da Mastodon.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a519b819b..dc0b5f8ad 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "リストから追加または外す",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
   "account.block": "@{name}さんをブロック",
   "account.block_domain": "{domain}全体をブロック",
   "account.blocked": "ブロック済み",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "リモートで表示",
   "account.cancel_follow_request": "フォローリクエストを取り消す",
   "account.direct": "@{name}さんにダイレクトメッセージ",
   "account.domain_blocked": "ドメインブロック中",
@@ -40,6 +42,10 @@
   "account.unfollow": "フォロー解除",
   "account.unmute": "@{name}さんのミュートを解除",
   "account.unmute_notifications": "@{name}さんからの通知を受け取るようにする",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "{retry_time, time, medium} 以降に再度実行してください。",
   "alert.rate_limited.title": "制限に達しました",
   "alert.unexpected.message": "不明なエラーが発生しました。",
@@ -79,9 +85,9 @@
   "column_subheading.lists": "リスト",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "ローカルのみ表示",
   "community.column_settings.media_only": "メディアのみ表示",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "リモートのみ表示",
   "compose_form.direct_message_warning": "このトゥートはメンションされた人にのみ送信されます。",
   "compose_form.direct_message_warning_learn_more": "もっと詳しく",
   "compose_form.hashtag_warning": "このトゥートは公開設定ではないのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
@@ -241,7 +247,7 @@
   "keyboard_shortcuts.reply": "返信",
   "keyboard_shortcuts.requests": "フォローリクエストのリストを開く",
   "keyboard_shortcuts.search": "検索欄に移動",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "閲覧注意を表示する/隠す",
   "keyboard_shortcuts.start": "\"スタート\" カラムを開く",
   "keyboard_shortcuts.toggle_hidden": "CWで隠れた文を見る/隠す",
   "keyboard_shortcuts.toggle_sensitivity": "非表示のメディアを見る/隠す",
@@ -419,15 +425,15 @@
   "time_remaining.minutes": "残り{number}分",
   "time_remaining.moments": "まもなく終了",
   "time_remaining.seconds": "残り{number}秒",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "他のサーバーの{resource}は表示されません。",
+  "timeline_hint.resources.followers": "フォロワー",
+  "timeline_hint.resources.follows": "フォロー",
+  "timeline_hint.resources.statuses": "以前のトゥート",
   "trends.count_by_accounts": "{count}人がトゥート",
   "trends.trending_now": "トレンドタグ",
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",
   "upload_area.title": "ドラッグ&ドロップでアップロード",
-  "upload_button.label": "メディアを追加 ({formats})",
+  "upload_button.label": "メディアを追加 (複数の画像または1つの動画か音声ファイル)",
   "upload_error.limit": "アップロードできる上限を超えています。",
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴取が難しいユーザーへの説明",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index d7913dd2a..720dfe4c7 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "ბოტი",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "ნუღარ მიჰყვები",
   "account.unmute": "ნუღარ აჩუმებ @{name}-ს",
   "account.unmute_notifications": "ნუღარ აჩუმებ შეტყობინებებს @{name}-სგან",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 9237f486b..1eccc74ee 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Rnu neɣ kkes seg tebdarin",
   "account.badges.bot": "Aṛubut",
   "account.badges.group": "Agraw",
@@ -19,7 +21,7 @@
   "account.follows_you": "Yeṭṭafaṛ-ik",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
   "account.last_status": "Armud aneggaru",
-  "account.link_verified_on": "Taγara n useγwen-a tettwasenqed ass n {date}",
+  "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
   "account.locked_info": "Amiḍan-agi uslig isekweṛ. D bab-is kan i izemren ad yeǧǧ, s ufus-is, win ara t-iḍefṛen.",
   "account.media": "Amidya",
   "account.mention": "Bder-d @{name}",
@@ -33,13 +35,17 @@
   "account.report": "Cetki ɣef @{name}",
   "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
   "account.share": "Bḍu amaɣnu n @{name}",
-  "account.show_reblogs": "Sken-d inebḍa n @{name}",
+  "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.unblock": "Serreḥ i @{name}",
-  "account.unblock_domain": "Sken-d {domain}",
+  "account.unblock_domain": "Ssken-d {domain}",
   "account.unendorse": "Ur ttwellih ara fell-as deg umaɣnu-inek",
   "account.unfollow": "Ur ṭṭafaṛ ara",
   "account.unmute": "Kkes asgugem ɣef @{name}",
   "account.unmute_notifications": "Serreḥ ilɣa sɣur @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
   "alert.rate_limited.title": "Aktum s talast",
   "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
@@ -72,10 +78,10 @@
   "column_header.moveLeft_settings": "Err ajgu ɣer tama tazelmaḍt",
   "column_header.moveRight_settings": "Err ajgu ɣer tama tayfust",
   "column_header.pin": "Senteḍ",
-  "column_header.show_settings": "Sken iɣewwaṛen",
+  "column_header.show_settings": "Ssken iɣewwaṛen",
   "column_header.unpin": "Kkes asenteḍ",
-  "column_subheading.settings": "Iγewwaṛen",
-  "community.column_settings.local_only": "Local only",
+  "column_subheading.settings": "Iɣewwaṛen",
+  "community.column_settings.local_only": "Adigan kan",
   "community.column_settings.media_only": "Allal n teywalt kan",
   "community.column_settings.remote_only": "Remote only",
   "compose_form.direct_message_warning": "Tajewwaqt-a ad d-tettwasken kan i yimseqdacen i d-yettwabedren.",
@@ -95,33 +101,33 @@
   "compose_form.sensitive.hide": "Creḍ allal n teywalt d anafri",
   "compose_form.sensitive.marked": "Allal n teywalt yettwacreḍ d anafri",
   "compose_form.sensitive.unmarked": "Allal n teywalt ur yettwacreḍ ara d anafri",
-  "compose_form.spoiler.marked": "Aḍris yeffer deffir n walγu",
+  "compose_form.spoiler.marked": "Aḍris yeffer deffir n walɣu",
   "compose_form.spoiler.unmarked": "Aḍris ur yettwaffer ara",
-  "compose_form.spoiler_placeholder": "Aru alγu-inek da",
+  "compose_form.spoiler_placeholder": "Aru alɣu-inek da",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.block_and_report": "Sewḥel & sewɛed",
   "confirmations.block.confirm": "Sewḥel",
   "confirmations.block.message": "Tebγiḍ s tidet ad tesḥebseḍ {name}?",
   "confirmations.delete.confirm": "Kkes",
-  "confirmations.delete.message": "Tebγiḍ s tidet ad tekkseḍ tasuffeγt-agi?",
+  "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete_list.confirm": "Kkes",
-  "confirmations.delete_list.message": "Tebγiḍ s tidet ad tekkseḍ umuγ-agi i lebda?",
-  "confirmations.domain_block.confirm": "Ffer taγult meṛṛa",
+  "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
+  "confirmations.domain_block.confirm": "Ffer taɣult meṛṛa",
   "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": "Ffeγ",
-  "confirmations.logout.message": "D tidet tebγiḍ ad teffγeḍ?",
+  "confirmations.logout.confirm": "Ffeɣ",
+  "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.mute.confirm": "Sgugem",
-  "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neγ d-tettwabder, maca xas akka yezmer neγ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
-  "confirmations.mute.message": "Tetḥeqqeḍ belli tebγiḍ ad ttegugmeḍ {name}?",
+  "confirmations.mute.explanation": "Aya ad yeffer iznan-is d wid i deg d-yettwabder neɣ d-tettwabder, maca xas akka yezmer neɣ tezmer awali n yiznan-inek d uḍfaṛ-ik.",
+  "confirmations.mute.message": "Tetḥeqqeḍ belli tebɣiḍ ad ttegugmeḍ {name}?",
   "confirmations.redraft.confirm": "Sfeḍ & Ɛiwed tira",
-  "confirmations.redraft.message": "Tetḥeqqeḍ belli tebγiḍ tuksa n waddad-agi iwakken ad s-tɛiwdeḍ tira? Ismenyifen d beḍḍuwat ad ṛuḥen, ma d tiririyin-is ad uγalent d tigujilin.",
+  "confirmations.redraft.message": "Tetḥeqqeḍ belli tebɣiḍ tuksa n waddad-agi iwakken ad s-tɛiwdeḍ tira? Ismenyifen d beḍḍuwat ad ṛuḥen, ma d tiririyin-is ad uɣalent d tigujilin.",
   "confirmations.reply.confirm": "Err",
-  "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebγiḍ ad tkemmleḍ?",
+  "confirmations.reply.message": "Tiririt akka tura ad k-degger izen-agi i tettaruḍ. Tebɣiḍ ad tkemmleḍ?",
   "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
-  "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebγiḍ ur teṭafaṛeḍ ara {name}?",
+  "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
   "conversation.delete": "Sfeḍ adiwenni",
-  "conversation.mark_as_read": "Creḍ yettwaγṛa",
-  "conversation.open": "Sken adiwenni",
+  "conversation.mark_as_read": "Creḍ yettwaɣṛa",
+  "conversation.open": "Ssken adiwenni",
   "conversation.with": "Akked {names}",
   "directory.federated": "Deg fedivers yettwasnen",
   "directory.local": "Seg {domain} kan",
@@ -136,7 +142,7 @@
   "emoji_button.label": "Sekcem imuji",
   "emoji_button.nature": "Agama",
   "emoji_button.not_found": "Ulac izamulen n yiḥulfan  !! (╯°□°)╯︵ ┻━┻",
-  "emoji_button.objects": "Tiγawsiwin",
+  "emoji_button.objects": "Tiɣawsiwin",
   "emoji_button.people": "Medden",
   "emoji_button.recent": "Wid yettuseqdacen s waṭas",
   "emoji_button.search": "Nadi…",
@@ -144,40 +150,40 @@
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
   "empty_column.account_timeline": "Ulac tijewwaqin dagi!",
-  "empty_column.account_unavailable": "Ur nufi ara amaγnu-a",
+  "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
   "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.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.direct": "Ulac γur-k ula yiwen n yizen usrid. Ad d-yettwasken da, ticki tuzneḍ neγ teṭṭfeḍ-d yiwen.",
-  "empty_column.domain_blocks": "Ulac kra n taγult yettwaffren ar tura.",
+  "empty_column.direct": "Ulac ɣur-k ula yiwen n yizen usrid. Ad d-yettwasken da, ticki tuzneḍ neɣ teṭṭfeḍ-d yiwen.",
+  "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
   "empty_column.favourited_statuses": "Ulac ula yiwet n tjewwaqt deg yismenyifen-ik ar tura. Ticki Tella-d yiwet, ad d-ban da.",
   "empty_column.favourites": "Ula yiwen ur yerri tajewwaqt-agi deg yismenyifen-is. Melmi i d-yella waya, ad d-yettwasken da.",
-  "empty_column.follow_requests": "Ulac γur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
-  "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaγ γer uhacṭag-agi.",
-  "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neγ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
+  "empty_column.follow_requests": "Ulac ɣur-k ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
+  "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
+  "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
   "empty_column.home.public_timeline": "tasuddemt tazayezt n yisallen",
-  "empty_column.list": "Ar tura ur yelli kra deg umuγ-a. Ad d-yettwasken da ticki iɛeggalen n wumuγ-a suffγen-d kra.",
-  "empty_column.lists": "Ulac γur-k kra n wumuγ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
-  "empty_column.mutes": "Ulac γur-k imseqdacen i yettwasgugmen.",
-  "empty_column.notifications": "Ulac γur-k tilγa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
-  "empty_column.public": "Ulac kra da! Aru kra, neγ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
+  "empty_column.list": "Ar tura ur yelli kra deg umuɣ-a. Ad d-yettwasken da ticki iɛeggalen n wumuɣ-a suffɣen-d kra.",
+  "empty_column.lists": "Ulac ɣur-k kra n wumuɣ yakan. Ad d-tettwasken da ticki tesluleḍ-d yiwet.",
+  "empty_column.mutes": "Ulac ɣur-k imseqdacen i yettwasgugmen.",
+  "empty_column.notifications": "Ulac ɣur-k tilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
+  "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
   "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.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neγ deg usnas anaṣli.",
+  "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
   "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.",
   "getting_started.developers": "Ineflayen",
-  "getting_started.directory": "Akaram n imaγnuten",
+  "getting_started.directory": "Akaram n imaɣnuten",
   "getting_started.documentation": "Amnir",
   "getting_started.heading": "Bdu",
   "getting_started.invite": "Snebgi-d imdanen",
-  "getting_started.open_source_notice": "Maṣṭudun d aseγzan s uγbalu yeldin. Tzemreḍ ad tɛiwneḍ neγ ad temmleḍ uguren deg GitHub {github}.",
-  "getting_started.security": "Iγewwaṛen n umiḍan",
+  "getting_started.open_source_notice": "Maṣṭudun d aseɣzan s uɣbalu yeldin. Tzemreḍ ad tɛiwneḍ neɣ ad temmleḍ uguren deg GitHub {github}.",
+  "getting_started.security": "Iɣewwaṛen n umiḍan",
   "getting_started.terms": "Tiwetlin n useqdec",
   "hashtag.column_header.tag_mode.all": "d {additional}",
-  "hashtag.column_header.tag_mode.any": "neγ {additional}",
+  "hashtag.column_header.tag_mode.any": "neɣ {additional}",
   "hashtag.column_header.tag_mode.none": "war {additional}",
   "hashtag.column_settings.select.no_options_message": "Ulac isumar",
   "hashtag.column_settings.select.placeholder": "Rnu-d ihacṭagen…",
@@ -186,10 +192,10 @@
   "hashtag.column_settings.tag_mode.none": "Yiwen ala seg-sen",
   "hashtag.column_settings.tag_toggle": "Glu-d s yihacṭagen imerna i ujgu-agi",
   "home.column_settings.basic": "Igejdanen",
-  "home.column_settings.show_reblogs": "Sken-d beṭṭu",
-  "home.column_settings.show_replies": "Sken-d tiririyin",
-  "home.hide_announcements": "Ffer ulγuyen",
-  "home.show_announcements": "Sken-d ulγuyen",
+  "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
+  "home.column_settings.show_replies": "Ssken-d tiririyin",
+  "home.hide_announcements": "Ffer ulɣuyen",
+  "home.show_announcements": "Ssken-d ulɣuyen",
   "intervals.full.days": "{number, plural, one {# n wass} other {# n wussan}}",
   "intervals.full.hours": "{number, plural, one {# n usarag} other {# n yesragen}}",
   "intervals.full.minutes": "{number, plural, one {# n tesdat} other {# n tesdatin}}",
@@ -197,30 +203,30 @@
   "introduction.federation.federated.headline": "Amatu",
   "introduction.federation.federated.text": "Iznan izuyaz i d-yekkan seg yiqeddacen-nniḍen n fediverse ad banen deg tsuddemt tazayezt tamatut n yisallen.",
   "introduction.federation.home.headline": "Agejdan",
-  "introduction.federation.home.text": "Iznan n yemdanen i teṭṭafaṛeḍ ad banen deg tsuddemt n umagger. Tzemreḍ ad tḍefṛeḍ win tebγiḍ deg uqeddac i tebγiḍ!",
+  "introduction.federation.home.text": "Iznan n yemdanen i teṭṭafaṛeḍ ad banen deg tsuddemt n umagger. Tzemreḍ ad tḍefṛeḍ win tebɣiḍ deg uqeddac i tebɣiḍ!",
   "introduction.federation.local.headline": "Adigan",
   "introduction.federation.local.text": "Iznan izuyaz n yemdanen i yellan deg yiwen uqeddac akked kečč ad d-banen deg tsuddemt tazayezt tadigant.",
   "introduction.interactions.action": "Fakk tameskant!",
   "introduction.interactions.favourite.headline": "Ismenyifen",
-  "introduction.interactions.favourite.text": "Tzemreḍ ad teǧǧeḍ kra n tjewwaqt i ticki, daγen ad tiniḍ i bab-is d akken taɛǧeb-ik, s tmerna-ines γer yismenyifen-ik.",
+  "introduction.interactions.favourite.text": "Tzemreḍ ad teǧǧeḍ kra n tjewwaqt i ticki, daγen ad tiniḍ i bab-is d akken taɛǧeb-ik, s tmerna-ines ɣer yismenyifen-ik.",
   "introduction.interactions.reblog.headline": "Bḍu tikelt-nniḍen",
   "introduction.interactions.reblog.text": "Tzemreḍ ad tebḍuḍ tijewwaqin n medden akk d yimeḍfaṛen-ik s beṭṭu-nsent tikelt-nniḍen.",
   "introduction.interactions.reply.headline": "Err",
-  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ γef tjewwaqin-ik·im akked tid n medden-nniḍen, aya atent-id-icudd ta deffir ta deg yiwen udiwenni.",
+  "introduction.interactions.reply.text": "Tzemreḍ ad terreḍ ɣef tjewwaqin-ik·im akked tid n medden-nniḍen, aya atent-id-icudd ta deffir ta deg yiwen udiwenni.",
   "introduction.welcome.action": "Bdu!",
   "introduction.welcome.headline": "Isurifen imenza",
-  "introduction.welcome.text": "Anṣuf γer fediverse! Deg kra n yimiren, ad tizmireḍ ad tzzuzreḍ iznan neγ ad tmeslayeḍ i yemddukkal deg waṭas n yiqeddacen. Maca aqeddac-agi, {domain}, mačči am wiyaḍ - deg-s i yella umaγnu-ik, ihi cfu γef yisem-is.",
-  "keyboard_shortcuts.back": "uγal ar deffir",
-  "keyboard_shortcuts.blocked": "akken ad teldiḍ umuγ n yimseqdacen yettwasḥebsen",
+  "introduction.welcome.text": "Anṣuf ɣer fediverse! Deg kra n yimiren, ad tizmireḍ ad tzzuzreḍ iznan neγ ad tmeslayeḍ i yemddukkal deg waṭas n yiqeddacen. Maca aqeddac-agi, {domain}, mačči am wiyaḍ - deg-s i yella umaɣnu-ik, ihi cfu ɣef yisem-is.",
+  "keyboard_shortcuts.back": "i tuɣalin ɣer deffir",
+  "keyboard_shortcuts.blocked": "akken ad teldiḍ umuɣ n yimseqdacen yettwasḥebsen",
   "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.description": "Aglam",
   "keyboard_shortcuts.direct": "akken ad teldiḍ ajgu n yiznan usriden",
-  "keyboard_shortcuts.down": "i kennu γer wadda n wumuγ",
-  "keyboard_shortcuts.enter": "i tildin n tsuffeγt",
-  "keyboard_shortcuts.favourite": "akken ad ternuḍ γer yismenyifen",
-  "keyboard_shortcuts.favourites": "i tildin umuγ n yismenyifen",
+  "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",
+  "keyboard_shortcuts.favourites": "i tildin umuɣ n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
   "keyboard_shortcuts.home": "i tildin n tsuddemt tagejdant n yisallen",
@@ -228,14 +234,14 @@
   "keyboard_shortcuts.legend": "akken ad tsekneḍ taneffust-agi",
   "keyboard_shortcuts.local": "i tildin n tsuddemt tadigant n yisallen",
   "keyboard_shortcuts.mention": "akken ad d-bedreḍ ameskar",
-  "keyboard_shortcuts.muted": "akken ad teldiḍ umuγ n yimseqdacen yettwasgugmen",
-  "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaγnu-ik",
-  "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n tilγa",
+  "keyboard_shortcuts.muted": "akken ad teldiḍ tabdart n yimseqdacen yettwasgugmen",
+  "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaɣnu-ik",
+  "keyboard_shortcuts.notifications": "akken ad d-teldiḍ ajgu n tilɣa",
   "keyboard_shortcuts.open_media": "i taɣwalin yeldin ",
-  "keyboard_shortcuts.pinned": "akken ad teldiḍ umuγ n tjewwiqin yettwasentḍen",
-  "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaγnu n umeskar",
+  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tjewwiqin yettwasentḍen",
+  "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaɣnu n umeskar",
   "keyboard_shortcuts.reply": "i tririt",
-  "keyboard_shortcuts.requests": "akken ad d-teldiḍ umuγ n yisuturen n teḍfeṛt",
+  "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
   "keyboard_shortcuts.search": "to focus search",
   "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "akken ad d-teldiḍ ajgu n \"bdu\"",
@@ -243,26 +249,26 @@
   "keyboard_shortcuts.toggle_sensitivity": "i teskent/tuffra n yimidyaten",
   "keyboard_shortcuts.toot": "i wakken attebdud tajewwaqt tamaynut",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "i tulin γer d asawen n wumuγ",
+  "keyboard_shortcuts.up": "i tulin ɣer d asawen n tebdart",
   "lightbox.close": "Mdel",
   "lightbox.next": "Γer zdat",
   "lightbox.previous": "Γer deffir",
   "lightbox.view_context": "Ẓer amnaḍ",
-  "lists.account.add": "Rnu γer wumuγ",
-  "lists.account.remove": "Kkes seg umuγ",
-  "lists.delete": "Kkes umuγ",
-  "lists.edit": "Ẓreg umuγ",
+  "lists.account.add": "Rnu ɣer tebdart",
+  "lists.account.remove": "Kkes seg tebdart",
+  "lists.delete": "Kkes tabdart",
+  "lists.edit": "Ẓreg tabdart",
   "lists.edit.submit": "Beddel azwel",
-  "lists.new.create": "Rnu umuγ",
-  "lists.new.title_placeholder": "Azwel amaynut n wumuγ",
+  "lists.new.create": "Rnu tabdart",
+  "lists.new.title_placeholder": "Azwel amaynut n tebdart",
   "lists.search": "Nadi gar yemdanen i teṭṭafaṛeḍ",
-  "lists.subheading": "Umuγen-ik·im",
+  "lists.subheading": "Tibdarin-ik·im",
   "load_pending": "{count, plural, one {# n uferdis amaynut} other {# n yiferdisen imaynuten}}",
   "loading_indicator.label": "Yessalay-d…",
-  "media_gallery.toggle_visible": "Sken / Ffer",
+  "media_gallery.toggle_visible": "Ffer {number, plural, one {tugna} other {tugniwin}}",
   "missing_indicator.label": "Ulac-it",
-  "missing_indicator.sublabel": "Ur nufi ara aγbalu-a",
-  "mute_modal.hide_notifications": "Tebγiḍ ad teffreḍ talγutin n umseqdac-a?",
+  "missing_indicator.sublabel": "Ur nufi ara aɣbalu-a",
+  "mute_modal.hide_notifications": "Tebɣiḍ ad teffreḍ talɣutin n umseqdac-a?",
   "navigation_bar.apps": "Isnasen izirazen",
   "navigation_bar.blocks": "Imseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
@@ -270,43 +276,43 @@
   "navigation_bar.compose": "Aru tajewwiqt tamaynut",
   "navigation_bar.direct": "Iznan usridden",
   "navigation_bar.discover": "Ẓer",
-  "navigation_bar.domain_blocks": "Tiγula yeffren",
-  "navigation_bar.edit_profile": "Ẓreg amaγnu",
+  "navigation_bar.domain_blocks": "Tiɣula yeffren",
+  "navigation_bar.edit_profile": "Ẓreg amaɣnu",
   "navigation_bar.favourites": "Ismenyifen",
   "navigation_bar.filters": "Awalen i yettwasgugmen",
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
   "navigation_bar.info": "Ɣef uqeddac-agi",
   "navigation_bar.keyboard_shortcuts": "Inegzumen n unasiw",
-  "navigation_bar.lists": "Umuγen",
-  "navigation_bar.logout": "Ffeγ",
+  "navigation_bar.lists": "Tibdarin",
+  "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.personal": "Udmawan",
   "navigation_bar.pins": "Tijewwiqin yettwasentḍen",
   "navigation_bar.preferences": "Imenyafen",
   "navigation_bar.public_timeline": "Tasuddemt tazayezt tamatut",
-  "navigation_bar.security": "Taγellist",
-  "notification.favourite": "{name} yesmenyef tasuffeγt-ik",
+  "navigation_bar.security": "Taɣellist",
+  "notification.favourite": "{name} yesmenyef tasuffeɣt-ik·im",
   "notification.follow": "{name} yeṭṭafaṛ-ik",
   "notification.follow_request": "{name} yessuter-d ad k-yeḍfeṛ",
   "notification.mention": "{name} yebder-ik-id",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you have voted in has ended",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
-  "notifications.clear": "Sfeḍ tilγa",
-  "notifications.clear_confirmation": "Tebγiḍ s tidet ad tekkseḍ akk tilγa-ik i lebda?",
-  "notifications.column_settings.alert": "Tilγa n tnarit",
+  "notifications.clear": "Sfeḍ tilɣa",
+  "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk tilɣa-inek·em i lebda?",
+  "notifications.column_settings.alert": "Tilɣa n tnarit",
   "notifications.column_settings.favourite": "Ismenyifen:",
-  "notifications.column_settings.filter_bar.advanced": "Sken-d meṛṛa tiggayin",
+  "notifications.column_settings.filter_bar.advanced": "Ssken-d meṛṛa tiggayin",
   "notifications.column_settings.filter_bar.category": "Iri n usizdeg uzrib",
-  "notifications.column_settings.filter_bar.show": "Sken",
+  "notifications.column_settings.filter_bar.show": "Ssken",
   "notifications.column_settings.follow": "Imeḍfaṛen imaynuten:",
   "notifications.column_settings.follow_request": "Isuturen imaynuten n teḍfeṛt:",
   "notifications.column_settings.mention": "Abdar:",
   "notifications.column_settings.poll": "Igemmaḍ n usenqed:",
-  "notifications.column_settings.push": "Tilγa yettudemmren",
+  "notifications.column_settings.push": "Tilɣa yettudemmren",
   "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Sken-d tilγa deg ujgu",
+  "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
   "notifications.filter.all": "Akk",
   "notifications.filter.boosts": "Boosts",
@@ -314,13 +320,13 @@
   "notifications.filter.follows": "Yeṭafaṛ",
   "notifications.filter.mentions": "Abdar",
   "notifications.filter.polls": "Igemmaḍ n usenqed",
-  "notifications.group": "{count} n tilγa",
+  "notifications.group": "{count} n tilɣa",
   "poll.closed": "Ifukk",
   "poll.refresh": "Smiren",
   "poll.total_people": "{count, plural, one {# n wemdan} other {# n yemdanen}}",
-  "poll.total_votes": "{count, plural, one {# n udγaṛ} other {# n yedγaṛen}}",
-  "poll.vote": "Dγeṛ",
-  "poll.voted": "Tdeγṛeḍ γef tririt-agi",
+  "poll.total_votes": "{count, plural, one {# n udɣaṛ} other {# n yedɣaṛen}}",
+  "poll.vote": "Dɣeṛ",
+  "poll.voted": "Tdeɣṛeḍ ɣef tririt-ayi",
   "poll_button.add_poll": "Rnu asenqed",
   "poll_button.remove_poll": "Kkes asenqed",
   "privacy.change": "Adjust status privacy",
@@ -331,7 +337,7 @@
   "privacy.public.long": "Bḍu deg tsuddemt tazayezt",
   "privacy.public.short": "Azayez",
   "privacy.unlisted.long": "Ur beṭṭu ara deg tsuddemt tazayezt",
-  "privacy.unlisted.short": "War umuγ",
+  "privacy.unlisted.short": "War tabdert",
   "refresh": "Smiren",
   "regeneration_indicator.label": "Yessalay-d…",
   "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
@@ -342,7 +348,7 @@
   "relative_time.seconds": "{number}tas",
   "relative_time.today": "assa",
   "reply_indicator.cancel": "Sefsex",
-  "report.forward": "Bren-it γeṛ {target}",
+  "report.forward": "Bren-it ɣeṛ {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
   "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
   "report.placeholder": "Iwenniten-nniḍen",
@@ -358,29 +364,29 @@
   "search_results.accounts": "Medden",
   "search_results.hashtags": "Ihacṭagen",
   "search_results.statuses": "Tibeṛṛaniyin",
-  "search_results.statuses_fts_disabled": "Anadi γef tjewwiqin s ugbur-nsent ur yermid ara deg uqeddac-agi n Maṣṭudun.",
+  "search_results.statuses_fts_disabled": "Anadi ɣef tjewwiqin s ugbur-nsent ur yermid ara deg uqeddac-agi n Maṣṭudun.",
   "search_results.total": "{count, number} {count, plural, one {n ugemmuḍ} other {n yigemmuḍen}}",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Seḥbes @{name}",
   "status.bookmark": "Creḍ",
   "status.cancel_reblog_private": "Sefsex beṭṭu",
-  "status.cannot_reblog": "Tasuffeγt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
-  "status.copy": "Nγel assaγ γer tasuffeγt",
+  "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
+  "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Izen usrid i @{name}",
   "status.embed": "Embed",
-  "status.favourite": "Rnu γer yismenyifen",
+  "status.favourite": "Rnu ɣer yismenyifen",
   "status.filtered": "Yettwasizdeg",
   "status.load_more": "Sali ugar",
-  "status.media_hidden": "Taγwalt tettwaffer",
+  "status.media_hidden": "Taɣwalt tettwaffer",
   "status.mention": "Bder-d @{name}",
   "status.more": "Ugar",
   "status.mute": "Sussem @{name}",
   "status.mute_conversation": "Sgugem adiwenni",
-  "status.open": "Semγeṛ tasuffeγt-agi",
-  "status.pin": "Senteḍ-itt deg umaγnu",
+  "status.open": "Semɣeṛ tasuffeɣt-ayi",
+  "status.pin": "Senteḍ-itt deg umaɣnu",
   "status.pinned": "Tijewwiqin yettwasentḍen",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
@@ -391,23 +397,23 @@
   "status.remove_bookmark": "Kkes tacreḍt",
   "status.reply": "Err",
   "status.replyAll": "Err i lxiḍ",
-  "status.report": "Cetki γef @{name}",
+  "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
-  "status.show_less": "Sken-d drus",
+  "status.show_less": "Ssken-d drus",
   "status.show_less_all": "Semẓi akk tisuffγin",
-  "status.show_more": "Sken-d ugar",
+  "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
-  "status.show_thread": "Sken-d lxiḍ",
+  "status.show_thread": "Ssken-d lxiḍ",
   "status.uncached_media_warning": "Ulac-it",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
-  "status.unpin": "Kkes asenteḍ seg umaγnu",
+  "status.unpin": "Kkes asenteḍ seg umaɣnu",
   "suggestions.dismiss": "Sefsex asumer",
   "suggestions.header": "Ahat ad tcelgeḍ deg…",
   "tabs_bar.federated_timeline": "Amatu",
   "tabs_bar.home": "Agejdan",
   "tabs_bar.local_timeline": "Adigan",
-  "tabs_bar.notifications": "Tilγa",
+  "tabs_bar.notifications": "Tilɣa",
   "tabs_bar.search": "Nadi",
   "time_remaining.days": "Mazal {number, plural, one {# n wass} other {# n wussan}}",
   "time_remaining.hours": "Mazal {number, plural, one {# n usrag} other {# n yesragen}}",
@@ -415,33 +421,33 @@
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
   "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.followers": "Imeḍfaṛen",
+  "timeline_hint.resources.follows": "T·Yeṭafaṛ",
   "timeline_hint.resources.statuses": "Older toots",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {n umdan} other {n yemdanen}} i yettmeslayen",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "upload_area.title": "Zuḥeb rnu sers i tasalyt",
-  "upload_button.label": "Rnu Taγwalt ({formats})",
+  "upload_button.label": "Rnu taɣwalt ({formats})",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt",
   "upload_form.description": "Glem-d i yemdaneni yesɛan ugur deg yiẓri",
   "upload_form.edit": "Ẓreg",
   "upload_form.undo": "Kkes",
-  "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neγ deg yiẓri",
+  "upload_form.video_description": "Glem-d i yemdanen i yesɛan ugur deg tmesliwt neɣ deg yiẓri",
   "upload_modal.analyzing_picture": "Tasleḍt n tugna tetteddu…",
   "upload_modal.apply": "Snes",
-  "upload_modal.description_placeholder": "Aberraγ arurad ineggez nnig n uqjun amuṭṭis",
+  "upload_modal.description_placeholder": "Aberraɣ arurad ineggez nnig n uqjun amuṭṭis",
   "upload_modal.detect_text": "Sefru-d aḍris seg tugna",
-  "upload_modal.edit_media": "Ẓreg taγwalt",
+  "upload_modal.edit_media": "Ẓreg taɣwalt",
   "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.preview_label": "Taskant ({ratio})",
   "upload_progress.label": "Asali iteddu...",
   "video.close": "Mdel tabidyutt",
   "video.download": "Sidered afaylu",
-  "video.exit_fullscreen": "Ffeγ seg ugdil aččuran",
-  "video.expand": "Semγeṛ tavidyut",
+  "video.exit_fullscreen": "Ffeɣ seg ugdil ačuran",
+  "video.expand": "Semɣeṛ tavidyut",
   "video.fullscreen": "Agdil aččuran",
   "video.hide": "Ffer tabidyutt",
   "video.mute": "Gzem imesli",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index 48e6e414d..06d42eac9 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Тізімге қосу немесе жою",
   "account.badges.bot": "Бот",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Оқымау",
   "account.unmute": "@{name} ескертпелерін қосу",
   "account.unmute_notifications": "@{name} ескертпелерін көрсету",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Қайтадан көріңіз  {retry_time, time, medium} кейін.",
   "alert.rate_limited.title": "Бағалау шектеулі",
   "alert.unexpected.message": "Бір нәрсе дұрыс болмады.",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index 6c68862e0..67cf5a5c5 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index c8e470b38..6949ea5b0 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "리스트에 추가 혹은 삭제",
   "account.badges.bot": "봇",
   "account.badges.group": "그룹",
   "account.block": "@{name}을 차단",
   "account.block_domain": "{domain} 전체를 숨김",
   "account.blocked": "차단됨",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
   "account.cancel_follow_request": "팔로우 요청 취소",
   "account.direct": "@{name}의 다이렉트 메시지",
   "account.domain_blocked": "도메인 숨겨짐",
@@ -40,6 +42,10 @@
   "account.unfollow": "팔로우 해제",
   "account.unmute": "뮤트 해제",
   "account.unmute_notifications": "@{name}의 알림 뮤트 해제",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "{retry_time, time, medium}에 다시 시도해 주세요.",
   "alert.rate_limited.title": "빈도 제한",
   "alert.unexpected.message": "예측하지 못한 에러가 발생했습니다.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "설정 보이기",
   "column_header.unpin": "고정 해제",
   "column_subheading.settings": "설정",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "로컬만",
   "community.column_settings.media_only": "미디어만",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "원격만",
   "compose_form.direct_message_warning": "이 툿은 멘션 된 유저들에게만 보여집니다.",
   "compose_form.direct_message_warning_learn_more": "더 알아보기",
   "compose_form.hashtag_warning": "이 툿은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 툿만이 해시태그로 검색 될 수 있습니다.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "답장",
   "keyboard_shortcuts.requests": "팔로우 요청 리스트 열기",
   "keyboard_shortcuts.search": "검색창에 포커스",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "CW 필드를 보이거나 숨기기",
   "keyboard_shortcuts.start": "\"시작하기\" 컬럼 열기",
   "keyboard_shortcuts.toggle_hidden": "CW로 가려진 텍스트를 표시/비표시",
   "keyboard_shortcuts.toggle_sensitivity": "이미지 보이기/숨기기",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number} 분 남음",
   "time_remaining.moments": "남은 시간",
   "time_remaining.seconds": "{number} 초 남음",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource}는 보여지지 않습니다.",
+  "timeline_hint.resources.followers": "팔로워",
+  "timeline_hint.resources.follows": "팔로우",
+  "timeline_hint.resources.statuses": "이전 툿",
   "trends.count_by_accounts": "{count} 명의 사람들이 말하고 있습니다",
   "trends.trending_now": "지금 유행중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 6c68862e0..67cf5a5c5 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index aa8bc183c..6a17a4a0c 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Pievienot vai noņemt no saraksta",
   "account.badges.bot": "Bots",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Nesekot",
   "account.unmute": "Noņemt apklusinājumu no lietotāja @{name}",
   "account.unmute_notifications": "Rādīt paziņojumus no lietotāja @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "Negaidīta kļūda.",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 78cc18f53..65d546795 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Додади или одстрани од листа",
   "account.badges.bot": "Бот",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Одследи",
   "account.unmute": "Зачути го @{name}",
   "account.unmute_notifications": "Исклучи известувања од @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "Неочекувана грешка.",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 68b89a585..699dd91cb 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "പട്ടികയിൽ ചേർക്കുകയോ അല്ലെങ്കിൽ മാറ്റുകയോ ചെയ്യുക",
   "account.badges.bot": "റോബോട്ട്",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "പിന്തുടരുന്നത് നിര്‍ത്തുക",
   "account.unmute": "നിശ്ശബ്ദമാക്കുന്നത് നിർത്തുക @{name}",
   "account.unmute_notifications": "@{name} യിൽ നിന്നുള്ള അറിയിപ്പുകൾ പ്രസിദ്ധപ്പെടുത്തുക",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "{retry_time, time, medium} നു ശേഷം വീണ്ടും ശ്രമിക്കുക.",
   "alert.rate_limited.title": "തോത് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു",
   "alert.unexpected.message": "അപ്രതീക്ഷിതമായി എന്തോ സംഭവിച്ചു.",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 2188d02b0..5aaa6b314 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "यादीत घाला किंवा यादीतून काढून टाका",
   "account.badges.bot": "स्वयंचलित खाते",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "अनुयायी असणे थांबवा",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index b55fd4d43..fb49cd140 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index ca5be5164..465171222 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
   "account.badges.bot": "Bot",
   "account.badges.group": "Groep",
   "account.block": "@{name} blokkeren",
   "account.block_domain": "Alles van {domain} verbergen",
   "account.blocked": "Geblokkeerd",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Blader door het originele profiel",
   "account.cancel_follow_request": "Volgverzoek annuleren",
   "account.direct": "@{name} een direct bericht sturen",
   "account.domain_blocked": "Domein verborgen",
@@ -40,6 +42,10 @@
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet langer negeren",
   "account.unmute_notifications": "@{name} meldingen niet langer negeren",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Probeer het nog een keer na {retry_time, time, medium}.",
   "alert.rate_limited.title": "Beperkt te gebruiken",
   "alert.unexpected.message": "Er deed zich een onverwachte fout voor",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Instellingen tonen",
   "column_header.unpin": "Losmaken",
   "column_subheading.settings": "Instellingen",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Alleen lokaal",
   "community.column_settings.media_only": "Alleen media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Alleen op afstand",
   "compose_form.direct_message_warning": "Deze toot wordt alleen naar vermelde gebruikers verstuurd. Echter, de beheerders en moderatoren van jouw en de ontvangende server(s) kunnen dit bericht mogelijk wel bekijken.",
   "compose_form.direct_message_warning_learn_more": "Meer leren",
   "compose_form.hashtag_warning": "Deze toot valt niet onder een hashtag te bekijken, omdat deze niet op openbare tijdlijnen wordt getoond. Alleen openbare toots kunnen via hashtags gevonden worden.",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index dee0cd836..26c337aab 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Legg til eller tak vekk frå listene",
   "account.badges.bot": "Robot",
   "account.badges.group": "Gruppe",
@@ -40,6 +42,10 @@
   "account.unfollow": "Slutt å fylgja",
   "account.unmute": "Av-demp @{name}",
   "account.unmute_notifications": "Vis varsel frå @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Ver venleg å prøva igjen etter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Begrensa rate",
   "alert.unexpected.message": "Eit uventa problem oppstod.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Vis innstillingar",
   "column_header.unpin": "Løys",
   "column_subheading.settings": "Innstillingar",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Berre media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Kun eksternt",
   "compose_form.direct_message_warning": "Dette tutet vert berre synleg for nemnde brukarar.",
   "compose_form.direct_message_warning_learn_more": "Lær meir",
   "compose_form.hashtag_warning": "Dette tutet vert ikkje oppført under nokon emneknagg sidan det ikkje er oppført. Berre offentlege tut kan verta søkt etter med emneknagg.",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "Rapporter problem",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Avvis",
-  "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.",
+  "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
   "getting_started.developers": "Utviklarar",
   "getting_started.directory": "Profilkatalog",
   "getting_started.documentation": "Dokumentasjon",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 71cfdfe14..85715c7bf 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Legg til eller fjern fra lister",
   "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
@@ -40,6 +42,10 @@
   "account.unfollow": "Avfølg",
   "account.unmute": "Avdemp @{name}",
   "account.unmute_notifications": "Vis varsler fra @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Vennligst prøv igjen etter kl. {retry_time, time, medium}.",
   "alert.rate_limited.title": "Hastighetsbegrenset",
   "alert.unexpected.message": "En uventet feil oppstod.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Vis innstillinger",
   "column_header.unpin": "Løsne",
   "column_subheading.settings": "Innstillinger",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Media only",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Kun eksternt",
   "compose_form.direct_message_warning": "This toot will only be visible to all the mentioned users.",
   "compose_form.direct_message_warning_learn_more": "Lær mer",
   "compose_form.hashtag_warning": "Denne tuten blir ikke listet under noen emneknagger da den er ulistet. Kun offentlige tuter kan søktes etter med emneknagg.",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "Rapporter en feil",
   "follow_request.authorize": "Autorisér",
   "follow_request.reject": "Avvis",
-  "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.",
+  "follow_requests.unlocked_explanation": "Selv om kontoen din ikke er låst, tror {domain} ansatte at du kanskje vil gjennomgå forespørsler fra disse kontoene manuelt.",
   "getting_started.developers": "Utviklere",
   "getting_started.directory": "Profilmappe",
   "getting_started.documentation": "Dokumentasjon",
@@ -283,7 +289,7 @@
   "navigation_bar.mutes": "Dempede brukere",
   "navigation_bar.personal": "Personlig",
   "navigation_bar.pins": "Festa tuter",
-  "navigation_bar.preferences": "Preferanser",
+  "navigation_bar.preferences": "Innstillinger",
   "navigation_bar.public_timeline": "Felles tidslinje",
   "navigation_bar.security": "Sikkerhet",
   "notification.favourite": "{name} likte din status",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 370a73475..e0c9e99c6 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
   "account.badges.bot": "Robòt",
   "account.badges.group": "Grop",
@@ -40,6 +42,10 @@
   "account.unfollow": "Quitar de sègre",
   "account.unmute": "Quitar de rescondre @{name}",
   "account.unmute_notifications": "Mostrar las notificacions de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Mercés de tornar ensajar aprèp {retry_time, time, medium}.",
   "alert.rate_limited.title": "Taus limitat",
   "alert.unexpected.message": "Una error s’es producha.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostrar los paramètres",
   "column_header.unpin": "Despenjar",
   "column_subheading.settings": "Paramètres",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Sonque local",
   "community.column_settings.media_only": "Solament los mèdias",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Sonque alonhat",
   "compose_form.direct_message_warning": "Sols los mencionats poiràn veire aqueste tut.",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
   "compose_form.hashtag_warning": "Aqueste tut serà pas ligat a cap d’etiqueta estant qu’es pas listat. Òm pòt pas cercar que los tuts publics per etiqueta.",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index bbfe4cce3..3ac38a0ea 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Dodaj lub usuń z list",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupa",
   "account.block": "Blokuj @{name}",
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.blocked": "Zablokowany(-a)",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu",
   "account.cancel_follow_request": "Zrezygnuj z prośby o możliwość śledzenia",
   "account.direct": "Wyślij wiadomość bezpośrednią do @{name}",
   "account.domain_blocked": "Ukryto domenę",
@@ -40,6 +42,10 @@
   "account.unfollow": "Przestań śledzić",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "account.unmute_notifications": "Cofnij wyciszenie powiadomień od @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Spróbuj ponownie po {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ograniczony czasowo",
   "alert.unexpected.message": "Wystąpił nieoczekiwany błąd.",
@@ -79,9 +85,9 @@
   "column_subheading.lists": "Listy",
   "column_subheading.navigation": "Nawigacja",
   "column_subheading.settings": "Ustawienia",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Tylko Lokalne",
   "community.column_settings.media_only": "Tylko zawartość multimedialna",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Tylko Zdalne",
   "compose_form.direct_message_warning": "Ten wpis będzie widoczny tylko dla wszystkich wspomnianych użytkowników.",
   "compose_form.direct_message_warning_learn_more": "Dowiedz się więcej",
   "compose_form.hashtag_warning": "Ten wpis nie będzie widoczny pod podanymi hashtagami, ponieważ jest oznaczony jako niewidoczny. Tylko publiczne wpisy mogą zostać znalezione z użyciem hashtagów.",
@@ -241,7 +247,7 @@
   "keyboard_shortcuts.reply": "aby odpowiedzieć",
   "keyboard_shortcuts.requests": "aby przejść do listy próśb o możliwość śledzenia",
   "keyboard_shortcuts.search": "aby przejść do pola wyszukiwania",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "aby pokazać/ukryć pole CW",
   "keyboard_shortcuts.start": "aby otworzyć kolumnę „Rozpocznij”",
   "keyboard_shortcuts.toggle_hidden": "aby wyświetlić lub ukryć wpis spod CW",
   "keyboard_shortcuts.toggle_sensitivity": "by pokazać/ukryć multimedia",
@@ -419,10 +425,10 @@
   "time_remaining.minutes": "{number, plural, one {Pozostała # minuta} few {Pozostały # minuty} many {Pozostało # minut} other {Pozostało # minut}}",
   "time_remaining.moments": "Pozostała chwila",
   "time_remaining.seconds": "{number, plural, one {Pozostała # sekunda} few {Pozostały # sekundy} many {Pozostało # sekund} other {Pozostało # sekund}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} z innych serwerów nie są wyświetlane.",
+  "timeline_hint.resources.followers": "Śledzący",
+  "timeline_hint.resources.follows": "Śledzeni",
+  "timeline_hint.resources.statuses": "Starsze wpisy",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {osoba rozmawia} few {osoby rozmawiają} other {osób rozmawia}} o tym",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 334e0e8c6..b45ed4d06 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Adicionar ou Remover de listas",
   "account.badges.bot": "Robô",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Bloquear domínio {domain}",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Encontre mais no perfil original",
   "account.cancel_follow_request": "Cancelar solicitação para seguir",
   "account.direct": "Enviar toot direto para @{name}",
   "account.domain_blocked": "Domínio bloqueado",
@@ -40,6 +42,10 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Tirar @{name} do mudo",
   "account.unmute_notifications": "Mostrar notificações de @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Por favor tente novamente após {retry_time, time, medium}.",
   "alert.rate_limited.title": "Frequência limitada",
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_subheading.settings": "Configurações",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Apenas local",
   "community.column_settings.media_only": "Somente Mídia",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Apenas remoto",
   "compose_form.direct_message_warning": "Este toot só será enviado aos usuários mencionados.",
   "compose_form.direct_message_warning_learn_more": "Saiba mais",
   "compose_form.hashtag_warning": "Este toot não vai estar listado em nenhuma hashtag porque está como não-listado. Somente toots públicos podem ser pesquisados por hashtag.",
@@ -103,7 +109,7 @@
   "confirmations.block.confirm": "Bloquear",
   "confirmations.block.message": "Você tem certeza de que deseja bloquear {name}?",
   "confirmations.delete.confirm": "Excluir",
-  "confirmations.delete.message": "Você tem certeza de que deseja excluir este toot?",
+  "confirmations.delete.message": "Tem certeza que quer excluir este status?",
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.domain_block.confirm": "Bloquear domínio inteiro",
@@ -114,7 +120,7 @@
   "confirmations.mute.explanation": "Isso ocultará toots deles e toots mencionando-os, mas ainda permitirá que eles vejam seus toots e te sigam.",
   "confirmations.mute.message": "Você tem certeza de que deseja silenciar {name}?",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
-  "confirmations.redraft.message": "Você tem certeza de que deseja apagar o toot e usá-lo como rascunho? Boosts e favoritos serão perdidos e as respostas ao toot original ficarão desconectadas.",
+  "confirmations.redraft.message": "Tem certeza que quer excluir este status e re-rascunhá-lo? Favoritos e boots vão ser perdidos, e as respostas ao post original vão ficar órfãs.",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Responder agora sobrescreverá o toot que você está compondo. Deseja continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
@@ -152,11 +158,11 @@
   "empty_column.domain_blocks": "Não há domínios bloqueados ainda.",
   "empty_column.favourited_statuses": "Nada aqui. Quando você favoritar um toot, ele aparecerá aqui.",
   "empty_column.favourites": "Nada aqui. Quando alguém favoritar, o autor aparecerá aqui.",
-  "empty_column.follow_requests": "Nada aqui. Quando você receber solicitações de seguidores, elas aparecerão aqui.",
+  "empty_column.follow_requests": "Nada aqui. Quando você tiver seguidores pendentes, eles aparecerão aqui.",
   "empty_column.hashtag": "Nada aqui.",
   "empty_column.home": "Sua linha do tempo está vazia! Visite {public} ou use a pesquisa para começar e conhecer outros usuários.",
   "empty_column.home.public_timeline": "a linha do tempo pública",
-  "empty_column.list": "Nada aqui. Quando os usuários nesta lista postarem toots, eles aparecerão aqui.",
+  "empty_column.list": "Não há nada nesta lista ainda. Quando membros desta lista postarem novos statuses, eles vão aparecer aqui.",
   "empty_column.lists": "Nada aqui. Quando você criar listas, elas aparecerão aqui.",
   "empty_column.mutes": "Nada aqui.",
   "empty_column.notifications": "Nada aqui. Interaja com outros usuários para começar a conversar.",
@@ -213,7 +219,7 @@
   "keyboard_shortcuts.back": "voltar",
   "keyboard_shortcuts.blocked": "abrir lista de usuários bloqueados",
   "keyboard_shortcuts.boost": "dar boost",
-  "keyboard_shortcuts.column": "focar no toot de uma das colunas",
+  "keyboard_shortcuts.column": "para focar um status de uma das colunas",
   "keyboard_shortcuts.compose": "focar na composição",
   "keyboard_shortcuts.description": "Descrição",
   "keyboard_shortcuts.direct": "abrir Mensagens Diretas",
@@ -235,9 +241,9 @@
   "keyboard_shortcuts.pinned": "abrir toots fixados",
   "keyboard_shortcuts.profile": "para abrir perfil do autor",
   "keyboard_shortcuts.reply": "para responder",
-  "keyboard_shortcuts.requests": "para abrir lista de pedidos para seguir",
+  "keyboard_shortcuts.requests": "abrir lista de seguidores pendentes",
   "keyboard_shortcuts.search": "para focar pesquisa",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "para mostrar/ocultar o campo AC",
   "keyboard_shortcuts.start": "para abrir coluna \"primeiros passos\"",
   "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar o toot com Aviso de Conteúdo",
   "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar mídia",
@@ -286,13 +292,13 @@
   "navigation_bar.preferences": "Preferências",
   "navigation_bar.public_timeline": "Linha do tempo federada",
   "navigation_bar.security": "Segurança",
-  "notification.favourite": "{name} favoritou seu toot",
+  "notification.favourite": "{name} favoritou seu status",
   "notification.follow": "{name} te seguiu",
   "notification.follow_request": "{name} quer te seguir",
   "notification.mention": "{name} te mencionou",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
-  "notification.reblog": "{name} deu boost no seu toot",
+  "notification.reblog": "{name} boostou seu status",
   "notifications.clear": "Limpar notificações",
   "notifications.clear_confirmation": "Você tem certeza de que deseja limpar todas as suas notificações?",
   "notifications.column_settings.alert": "Notificações no computador",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos faltantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são exibidos.",
+  "timeline_hint.resources.followers": "Seguidores",
+  "timeline_hint.resources.follows": "Seguindo",
+  "timeline_hint.resources.statuses": "Toots mais antigos",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {pessoa} other {pessoas}} falando",
   "trends.trending_now": "Em alta no momento",
   "ui.beforeunload": "Seu rascunho vai ser perdido se você sair do Mastodon.",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a888f7a58..2697b0a0c 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Adicionar ou remover das listas",
   "account.badges.bot": "Robô",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Esconder tudo do domínio {domain}",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Encontre mais no perfil original",
   "account.cancel_follow_request": "Cancelar pedido de seguidor",
   "account.direct": "Mensagem directa @{name}",
   "account.domain_blocked": "Domínio escondido",
@@ -40,6 +42,10 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
   "account.unmute_notifications": "Deixar de silenciar @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Volte a tentar depois das {retry_time, time, medium}.",
   "alert.rate_limited.title": "Limite de tentativas",
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
   "column_subheading.settings": "Configurações",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Local apenas",
   "community.column_settings.media_only": "Somente media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Remoto apenas",
   "compose_form.direct_message_warning": "Esta publicação será enviada apenas para os utilizadores mencionados.",
   "compose_form.direct_message_warning_learn_more": "Conhecer mais",
   "compose_form.hashtag_warning": "Este toot não será listado em nenhuma hashtag por ser não listado. Apenas toots públics podem ser pesquisados por hashtag.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "para responder",
   "keyboard_shortcuts.requests": "para abrir a lista dos pedidos de seguidor",
   "keyboard_shortcuts.search": "para focar na pesquisa",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "para mostrar/esconder o campo AC",
   "keyboard_shortcuts.start": "para abrir a coluna dos \"primeiros passos\"",
   "keyboard_shortcuts.toggle_hidden": "para mostrar/esconder texto atrás de CW",
   "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar media",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{número, plural, um {# minute} outro {# minutes}} faltam",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{número, plural, um {# second} outro {# seconds}} faltam",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são exibidos.",
+  "timeline_hint.resources.followers": "Seguidores",
+  "timeline_hint.resources.follows": "Seguindo",
+  "timeline_hint.resources.statuses": "Toots antigos",
   "trends.count_by_accounts": "{count} {rawCount, plural, uma {person} outra {people}} a falar",
   "trends.trending_now": "Tendências atuais",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 1a998e8fb..e470a7f90 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Adaugă sau Elimină din liste",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grup",
   "account.block": "Blocați @{name}",
   "account.block_domain": "Blocați domeniul {domain}",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Caută mai multe în profilul original",
   "account.cancel_follow_request": "Anulați cererea de urmărire",
   "account.direct": "Mesaj direct @{name}",
   "account.domain_blocked": "Domeniu blocat",
@@ -37,9 +39,13 @@
   "account.unblock": "Deblochează pe @{name}",
   "account.unblock_domain": "Deblochează domeniul {domain}",
   "account.unendorse": "Nu promova pe profil",
-  "account.unfollow": "Nu mai urmării",
+  "account.unfollow": "Nu mai urmări",
   "account.unmute": "Nu mai ignora pe @{name}",
   "account.unmute_notifications": "Activează notificările de la @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Vă rugăm să reîncercați după {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rată limitată",
   "alert.unexpected.message": "A apărut o eroare neașteptată.",
@@ -55,7 +61,7 @@
   "bundle_modal_error.retry": "Încearcă din nou",
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Marcaje",
-  "column.community": "Fluxul Local",
+  "column.community": "Fluxul local",
   "column.direct": "Mesaje directe",
   "column.directory": "Răsfoiți profiluri",
   "column.domain_blocks": "Domenii blocate",
@@ -75,12 +81,12 @@
   "column_header.show_settings": "Arată setările",
   "column_header.unpin": "Eliberează",
   "column_subheading.settings": "Setări",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Doar local",
   "community.column_settings.media_only": "Doar media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Doar la distanţă",
   "compose_form.direct_message_warning": "Această postare va fi trimisă doar utilizatorilor menționați.",
   "compose_form.direct_message_warning_learn_more": "Află mai multe",
-  "compose_form.hashtag_warning": "Această postare nu va fi listată sub nici un hashtag pentru că este nelistată. Doar postările publice pot fi găsite după un hashtag.",
+  "compose_form.hashtag_warning": "Această postare nu va fi listată sub niciun hashtag pentru că este nelistată. Doar postările publice pot fi găsite după un hashtag.",
   "compose_form.lock_disclaimer": "Contul tău nu este {locked}. Oricine te poate urmări fără aprobarea ta și vedea toate postările tale.",
   "compose_form.lock_disclaimer.lock": "privat",
   "compose_form.placeholder": "La ce te gândești?",
@@ -107,7 +113,7 @@
   "confirmations.delete_list.confirm": "Șterge",
   "confirmations.delete_list.message": "Ești sigur că vrei să ștergi permanent această listă?",
   "confirmations.domain_block.confirm": "Ascunde tot domeniul",
-  "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi complet domeniul {domain}? În cele mai multe cazuri raportarea sau ignorarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea nici un conținut de la acest domeniu în nici un flux public sau în notificările tale. Urmăritorii tăi de la acele domenii vor fi eliminați.",
+  "confirmations.domain_block.message": "Ești absolut sigur că vrei să blochezi complet domeniul {domain}? În cele mai multe cazuri raportarea sau ignorarea anumitor lucruri este suficientă și de preferat. Nu vei mai vedea niciun conținut de la acest domeniu în nici un flux public sau în notificările tale. Urmăritorii tăi de la acele domenii vor fi eliminați.",
   "confirmations.logout.confirm": "Deconectare",
   "confirmations.logout.message": "Ești sigur că vrei să te deconectezi?",
   "confirmations.mute.confirm": "Ignoră",
@@ -143,7 +149,7 @@
   "emoji_button.search_results": "Rezultatele căutării",
   "emoji_button.symbols": "Simboluri",
   "emoji_button.travel": "Călătorii și Locuri",
-  "empty_column.account_timeline": "Nici o postare aici!",
+  "empty_column.account_timeline": "Nicio postare aici!",
   "empty_column.account_unavailable": "Profil indisponibil",
   "empty_column.blocks": "Nu ai blocat nici un utilizator încă.",
   "empty_column.bookmarked_statuses": "Nu aveți nici o postare marcată încă. Atunci când veți marca una, va fi afișată aici.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "să răspundă",
   "keyboard_shortcuts.requests": "să deschidă lista cu cereri de urmărire",
   "keyboard_shortcuts.search": "să focalizeze căutarea",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "pentru a afişa/ascunde câmpul CW",
   "keyboard_shortcuts.start": "să deschidă coloana \"Începere\"",
   "keyboard_shortcuts.toggle_hidden": "să arate/ascundă textul în spatele CW",
   "keyboard_shortcuts.toggle_sensitivity": "pentru a afișa/ascunde media",
@@ -359,7 +365,7 @@
   "search_results.hashtags": "Hashtag-uri",
   "search_results.statuses": "Postări",
   "search_results.statuses_fts_disabled": "Căutarea de postări după conținutul lor nu este activată pe acest server.",
-  "search_results.total": "{count, number}{count, plural, one { rezultat} other { rezultate}}",
+  "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultate}}",
   "status.admin_account": "Deschide interfața de moderare pentru @{name}",
   "status.admin_status": "Deschide această stare în interfața de moderare",
   "status.block": "Blochează pe @{name}",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minute}} rămase",
   "time_remaining.moments": "Momente rămase",
   "time_remaining.seconds": "{number, plural, one {# secundă} other {# secunde}} rămase",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "{resource} de la alte servere nu sunt afișate.",
+  "timeline_hint.resources.followers": "Urmăritori",
+  "timeline_hint.resources.follows": "Urmăriri",
+  "timeline_hint.resources.statuses": "Postări mai vechi",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoană} other {persoane}} vorbește/ecs",
   "trends.trending_now": "În tendință acum",
   "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index ed1518d02..4ef68d955 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Управление списками",
   "account.badges.bot": "Бот",
   "account.badges.group": "Группа",
   "account.block": "Заблокировать @{name}",
   "account.block_domain": "Заблокировать {domain}",
   "account.blocked": "Заблокирован(а)",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Посмотреть их можно в оригинальном профиле",
   "account.cancel_follow_request": "Отменить запрос",
   "account.direct": "Написать @{name}",
   "account.domain_blocked": "Домен скрыт",
@@ -40,6 +42,10 @@
   "account.unfollow": "Отписаться",
   "account.unmute": "Не игнорировать @{name}",
   "account.unmute_notifications": "Показывать уведомления от @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Вы выполняете действие слишком часто",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Показать настройки",
   "column_header.unpin": "Открепить",
   "column_subheading.settings": "Настройки",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Только локальные",
   "community.column_settings.media_only": "Только с медиафайлами",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Только удалённые",
   "compose_form.direct_message_warning": "Адресованные посты отправляются и видны только упомянутым в них пользователям.",
   "compose_form.direct_message_warning_learn_more": "Узнать подробнее",
   "compose_form.hashtag_warning": "Так как этот пост не публичный, он не отобразится в поиске по хэштегам.",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "ответить",
   "keyboard_shortcuts.requests": "перейти к запросам на подписку",
   "keyboard_shortcuts.search": "перейти к поиску",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "показать/скрыть поле предупреждения о содержании",
   "keyboard_shortcuts.start": "перейти к разделу \"добро пожаловать\"",
   "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
   "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
   "time_remaining.moments": "остались считанные мгновения",
   "time_remaining.seconds": "{number, plural, one {# секунда} many {# секунд} other {# секунды}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "Мы не отображаем {resource} с других серверов.",
+  "timeline_hint.resources.followers": "подписчиков",
+  "timeline_hint.resources.follows": "подписки",
+  "timeline_hint.resources.statuses": "Прошлые посты",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {человек говорит} few {человека говорят} other {человек говорят}} про это",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index dadc34cde..79f593417 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Agiunghe o boga dae is listas",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grupu",
@@ -40,6 +42,10 @@
   "account.unfollow": "Non sigas prus",
   "account.unmute": "Torra a ativare @{name}",
   "account.unmute_notifications": "Ativa notìficas pro @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Torra·bi a proare a pustis de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Màssimu de rechestas barigadu",
   "alert.unexpected.message": "B'at àpidu una faddina.",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index d37a7db6f..2b5060efe 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Pridaj do, alebo odober zo zoznamov",
   "account.badges.bot": "Bot",
   "account.badges.group": "Skupina",
@@ -40,6 +42,10 @@
   "account.unfollow": "Prestaň následovať",
   "account.unmute": "Prestaň ignorovať @{name}",
   "account.unmute_notifications": "Zruš stĺmenie oboznámení od @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Prosím, skús to znova za {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tempo obmedzené",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index e969b9ad2..3f334892b 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Dodaj ali odstrani iz seznama",
   "account.badges.bot": "Robot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Prenehaj slediti",
   "account.unmute": "Odtišaj @{name}",
   "account.unmute_notifications": "Vklopi obvestila od @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "Zgodila se je nepričakovana napaka.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 2729c0266..5c8181ce1 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -1,14 +1,16 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Shtoni ose Hiqni prej listash",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grup",
   "account.block": "Blloko @{name}",
-  "account.block_domain": "Fshih gjithçka prej {domain}",
+  "account.block_domain": "Blloko përkatësinë {domain}",
   "account.blocked": "E bllokuar",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "Shfletoni më tepër rreth profilit origjinal",
   "account.cancel_follow_request": "Anulo kërkesën e ndjekjes",
-  "account.direct": "Mesazh i drejtpërdrejt për @{name}",
-  "account.domain_blocked": "Përkatësi e fshehur",
+  "account.direct": "Mesazh i drejtpërdrejtë për @{name}",
+  "account.domain_blocked": "Përkatësia u bllokua",
   "account.edit_profile": "Përpunoni profilin",
   "account.endorse": "Pasqyrojeni në profil",
   "account.follow": "Ndiqeni",
@@ -18,7 +20,7 @@
   "account.follows.empty": "Ky përdorues ende s’ndjek njeri.",
   "account.follows_you": "Ju ndjek",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
-  "account.last_status": "Së fundi aktiv",
+  "account.last_status": "Aktiv së fundi më",
   "account.link_verified_on": "Pronësia e kësaj lidhjeje qe kontrolluar më {date}",
   "account.locked_info": "Gjendja e privatësisë së kësaj llogarie është caktuar si e kyçur. I zoti merr dorazi në shqyrtim cilët mund ta ndjekin.",
   "account.media": "Media",
@@ -27,26 +29,30 @@
   "account.mute": "Heshtoni @{name}",
   "account.mute_notifications": "Heshtoji njoftimet prej @{name}",
   "account.muted": "Heshtuar",
-  "account.never_active": "Asnjëherë",
+  "account.never_active": "Kurrë",
   "account.posts": "Mesazhe",
   "account.posts_with_replies": "Mesazhe dhe përgjigje",
-  "account.report": "Raporto @{name}",
-  "account.requested": "Në pritje të pranimit. Klikoni që të anulosh kërkesën për ndjekje",
+  "account.report": "Raportojeni @{name}",
+  "account.requested": "Në pritje të miratimit. Që të anuloni kërkesën për ndjekje, klikojeni",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
   "account.show_reblogs": "Shfaq përforcime nga @{name}",
-  "account.unblock": "Ç'bllokoje @{name}",
-  "account.unblock_domain": "Ç'blloko {domain}",
+  "account.unblock": "Zhbllokoje @{name}",
+  "account.unblock_domain": "Zhblloko përkatësinë {domain}",
   "account.unendorse": "Mos e përfshi në profil",
-  "account.unfollow": "Mos e ndjek",
+  "account.unfollow": "Resht së ndjekuri",
   "account.unmute": "Ktheji zërin @{name}",
   "account.unmute_notifications": "Hiqua ndalimin e shfaqjes njoftimeve nga @{name}",
-  "alert.rate_limited.message": "Ju lutemi provoni pas {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Sasi e kufizuar",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
+  "alert.rate_limited.message": "Ju lutemi, riprovoni pas {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Shpejtësi e kufizuar",
   "alert.unexpected.message": "Ndodhi një gabim të papritur.",
   "alert.unexpected.title": "Hëm!",
   "announcement.announcement": "Njoftime",
   "autosuggest_hashtag.per_week": "{count} për javë",
-  "boost_modal.combo": "Mund të shtypni {combo}, që të anashkalohet kjo herës tjetër",
+  "boost_modal.combo": "Mund të shtypni {combo}, që kjo të anashkalohet herës tjetër",
   "bundle_column_error.body": "Diç shkoi ters teksa ngarkohej ky përbërës.",
   "bundle_column_error.retry": "Riprovoni",
   "bundle_column_error.title": "Gabim rrjeti",
@@ -54,11 +60,11 @@
   "bundle_modal_error.message": "Diç shkoi ters teksa ngarkohej ky përbërës.",
   "bundle_modal_error.retry": "Riprovoni",
   "column.blocks": "Përdorues të bllokuar",
-  "column.bookmarks": "Shënjimet",
+  "column.bookmarks": "Faqerojtës",
   "column.community": "Rrjedhë kohore vendore",
-  "column.direct": "Mesazhe të drejtpërdrejta",
-  "column.directory": "Shfleto profile",
-  "column.domain_blocks": "Përkatësi të fshehura",
+  "column.direct": "Mesazhe të drejtpërdrejtë",
+  "column.directory": "Shfletoni profile",
+  "column.domain_blocks": "Përkatësi të bllokuara",
   "column.favourites": "Të parapëlqyer",
   "column.follow_requests": "Kërkesa për ndjekje",
   "column.home": "Kreu",
@@ -75,65 +81,65 @@
   "column_header.show_settings": "Shfaq rregullime",
   "column_header.unpin": "Shfiksoje",
   "column_subheading.settings": "Rregullime",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Vetëm vendore",
   "community.column_settings.media_only": "Vetëm Media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Vetëm të largëta",
   "compose_form.direct_message_warning": "Ky mesazh do t’u dërgohet përdoruesve të përmendur.",
   "compose_form.direct_message_warning_learn_more": "Mësoni më tepër",
   "compose_form.hashtag_warning": "Ky mesazh s’do të paraqitet nën ndonjë hashtag, ngaqë s’i është caktuar ndonjë. Vetëm mesazhet publike mund të kërkohen sipas hashtagësh.",
   "compose_form.lock_disclaimer": "Llogaria juaj s’është {locked}. Mund ta ndjekë cilido, për të parë postimet tuaja vetëm për ndjekësit.",
-  "compose_form.lock_disclaimer.lock": "e bllokuar",
+  "compose_form.lock_disclaimer.lock": "e kyçur",
   "compose_form.placeholder": "Ç’bluani në mendje?",
   "compose_form.poll.add_option": "Shto zgjedhje",
-  "compose_form.poll.duration": "Kohëzgjatja e votimit",
+  "compose_form.poll.duration": "Kohëzgjatje pyetësori",
   "compose_form.poll.option_placeholder": "Zgjedhja {number}",
-  "compose_form.poll.remove_option": "Largo këtë zgjedhje",
+  "compose_form.poll.remove_option": "Hiqe këtë zgjedhje",
   "compose_form.poll.switch_to_multiple": "Ndrysho votimin për të lejuar shumë zgjedhje",
   "compose_form.poll.switch_to_single": "Ndrysho votimin për të lejuar vetëm një zgjedhje",
   "compose_form.publish": "Mesazh",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Lajmëro media si sensitive",
+  "compose_form.sensitive.hide": "Vëri shenjë medias si rezervat",
   "compose_form.sensitive.marked": "Media është shënuar si rezervat",
   "compose_form.sensitive.unmarked": "Media s’është shënuar si rezervat",
   "compose_form.spoiler.marked": "Teksti është fshehur pas sinjalizimit",
   "compose_form.spoiler.unmarked": "Teksti s’është i fshehur",
   "compose_form.spoiler_placeholder": "Shkruani këtu sinjalizimin tuaj",
   "confirmation_modal.cancel": "Anuloje",
-  "confirmations.block.block_and_report": "Ndalo dhe Raporto",
+  "confirmations.block.block_and_report": "Bllokoje & Raportojeni",
   "confirmations.block.confirm": "Bllokoje",
   "confirmations.block.message": "Jeni i sigurt se doni të bllokohet {name}?",
   "confirmations.delete.confirm": "Fshije",
   "confirmations.delete.message": "Jeni i sigurt se doni të fshihet kjo gjendje?",
   "confirmations.delete_list.confirm": "Fshije",
-  "confirmations.delete_list.message": "Jeni i sigurt që doni të fshihet përgjithmonë kjo listë?",
-  "confirmations.domain_block.confirm": "Fshih krejt përkatësinë",
+  "confirmations.delete_list.message": "Jeni i sigurt se doni të fshihet përgjithmonë kjo listë?",
+  "confirmations.domain_block.confirm": "Bllokoje krejt përkatësinë",
   "confirmations.domain_block.message": "Jeni i sigurt, shumë i sigurt se doni të bllokohet krejt {domain}? Në shumicën e rasteve, ndoca bllokime ose heshtime me synim të caktuar janë të mjaftueshme dhe të parapëlqyera. S’keni për të parë lëndë nga kjo përkatësi në ndonjë rrjedhë kohore publike, apo te njoftimet tuaja. Ndjekësit tuaj prej asaj përkatësie do të hiqen.",
-  "confirmations.logout.confirm": "Ç'kyçu",
-  "confirmations.logout.message": "A jeni të sigurt se dëshironi të ç'kyçeni?",
+  "confirmations.logout.confirm": "Dilni",
+  "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
   "confirmations.mute.confirm": "Heshtoje",
-  "confirmations.mute.explanation": "Kjo do të fsheh postimet nga ata dhe postimet që përmendin ata, megjithatë ende do ti lejojë ata që të shohin postimet e juaja dhe të ju ndjekin.",
+  "confirmations.mute.explanation": "Kjo do t’u fshehë postimet dhe përmendje postimesh, por ende do t’u lejojë të shohin postimet tuaja dhe t’ju ndjekin.",
   "confirmations.mute.message": "Jeni i sigurt se doni të heshtohet {name}?",
   "confirmations.redraft.confirm": "Fshijeni & rihartojeni",
-  "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Parapëlqimet dhe boosts do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
+  "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Parapëlqimet dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
   "confirmations.reply.confirm": "Përgjigjuni",
-  "confirmations.reply.message": "Përgjigja tani do të shkaktojë mbishkrimin e mesazhit që po hartoni. Jeni i sigurt se doni të vazhdohet më tej?",
+  "confirmations.reply.message": "Po të përgjigjeni tani, mesazhi që po hartoni, do të mbishkruhet. Jeni i sigurt se doni të vazhdohet më tej?",
   "confirmations.unfollow.confirm": "Resht së ndjekuri",
   "confirmations.unfollow.message": "Jeni i sigurt se doni të mos ndiqet më {name}?",
-  "conversation.delete": "Fshijë bisedën",
-  "conversation.mark_as_read": "Shëno si të lexuar",
+  "conversation.delete": "Fshije bisedën",
+  "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
   "conversation.with": "Me {names}",
-  "directory.federated": "Nga fediversa e njohur",
+  "directory.federated": "Nga fedivers i njohur",
   "directory.local": "Vetëm nga {domain}",
-  "directory.new_arrivals": "Arritje të reja",
-  "directory.recently_active": "Aktive së fundi",
+  "directory.new_arrivals": "Të ardhur rishtas",
+  "directory.recently_active": "Aktivë së fundi",
   "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
   "embed.preview": "Ja si do të duket:",
   "emoji_button.activity": "Veprimtari",
   "emoji_button.custom": "Vetjak",
   "emoji_button.flags": "Flamuj",
   "emoji_button.food": "Ushqim & Pije",
-  "emoji_button.label": "Futni emoji",
+  "emoji_button.label": "Futni emotikonë",
   "emoji_button.nature": "Natyrë",
   "emoji_button.not_found": "No emojos!!! (╯°□°)╯︵ ┻━┻",
   "emoji_button.objects": "Objekte",
@@ -144,9 +150,9 @@
   "emoji_button.symbols": "Simbole",
   "emoji_button.travel": "Udhëtime & Vende",
   "empty_column.account_timeline": "S’ka mesazhe këtu!",
-  "empty_column.account_unavailable": "Profil i pa arritshëm",
+  "empty_column.account_unavailable": "Profil jashtë funksionimi",
   "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.",
-  "empty_column.bookmarked_statuses": "Nuk keni ndonjë Cicërimë të shënjuar. Kur të shënjoni ndonjë, do të shfaqet këtu.",
+  "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.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.",
@@ -161,38 +167,38 @@
   "empty_column.mutes": "S’keni heshtuar ende ndonjë përdorues.",
   "empty_column.notifications": "Ende s’keni ndonjë njoftim. Ndërveproni me të tjerët që të nisë biseda.",
   "empty_column.public": "S’ka gjë këtu! Shkruani diçka publikisht, ose ndiqni dorazi përdorues prej instancash të tjera, që ta mbushni këtë zonë",
-  "error.unexpected_crash.explanation": "Për shkak të një gabimi në kodin burimor ose dështimi të shfletuesit, kjo faqe nuk mund të prezentohet saktësisht.",
-  "error.unexpected_crash.next_steps": "Provoni të freskoni faqen. Nëse kjo nuk ju ndihmon, mund të përdorni Mastodon nga një shfletues tjetër ose nga ndonjë aplikacion.",
-  "errors.unexpected_crash.copy_stacktrace": "Kopjo vëzhgimin stack në clipboard",
-  "errors.unexpected_crash.report_issue": "Raporto çështje",
+  "error.unexpected_crash.explanation": "Për shkak të një të mete në kodin tonë ose të një problemi përputhshmërie të shfletuesit, kjo faqe s’mund të shfaqet saktë.",
+  "error.unexpected_crash.next_steps": "Provoni të freskoni faqen. Nëse kjo s’bën punë, mundeni ende të jeni në gjendje të përdorni Mastodon-in që nga një shfletues tjetër ose nga ndonjë aplikacion origjinal prej projektit.",
+  "errors.unexpected_crash.copy_stacktrace": "Kopjo stacktrace-in në të papastër",
+  "errors.unexpected_crash.report_issue": "Raportoni problemin",
   "follow_request.authorize": "Autorizoje",
   "follow_request.reject": "Hidhe tej",
-  "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj nuk është e ndaluar, ekipi {domain} mendon se ju duhett të rishikoni manualisht kërkesat për ndiqje nga këto llogari.",
+  "follow_requests.unlocked_explanation": "Edhe pse llogaria juaj s’është e kyçur, ekipi i {domain} mendoi se mund të donit të shqyrtonit dorazi kërkesa ndjekjeje prej këtyre llogarive.",
   "getting_started.developers": "Zhvillues",
   "getting_started.directory": "Drejtori profilesh",
   "getting_started.documentation": "Dokumentim",
   "getting_started.heading": "Si t’ia fillohet",
   "getting_started.invite": "Ftoni njerëz",
   "getting_started.open_source_notice": "Mastodon-i është software me burim të hapur. Mund të jepni ndihmesë ose të njoftoni probleme në GitHub, te {github}.",
-  "getting_started.security": "Siguri",
+  "getting_started.security": "Rregullime llogarie",
   "getting_started.terms": "Kushte shërbimi",
   "hashtag.column_header.tag_mode.all": "dhe {additional}",
   "hashtag.column_header.tag_mode.any": "ose {additional}",
   "hashtag.column_header.tag_mode.none": "pa {additional}",
-  "hashtag.column_settings.select.no_options_message": "Nuk gjetëm sygjerime",
-  "hashtag.column_settings.select.placeholder": "Shëno hashtags…",
-  "hashtag.column_settings.tag_mode.all": "Krejt këto",
-  "hashtag.column_settings.tag_mode.any": "Cilëndo prej këtyre",
+  "hashtag.column_settings.select.no_options_message": "S’u gjetën sugjerime",
+  "hashtag.column_settings.select.placeholder": "Jepni hashtag-ë…",
+  "hashtag.column_settings.tag_mode.all": "Krejt këta",
+  "hashtag.column_settings.tag_mode.any": "Cilindo prej këtyre",
   "hashtag.column_settings.tag_mode.none": "Asnjë prej këtyre",
   "hashtag.column_settings.tag_toggle": "Përfshi etiketa shtesë për këtë shtyllë",
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
-  "home.hide_announcements": "Fsheh lajmërimet",
-  "home.show_announcements": "Shfaq lajmërimet",
-  "intervals.full.days": "{number, plural,one { ditë }other { ditë }}",
-  "intervals.full.hours": "{number, plural,one { orë }other {# orë }}",
-  "intervals.full.minutes": "{number, plural,one { minuta }other {# minuta }}",
+  "home.hide_announcements": "Fshihi lajmërimet",
+  "home.show_announcements": "Shfaqi lajmërimet",
+  "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}",
+  "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}",
+  "intervals.full.minutes": "{number, plural, one {# minutë} other {# minuta}}",
   "introduction.federation.action": "Pasuesi",
   "introduction.federation.federated.headline": "Të federuara",
   "introduction.federation.federated.text": "Postimet publike nga shërbyes të tjerë të fediversit do të shfaqen te rrjedha kohore e të federuarve.",
@@ -203,16 +209,16 @@
   "introduction.interactions.action": "Përfundojeni përkujdesoren!",
   "introduction.interactions.favourite.headline": "Parapëlqejeni",
   "introduction.interactions.favourite.text": "Duke e parapëlqyer, një mesazh mund ta ruani për më vonë dhe t’i bëni të ditur autorit se e pëlqyet.",
-  "introduction.interactions.reblog.headline": "Përforcime",
+  "introduction.interactions.reblog.headline": "Përforcim",
   "introduction.interactions.reblog.text": "Mesazhet e të tjerëve mund t’i ndani me ndjekësit tuaj duke i përforcuar.",
   "introduction.interactions.reply.headline": "Përgjigjuni",
   "introduction.interactions.reply.text": "Mund t'u përgjigjeni mesazheve tuaja dhe atyre të personave të tjerë, çka do t’i lidhë ato tok në një bisedë.",
   "introduction.welcome.action": "Shkojmë!",
   "introduction.welcome.headline": "Hapat e parë",
-  "introduction.welcome.text": "Mirë se vini në fedivers! Brenda pak çastesh do të jeni në gjendje të transmetoni mesazhe dhe të bisedoni me miqtë tuaj nëpër një larmi të madhe shërbyesish. Po ky shërbyes, {domain}, është i veçantë—strehon profilin tuaj, ndaj mbajeni mend emrin e tij.",
+  "introduction.welcome.text": "Mirë se vini në fedivers! Brenda pak çastesh do të jeni në gjendje të transmetoni mesazhe dhe të bisedoni me miqtë tuaj nëpër një larmi të madhe shërbyesish. Por ky shërbyes, {domain}, është i veçantë—strehon profilin tuaj, ndaj mbajeni mend emrin e tij.",
   "keyboard_shortcuts.back": "për shkuarje mbrapsht",
   "keyboard_shortcuts.blocked": "për hapje liste përdoruesish të bllokuar",
-  "keyboard_shortcuts.boost": "për përfocim",
+  "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.description": "Përshkrim",
@@ -231,51 +237,51 @@
   "keyboard_shortcuts.muted": "për hapje liste përdoruesish të heshtuar",
   "keyboard_shortcuts.my_profile": "për hapjen e profilit tuaj",
   "keyboard_shortcuts.notifications": "për hapje shtylle njoftimesh",
-  "keyboard_shortcuts.open_media": "për të hapur media",
+  "keyboard_shortcuts.open_media": "për hapje mediash",
   "keyboard_shortcuts.pinned": "për hapje liste mesazhesh të fiksuar",
   "keyboard_shortcuts.profile": "për hapje të profilit të autorit",
   "keyboard_shortcuts.reply": "për t’u përgjigjur",
   "keyboard_shortcuts.requests": "për hapje liste kërkesash për ndjekje",
   "keyboard_shortcuts.search": "për kalim fokusi te kërkimi",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "për hapjen e shtyllës \"fillojani\"",
+  "keyboard_shortcuts.spoilers": "për shfaqje/fshehje fushe CW",
+  "keyboard_shortcuts.start": "për hapjen e shtyllës “fillojani”",
   "keyboard_shortcuts.toggle_hidden": "për shfaqje/fshehje teksti pas CW",
-  "keyboard_shortcuts.toggle_sensitivity": "për të shfaqur/të fshehur media",
+  "keyboard_shortcuts.toggle_sensitivity": "për shfaqje/fshehje mediash",
   "keyboard_shortcuts.toot": "për të filluar një mesazh fringo të ri",
   "keyboard_shortcuts.unfocus": "për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve",
   "keyboard_shortcuts.up": "për ngjitje sipër nëpër listë",
   "lightbox.close": "Mbylle",
   "lightbox.next": "Pasuesja",
   "lightbox.previous": "E mëparshmja",
-  "lightbox.view_context": "Shfaq kontekst",
+  "lightbox.view_context": "Shihni kontekstin",
   "lists.account.add": "Shto në listë",
   "lists.account.remove": "Hiqe nga lista",
   "lists.delete": "Fshije listën",
   "lists.edit": "Përpunoni listën",
-  "lists.edit.submit": "Ndrysho titullin",
+  "lists.edit.submit": "Ndryshoni titullin",
   "lists.new.create": "Shtoni listë",
   "lists.new.title_placeholder": "Titull liste të re",
   "lists.search": "Kërkoni mes personash që ndiqni",
   "lists.subheading": "Listat tuaja",
-  "load_pending": "{count, plural,one {# artikull i ri }other {# artikuj të ri }}",
+  "load_pending": "{count, plural,one {# objekt i ri }other {# objekte të rinj }}",
   "loading_indicator.label": "Po ngarkohet…",
-  "media_gallery.toggle_visible": "Ndërroni dukshmërinë",
+  "media_gallery.toggle_visible": "Fshihni {number, plural, one {figurë} other {figura}}",
   "missing_indicator.label": "S’u gjet",
   "missing_indicator.sublabel": "Ky burim s’u gjet dot",
-  "mute_modal.hide_notifications": "Të fshihen njoftimet prej këtij përdoruesi?",
+  "mute_modal.hide_notifications": "Të kalohen të fshehura njoftimet prej këtij përdoruesi?",
   "navigation_bar.apps": "Aplikacione për celular",
   "navigation_bar.blocks": "Përdorues të bllokuar",
-  "navigation_bar.bookmarks": "Shënjimet",
+  "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ërdrejta",
+  "navigation_bar.direct": "Mesazhe të drejtpërdrejtë",
   "navigation_bar.discover": "Zbuloni",
-  "navigation_bar.domain_blocks": "Përkatësi të fshehura",
+  "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
   "navigation_bar.edit_profile": "Përpunoni profilin",
   "navigation_bar.favourites": "Të parapëlqyer",
   "navigation_bar.filters": "Fjalë të heshtuara",
   "navigation_bar.follow_requests": "Kërkesa për ndjekje",
-  "navigation_bar.follows_and_followers": "Ndjek dhe ndjekësit",
+  "navigation_bar.follows_and_followers": "Ndjekje dhe ndjekës",
   "navigation_bar.info": "Mbi këtë shërbyes",
   "navigation_bar.keyboard_shortcuts": "Taste përkatës",
   "navigation_bar.lists": "Lista",
@@ -286,24 +292,24 @@
   "navigation_bar.preferences": "Parapëlqime",
   "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish",
   "navigation_bar.security": "Siguri",
-  "notification.favourite": "{name} parapëlqeu gjendjen tuaj",
+  "notification.favourite": "{name} pëlqeu mesazhin tuaj",
   "notification.follow": "{name} zuri t’ju ndjekë",
-  "notification.follow_request": "{name} kërkoji që të ju ndiq",
+  "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.mention": "{name} ju ka përmendur",
-  "notification.own_poll": "Votimi juaj mbaroi",
-  "notification.poll": "Votimi që nisët tanimë ka mbaruar",
-  "notification.reblog": "{name} përforcoi gjendjen tuaj",
-  "notifications.clear": "Pastroji njoftimet",
-  "notifications.clear_confirmation": "Jeni i sigurt se doni të pastrohen përgjithmonë krejt njoftimet tuaja?",
+  "notification.own_poll": "Pyetësori juaj ka përfunduar",
+  "notification.poll": "Ka përfunduar një pyetësor ku keni votuar",
+  "notification.reblog": "{name} përforcoi mesazhin tuaj",
+  "notifications.clear": "Spastroji njoftimet",
+  "notifications.clear_confirmation": "Jeni i sigurt se doni të spastrohen përgjithmonë krejt njoftimet tuaja?",
   "notifications.column_settings.alert": "Njoftime desktopi",
   "notifications.column_settings.favourite": "Të parapëlqyer:",
   "notifications.column_settings.filter_bar.advanced": "Shfaq krejt kategoritë",
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
   "notifications.column_settings.filter_bar.show": "Shfaq",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
-  "notifications.column_settings.follow_request": "Kërkesat e reja për ndjekje:",
+  "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
   "notifications.column_settings.mention": "Përmendje:",
-  "notifications.column_settings.poll": "Rezultatet e votimit:",
+  "notifications.column_settings.poll": "Përfundime pyetësori:",
   "notifications.column_settings.push": "Njoftime Push",
   "notifications.column_settings.reblog": "Përforcime:",
   "notifications.column_settings.show": "Shfaq në shtylla",
@@ -313,28 +319,28 @@
   "notifications.filter.favourites": "Të parapëlqyer",
   "notifications.filter.follows": "Ndjekje",
   "notifications.filter.mentions": "Përmendje",
-  "notifications.filter.polls": "Rezultatet e votimit",
+  "notifications.filter.polls": "Përfundime pyetësori",
   "notifications.group": "{count}s njoftime",
-  "poll.closed": "Mbyllur",
-  "poll.refresh": "Rifresko",
-  "poll.total_people": "{count, plural,one {# person }other {# njerëz }}",
-  "poll.total_votes": "{count, plural,one {# votë }other {# votat }}",
-  "poll.vote": "Voto",
-  "poll.voted": "Ju votuat për këtë pyetje",
-  "poll_button.add_poll": "Shto votim",
-  "poll_button.remove_poll": "Fshij votim",
-  "privacy.change": "Rregulloni privatësi gjendje",
-  "privacy.direct.long": "Postoja vetëm përdoruesve të përmendur",
+  "poll.closed": "I mbyllur",
+  "poll.refresh": "Rifreskoje",
+  "poll.total_people": "{count, plural,one {# person }other {# vetë }}",
+  "poll.total_votes": "{count, plural,one {# votë }other {# vota }}",
+  "poll.vote": "Votoni",
+  "poll.voted": "Votuat për këtë përgjigje",
+  "poll_button.add_poll": "Shtoni një pyetësor",
+  "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": "I drejtpërdrejtë",
-  "privacy.private.long": "Postojuani vetëm ndjekësve",
+  "privacy.private.long": "I dukshëm vetëm për ndjekës",
   "privacy.private.short": "Vetëm ndjekësve",
-  "privacy.public.long": "Postojeni në rrjedha publike kohore",
-  "privacy.public.short": "Publike",
-  "privacy.unlisted.long": "Mos e postoni në rrjedha publike kohore",
+  "privacy.public.long": "I dukshëm për të tërë, shfaqur në rrjedha kohore publike",
+  "privacy.public.short": "Publik",
+  "privacy.unlisted.long": "I dukshëm për të tërë, por jo në rrjedha kohore publike",
   "privacy.unlisted.short": "Jo në lista",
-  "refresh": "Rifresko",
+  "refresh": "Rifreskoje",
   "regeneration_indicator.label": "Po ngarkohet…",
-  "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatiteet!",
+  "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "tani",
@@ -349,27 +355,27 @@
   "report.submit": "Parashtroje",
   "report.target": "Raportim i {target}",
   "search.placeholder": "Kërkoni",
-  "search_popout.search_format": "Format kërkimi të përparuar",
-  "search_popout.tips.full_text": "Kërkimi për tekst të thjeshtë përgjigjet me gjendje që keni shkruar, parapëlqyer, përforcuar, ose ku jeni përmendur, si dhe emra përdoruesish, emra ekrani dhe hashtagë që kanë përputhje me termin e kërkimit.",
+  "search_popout.search_format": "Format kërkimi të mëtejshëm",
+  "search_popout.tips.full_text": "Kërkimi për tekst të thjeshtë përgjigjet me mesazhe që keni shkruar, parapëlqyer, përforcuar, ose ku jeni përmendur, si dhe emra përdoruesish, emra ekrani dhe hashtag-ë që kanë përputhje me termin e kërkimit.",
   "search_popout.tips.hashtag": "hashtag",
-  "search_popout.tips.status": "gjendje",
-  "search_popout.tips.text": "Kërkim për tekst të thjeshtë përgjigjet me emra, emra përdoruesish dhe hashtagë që kanë përputhje me termin e kërkimit",
+  "search_popout.tips.status": "mesazh",
+  "search_popout.tips.text": "Kërkim për tekst të thjeshtë përgjigjet me emra, emra përdoruesish dhe hashtag-ë që kanë përputhje me termin e kërkimit",
   "search_popout.tips.user": "përdorues",
   "search_results.accounts": "Persona",
-  "search_results.hashtags": "Hashtagë",
+  "search_results.hashtags": "Hashtag-ë",
   "search_results.statuses": "Mesazhe",
-  "search_results.statuses_fts_disabled": "Kërkimi cicërimave në bazë të përmbajtjes nuk është e aktivizuar në këtë server Mastodon.",
-  "search_results.total": "{count, number} {count, plural, një {result} {results} të tjera}",
+  "search_results.statuses_fts_disabled": "Kërkimi i mesazheve sipas lëndës së tyre s’është i aktivizuar në këtë shërbyes Mastodon.",
+  "search_results.total": "{count, number} {count, plural, one {përfundim} other {përfundime}}",
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
-  "status.admin_status": "Hape këtë gjendje te ndërfaqja e moderimit",
+  "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit",
   "status.block": "Blloko @{name}",
-  "status.bookmark": "Shënjim",
+  "status.bookmark": "Faqeruaje",
   "status.cancel_reblog_private": "Shpërforcojeni",
   "status.cannot_reblog": "Ky postim s’mund të përforcohet",
-  "status.copy": "Kopjoje lidhjen te gjendje",
+  "status.copy": "Kopjoje lidhjen për te mesazhi",
   "status.delete": "Fshije",
   "status.detailed_status": "Pamje e hollësishme bisede",
-  "status.direct": "Mesazh i drejtpërdrejt për @{name}",
+  "status.direct": "Mesazh i drejtpërdrejtë për @{name}",
   "status.embed": "Trupëzim",
   "status.favourite": "I parapëlqyer",
   "status.filtered": "I filtruar",
@@ -378,8 +384,8 @@
   "status.mention": "Përmendni @{name}",
   "status.more": "Më tepër",
   "status.mute": "Heshtoni @{name}",
-  "status.mute_conversation": "Heshtojeni bisedën",
-  "status.open": "Zgjeroje këtë gjendje",
+  "status.mute_conversation": "Heshtoje bisedën",
+  "status.open": "Zgjeroje këtë mesazh",
   "status.pin": "Fiksoje në profil",
   "status.pinned": "Mesazh i fiksuar",
   "status.read_more": "Lexoni më tepër",
@@ -388,18 +394,18 @@
   "status.reblogged_by": "{name} përforcoi",
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
-  "status.remove_bookmark": "Largo shënjimin",
+  "status.remove_bookmark": "Hiqe faqerojtësin",
   "status.reply": "Përgjigjuni",
   "status.replyAll": "Përgjigjuni rrjedhës",
   "status.report": "Raportojeni @{name}",
-  "status.sensitive_warning": "Lëndë me spec",
-  "status.share": "Ndajeni me të tjerët",
+  "status.sensitive_warning": "Lëndë rezervat",
+  "status.share": "Ndajeni me të tjerë",
   "status.show_less": "Shfaq më pak",
   "status.show_less_all": "Shfaq më pak për të tërë",
   "status.show_more": "Shfaq më tepër",
   "status.show_more_all": "Shfaq më tepër për të tërë",
   "status.show_thread": "Shfaq rrjedhën",
-  "status.uncached_media_warning": "I padisponueshëm",
+  "status.uncached_media_warning": "Jo e passhme",
   "status.unmute_conversation": "Ktheji zërin bisedës",
   "status.unpin": "Shfiksoje nga profili",
   "suggestions.dismiss": "Mos e merr parasysh sugjerimin",
@@ -409,37 +415,37 @@
   "tabs_bar.local_timeline": "Vendore",
   "tabs_bar.notifications": "Njoftime",
   "tabs_bar.search": "Kërkim",
-  "time_remaining.days": "{number, plural,one {# ditë}other {# ditëve}} të mbetur",
-  "time_remaining.hours": "{number, plural,one {# orë}other {# orëve}} mbetur",
-  "time_remaining.minutes": "{number, plural,one {# minutë}other {# minuta}} mbetur",
-  "time_remaining.moments": "Momente të mbetura",
-  "time_remaining.seconds": "{number, plural,one {# sekond}other {# sekonda}} mbetur",
-  "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 toots",
-  "trends.count_by_accounts": "{count} {rawCount, plural, një {person} {people} të tjerë} po flasin",
-  "trends.trending_now": "Në trend",
-  "ui.beforeunload": "Skica juaj do të humbë nëse dilni nga Mastodon-i.",
-  "upload_area.title": "Merreni & vëreni që të ngarkohet",
-  "upload_button.label": "Shtoni media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "time_remaining.days": "Edhe {number, plural, one {# ditë} other {# ditë}}",
+  "time_remaining.hours": "Edhe {number, plural, one {# orë} other {# orë}}",
+  "time_remaining.minutes": "Edhe {number, plural, one {# minutë} other {# minuta}}",
+  "time_remaining.moments": "Çaste të mbetur",
+  "time_remaining.seconds": "Edhe {number, plural, one {# sekondë} other {# sekonda}}",
+  "timeline_hint.remote_resource_not_displayed": "S’janë shfaqur {resource} nga shërbyes të tjerë.",
+  "timeline_hint.resources.followers": "Ndjekës",
+  "timeline_hint.resources.follows": "Ndjekje",
+  "timeline_hint.resources.statuses": "Mesazhe të vjetër",
+  "trends.count_by_accounts": "E biseduar nga {count} {rawCount, plural, one {person} other {vetë}}",
+  "trends.trending_now": "Prirjet e tashme",
+  "ui.beforeunload": "Skica juaj do të humbë, nëse dilni nga Mastodon-i.",
+  "upload_area.title": "Që të ngarkohet, merreni & vëreni",
+  "upload_button.label": "Shtoni figura, një video ose një kartelë audio",
   "upload_error.limit": "U tejkalua kufi ngarkimi kartelash.",
-  "upload_error.poll": "Ngarkimi dokumenteve nuk lejohet në votime.",
-  "upload_form.audio_description": "Shpjego për njerëzit me ndëgjim të kufizuar",
+  "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
+  "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
-  "upload_form.edit": "Modifiko",
+  "upload_form.edit": "Përpunoni",
   "upload_form.undo": "Fshije",
-  "upload_form.video_description": "Shpjego për njerëzit me ndëgjim të kufizuar ose probleme me të pamurit",
-  "upload_modal.analyzing_picture": "Duke analizuar fotografinë…",
-  "upload_modal.apply": "Zbato",
-  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
-  "upload_modal.detect_text": "Detekto tekstin nga fotografia",
-  "upload_modal.edit_media": "Modifiko media",
-  "upload_modal.hint": "Kliko ose zhvendos rrethin në shfaqjen e cila do të jetë pika fokusit dhe shfaqet në gjithë tablot.",
-  "upload_modal.preview_label": "Shiko paraprakisht ({ratio})",
+  "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
+  "upload_modal.analyzing_picture": "Po analizohet fotoja…",
+  "upload_modal.apply": "Aplikoje",
+  "upload_modal.description_placeholder": "Deshe Korçën, Korçën të dhamë",
+  "upload_modal.detect_text": "Pikase tekstin prej fotoje",
+  "upload_modal.edit_media": "Përpunoni media",
+  "upload_modal.hint": "Që të zgjidhni pikën vatrore e cila do të jetë përherë e dukshme në krejt miniaturat, klikojeni ose tërhiqeni rrethin te paraparja.",
+  "upload_modal.preview_label": "Paraparje ({ratio})",
   "upload_progress.label": "Po ngarkohet…",
   "video.close": "Mbylle videon",
-  "video.download": "Shkarko të dhënë",
+  "video.download": "Shkarkoje kartelën",
   "video.exit_fullscreen": "Dil nga mënyra Sa Krejt Ekrani",
   "video.expand": "Zgjeroje videon",
   "video.fullscreen": "Sa krejt ekrani",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 6e0bd4d1e..cb49a1cb9 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "Otprati",
   "account.unmute": "Ukloni ućutkavanje korisniku @{name}",
   "account.unmute_notifications": "Uključi nazad obaveštenja od korisnika @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "An unexpected error occurred.",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 356ff85bc..b1104f653 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Додај или Одстрани са листа",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
@@ -40,6 +42,10 @@
   "account.unfollow": "Отпрати",
   "account.unmute": "Уклони ућуткавање кориснику @{name}",
   "account.unmute_notifications": "Укључи назад обавештења од корисника @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Молимо покушајте поново после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ограничена брзина",
   "alert.unexpected.message": "Појавила се неочекивана грешка.",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 11b72db36..3a221b641 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Lägg till i eller ta bort från listor",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
@@ -40,6 +42,10 @@
   "account.unfollow": "Sluta följ",
   "account.unmute": "Sluta tysta @{name}",
   "account.unmute_notifications": "Återaktivera aviseringar från @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Vänligen försök igen efter {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mängd begränsad",
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Visa inställningar",
   "column_header.unpin": "Ångra fäst",
   "column_subheading.settings": "Inställningar",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Endast lokalt",
   "community.column_settings.media_only": "Endast media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Endast fjärr",
   "compose_form.direct_message_warning": "Denna tutning kommer endast skickas till de nämnda användarna.",
   "compose_form.direct_message_warning_learn_more": "Lär dig mer",
   "compose_form.hashtag_warning": "Denna toot kommer inte att visas under någon hashtag eftersom den är onoterad. Endast offentliga toots kan sökas med hashtag.",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
new file mode 100644
index 000000000..1476d0a54
--- /dev/null
+++ b/app/javascript/mastodon/locales/szl.json
@@ -0,0 +1,457 @@
+{
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "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.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.last_status": "Last active",
+  "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.never_active": "Never",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
+  "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",
+  "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 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_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": "This toot will only be sent to all the mentioned users.",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "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.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.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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.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 emojos!! (╯°□°)╯︵ ┻━┻",
+  "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_timeline": "No toots here!",
+  "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 toots yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home.public_timeline": "the public timeline",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.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.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.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "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.",
+  "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}}",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+  "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 toots 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 toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lightbox.view_context": "View context",
+  "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.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": "Hide {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "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 toot",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "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 toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "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",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "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": "Show",
+  "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.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.group": "{count} notifications",
+  "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_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, shown in public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "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.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.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "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.hashtags": "Hashtags",
+  "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 {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.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "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 toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "status.reblogged_by": "{name} boosted",
+  "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.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 toots",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "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.edit": "Edit",
+  "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.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.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/ta.json b/app/javascript/mastodon/locales/ta.json
index 117fa0839..8fdf10997 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "பட்டியல்களில் சேர்/நீக்கு",
   "account.badges.bot": "பாட்",
   "account.badges.group": "குழு",
@@ -40,6 +42,10 @@
   "account.unfollow": "பின்தொடர்வதை நிறுத்துக",
   "account.unmute": "@{name} இன் மீது மௌனத் தடையை நீக்குக",
   "account.unmute_notifications": "@{name} இலிருந்து அறிவிப்புகளின் மீது மௌனத் தடையை நீக்குக",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "{retry_time, time, medium} க்கு பிறகு மீண்டும் முயற்சிக்கவும்.",
   "alert.rate_limited.title": "பயன்பாடு கட்டுப்படுத்தப்பட்டுள்ளது",
   "alert.unexpected.message": "எதிர்பாராத பிழை ஏற்பட்டுவிட்டது.",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
new file mode 100644
index 000000000..1476d0a54
--- /dev/null
+++ b/app/javascript/mastodon/locales/tai.json
@@ -0,0 +1,457 @@
+{
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.badges.group": "Group",
+  "account.block": "Block @{name}",
+  "account.block_domain": "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.domain_blocked": "Domain blocked",
+  "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "account.last_status": "Last active",
+  "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.never_active": "Never",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.unblock": "Unblock @{name}",
+  "account.unblock_domain": "Unblock domain {domain}",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
+  "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",
+  "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 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_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": "This toot will only be sent to all the mentioned users.",
+  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "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.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.sensitive.hide": "Mark media as sensitive",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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.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 emojos!! (╯°□°)╯︵ ┻━┻",
+  "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_timeline": "No toots here!",
+  "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 toots yet. When you bookmark one, it will show up here.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
+  "empty_column.domain_blocks": "There are no blocked domains yet.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
+  "empty_column.home.public_timeline": "the public timeline",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
+  "empty_column.lists": "You don't have any lists yet. When you create one, it will show up here.",
+  "empty_column.mutes": "You haven't muted any users yet.",
+  "empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
+  "empty_column.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.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.",
+  "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
+  "errors.unexpected_crash.report_issue": "Report issue",
+  "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.",
+  "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}}",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish toot-orial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "Welcome to the fediverse! In a few moments, you'll be able to broadcast messages and talk to your friends across a wide variety of servers. But this server, {domain}, is special—it hosts your profile, so remember its name.",
+  "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 toots 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 toot",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "to move up in the list",
+  "lightbox.close": "Close",
+  "lightbox.next": "Next",
+  "lightbox.previous": "Previous",
+  "lightbox.view_context": "View context",
+  "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.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": "Hide {number, plural, one {image} other {images}}",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "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 toot",
+  "navigation_bar.direct": "Direct messages",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.edit_profile": "Edit profile",
+  "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 toots",
+  "navigation_bar.preferences": "Preferences",
+  "navigation_bar.public_timeline": "Federated timeline",
+  "navigation_bar.security": "Security",
+  "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",
+  "notifications.clear": "Clear notifications",
+  "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
+  "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": "Show",
+  "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.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.group": "{count} notifications",
+  "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_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, shown in public timelines",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Visible for all, but not in public timelines",
+  "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.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.forward": "Forward to {target}",
+  "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
+  "report.hint": "The report will be sent to your server moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Additional comments",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "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.hashtags": "Hashtags",
+  "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 {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.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "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 toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "status.reblogged_by": "{name} boosted",
+  "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.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 toots",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.trending_now": "Trending now",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "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.edit": "Edit",
+  "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.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.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/te.json b/app/javascript/mastodon/locales/te.json
index bd94f8498..45e0dce32 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "జాబితాల నుండి చేర్చు లేదా తీసివేయి",
   "account.badges.bot": "బాట్",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "అనుసరించవద్దు",
   "account.unmute": "@{name}పై మ్యూట్ ని తొలగించు",
   "account.unmute_notifications": "@{name} నుంచి ప్రకటనలపై మ్యూట్ ని తొలగించు",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Please retry after {retry_time, time, medium}.",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "అనుకోని తప్పు జరిగినది.",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a95fc55b9..4ecd1be72 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "เพิ่มหรือเอาออกจากรายการ",
   "account.badges.bot": "บอต",
   "account.badges.group": "กลุ่ม",
   "account.block": "ปิดกั้น @{name}",
   "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.blocked": "ปิดกั้นอยู่",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "ดูเพิ่มเติมในโปรไฟล์ต้นฉบับ",
   "account.cancel_follow_request": "ยกเลิกคำขอติดตาม",
   "account.direct": "ส่งข้อความโดยตรงถึง @{name}",
   "account.domain_blocked": "ปิดกั้นโดเมนอยู่",
@@ -24,9 +26,9 @@
   "account.media": "สื่อ",
   "account.mention": "กล่าวถึง @{name}",
   "account.moved_to": "{name} ได้ย้ายไปยัง:",
-  "account.mute": "ปิดเสียง @{name}",
-  "account.mute_notifications": "ปิดเสียงการแจ้งเตือนจาก @{name}",
-  "account.muted": "ปิดเสียงอยู่",
+  "account.mute": "ซ่อน @{name}",
+  "account.mute_notifications": "ซ่อนการแจ้งเตือนจาก @{name}",
+  "account.muted": "ซ่อนอยู่",
   "account.never_active": "ไม่เลย",
   "account.posts": "โพสต์",
   "account.posts_with_replies": "โพสต์และการตอบกลับ",
@@ -38,8 +40,12 @@
   "account.unblock_domain": "เลิกปิดกั้นโดเมน {domain}",
   "account.unendorse": "ไม่แสดงให้เห็นในโปรไฟล์",
   "account.unfollow": "เลิกติดตาม",
-  "account.unmute": "เลิกปิดเสียง @{name}",
-  "account.unmute_notifications": "เลิกปิดเสียงการแจ้งเตือนจาก @{name}",
+  "account.unmute": "เลิกซ่อน @{name}",
+  "account.unmute_notifications": "เลิกซ่อนการแจ้งเตือนจาก @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "โปรดลองใหม่หลังจาก {retry_time, time, medium}",
   "alert.rate_limited.title": "มีการจำกัดอัตรา",
   "alert.unexpected.message": "เกิดข้อผิดพลาดที่ไม่คาดคิด",
@@ -63,7 +69,7 @@
   "column.follow_requests": "คำขอติดตาม",
   "column.home": "หน้าแรก",
   "column.lists": "รายการ",
-  "column.mutes": "ผู้ใช้ที่ปิดเสียงอยู่",
+  "column.mutes": "ผู้ใช้ที่ซ่อนอยู่",
   "column.notifications": "การแจ้งเตือน",
   "column.pins": "โพสต์ที่ปักหมุด",
   "column.public": "เส้นเวลาที่ติดต่อกับภายนอก",
@@ -75,21 +81,21 @@
   "column_header.show_settings": "แสดงการตั้งค่า",
   "column_header.unpin": "ถอนหมุด",
   "column_subheading.settings": "การตั้งค่า",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "ในเซิร์ฟเวอร์เท่านั้น",
   "community.column_settings.media_only": "สื่อเท่านั้น",
-  "community.column_settings.remote_only": "Remote only",
-  "compose_form.direct_message_warning": "จะส่งโพสต์นี้ไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
+  "community.column_settings.remote_only": "ระยะไกลเท่านั้น",
+  "compose_form.direct_message_warning": "โพสต์นี้จะถูกส่งไปยังผู้ใช้ที่กล่าวถึงเท่านั้น",
   "compose_form.direct_message_warning_learn_more": "เรียนรู้เพิ่มเติม",
-  "compose_form.hashtag_warning": "จะไม่แสดงรายการโพสต์นี้ภายใต้แฮชแท็กใด ๆ เนื่องจากไม่อยู่ในรายการ เฉพาะโพสต์สาธารณะเท่านั้นที่สามารถค้นหาโดยแฮชแท็ก",
+  "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_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตทางเลือกเดี่ยว",
+  "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_single": "เปลี่ยนการสำรวจความคิดเห็นเป็นอนุญาตตัวเลือกเดี่ยว",
   "compose_form.publish": "โพสต์",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.hide": "ทำเครื่องหมายสื่อว่าละเอียดอ่อน",
@@ -103,18 +109,18 @@
   "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.domain_block.confirm": "ปิดกั้นทั้งโดเมน",
-  "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการปิดเสียงแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
+  "confirmations.domain_block.message": "คุณแน่ใจจริง ๆ หรือไม่ว่าต้องการปิดกั้นทั้ง {domain}? ในกรณีส่วนใหญ่ การปิดกั้นหรือการซ่อนแบบกำหนดเป้าหมายไม่กี่รายการนั้นเพียงพอและเป็นที่นิยม คุณจะไม่เห็นเนื้อหาจากโดเมนนั้นในเส้นเวลาสาธารณะใด ๆ หรือการแจ้งเตือนของคุณ จะเอาผู้ติดตามของคุณจากโดเมนนั้นออก",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
-  "confirmations.mute.confirm": "ปิดเสียง",
+  "confirmations.mute.confirm": "ซ่อน",
   "confirmations.mute.explanation": "นี่จะซ่อนโพสต์จากเขาและโพสต์ที่กล่าวถึงเขา แต่จะยังอนุญาตให้เขาเห็นโพสต์ของคุณและติดตามคุณ",
-  "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการปิดเสียง {name}?",
+  "confirmations.mute.message": "คุณแน่ใจหรือไม่ว่าต้องการซ่อน {name}?",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
-  "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบสถานะนี้แล้วร่างใหม่? รายการโปรดและการดันจะหายไป และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
+  "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างใหม่? รายการโปรดและการดันจะหายไป และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.reply.confirm": "ตอบกลับ",
   "confirmations.reply.message": "การตอบกลับตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.unfollow.confirm": "เลิกติดตาม",
@@ -127,7 +133,7 @@
   "directory.local": "จาก {domain} เท่านั้น",
   "directory.new_arrivals": "มาใหม่",
   "directory.recently_active": "ใช้งานล่าสุด",
-  "embed.instructions": "ฝังสถานะนี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
+  "embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
   "embed.preview": "นี่คือลักษณะที่จะปรากฏ:",
   "emoji_button.activity": "กิจกรรม",
   "emoji_button.custom": "กำหนดเอง",
@@ -156,9 +162,9 @@
   "empty_column.hashtag": "ยังไม่มีสิ่งใดในแฮชแท็กนี้",
   "empty_column.home": "เส้นเวลาหน้าแรกของคุณว่างเปล่า! เยี่ยมชม {public} หรือใช้การค้นหาเพื่อเริ่มต้นใช้งานและพบปะผู้ใช้อื่น ๆ",
   "empty_column.home.public_timeline": "เส้นเวลาสาธารณะ",
-  "empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์สถานะใหม่ สถานะจะปรากฏที่นี่",
+  "empty_column.list": "ยังไม่มีสิ่งใดในรายการนี้ เมื่อสมาชิกของรายการนี้โพสต์โพสต์ใหม่ โพสต์จะปรากฏที่นี่",
   "empty_column.lists": "คุณยังไม่มีรายการใด ๆ เมื่อคุณสร้างรายการ รายการจะปรากฏที่นี่",
-  "empty_column.mutes": "คุณยังไม่ได้ปิดเสียงผู้ใช้ใด ๆ",
+  "empty_column.mutes": "คุณยังไม่ได้ซ่อนผู้ใช้ใด ๆ",
   "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ โต้ตอบกับผู้อื่นเพื่อเริ่มการสนทนา",
   "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมให้เต็ม",
   "error.unexpected_crash.explanation": "เนื่องจากข้อบกพร่องในโค้ดของเราหรือปัญหาความเข้ากันได้ของเบราว์เซอร์ จึงไม่สามารถแสดงหน้านี้ได้อย่างถูกต้อง",
@@ -173,7 +179,7 @@
   "getting_started.documentation": "เอกสารประกอบ",
   "getting_started.heading": "เริ่มต้นใช้งาน",
   "getting_started.invite": "เชิญผู้คน",
-  "getting_started.open_source_notice": "Mastodon เป็นซอฟต์แวร์เปิดต้นฉบับ คุณสามารถมีส่วนร่วมหรือรายงานปัญหาที่ GitHub ที่ {github}",
+  "getting_started.open_source_notice": "Mastodon เป็นซอฟต์แวร์โอเพนซอร์ส คุณสามารถมีส่วนร่วมหรือรายงานปัญหาใน GitHub ที่ {github}",
   "getting_started.security": "การตั้งค่าบัญชี",
   "getting_started.terms": "เงื่อนไขการให้บริการ",
   "hashtag.column_header.tag_mode.all": "และ {additional}",
@@ -197,7 +203,7 @@
   "introduction.federation.federated.headline": "ที่ติดต่อกับภายนอก",
   "introduction.federation.federated.text": "โพสต์สาธารณะจากเซิร์ฟเวอร์อื่น ๆ ของเฟดิเวิร์สจะปรากฏในเส้นเวลาที่ติดต่อกับภายนอก",
   "introduction.federation.home.headline": "หน้าแรก",
-  "introduction.federation.home.text": "โพสต์จากผู้คนที่คุณติดตามจะปรากฏในฟีดหน้าแรกของคุณ คุณสามารถติดตามใครก็ตามในเซิร์ฟเวอร์ใดก็ตาม!",
+  "introduction.federation.home.text": "โพสต์จากผู้คนที่คุณติดตามจะปรากฏในฟีดหน้าแรกของคุณ คุณสามารถติดตามใครก็ได้บนเซิร์ฟเวอร์ไหนก็ได้!",
   "introduction.federation.local.headline": "ในเซิร์ฟเวอร์",
   "introduction.federation.local.text": "โพสต์สาธารณะจากผู้คนในเซิร์ฟเวอร์เดียวกันกับคุณจะปรากฏในเส้นเวลาในเซิร์ฟเวอร์",
   "introduction.interactions.action": "เสร็จสิ้นบทช่วยสอน!",
@@ -213,12 +219,12 @@
   "keyboard_shortcuts.back": "เพื่อนำทางย้อนกลับ",
   "keyboard_shortcuts.blocked": "เพื่อเปิดรายการผู้ใช้ที่ปิดกั้นอยู่",
   "keyboard_shortcuts.boost": "เพื่อดัน",
-  "keyboard_shortcuts.column": "เพื่อโฟกัสสถานะในหนึ่งในคอลัมน์",
+  "keyboard_shortcuts.column": "เพื่อโฟกัสโพสต์ในหนึ่งในคอลัมน์",
   "keyboard_shortcuts.compose": "เพื่อโฟกัสพื้นที่เขียนข้อความ",
   "keyboard_shortcuts.description": "คำอธิบาย",
   "keyboard_shortcuts.direct": "เพื่อเปิดคอลัมน์ข้อความโดยตรง",
   "keyboard_shortcuts.down": "เพื่อย้ายลงในรายการ",
-  "keyboard_shortcuts.enter": "เพื่อเปิดสถานะ",
+  "keyboard_shortcuts.enter": "เพื่อเปิดโพสต์",
   "keyboard_shortcuts.favourite": "เพื่อชื่นชอบ",
   "keyboard_shortcuts.favourites": "เพื่อเปิดรายการโปรด",
   "keyboard_shortcuts.federated": "เพื่อเปิดเส้นเวลาที่ติดต่อกับภายนอก",
@@ -228,7 +234,7 @@
   "keyboard_shortcuts.legend": "เพื่อแสดงคำอธิบายนี้",
   "keyboard_shortcuts.local": "เพื่อเปิดเส้นเวลาในเซิร์ฟเวอร์",
   "keyboard_shortcuts.mention": "เพื่อกล่าวถึงผู้สร้าง",
-  "keyboard_shortcuts.muted": "เพื่อเปิดรายการผู้ใช้ที่ปิดเสียงอยู่",
+  "keyboard_shortcuts.muted": "เพื่อเปิดรายการผู้ใช้ที่ซ่อนอยู่",
   "keyboard_shortcuts.my_profile": "เพื่อเปิดโปรไฟล์ของคุณ",
   "keyboard_shortcuts.notifications": "เพื่อเปิดคอลัมน์การแจ้งเตือน",
   "keyboard_shortcuts.open_media": "เพื่อเปิดสื่อ",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "เพื่อตอบกลับ",
   "keyboard_shortcuts.requests": "เพื่อเปิดรายการคำขอติดตาม",
   "keyboard_shortcuts.search": "เพื่อโฟกัสการค้นหา",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "เพื่อแสดง/ซ่อนช่องกรอกคำเตือนเนื้อหา",
   "keyboard_shortcuts.start": "เพื่อเปิดคอลัมน์ \"เริ่มต้นใช้งาน\"",
   "keyboard_shortcuts.toggle_hidden": "เพื่อแสดง/ซ่อนข้อความที่อยู่หลังคำเตือนเนื้อหา",
   "keyboard_shortcuts.toggle_sensitivity": "เพื่อแสดง/ซ่อนสื่อ",
@@ -259,7 +265,7 @@
   "lists.subheading": "รายการของคุณ",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด...",
-  "media_gallery.toggle_visible": "ซ่อนสื่อ",
+  "media_gallery.toggle_visible": "ซ่อน {number, plural, other {ภาพ}}",
   "missing_indicator.label": "ไม่พบ",
   "missing_indicator.sublabel": "ไม่พบทรัพยากรนี้",
   "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
@@ -273,26 +279,26 @@
   "navigation_bar.domain_blocks": "โดเมนที่ปิดกั้นอยู่",
   "navigation_bar.edit_profile": "แก้ไขโปรไฟล์",
   "navigation_bar.favourites": "รายการโปรด",
-  "navigation_bar.filters": "คำที่ปิดเสียงอยู่",
+  "navigation_bar.filters": "คำที่ซ่อนอยู่",
   "navigation_bar.follow_requests": "คำขอติดตาม",
   "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
   "navigation_bar.info": "เกี่ยวกับเซิร์ฟเวอร์นี้",
   "navigation_bar.keyboard_shortcuts": "ปุ่มลัด",
   "navigation_bar.lists": "รายการ",
   "navigation_bar.logout": "ออกจากระบบ",
-  "navigation_bar.mutes": "ผู้ใช้ที่ปิดเสียงอยู่",
+  "navigation_bar.mutes": "ผู้ใช้ที่ซ่อนอยู่",
   "navigation_bar.personal": "ส่วนบุคคล",
   "navigation_bar.pins": "โพสต์ที่ปักหมุด",
   "navigation_bar.preferences": "การกำหนดลักษณะ",
   "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
   "navigation_bar.security": "ความปลอดภัย",
-  "notification.favourite": "{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} ได้ดันโพสต์ของคุณ",
   "notifications.clear": "ล้างการแจ้งเตือน",
   "notifications.clear_confirmation": "คุณแน่ใจหรือไม่ว่าต้องการล้างการแจ้งเตือนทั้งหมดของคุณอย่างถาวร?",
   "notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
@@ -323,7 +329,7 @@
   "poll.voted": "คุณได้ลงคะแนนให้กับคำตอบนี้",
   "poll_button.add_poll": "เพิ่มการสำรวจความคิดเห็น",
   "poll_button.remove_poll": "เอาการสำรวจความคิดเห็นออก",
-  "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของสถานะ",
+  "privacy.change": "ปรับเปลี่ยนความเป็นส่วนตัวของโพสต์",
   "privacy.direct.long": "ปรากฏแก่ผู้ใช้ที่กล่าวถึงเท่านั้น",
   "privacy.direct.short": "โดยตรง",
   "privacy.private.long": "ปรากฏแก่ผู้ติดตามเท่านั้น",
@@ -343,16 +349,16 @@
   "relative_time.today": "วันนี้",
   "reply_indicator.cancel": "ยกเลิก",
   "report.forward": "ส่งต่อไปยัง {target}",
-  "report.forward_hint": "บัญชีมาจากเซิร์ฟเวอร์อื่น ส่งสำเนาของรายงานที่ไม่ระบุตัวตนไปที่นั่นด้วย?",
-  "report.hint": "จะส่งรายงานไปยังผู้ควบคุมเซิร์ฟเวอร์ของคุณ คุณสามารถให้คำอธิบายเหตุผลที่คุณรายงานบัญชีนี้ด้านล่าง:",
+  "report.forward_hint": "บัญชีมาจากเซิร์ฟเวอร์อื่น ต้องการส่งสำเนาของรายงานที่ไม่ระบุตัวตนไปที่เซิร์ฟเวอร์นั้นด้วยหรือไม่?",
+  "report.hint": "รายงานนี้จะถูกส่งไปยังผู้ควบคุมเซิร์ฟเวอร์ของคุณ คุณสามารถอธิบายเหตุผลที่คุณรายงานบัญชีนี้ด้านล่าง:",
   "report.placeholder": "ความคิดเห็นเพิ่มเติม",
   "report.submit": "ส่ง",
   "report.target": "กำลังรายงาน {target}",
   "search.placeholder": "ค้นหา",
   "search_popout.search_format": "รูปแบบการค้นหาขั้นสูง",
-  "search_popout.tips.full_text": "ข้อความแบบง่ายส่งคืนสถานะที่คุณได้เขียน ชื่นชอบ ดัน หรือได้รับการกล่าวถึง ตลอดจนชื่อผู้ใช้, ชื่อที่แสดง และแฮชแท็กที่ตรงกัน",
+  "search_popout.tips.full_text": "ข้อความแบบง่ายส่งคืนโพสต์ที่คุณได้เขียน ชื่นชอบ ดัน หรือได้รับการกล่าวถึง ตลอดจนชื่อผู้ใช้, ชื่อที่แสดง และแฮชแท็กที่ตรงกัน",
   "search_popout.tips.hashtag": "แฮชแท็ก",
-  "search_popout.tips.status": "สถานะ",
+  "search_popout.tips.status": "โพสต์",
   "search_popout.tips.text": "ข้อความแบบง่ายส่งคืนชื่อที่แสดง, ชื่อผู้ใช้ และแฮชแท็กที่ตรงกัน",
   "search_popout.tips.user": "ผู้ใช้",
   "search_results.accounts": "ผู้คน",
@@ -361,12 +367,12 @@
   "search_results.statuses_fts_disabled": "ไม่มีการเปิดใช้งานการค้นหาโพสต์โดยเนื้อหาของโพสต์ในเซิร์ฟเวอร์ Mastodon นี้",
   "search_results.total": "{count, number} {count, plural, other {ผลลัพธ์}}",
   "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
-  "status.admin_status": "เปิดสถานะนี้ในส่วนติดต่อการควบคุม",
+  "status.admin_status": "เปิดโพสต์นี้ในส่วนติดต่อการควบคุม",
   "status.block": "ปิดกั้น @{name}",
   "status.bookmark": "เพิ่มที่คั่นหน้า",
   "status.cancel_reblog_private": "เลิกดัน",
   "status.cannot_reblog": "ไม่สามารถดันโพสต์นี้",
-  "status.copy": "คัดลอกลิงก์ไปยังสถานะ",
+  "status.copy": "คัดลอกลิงก์ไปยังโพสต์",
   "status.delete": "ลบ",
   "status.detailed_status": "มุมมองการสนทนาโดยละเอียด",
   "status.direct": "ส่งข้อความโดยตรงถึง @{name}",
@@ -377,9 +383,9 @@
   "status.media_hidden": "ซ่อนสื่ออยู่",
   "status.mention": "กล่าวถึง @{name}",
   "status.more": "เพิ่มเติม",
-  "status.mute": "ปิดเสียง @{name}",
-  "status.mute_conversation": "ปิดเสียงการสนทนา",
-  "status.open": "ขยายสถานะนี้",
+  "status.mute": "ซ่อน @{name}",
+  "status.mute_conversation": "ซ่อนการสนทนา",
+  "status.open": "ขยายโพสต์นี้",
   "status.pin": "ปักหมุดในโปรไฟล์",
   "status.pinned": "โพสต์ที่ปักหมุด",
   "status.read_more": "อ่านเพิ่มเติม",
@@ -400,9 +406,9 @@
   "status.show_more_all": "แสดงเพิ่มเติมทั้งหมด",
   "status.show_thread": "แสดงกระทู้",
   "status.uncached_media_warning": "ไม่พร้อมใช้งาน",
-  "status.unmute_conversation": "เลิกปิดเสียงการสนทนา",
+  "status.unmute_conversation": "เลิกซ่อนการสนทนา",
   "status.unpin": "ถอนหมุดจากโปรไฟล์",
-  "suggestions.dismiss": "ยกเลิกข้อเสนอแนะ",
+  "suggestions.dismiss": "ปิดข้อเสนอแนะ",
   "suggestions.header": "คุณอาจสนใจ…",
   "tabs_bar.federated_timeline": "ที่ติดต่อกับภายนอก",
   "tabs_bar.home": "หน้าแรก",
@@ -414,17 +420,17 @@
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",
   "time_remaining.moments": "ช่วงเวลาที่เหลือ",
   "time_remaining.seconds": "เหลืออีก {number, plural, other {# วินาที}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "ไม่ได้แสดง {resource} จากเซิร์ฟเวอร์อื่น ๆ",
+  "timeline_hint.resources.followers": "ผู้ติดตาม",
+  "timeline_hint.resources.follows": "การติดตาม",
+  "timeline_hint.resources.statuses": "โพสต์ที่เก่ากว่า",
   "trends.count_by_accounts": "{count} {rawCount, plural, other {คน}}กำลังพูดคุย",
   "trends.trending_now": "กำลังนิยม",
   "ui.beforeunload": "แบบร่างของคุณจะหายไปหากคุณออกจาก Mastodon",
   "upload_area.title": "ลากแล้วปล่อยเพื่ออัปโหลด",
-  "upload_button.label": "เพิ่มสื่อ ({formats})",
+  "upload_button.label": "เพิ่มไฟล์ภาพ วิดีโอ หรือเสียง",
   "upload_error.limit": "เกินขีดจำกัดการอัปโหลดไฟล์",
-  "upload_error.poll": "ไม่อนุญาตให้อัปโหลดไฟล์กับการลงคะแนน",
+  "upload_error.poll": "ไม่อนุญาตให้อัปโหลดไฟล์พร้อมโพล",
   "upload_form.audio_description": "อธิบายสำหรับผู้สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้บกพร่องทางการมองเห็น",
   "upload_form.edit": "แก้ไข",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 17d8a54ff..f6495bd63 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Listelere ekle veya kaldır",
   "account.badges.bot": "Bot",
   "account.badges.group": "Grup",
@@ -40,6 +42,10 @@
   "account.unfollow": "Takibi bırak",
   "account.unmute": "@{name} adlı kişinin sesini aç",
   "account.unmute_notifications": "@{name} adlı kişinin bildirimlerini aç",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Lütfen sonra tekrar deneyin {retry_time, time, medium}.",
   "alert.rate_limited.title": "Oran sınırlıdır",
   "alert.unexpected.message": "Beklenmedik bir hata oluştu.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 9735f2b83..2115aeec5 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Додати або видалити зі списків",
   "account.badges.bot": "Бот",
   "account.badges.group": "Група",
@@ -40,6 +42,10 @@
   "account.unfollow": "Відписатися",
   "account.unmute": "Зняти глушення з @{name}",
   "account.unmute_notifications": "Показувати сповіщення від @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "Спробуйте ще раз через {retry_time, time, medium}.",
   "alert.rate_limited.title": "Швидкість обмежена",
   "alert.unexpected.message": "Трапилась неочікувана помилка.",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "Показати налаштування",
   "column_header.unpin": "Відкріпити",
   "column_subheading.settings": "Налаштування",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "Тільки локальні",
   "community.column_settings.media_only": "Тільки медіа",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "Тільки видалені",
   "compose_form.direct_message_warning": "Цей дмух буде видимий тільки згаданим користувачам.",
   "compose_form.direct_message_warning_learn_more": "Дізнатися більше",
   "compose_form.hashtag_warning": "Цей дмух не буде відображений у жодній стрічці хештеґу, оскільки він прихований. Тільки публічні дмухи можуть бути знайдені за хештеґом.",
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index bff992983..79e2bfaf1 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "فہرست میں شامل یا برطرف کریں",
   "account.badges.bot": "روبوٹ",
   "account.badges.group": "Group",
@@ -40,6 +42,10 @@
   "account.unfollow": "پیروی ترک کریں",
   "account.unmute": "@{name} کو با آواز کریں",
   "account.unmute_notifications": "@{name} سے اطلاعات کو با آواز کریں",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "\"{retry_time, time, medium} کے بعد کوشش کریں\".",
   "alert.rate_limited.title": "Rate limited",
   "alert.unexpected.message": "ایک غیر متوقع سہو ہوا ہے.",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 2d16526c4..3bdd8c233 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -1,87 +1,93 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "Thêm hoặc Xóa khỏi danh sách",
-  "account.badges.bot": "Robot",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Nhóm",
   "account.block": "Chặn @{name}",
-  "account.block_domain": "Ẩn mọi thứ từ {domain}",
+  "account.block_domain": "Chặn miền {domain}",
   "account.blocked": "Đã chặn",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
-  "account.cancel_follow_request": "Hủy theo yêu cầu",
-  "account.direct": "Nhắn riêng @{name}",
-  "account.domain_blocked": "Miền đã ẩn",
-  "account.edit_profile": "Sửa hồ sơ",
-  "account.endorse": "Đưa lên hồ sơ",
-  "account.follow": "Quan tâm",
-  "account.followers": "Người quan tâm",
-  "account.followers.empty": "Chưa có ai quan tâm",
-  "account.follows": "Đang quan tâm",
-  "account.follows.empty": "Chưa quan tâm ai",
-  "account.follows_you": "Đã quan tâm bạn",
-  "account.hide_reblogs": "Ẩn loan tin từ @{name}",
-  "account.last_status": "Hoạt động lần cuối",
-  "account.link_verified_on": "Quyền sở hữu của liên kết này đã được kiểm tra vào {date}",
-  "account.locked_info": "Tài khoản này đã mở chế độ ẩn. Người sở hữu tài khoản này sẽ tự mình chấp nhận các yêu cầu quan tâm.",
-  "account.media": "Ảnh và video",
+  "account.browse_more_on_origin_server": "Tìm những tài khoản có liên quan",
+  "account.cancel_follow_request": "Hủy yêu cầu theo dõi",
+  "account.direct": "Nhắn tin cho @{name}",
+  "account.domain_blocked": "Đã chặn miền",
+  "account.edit_profile": "Chỉnh sửa hồ sơ",
+  "account.endorse": "Hiển thị trên trang cá nhân",
+  "account.follow": "Theo dõi",
+  "account.followers": "Người theo dõi",
+  "account.followers.empty": "Chưa có người theo dõi.",
+  "account.follows": "Đang theo dõi",
+  "account.follows.empty": "Người dùng này chưa theo dõi ai.",
+  "account.follows_you": "Đang theo dõi bạn",
+  "account.hide_reblogs": "Ẩn chia sẻ từ @{name}",
+  "account.last_status": "Hoạt động gần đây",
+  "account.link_verified_on": "Liên kết này đã được xác thực vào {date}",
+  "account.locked_info": "Người dùng này thiết lập trạng thái ẩn. Họ sẽ tự mình xét duyệt các yêu cầu mến mộ.",
+  "account.media": "Ảnh & Video",
   "account.mention": "Nhắc đến @{name}",
-  "account.moved_to": "{name} đã chuyển đến:",
+  "account.moved_to": "{name} đã dời sang:",
   "account.mute": "Ẩn @{name}",
   "account.mute_notifications": "Tắt thông báo từ @{name}",
   "account.muted": "Đã ẩn",
-  "account.never_active": "Không bao giờ",
+  "account.never_active": "Chưa có bất cứ hoạt động nào",
   "account.posts": "Tút",
   "account.posts_with_replies": "Tút và trả lời",
   "account.report": "Báo cáo @{name}",
-  "account.requested": "Đang chờ chấp nhận. Nhấn vào đây để hủy bỏ yêu cầu sau",
+  "account.requested": "Đang chờ chấp thuận. Nhấp vào đây để hủy yêu cầu theo dõi",
   "account.share": "Chia sẻ hồ sơ @{name}",
-  "account.show_reblogs": "Hiện loan tin các từ @{name}",
-  "account.unblock": "Mở chặn @{name}",
-  "account.unblock_domain": "Bỏ ẩn {domain}",
-  "account.unendorse": "Không đưa lên nổi bật",
-  "account.unfollow": "Ngưng quan tâm",
-  "account.unmute": "Huỷ bỏ qua @{name}",
-  "account.unmute_notifications": "Hiển thị thông báo từ @{name}",
-  "alert.rate_limited.message": "Vui lòng thử lại sau {retry_time, time, Medium}.",
-  "alert.rate_limited.title": "Tỷ lệ giới hạn",
+  "account.show_reblogs": "Hiện chia sẻ từ @{name}",
+  "account.unblock": "Bỏ chặn @{name}",
+  "account.unblock_domain": "Bỏ chặn miền {domain}",
+  "account.unendorse": "Không hiện trên trang cá nhân",
+  "account.unfollow": "Ngừng theo dõi",
+  "account.unmute": "Bỏ ẩn @{name}",
+  "account.unmute_notifications": "Hiển lại thông báo từ @{name}",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
+  "alert.rate_limited.message": "Vui lòng thử lại sau {retry_time, time, medium}.",
+  "alert.rate_limited.title": "Vượt giới hạn",
   "alert.unexpected.message": "Đã xảy ra lỗi không mong muốn.",
   "alert.unexpected.title": "Ốiii!",
-  "announcement.announcement": "Announcement",
-  "autosuggest_hashtag.per_week": "{tính} mỗi tuần",
-  "boost_modal.combo": "Bạn có thể nhấn {combo} để bỏ qua lần sau",
-  "bundle_column_error.body": "Có gì đó sai sai trong khi tải nội dung này",
+  "announcement.announcement": "Thông báo",
+  "autosuggest_hashtag.per_week": "{count} mỗi tuần",
+  "boost_modal.combo": "Lần sau, bạn có thể nhấn {combo} để bỏ qua",
+  "bundle_column_error.body": "Đã có lỗi xảy ra trong khi tải nội dung này.",
   "bundle_column_error.retry": "Thử lại",
   "bundle_column_error.title": "Lỗi mạng",
-  "bundle_modal_error.close": "Tắt",
-  "bundle_modal_error.message": "Có gì đó sai sai trong khi tải nội dung này",
+  "bundle_modal_error.close": "Đóng",
+  "bundle_modal_error.message": "Đã có lỗi xảy ra trong khi tải nội dung này.",
   "bundle_modal_error.retry": "Thử lại",
-  "column.blocks": "Người bị chặn",
-  "column.bookmarks": "Đã lưu",
-  "column.community": "Dòng thời gian của miền",
-  "column.direct": "Tin nhắn",
-  "column.directory": "Duyệt hồ sơ",
-  "column.domain_blocks": "Miền đã ẩn",
-  "column.favourites": "Đã thích",
-  "column.follow_requests": "Yêu cầu quan tâm",
+  "column.blocks": "Người dùng đã chặn",
+  "column.bookmarks": "Tút đã lưu",
+  "column.community": "Máy chủ của bạn",
+  "column.direct": "Nhắn tin",
+  "column.directory": "Tìm một ai đó",
+  "column.domain_blocks": "Máy chủ đã chặn",
+  "column.favourites": "Tâm đắc",
+  "column.follow_requests": "Yêu cầu theo dõi",
   "column.home": "Bảng tin",
   "column.lists": "Danh sách",
-  "column.mutes": "Đã ẩn",
+  "column.mutes": "Người dùng đã chặn",
   "column.notifications": "Thông báo",
-  "column.pins": "Tút được ghim",
+  "column.pins": "Tút ghim",
   "column.public": "Dòng thời gian liên kết",
   "column_back_button.label": "Quay lại",
-  "column_header.hide_settings": "Ẩn các thiết lập",
-  "column_header.moveLeft_settings": "Di chuyển cột sang trái",
-  "column_header.moveRight_settings": "Di chuyển cột sang phải",
+  "column_header.hide_settings": "Ẩn cài đặt",
+  "column_header.moveLeft_settings": "Dời cột sang bên trái",
+  "column_header.moveRight_settings": "Dời cột sang bên phải",
   "column_header.pin": "Ghim",
   "column_header.show_settings": "Hiển thị cài đặt",
-  "column_header.unpin": "Bỏ ghim",
+  "column_header.unpin": "Không ghim",
   "column_subheading.settings": "Cài đặt",
-  "community.column_settings.local_only": "Local only",
-  "community.column_settings.media_only": "Chỉ tút có media",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.local_only": "Chỉ miền của bạn",
+  "community.column_settings.media_only": "Chỉ ảnh/video",
+  "community.column_settings.remote_only": "Chỉ người dùng ở miền khác",
   "compose_form.direct_message_warning": "Tút này sẽ chỉ gửi cho người được nhắc đến.",
   "compose_form.direct_message_warning_learn_more": "Tìm hiểu thêm",
-  "compose_form.hashtag_warning": "Tút này sẽ không được xuất hiện khi tìm kiếm theo hashtag vì nó không công khai. Chỉ Tút công khai có thể được tìm kiếm theo hashtag.",
-  "compose_form.lock_disclaimer": "Tài khoản của bạn không được {locked}. Bất cứ ai cũng có thể quan tâm bạn và xem bài viết đi bạn đăng cho người quan tâm",
+  "compose_form.hashtag_warning": "Tút này sẽ không xuất hiện công khai khi tìm kiếm theo chủ đề. Chỉ Tút công khai có thể được tìm kiếm theo chủ đề.",
+  "compose_form.lock_disclaimer": "Tài khoản của bạn không {locked}. Bất cứ ai cũng có thể theo dõi bạn để xem bài viết dành riêng cho người theo dõi của bạn.",
   "compose_form.lock_disclaimer.lock": "khóa",
   "compose_form.placeholder": "Bạn đang nghĩ gì?",
   "compose_form.poll.add_option": "Thêm lựa chọn",
@@ -92,14 +98,14 @@
   "compose_form.poll.switch_to_single": "Sửa thăm dò để cho phép một lựa chọn",
   "compose_form.publish": "Tút",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.hide": "Đánh dấu hình ảnh nhạy cảm",
-  "compose_form.sensitive.marked": "Media đã được đánh dấu nhạy cảm",
-  "compose_form.sensitive.unmarked": "Media đã không được đánh dấu nhạy cảm",
-  "compose_form.spoiler.marked": "Văn bản ẩn dấu sau lời cảnh báo",
-  "compose_form.spoiler.unmarked": "Văn bản không bị ẩn",
+  "compose_form.sensitive.hide": "Đánh dấu là nội dung nhạy cảm",
+  "compose_form.sensitive.marked": "Nội dung đã đánh dấu nhạy cảm",
+  "compose_form.sensitive.unmarked": "Nội dung không đánh dấu nhạy cảm",
+  "compose_form.spoiler.marked": "Văn bản ẩn sau cảnh báo",
+  "compose_form.spoiler.unmarked": "Văn bản không ẩn sau spoil",
   "compose_form.spoiler_placeholder": "Viết cảnh báo của bạn ở đây",
   "confirmation_modal.cancel": "Hủy bỏ",
-  "confirmations.block.block_and_report": "Chặn và Báo cáo",
+  "confirmations.block.block_and_report": "Chặn & Báo cáo",
   "confirmations.block.confirm": "Chặn",
   "confirmations.block.message": "Bạn có chắc chắn muốn chặn {name}?",
   "confirmations.delete.confirm": "Xóa bỏ",
@@ -107,147 +113,147 @@
   "confirmations.delete_list.confirm": "Xóa bỏ",
   "confirmations.delete_list.message": "Bạn có chắc chắn muốn xóa vĩnh viễn danh sách này?",
   "confirmations.domain_block.confirm": "Ẩn toàn bộ miền",
-  "confirmations.domain_block.message": "Bạn có thực sự, thực sự chắc chắn rằng bạn muốn ẩn toàn bộ từ {domain}? Hầu hết các trường hợp, bạn chỉ cần chặn hoặc ẩn một vài tài khoản thì phù hợp hơn. Ẩn toàn bộ miền khiến bạn sẽ không thấy nội dung từ miền đó trong bất kỳ nơi nào kể cả thông báo. người quan tâm bạn từ miền đó sẽ bị xóa luôn.",
+  "confirmations.domain_block.message": "Bạn có chắc chắn rằng muốn ẩn toàn bộ nội dung từ {domain}? Sẽ hợp lý hơn nếu bạn chỉ chặn hoặc ẩn một vài tài khoản cụ thể. Ẩn toàn bộ nội dung từ máy chủ sẽ khiến bạn không còn thấy nội dung từ máy chủ đó ở bất kỳ nơi nào, kể cả thông báo. Người quan tâm bạn từ máy chủ đó cũng sẽ bị xóa luôn.",
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có chắc chắn bạn muốn thoát?",
   "confirmations.mute.confirm": "Ẩn",
-  "confirmations.mute.explanation": "Điều này sẽ ẩn bài đăng từ họ và bài viết đề cập đến họ, nhưng nó vẫn sẽ cho phép họ xem bài đăng của bạn và quan tâm bạn.",
+  "confirmations.mute.explanation": "Điều này sẽ khiến tút của người đó và những tút có đề cập đến họ bị ẩn, tuy nhiên vẫn cho phép họ xem bài đăng của bạn và mến mộ bạn.",
   "confirmations.mute.message": "Bạn có chắc chắn muốn ẩn {name}?",
-  "confirmations.redraft.confirm": "Xóa & đưa vào nháp",
-  "confirmations.redraft.message": "Bạn có chắc chắn muốn xóa tút này và đưa nó vào nháp? Những lượt thích và loan tin tút sẽ bị mất, và những tút trả lời tút này sẽ mất đầu mối.",
+  "confirmations.redraft.confirm": "Xóa & viết lại",
+  "confirmations.redraft.message": "Bạn có chắc chắn muốn xóa tút và viết lại? Điều này sẽ xóa mất những lượt tâm đắc và chia sẻ của tút, cũng như những phản hồi sẽ không còn nội dung gốc.",
   "confirmations.reply.confirm": "Trả lời",
   "confirmations.reply.message": "Nội dung bạn đang soạn thảo sẽ bị ghi đè, bạn có tiếp tục?",
-  "confirmations.unfollow.confirm": "Ngưng quan tâm",
-  "confirmations.unfollow.message": "Bạn có chắc chắn muốn ngưng quan tâm {name}?",
-  "conversation.delete": "Xóa cuộc hội thoại",
-  "conversation.mark_as_read": "đánh dấu là đã đọc",
-  "conversation.open": "Xem cuộc hội thoại",
-  "conversation.with": "Với {tên}",
-  "directory.federated": "Từ fediverse được biết đến",
+  "confirmations.unfollow.confirm": "Ngưng theo dõi",
+  "confirmations.unfollow.message": "Bạn có chắc chắn muốn ngưng theo dõi {name}?",
+  "conversation.delete": "Xóa tin nhắn này",
+  "conversation.mark_as_read": "Đánh dấu là đã đọc",
+  "conversation.open": "Xem tin nhắn",
+  "conversation.with": "Với {names}",
+  "directory.federated": "Từ mạng liên kết",
   "directory.local": "Chỉ từ {domain}",
-  "directory.new_arrivals": "Điểm đến mới",
-  "directory.recently_active": "Mới hoạt động",
-  "embed.instructions": "Nhúng tút này trên trang web của bạn bằng cách sao chép đoạn mã dưới đây.",
-  "embed.preview": "Nó sẽ hiển thị như dưới đây:",
+  "directory.new_arrivals": "Gia nhập gần đây",
+  "directory.recently_active": "Hoạt động gần đây",
+  "embed.instructions": "Sao chép đoạn mã dưới đây và chèn vào trang web của bạn.",
+  "embed.preview": "Nó sẽ hiển thị như vầy:",
   "emoji_button.activity": "Hoạt động",
   "emoji_button.custom": "Riêng",
   "emoji_button.flags": "Cờ",
   "emoji_button.food": "Ăn uống",
-  "emoji_button.label": "Chèn biểu emoj",
+  "emoji_button.label": "Chèn emoji",
   "emoji_button.nature": "Thiên nhiên",
-  "emoji_button.not_found": "Không emojos !! (╯ ° □ °) ╯( ┻━┻",
-  "emoji_button.objects": "Đối tượng",
+  "emoji_button.not_found": "Không tìm thấy emoji! (°□°)",
+  "emoji_button.objects": "Đồ vật",
   "emoji_button.people": "Người",
-  "emoji_button.recent": "Hay dùng",
+  "emoji_button.recent": "Thường dùng",
   "emoji_button.search": "Tìm kiếm...",
   "emoji_button.search_results": "Kết quả tìm kiếm",
   "emoji_button.symbols": "Biểu tượng",
   "emoji_button.travel": "Du lịch",
-  "empty_column.account_timeline": "Chưa có tút nào",
-  "empty_column.account_unavailable": "Hồ sơ không truy cập được",
-  "empty_column.blocks": "Bạn chưa chặn ai cả.",
-  "empty_column.bookmarked_statuses": "Bạn chưa lưu tút nào, nếu có sẽ thấy ở đây.",
-  "empty_column.community": "Chưa có gì trong dòng thời gian chung của miền cả, bạn hãy tút gì đó đi!",
-  "empty_column.direct": "Bạn không có bất kỳ tin nhắn trực tiếp nêu ra. Khi bạn gửi hoặc nhận một, nó sẽ hiển thị ở đây.",
-  "empty_column.domain_blocks": "Chưa ẩn miền nào",
-  "empty_column.favourited_statuses": "Bạn chưa thích tút nào, nếu có sẽ thấy ở đây.",
-  "empty_column.favourites": "Chưa ai thích tút này, nếu có bạn sẽ thấy ở đây.",
-  "empty_column.follow_requests": "Bạn chưa có yêu cầu nào. Khi bạn nhận được yêu cầu, nó sẽ hiển ở đây.",
-  "empty_column.hashtag": "Chưa có bài đăng nào sử dụng hashtag này.",
-  "empty_column.home": "Bảng tin của bạn đang trống! Truy cập {public} hoặc sử dụng tìm kiếm để quan tâm và trao đổi với những người khác đi.",
-  "empty_column.home.public_timeline": "Dòng thời gian công khai",
-  "empty_column.list": "Không có gì trong danh sách này là nêu ra. Khi các thành viên của danh sách này gửi trạng thái mới, họ sẽ xuất hiện ở đây.",
-  "empty_column.lists": "Bạn không có bất kỳ danh sách được nêu ra. Khi bạn tạo một, nó sẽ hiển thị ở đây.",
-  "empty_column.mutes": "Bạn chưa tắt bất kỳ người dùng nào.",
-  "empty_column.notifications": "Bạn không có thông báo nào. Tương tác với những người khác để bắt đầu trao đổi.",
-  "empty_column.public": "Chưa có gì cả, bạn hãy đăng gì đó đi đừng để nó trắng trơn",
-  "error.unexpected_crash.explanation": "Do lỗi trong mã của chúng tôi hoặc sự cố tương thích trình duyệt, trang này không thể được hiển thị chính xác.",
-  "error.unexpected_crash.next_steps": "Hãy thử làm mới trang. Nếu điều đó không có ích, bạn vẫn có thể sử dụng Mastodon thông qua một trình duyệt hoặc ứng dụng gốc khác.",
+  "empty_column.account_timeline": "Chưa có tút nào!",
+  "empty_column.account_unavailable": "Tài khoản không còn nữa",
+  "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.direct": "Bạn chưa có tin nhắn nào. Khi bạn gửi hoặc nhận tin nhắn, nó sẽ hiển thị ở đây.",
+  "empty_column.domain_blocks": "Chưa ẩn bất kỳ máy chủ nào.",
+  "empty_column.favourited_statuses": "Bạn chưa tâm đắc tút nào. Hãy thử đi, nó sẽ xuất hiện ở đây.",
+  "empty_column.favourites": "Chưa có ai tâm đắc tút này.",
+  "empty_column.follow_requests": "Bạn chưa có yêu cầu theo dõi nào. Khi có yêu cầu mới, nó sẽ xuất hiện ở đây.",
+  "empty_column.hashtag": "Chưa có bài đăng nào về chủ đề này.",
+  "empty_column.home": "Chưa có bất cứ gì! Hãy bắt đầu bằng cách tìm kiếm hoặc truy cập {public} để mến mộ những người bạn thích.",
+  "empty_column.home.public_timeline": "tút công khai",
+  "empty_column.list": "Chưa có gì trong danh sách. Khi thành viên của danh sách này đăng tút mới, chúng mới xuất hiện ở đây.",
+  "empty_column.lists": "Bạn không có danh sách nào.",
+  "empty_column.mutes": "Bạn chưa ẩn người dùng nào.",
+  "empty_column.notifications": "Bạn chưa có thông báo nào. Hãy thử mến mộ hoặc nhắn tin cho một ai đó mà bạn thích.",
+  "empty_column.public": "Trống trơn! Bạn hãy viết gì đó hoặc bắt đầu mến mộ người dùng khác",
+  "error.unexpected_crash.explanation": "Trang này có thể không hiển thị chính xác do lỗi lập trình Mastodon hoặc vấn đề tương thích trình duyệt.",
+  "error.unexpected_crash.next_steps": "Hãy thử làm mới trang. Nếu vẫn không được, bạn hãy vào Mastodon bằng một ứng dụng di động hoặc trình duyệt khác.",
   "errors.unexpected_crash.copy_stacktrace": "Sao chép stacktrace vào clipboard",
-  "errors.unexpected_crash.report_issue": "Báo cáo phát hành",
+  "errors.unexpected_crash.report_issue": "Báo cáo lỗi",
   "follow_request.authorize": "Cho phép",
   "follow_request.reject": "Từ chối",
-  "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.",
+  "follow_requests.unlocked_explanation": "Mặc dù tài khoản của bạn đang ở chế độ công khai, quản trị viên của {domain} vẫn tin rằng bạn sẽ muốn xem lại yêu cầu mến mộ từ những người khác.",
   "getting_started.developers": "Nhà phát triển",
-  "getting_started.directory": "Danh mục thành viên",
+  "getting_started.directory": "Danh sách người dùng",
   "getting_started.documentation": "Tài liệu",
-  "getting_started.heading": "Bắt đầu",
+  "getting_started.heading": "Dành cho người mới",
   "getting_started.invite": "Mời bạn bè",
-  "getting_started.open_source_notice": "Mastodon là phần mềm mã nguồn mở. Bạn có thể đóng góp hoặc báo cáo vấn đề gặp phải trên GitHub tại {github}.",
+  "getting_started.open_source_notice": "Mastodon là phần mềm mã nguồn mở. Bạn có thể đóng góp hoặc báo lỗi trên GitHub tại {github}.",
   "getting_started.security": "Bảo mật",
   "getting_started.terms": "Điều khoản dịch vụ",
-  "hashtag.column_header.tag_mode.all": "Và {additional} thêm",
-  "hashtag.column_header.tag_mode.any": "Hoặc {additional} thêm",
-  "hashtag.column_header.tag_mode.none": "Mà không {additional} thêm",
+  "hashtag.column_header.tag_mode.all": "và {additional}",
+  "hashtag.column_header.tag_mode.any": "hoặc {additional}",
+  "hashtag.column_header.tag_mode.none": "mà không {additional}",
   "hashtag.column_settings.select.no_options_message": "Không tìm thấy đề xuất nào",
-  "hashtag.column_settings.select.placeholder": "Nhập hashtags ...",
-  "hashtag.column_settings.tag_mode.all": "Tất cả những cái này",
-  "hashtag.column_settings.tag_mode.any": "Bất kỳ trong số này",
-  "hashtag.column_settings.tag_mode.none": "Không ai trong số những",
-  "hashtag.column_settings.tag_toggle": "Bao gồm thêm thẻ cho cột này",
+  "hashtag.column_settings.select.placeholder": "Nhập chủ đề…",
+  "hashtag.column_settings.tag_mode.all": "Toàn bộ",
+  "hashtag.column_settings.tag_mode.any": "Một phần",
+  "hashtag.column_settings.tag_mode.none": "Không chọn",
+  "hashtag.column_settings.tag_toggle": "Bao gồm thêm chủ đề cho cột này",
   "home.column_settings.basic": "Cơ bản",
-  "home.column_settings.show_reblogs": "Hiện tút được loan tin",
-  "home.column_settings.show_replies": "Hiện trả lời",
-  "home.hide_announcements": "Hide announcements",
-  "home.show_announcements": "Show announcements",
+  "home.column_settings.show_reblogs": "Hiện tút chia sẻ",
+  "home.column_settings.show_replies": "Hiện phản hồi",
+  "home.hide_announcements": "Ẩn thông báo",
+  "home.show_announcements": "Hiện thông báo",
   "intervals.full.days": "{number} days",
   "intervals.full.hours": "{number} hours",
   "intervals.full.minutes": "{number} minutes",
-  "introduction.federation.action": "Tiếp",
-  "introduction.federation.federated.headline": "Miền liên kết",
-  "introduction.federation.federated.text": "Bài đăng công khai từ các miền khác có liên hệ với miền của bạn sẽ xuất hiện ở Dòng thời gian liên kết",
+  "introduction.federation.action": "Tiếp theo",
+  "introduction.federation.federated.headline": "Mạng liên kết",
+  "introduction.federation.federated.text": "Nếu máy chủ của bạn có liên kết với các máy chủ khác, bài đăng công khai từ họ sẽ xuất hiện ở Mạng liên kết.",
   "introduction.federation.home.headline": "Bảng tin",
-  "introduction.federation.home.text": "Bài đăng từ những người bạn quan tâm sẽ xuất hiện ở bảng tin của bạn. Bạn có thể quan tâm bất cứ ai trên bất cứ miền nào!",
-  "introduction.federation.local.headline": "Cùng miền",
-  "introduction.federation.local.text": "Bài đăng công khai từ những người trên cùng một miền như bạn sẽ xuất hiện trong Dòng thời gian cùng miền.",
-  "introduction.interactions.action": "Hoàn thành hướng dẫn!",
-  "introduction.interactions.favourite.headline": "Thích",
-  "introduction.interactions.favourite.text": "Bạn có thể lưu tút để sau này xem lại, và để cho các tác giả biết rằng bạn thích tút của họ bằng cách bấm thích tút đó.",
-  "introduction.interactions.reblog.headline": "Loan tin",
-  "introduction.interactions.reblog.text": "Bạn có thể chia sẻ Tút của người khác với những người quan tâm bạn bằng cách loan tin.",
+  "introduction.federation.home.text": "Bảng tin là nơi hiển thị bài đăng từ những người bạn mến mộ. Bạn có thể mến mộ bất cứ ai trên bất cứ máy chủ nào!",
+  "introduction.federation.local.headline": "Máy chủ của bạn",
+  "introduction.federation.local.text": "Máy chủ của bạn là nơi hiển thị bài đăng công khai từ những người thuộc cùng một máy chủ của bạn.",
+  "introduction.interactions.action": "Tôi đã hiểu rồi!",
+  "introduction.interactions.favourite.headline": "Tâm đắc",
+  "introduction.interactions.favourite.text": "Tâm đắc một tút có nghĩa là bạn thích tút đó và lưu giữ để sau này xem lại.",
+  "introduction.interactions.reblog.headline": "Chia sẻ",
+  "introduction.interactions.reblog.text": "Với tính năng chia sẻ, bạn có thể chia sẻ tút của người khác với những người mến mộ bạn.",
   "introduction.interactions.reply.headline": "Trả lời",
-  "introduction.interactions.reply.text": "Bạn có thể trả lời tút của những người khác và tút riêng của bạn, từ đó tạo nên những cuộc hội thoại.",
-  "introduction.welcome.action": "Ok đi thôi!",
-  "introduction.welcome.headline": "Bước đầu tiên",
-  "introduction.welcome.text": "Chào mừng bạn đến mạng xã hội đa liên kết! Trong vài phút tới, bạn sẽ có thể phát đi những nội dung và trao đổi với bạn bè của bạn trên một loạt các trang hay còn gọi là các miền. Đặc biệt ở là {domain}, là nơi lưu trữ hồ sơ của bạn, vì vậy đừng quên miền này.",
-  "keyboard_shortcuts.back": "để trở lại",
-  "keyboard_shortcuts.blocked": "để mở danh sách người dùng bị chặn",
-  "keyboard_shortcuts.boost": "để loan tin",
-  "keyboard_shortcuts.column": "để tập trung một tút cụ thể từ một trong các cột",
-  "keyboard_shortcuts.compose": "để vào khung soạn tút",
+  "introduction.interactions.reply.text": "Bạn có thể trả lời tút của những người khác và tút của bạn, từ đó tạo nên những cuộc hội thoại.",
+  "introduction.welcome.action": "Bắt đầu nào!",
+  "introduction.welcome.headline": "Hướng dẫn người mới",
+  "introduction.welcome.text": "Chào mừng bạn đến mạng xã hội liên hợp! Tại đây bạn có thể đăng tải nội dung và trao đổi với bạn bè của mình trên các máy chủ khác nhau. Máy chủ {domain} là nơi lưu trữ trang cá nhân của bạn.",
+  "keyboard_shortcuts.back": "trở lại",
+  "keyboard_shortcuts.blocked": "mở danh sách người dùng đã chặn",
+  "keyboard_shortcuts.boost": "chia sẻ",
+  "keyboard_shortcuts.column": "mở các mục",
+  "keyboard_shortcuts.compose": "mở khung soạn tút",
   "keyboard_shortcuts.description": "Mô tả",
-  "keyboard_shortcuts.direct": "để mở thư cột trực tiếp",
-  "keyboard_shortcuts.down": "để di chuyển xuống trong danh sách",
-  "keyboard_shortcuts.enter": "để mở trạng thái",
-  "keyboard_shortcuts.favourite": "để thích",
-  "keyboard_shortcuts.favourites": "để mở danh sách yêu thích",
-  "keyboard_shortcuts.federated": "để mở dòng thời gian liên kết",
+  "keyboard_shortcuts.direct": "mở mục 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": "tâm đắc",
+  "keyboard_shortcuts.favourites": "mở danh sách tâm đắc",
+  "keyboard_shortcuts.federated": "mở mạng liên kết",
   "keyboard_shortcuts.heading": "Các phím tắt",
-  "keyboard_shortcuts.home": "để mở bảng tin",
+  "keyboard_shortcuts.home": "mở bảng tin",
   "keyboard_shortcuts.hotkey": "Phím tắt",
-  "keyboard_shortcuts.legend": "để hiển thị bảng hướng dẫn này",
-  "keyboard_shortcuts.local": "để mở dòng thời gian của miền",
-  "keyboard_shortcuts.mention": "để nhắc đến tác giả",
-  "keyboard_shortcuts.muted": "để mở danh sách người dùng tắt tiếng",
-  "keyboard_shortcuts.my_profile": "để mở hồ sơ của bạn",
-  "keyboard_shortcuts.notifications": "để mở thông báo cột",
-  "keyboard_shortcuts.open_media": "để mở media",
-  "keyboard_shortcuts.pinned": "để mở danh sách tút được ghim",
-  "keyboard_shortcuts.profile": "để mở hồ sơ của tác giả",
-  "keyboard_shortcuts.reply": "để trả lời",
-  "keyboard_shortcuts.requests": "để mở danh sách các yêu cầu",
-  "keyboard_shortcuts.search": "để vào ô tìm kiếm",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
-  "keyboard_shortcuts.start": "để mở cột \"Bắt đầu\"",
-  "keyboard_shortcuts.toggle_hidden": "để ẩn/hiện đằng sau văn bản CW",
-  "keyboard_shortcuts.toggle_sensitivity": "để hiển thị / ẩn media",
-  "keyboard_shortcuts.toot": "để viết tút mới",
-  "keyboard_shortcuts.unfocus": "để đưa con trỏ ra khỏi ô soạn thảo hoặc ô tìm kiếm",
-  "keyboard_shortcuts.up": "để di chuyển lên trong danh sách",
-  "lightbox.close": "Tắt",
+  "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này",
+  "keyboard_shortcuts.local": "mở máy chủ của bạn",
+  "keyboard_shortcuts.mention": "nhắc đến người dùng",
+  "keyboard_shortcuts.muted": "mở danh sách người dùng đã ẩn",
+  "keyboard_shortcuts.my_profile": "mở trang cá nhân của bạn",
+  "keyboard_shortcuts.notifications": "mở mục thông báo",
+  "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
+  "keyboard_shortcuts.pinned": "mở danh sách tút ghim",
+  "keyboard_shortcuts.profile": "mở trang cá nhân của người viết tút",
+  "keyboard_shortcuts.reply": "trả lời",
+  "keyboard_shortcuts.requests": "mở danh sách yêu cầu mến mộ",
+  "keyboard_shortcuts.search": "mở tìm kiếm",
+  "keyboard_shortcuts.spoilers": "Hiện/ẩn nội dung nhạy cảm",
+  "keyboard_shortcuts.start": "mở mục \"Dành cho người mới\"",
+  "keyboard_shortcuts.toggle_hidden": "ẩn/hiện văn bản bên dưới spoil",
+  "keyboard_shortcuts.toggle_sensitivity": "ẩn/hiện ảnh hoặc video",
+  "keyboard_shortcuts.toot": "viết tút mới",
+  "keyboard_shortcuts.unfocus": "đưa con trỏ ra khỏi ô soạn thảo hoặc ô tìm kiếm",
+  "keyboard_shortcuts.up": "di chuyển lên trên danh sách",
+  "lightbox.close": "Đóng",
   "lightbox.next": "Tiếp",
   "lightbox.previous": "Trước",
-  "lightbox.view_context": "Xem bối cảnh",
+  "lightbox.view_context": "Xem nội dung",
   "lists.account.add": "Thêm vào danh sách",
   "lists.account.remove": "Xóa khỏi danh sách",
   "lists.delete": "Xóa danh sách",
@@ -255,158 +261,158 @@
   "lists.edit.submit": "Thay đổi tiêu đề",
   "lists.new.create": "Thêm vào danh sách",
   "lists.new.title_placeholder": "Tên danh sách mới",
-  "lists.search": "Tìm kiếm trong số những người bạn quan tâm",
+  "lists.search": "Tìm kiếm những người mà bạn mến mộ",
   "lists.subheading": "Danh sách của bạn",
-  "load_pending": "{count, plural, other {}}",
+  "load_pending": "{count, plural, one {# new item} other {# new items}}",
   "loading_indicator.label": "Đang tải...",
-  "media_gallery.toggle_visible": "Bật/tắt",
+  "media_gallery.toggle_visible": "Ẩn {number, plural, one {image} other {images}}",
   "missing_indicator.label": "Không tìm thấy",
-  "missing_indicator.sublabel": "Tài liệu này không thể được tìm thấy",
-  "mute_modal.hide_notifications": "Ẩn thông báo từ thành viên này?",
-  "navigation_bar.apps": "Ứng dụng di động",
-  "navigation_bar.blocks": "Người dùng bị chặn",
+  "missing_indicator.sublabel": "Không tìm thấy cái này",
+  "mute_modal.hide_notifications": "Ẩn thông báo từ người dùng này?",
+  "navigation_bar.apps": "Apps",
+  "navigation_bar.blocks": "Người dùng đã chặn",
   "navigation_bar.bookmarks": "Đã lưu",
-  "navigation_bar.community_timeline": "Dòng thời gian của miền",
+  "navigation_bar.community_timeline": "Máy chủ của bạn",
   "navigation_bar.compose": "Soạn tút mới",
-  "navigation_bar.direct": "Tin nhắn trực tiếp",
-  "navigation_bar.discover": "Khám phá",
-  "navigation_bar.domain_blocks": "Miền đã ẩn",
-  "navigation_bar.edit_profile": "Sửa hồ sơ cá nhân",
-  "navigation_bar.favourites": "Đã thích",
-  "navigation_bar.filters": "Nói cách tắt tiếng",
-  "navigation_bar.follow_requests": "Yêu cầu quan tâm",
-  "navigation_bar.follows_and_followers": "Đang quan tâm và được quan tâm",
-  "navigation_bar.info": "Giới thiệu",
+  "navigation_bar.direct": "Tin nhắn",
+  "navigation_bar.discover": "Cộng đồng",
+  "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
+  "navigation_bar.edit_profile": "Chỉnh sửa trang cá nhân",
+  "navigation_bar.favourites": "Những thứ tâm đắc",
+  "navigation_bar.filters": "Bộ lọc từ ngữ",
+  "navigation_bar.follow_requests": "Yêu cầu theo dõi",
+  "navigation_bar.follows_and_followers": "Đang theo dõi và người theo dõi bạn",
+  "navigation_bar.info": "Về máy chủ này",
   "navigation_bar.keyboard_shortcuts": "Phím tắt",
   "navigation_bar.lists": "Danh sách",
   "navigation_bar.logout": "Đăng xuất",
-  "navigation_bar.mutes": "Người sử dụng tắt tiếng",
+  "navigation_bar.mutes": "Người dùng đã chặn",
   "navigation_bar.personal": "Cá nhân",
-  "navigation_bar.pins": "Tút được ghim",
+  "navigation_bar.pins": "Tút ghim",
   "navigation_bar.preferences": "Tùy chỉnh",
   "navigation_bar.public_timeline": "Dòng thời gian liên kết",
   "navigation_bar.security": "Bảo mật",
-  "notification.favourite": "{name} favourited trạng thái của bạn",
-  "notification.follow": "{name} đã quan tâm bạn",
+  "notification.favourite": "{name} vừa tâm đắc tút của bạn",
+  "notification.follow": "{name} đã theo dõi bạn",
   "notification.follow_request": "{name} đã yêu cầu theo dõi bạn",
   "notification.mention": "{name} nhắc đến bạn",
   "notification.own_poll": "Cuộc thăm dò của bạn đã kết thúc",
-  "notification.poll": "Một cuộc thăm dò bạn đã bỏ phiếu tại đã kết thúc",
-  "notification.reblog": "{name} loan tin tút của bạn",
+  "notification.poll": "Một cuộc thăm dò mà bạn tham gia đã kết thúc",
+  "notification.reblog": "{name} chia sẻ tút của bạn",
   "notifications.clear": "Xóa thông báo",
-  "notifications.clear_confirmation": "Bạn có chắc chắn muốn xóa vĩnh viễn tất cả các thông báo của mình?",
+  "notifications.clear_confirmation": "Bạn có chắc chắn muốn xóa vĩnh viễn tất cả thông báo của mình?",
   "notifications.column_settings.alert": "Thông báo trên máy tính",
-  "notifications.column_settings.favourite": "Đã thích:",
-  "notifications.column_settings.filter_bar.advanced": "Hiển thị tất cả các loại",
+  "notifications.column_settings.favourite": "Tâm đắc:",
+  "notifications.column_settings.filter_bar.advanced": "Hiển thị toàn bộ",
   "notifications.column_settings.filter_bar.category": "Lọc nhanh",
   "notifications.column_settings.filter_bar.show": "Hiện",
-  "notifications.column_settings.follow": "Người mới quan tâm :",
+  "notifications.column_settings.follow": "Người theo dõi mới:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi mới:",
   "notifications.column_settings.mention": "Nhắc đến:",
   "notifications.column_settings.poll": "Kết quả cuộc thăm dò:",
   "notifications.column_settings.push": "Thông báo đẩy",
-  "notifications.column_settings.reblog": "Loan tin:",
+  "notifications.column_settings.reblog": "Chia sẻ:",
   "notifications.column_settings.show": "Hiện trong cột",
   "notifications.column_settings.sound": "Mở tiếng",
   "notifications.filter.all": "Toàn bộ",
-  "notifications.filter.boosts": "Loan tin",
-  "notifications.filter.favourites": "Đã thích",
-  "notifications.filter.follows": "Quan tâm",
+  "notifications.filter.boosts": "Chia sẻ",
+  "notifications.filter.favourites": "Tâm đắc",
+  "notifications.filter.follows": "Đang theo dõi",
   "notifications.filter.mentions": "Nhắc đến",
   "notifications.filter.polls": "Kết quả cuộc thăm dò",
   "notifications.group": "{count} thông báo",
   "poll.closed": "Đóng",
   "poll.refresh": "Làm mới",
   "poll.total_people": "{count, plural, other {}}",
-  "poll.total_votes": "{count, plural, other {}}",
-  "poll.vote": "Bỏ phiếu",
+  "poll.total_votes": "{count, plural, one {# bình chọn} other {# bình chọn}}",
+  "poll.vote": "Cuộc thăm dò",
   "poll.voted": "Bạn đã bình chọn cho câu trả lời này",
   "poll_button.add_poll": "Tạo thăm dò",
-  "poll_button.remove_poll": "Bỏ thăm dò",
-  "privacy.change": "Điều chỉnh chế độ của tút",
-  "privacy.direct.long": "Chỉ gửi cho người được nhắc đến",
-  "privacy.direct.short": "Nhắn riêng",
-  "privacy.private.long": "Chỉ người quan tâm mới xem được",
-  "privacy.private.short": "Chỉ người quan tâm",
-  "privacy.public.long": "Đăng lên các dòng thời gian công khai",
+  "poll_button.remove_poll": "Hủy thăm dò",
+  "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": "Tin nhắn",
+  "privacy.private.long": "Chỉ dành cho người theo dõi",
+  "privacy.private.short": "Chỉ người theo dõi",
+  "privacy.public.long": "Đăng lên các dòng thời gian công cộng",
   "privacy.public.short": "Công khai",
-  "privacy.unlisted.long": "Không đăng lên các dòng thời gian công khai",
-  "privacy.unlisted.short": "Không công khai",
-  "refresh": "Làm tươi",
+  "privacy.unlisted.long": "Không đăng lên các dòng thời gian công cộng",
+  "privacy.unlisted.short": "Mở",
+  "refresh": "Làm mới",
   "regeneration_indicator.label": "Đang tải…",
   "regeneration_indicator.sublabel": "Bảng tin của bạn đang được cập nhật!",
   "relative_time.days": "{number} ngày",
   "relative_time.hours": "{number} giờ",
   "relative_time.just_now": "vừa xong",
-  "relative_time.minutes": "{number} phút",
-  "relative_time.seconds": "{number} giây",
-  "relative_time.today": "today",
+  "relative_time.minutes": "{number}p",
+  "relative_time.seconds": "{number}s",
+  "relative_time.today": "hôm nay",
   "reply_indicator.cancel": "Hủy bỏ",
   "report.forward": "Chuyển đến {target}",
-  "report.forward_hint": "Tài khoản này từ miền khác. Gửi thêm một báo cáo ẩn danh tới miền của tài khoản này?",
-  "report.hint": "Báo cáo này sẽ được gửi đến điều hành viên miền của bạn. Bạn có thể cung cấp lý do tại sao bạn lại báo cáo tài khoản vào này dưới đây:",
-  "report.placeholder": "Ý kiến ​​khác",
+  "report.forward_hint": "Người dùng này ở máy chủ khác. Gửi một báo xấu ẩn danh tới máy chủ đó?",
+  "report.hint": "Hãy cho quản trị viên biết lý do tại sao bạn lại báo xấu tài khoản này:",
+  "report.placeholder": "Bổ sung thêm",
   "report.submit": "Gửi đi",
   "report.target": "Báo xấu {target}",
   "search.placeholder": "Tìm kiếm",
-  "search_popout.search_format": "Tìm kiếm nâng cao theo cú pháp",
-  "search_popout.tips.full_text": "Không dùng ký tự đặc biệt sẽ trả về tút của bạn, tút bạn thích, tút bạn loan tin hoặc bạn được nhắc đến, kể cả tên tài khoản, tên hiển thị và hashtag.",
-  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.search_format": "Tìm kiếm nâng cao",
+  "search_popout.tips.full_text": "Nội dung trả về bao gồm các tút do bạn viết, thích, đã chia sẻ hoặc được nhắc đến. Cũng như địa chỉ người dùng, tên hiển thị lẫn chủ đề.",
+  "search_popout.tips.hashtag": "chủ đề",
   "search_popout.tips.status": "tút",
-  "search_popout.tips.text": "không dùng ký tự đặc biệt sẽ trả về nội dung tương ứng, tên tài khoản và các hashtag.",
-  "search_popout.tips.user": "thành viên",
-  "search_results.accounts": "Người",
-  "search_results.hashtags": "Hashtags",
+  "search_popout.tips.text": "Nội dung trả về là địa chỉ người dùng, tên hiển thị và hashtag",
+  "search_popout.tips.user": "người dùng",
+  "search_results.accounts": "Người dùng",
+  "search_results.hashtags": "Chủ đề",
   "search_results.statuses": "Tút",
-  "search_results.statuses_fts_disabled": "Tìm kiếm các tút theo nội dung của chúng không được kích hoạt trên trang Mastodon này.",
-  "search_results.total": "{đếm, số} {đếm, số nhiều, một {kết quả} khác {kết quả}}",
+  "search_results.statuses_fts_disabled": "Máy chủ của bạn không bật chức năng tìm kiếm tút.",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_status": "Mở tút này trong giao diện quản trị",
   "status.block": "Chặn @{name}",
   "status.bookmark": "Lưu",
-  "status.cancel_reblog_private": "Hủy loan tin",
-  "status.cannot_reblog": "Không thể loan tin tút này",
-  "status.copy": "Sao chép liên kết đến tút",
-  "status.delete": "Xóa bỏ",
-  "status.detailed_status": "Chi tiết xem cuộc hội thoại",
+  "status.cancel_reblog_private": "Hủy chia sẻ",
+  "status.cannot_reblog": "Không thể chia sẻ tút này",
+  "status.copy": "Sao chép URL tút",
+  "status.delete": "Xóa",
+  "status.detailed_status": "Xem chi tiết thêm",
   "status.direct": "Nhắn riêng @{name}",
   "status.embed": "Nhúng",
-  "status.favourite": "Thích",
-  "status.filtered": "Lọc qua",
-  "status.load_more": "Tải thêm",
-  "status.media_hidden": "Media đã ẩn",
+  "status.favourite": "Tâm đắc",
+  "status.filtered": "Bộ lọc",
+  "status.load_more": "Xem thêm",
+  "status.media_hidden": "Ảnh/video đã ẩn",
   "status.mention": "Nhắc đến @{name}",
-  "status.more": "Thêm nữa",
+  "status.more": "Thêm",
   "status.mute": "Ẩn @{name}",
-  "status.mute_conversation": "Ẩn trao đổi",
-  "status.open": "Mở rộng tút này",
-  "status.pin": "Ghim trong hồ sơ",
-  "status.pinned": "Tút được ghim",
+  "status.mute_conversation": "Không quan tâm nữa",
+  "status.open": "Xem nguyên văn",
+  "status.pin": "Ghim lên trang cá nhân",
+  "status.pinned": "Tút đã ghim",
   "status.read_more": "Đọc thêm",
-  "status.reblog": "Loan tin",
-  "status.reblog_private": "Loan tin đến những người có thể xem",
-  "status.reblogged_by": "{name} loan tin",
-  "status.reblogs.empty": "Chưa ai loan tin tút này, nếu có bạn sẽ thấy ở đây.",
-  "status.redraft": "Xóa & nháp lại",
-  "status.remove_bookmark": "Xóa",
+  "status.reblog": "Chia sẻ",
+  "status.reblog_private": "Chia sẻ với người viết tút gốc",
+  "status.reblogged_by": "{name} chia sẻ",
+  "status.reblogs.empty": "Chưa ai chia sẻ Tút này. Nếu có, nó sẽ xuất hiện ở đây.",
+  "status.redraft": "Xóa và viết lại",
+  "status.remove_bookmark": "Hủy lưu",
   "status.reply": "Trả lời",
-  "status.replyAll": "Trả lời chủ đề",
-  "status.report": "Báo cáo @{name}",
+  "status.replyAll": "Trả lời tất cả",
+  "status.report": "Báo xấu @{name}",
   "status.sensitive_warning": "Nội dung nhạy cảm",
   "status.share": "Chia sẻ",
-  "status.show_less": "Hiện ít hơn",
-  "status.show_less_all": "Hiển thị ít hơn cho tất cả",
-  "status.show_more": "Xem nhiều hơn",
-  "status.show_more_all": "Hiển thị thêm cho tất cả",
-  "status.show_thread": "Xem chủ đề",
-  "status.uncached_media_warning": "Không có sẵn",
-  "status.unmute_conversation": "Bỏ ẩn hội thoại",
-  "status.unpin": "Bỏ ghim khỏi hồ sơ",
+  "status.show_less": "Thu gọn",
+  "status.show_less_all": "Thu gọn tất cả",
+  "status.show_more": "Mở rộng",
+  "status.show_more_all": "Hiển thị tất cả",
+  "status.show_thread": "Hiện thêm",
+  "status.uncached_media_warning": "N/A",
+  "status.unmute_conversation": "Quan tâm",
+  "status.unpin": "Bỏ ghim trên trang cá nhân",
   "suggestions.dismiss": "Tắt đề xuất",
   "suggestions.header": "Có thể bạn quan tâm…",
-  "tabs_bar.federated_timeline": "Miền liên kết",
+  "tabs_bar.federated_timeline": "Mạng liên kết",
   "tabs_bar.home": "Bảng tin",
-  "tabs_bar.local_timeline": "Cùng miền",
+  "tabs_bar.local_timeline": "Máy chủ của bạn",
   "tabs_bar.notifications": "Thông báo",
   "tabs_bar.search": "Tìm kiếm",
   "time_remaining.days": "{number, plural, other {}} left",
@@ -414,38 +420,38 @@
   "time_remaining.minutes": "{number, plural, other {}} left",
   "time_remaining.moments": "Còn lại",
   "time_remaining.seconds": "{number, plural, other {}} 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 toots",
-  "trends.count_by_accounts": "{Count} {rawCount, số nhiều, một {người} khác {người}} nói chuyện",
-  "trends.trending_now": "Đang là xu hướng",
-  "ui.beforeunload": "Bản nháp của bạn sẽ bị mất nếu bạn rời của Mastodon.",
+  "timeline_hint.remote_resource_not_displayed": "{resource} từ máy chủ khác sẽ không hiển thị.",
+  "timeline_hint.resources.followers": "Người theo dõi",
+  "timeline_hint.resources.follows": "Đang theo dõi",
+  "timeline_hint.resources.statuses": "Tút cũ hơn",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} đang thảo luận",
+  "trends.trending_now": "Xu hướng",
+  "ui.beforeunload": "Bản nháp của bạn sẽ bị mất nếu bạn thoát khỏi Mastodon.",
   "upload_area.title": "Kéo và thả để tải lên",
   "upload_button.label": "Thêm media (JPEG, PNG, GIF, WebM, MP4, MOV)",
-  "upload_error.limit": "Giới hạn tải lên tập tin vượt quá.",
-  "upload_error.poll": "Không thể tải file lên cùng với thăm dò",
-  "upload_form.audio_description": "Mô tả cho người có vấn đề về thính giác",
+  "upload_error.limit": "Tập tin tải lên vượt quá giới hạn cho phép.",
+  "upload_error.poll": "Cuộc thăm dò không được tải tập tin.",
+  "upload_form.audio_description": "Mô tả cho người thính giác kém",
   "upload_form.description": "Mô tả cho người khiếm thị",
   "upload_form.edit": "Biên tập",
   "upload_form.undo": "Xóa bỏ",
   "upload_form.video_description": "Mô tả cho người có vấn đề về thính giác",
   "upload_modal.analyzing_picture": "Phân tích hình ảnh",
-  "upload_modal.apply": "Ứng dụng",
-  "upload_modal.description_placeholder": "Một con cáo nâu nhanh nhẹn nhảy qua con chó lười",
-  "upload_modal.detect_text": "Phát hiện văn bản từ hình ảnh",
-  "upload_modal.edit_media": "Chỉnh sửa phương tiện truyền thông",
-  "upload_modal.hint": "Nhấp hoặc kéo vòng tròn trên bản xem trước để chọn tiêu điểm sẽ luôn được xem trên tất cả các hình thu nhỏ.",
-  "upload_modal.preview_label": "Xem trước ({tỷ lệ})",
-  "upload_progress.label": "Đang tải lên ...",
+  "upload_modal.apply": "Áp dụng",
+  "upload_modal.description_placeholder": "A quick brown fox jumps over the lazy dog",
+  "upload_modal.detect_text": "Phát hiện văn bản trong hình ảnh",
+  "upload_modal.edit_media": "Chỉnh sửa ảnh/video",
+  "upload_modal.hint": "Nhấp hoặc kéo vòng tròn trên bản xem trước để chọn phần hiển thị trên hình thu nhỏ.",
+  "upload_modal.preview_label": "Xem trước ({ratio})",
+  "upload_progress.label": "Đang tải lên...",
   "video.close": "Đóng video",
-  "video.download": "Download file",
+  "video.download": "Tải tập tin",
   "video.exit_fullscreen": "Thoát toàn màn hình",
   "video.expand": "Mở rộng video",
   "video.fullscreen": "Toàn màn hình",
   "video.hide": "Ẩn video",
   "video.mute": "Tắt tiếng",
-  "video.pause": "Pause",
-  "video.play": "Play",
+  "video.pause": "Tạm dừng",
+  "video.play": "Phát",
   "video.unmute": "Mở tiếng"
 }
diff --git a/app/javascript/mastodon/locales/whitelist_szl.json b/app/javascript/mastodon/locales/whitelist_szl.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_szl.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_tai.json b/app/javascript/mastodon/locales/whitelist_tai.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_tai.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 0069b90ae..222d3aed8 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,11 +1,13 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "从列表中添加或删除",
   "account.badges.bot": "机器人",
   "account.badges.group": "群组",
   "account.block": "屏蔽 @{name}",
   "account.block_domain": "隐藏来自 {domain} 的内容",
   "account.blocked": "已屏蔽",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
+  "account.browse_more_on_origin_server": "在原始个人资料页面上浏览详情",
   "account.cancel_follow_request": "取消关注请求",
   "account.direct": "发送私信给 @{name}",
   "account.domain_blocked": "网站已屏蔽",
@@ -40,6 +42,10 @@
   "account.unfollow": "取消关注",
   "account.unmute": "不再隐藏 @{name}",
   "account.unmute_notifications": "不再隐藏来自 @{name} 的通知",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "请在{retry_time, time, medium}后重试。",
   "alert.rate_limited.title": "频率受限",
   "alert.unexpected.message": "发生了意外错误。",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "显示设置",
   "column_header.unpin": "取消固定",
   "column_subheading.settings": "设置",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "只显示本站",
   "community.column_settings.media_only": "仅媒体",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "只显示外站",
   "compose_form.direct_message_warning": "这条嘟文仅对所有被提及的用户可见。",
   "compose_form.direct_message_warning_learn_more": "了解详情",
   "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”,因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
@@ -237,7 +243,7 @@
   "keyboard_shortcuts.reply": "回复嘟文",
   "keyboard_shortcuts.requests": "打开关注请求列表",
   "keyboard_shortcuts.search": "选择搜索框",
-  "keyboard_shortcuts.spoilers": "to show/hide CW field",
+  "keyboard_shortcuts.spoilers": "显示或隐藏被折叠的正文",
   "keyboard_shortcuts.start": "打开“开始使用”栏",
   "keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
   "keyboard_shortcuts.toggle_sensitivity": "显示/隐藏媒体",
@@ -259,7 +265,7 @@
   "lists.subheading": "你的列表",
   "load_pending": "{count} 项",
   "loading_indicator.label": "加载中……",
-  "media_gallery.toggle_visible": "切换显示/隐藏",
+  "media_gallery.toggle_visible": "隐藏 {number} 张图片",
   "missing_indicator.label": "找不到内容",
   "missing_indicator.sublabel": "无法找到此资源",
   "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知?",
@@ -414,10 +420,10 @@
   "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
   "time_remaining.moments": "即将结束",
   "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
-  "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 toots",
+  "timeline_hint.remote_resource_not_displayed": "不会显示来自其它服务器的 {resource}",
+  "timeline_hint.resources.followers": "关注者",
+  "timeline_hint.resources.follows": "关注",
+  "timeline_hint.resources.statuses": "更早的嘟文",
   "trends.count_by_accounts": "{count} 人正在讨论",
   "trends.trending_now": "现在流行",
   "ui.beforeunload": "如果你现在离开 Mastodon,你的草稿内容将会丢失。",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index f3212049b..222855c2c 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機械人",
   "account.badges.group": "群組",
@@ -40,6 +42,10 @@
   "account.unfollow": "取消關注",
   "account.unmute": "取消 @{name} 的靜音",
   "account.unmute_notifications": "取消來自 @{name} 通知的靜音",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "請在 {retry_time, time, medium} 過後重試",
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生不可預期的錯誤。",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取下",
   "column_subheading.settings": "設定",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "只有本地",
   "community.column_settings.media_only": "僅媒體",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "只有遠端",
   "compose_form.direct_message_warning": "這文章只有被提及的用戶才可以看到。",
   "compose_form.direct_message_warning_learn_more": "了解更多",
   "compose_form.hashtag_warning": "這文章因為不是公開,所以不會被標籤搜索。只有公開的文章才會被標籤搜索。",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "舉報問題",
   "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.",
+  "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定,{domain} 的員工認為可能想要自己審核這些帳號的追蹤請求。",
   "getting_started.developers": "開發者",
   "getting_started.directory": "個人資料目錄",
   "getting_started.documentation": "文件",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 62ef113ed..81c13c652 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,4 +1,6 @@
 {
+  "account.account_note_header": "Your note for @{name}",
+  "account.add_account_note": "Add note for @{name}",
   "account.add_or_remove_from_list": "從名單中新增或移除",
   "account.badges.bot": "機器人",
   "account.badges.group": "群組",
@@ -40,6 +42,10 @@
   "account.unfollow": "取消關注",
   "account.unmute": "取消靜音 @{name}",
   "account.unmute_notifications": "重新接收來自 @{name} 的通知",
+  "account_note.cancel": "Cancel",
+  "account_note.edit": "Edit",
+  "account_note.placeholder": "No comment provided",
+  "account_note.save": "Save",
   "alert.rate_limited.message": "請在 {retry_time, time, medium} 過後重試",
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生了非預期的錯誤。",
@@ -75,9 +81,9 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取消釘選",
   "column_subheading.settings": "設定",
-  "community.column_settings.local_only": "Local only",
+  "community.column_settings.local_only": "只有本地",
   "community.column_settings.media_only": "只有媒體",
-  "community.column_settings.remote_only": "Remote only",
+  "community.column_settings.remote_only": "只有遠端",
   "compose_form.direct_message_warning": "這條嘟文只有被提及的使用者才看得到。",
   "compose_form.direct_message_warning_learn_more": "了解更多",
   "compose_form.hashtag_warning": "由於這則嘟文被設定成「不公開」,所以它將不會被列在任何主題標籤下。只有公開的嘟文才能藉主題標籤找到。",
@@ -167,7 +173,7 @@
   "errors.unexpected_crash.report_issue": "舉報問題",
   "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.",
+  "follow_requests.unlocked_explanation": "即便您的帳號未被鎖定,{domain} 的員工認為可能想要自己審核這些帳號的追蹤請求。",
   "getting_started.developers": "開發者",
   "getting_started.directory": "個人資料目錄",
   "getting_started.documentation": "文件",