From 09bcb4336b41be9cfaaf57f2e8ef6bf44f870ee9 Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Mon, 15 Jun 2020 19:49:38 -0500
Subject: [PATCH 01/56] Fix sidebar menu rendering to work in iOS Safari and
 other browsers

---
 app/styles/components/sidebar-menu.scss | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/styles/components/sidebar-menu.scss b/app/styles/components/sidebar-menu.scss
index e6b4d15a5..b50dfb6dc 100644
--- a/app/styles/components/sidebar-menu.scss
+++ b/app/styles/components/sidebar-menu.scss
@@ -3,7 +3,7 @@
   position: fixed;
   flex-direction: column;
   width: 275px;
-  height: 100vh;
+  //height: 100vh;
   top: 0;
   bottom: 0;
   left: 0;
@@ -30,12 +30,15 @@
   }
 
   &__content {
-    display: flex;
-    flex: 1 1;
-    flex-direction: column;
-    padding-bottom: 40px;
+    //display: flex;
+    //flex: 1 1;
+    //flex-direction: column;
+    //padding-bottom: 40px;
     overflow-y: scroll;
-    -webkit-overflow-scrolling: touch;
+    overflow: auto;
+    height: 100%;
+    width: 100%;
+    //-webkit-overflow-scrolling: touch;
   }
 
   &__section {

From 10883a9bc962108354ceb3166ac4fd9fe5a59833 Mon Sep 17 00:00:00 2001
From: Curtis <curtis.rock@wirelessmessaging.com>
Date: Tue, 16 Jun 2020 22:05:16 +0000
Subject: [PATCH 02/56] Update sidebar-menu.scss removed commented code

---
 app/styles/components/sidebar-menu.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/styles/components/sidebar-menu.scss b/app/styles/components/sidebar-menu.scss
index b50dfb6dc..2207a2aed 100644
--- a/app/styles/components/sidebar-menu.scss
+++ b/app/styles/components/sidebar-menu.scss
@@ -3,7 +3,6 @@
   position: fixed;
   flex-direction: column;
   width: 275px;
-  //height: 100vh;
   top: 0;
   bottom: 0;
   left: 0;
@@ -30,15 +29,10 @@
   }
 
   &__content {
-    //display: flex;
-    //flex: 1 1;
-    //flex-direction: column;
-    //padding-bottom: 40px;
     overflow-y: scroll;
     overflow: auto;
     height: 100%;
     width: 100%;
-    //-webkit-overflow-scrolling: touch;
   }
 
   &__section {

From 0830d227a5d6fe5ce67e39f01d856d80c54ee4e6 Mon Sep 17 00:00:00 2001
From: Curtis ROck <curtis.rock@wirelessmessaging.com>
Date: Wed, 5 Aug 2020 21:12:15 -0500
Subject: [PATCH 03/56] Added translations for public_header text elements

---
 .../public_layout/components/header.js        |  23 +-
 app/soapbox/locales/ar.json                   |  43 +++
 app/soapbox/locales/ast.json                  |  43 +++
 app/soapbox/locales/bg.json                   |  43 +++
 app/soapbox/locales/bn.json                   |  43 +++
 app/soapbox/locales/br.json                   |  43 +++
 app/soapbox/locales/ca.json                   |  43 +++
 app/soapbox/locales/co.json                   |  43 +++
 app/soapbox/locales/cs.json                   |  43 +++
 app/soapbox/locales/cy.json                   |  43 +++
 app/soapbox/locales/da.json                   |  43 +++
 app/soapbox/locales/de.json                   |  43 +++
 app/soapbox/locales/defaultMessages.json      | 253 ++++++++++++++++--
 app/soapbox/locales/el.json                   |  43 +++
 app/soapbox/locales/en.json                   |  43 +++
 app/soapbox/locales/eo.json                   |  43 +++
 app/soapbox/locales/es-AR.json                |  43 +++
 app/soapbox/locales/es.json                   |  43 +++
 app/soapbox/locales/et.json                   |  43 +++
 app/soapbox/locales/eu.json                   |  43 +++
 app/soapbox/locales/fa.json                   |  43 +++
 app/soapbox/locales/fi.json                   |  43 +++
 app/soapbox/locales/fr.json                   |  43 +++
 app/soapbox/locales/ga.json                   |  43 +++
 app/soapbox/locales/gl.json                   |  43 +++
 app/soapbox/locales/he.json                   |  43 +++
 app/soapbox/locales/hi.json                   |  43 +++
 app/soapbox/locales/hr.json                   |  43 +++
 app/soapbox/locales/hu.json                   |  43 +++
 app/soapbox/locales/hy.json                   |  43 +++
 app/soapbox/locales/id.json                   |  43 +++
 app/soapbox/locales/io.json                   |  43 +++
 app/soapbox/locales/it.json                   |  43 +++
 app/soapbox/locales/ja.json                   |  43 +++
 app/soapbox/locales/ka.json                   |  43 +++
 app/soapbox/locales/kk.json                   |  43 +++
 app/soapbox/locales/ko.json                   |  43 +++
 app/soapbox/locales/lt.json                   |  43 +++
 app/soapbox/locales/lv.json                   |  43 +++
 app/soapbox/locales/mk.json                   |  43 +++
 app/soapbox/locales/ms.json                   |  43 +++
 app/soapbox/locales/nl.json                   |  43 +++
 app/soapbox/locales/nn.json                   |  43 +++
 app/soapbox/locales/no.json                   |  43 +++
 app/soapbox/locales/oc.json                   |  43 +++
 app/soapbox/locales/pl.json                   |  43 +++
 app/soapbox/locales/pt-BR.json                |  43 +++
 app/soapbox/locales/pt.json                   |  43 +++
 app/soapbox/locales/ro.json                   |  43 +++
 app/soapbox/locales/ru.json                   |  43 +++
 app/soapbox/locales/sk.json                   |  43 +++
 app/soapbox/locales/sl.json                   |  43 +++
 app/soapbox/locales/sq.json                   |  43 +++
 app/soapbox/locales/sr-Latn.json              |  43 +++
 app/soapbox/locales/sr.json                   |  43 +++
 app/soapbox/locales/sv.json                   |  43 +++
 app/soapbox/locales/ta.json                   |  43 +++
 app/soapbox/locales/te.json                   |  43 +++
 app/soapbox/locales/th.json                   |  43 +++
 app/soapbox/locales/tr.json                   |  43 +++
 app/soapbox/locales/uk.json                   |  43 +++
 app/soapbox/locales/zh-CN.json                |  43 +++
 app/soapbox/locales/zh-HK.json                |  43 +++
 app/soapbox/locales/zh-TW.json                |  43 +++
 64 files changed, 2919 insertions(+), 23 deletions(-)

diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js
index 9f018cc3c..016d6dc47 100644
--- a/app/soapbox/features/public_layout/components/header.js
+++ b/app/soapbox/features/public_layout/components/header.js
@@ -6,6 +6,15 @@ import { Link } from 'react-router-dom';
 import LoginForm from 'soapbox/features/auth_login/components/login_form';
 import SiteLogo from './site_logo';
 import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
+import { defineMessages, injectIntl } from 'react-intl';
+import PropTypes from 'prop-types';
+
+const messages = defineMessages({
+  home: { id: 'header.home.label', defaultMessage: 'Home' },
+  about: { id: 'header.about.label', defaultMessage: 'About' },
+  backTo: { id: 'header.back_to.label', defaultMessage: 'Back to' },
+  login: { id: 'header.login.label', defaultMessage: 'Log in' },
+});
 
 const mapStateToProps = state => ({
   me: state.get('me'),
@@ -13,15 +22,17 @@ const mapStateToProps = state => ({
 });
 
 export default @connect(mapStateToProps)
+@injectIntl
 class Header extends ImmutablePureComponent {
 
   static propTypes = {
     me: SoapboxPropTypes.me,
     instance: ImmutablePropTypes.map,
+    intl: PropTypes.object.isRequired,
   }
 
   render() {
-    const { me, instance } = this.props;
+    const { me, instance, intl } = this.props;
 
     return (
       <nav className='header'>
@@ -30,21 +41,21 @@ class Header extends ImmutablePureComponent {
             <Link className='brand' to='/'>
               <SiteLogo />
             </Link>
-            <Link className='nav-link optional' to='/'>Home</Link>
-            <Link className='nav-link' to='/about'>About</Link>
+            <Link className='nav-link optional' to='/'>{intl.formatMessage(messages.home)}</Link>
+            <Link className='nav-link' to='/about'>{intl.formatMessage(messages.about)}</Link>
           </div>
           <div className='nav-center' />
           <div className='nav-right'>
             <div className='hidden-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>Back to {instance.get('title')}</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')}</Link>
                 : <LoginForm />
               }
             </div>
             <div className='visible-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>Back to {instance.get('title')}</Link>
-                : <Link className='nav-link nav-button webapp-btn' to='/auth/sign_in'>Log in</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')}</Link>
+                : <Link className='nav-link nav-button webapp-btn' to='/auth/sign_in'>{intl.formatMessage(messages.login)}</Link>
               }
             </div>
           </div>
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index 1029d3b53..c5ee247d1 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.",
   "bundle_modal_error.retry": "إعادة المحاولة",
   "column.blocks": "الحسابات المحجوبة",
+  "column.bookmarks": "Bookmarks",
   "column.community": "الخيط العام المحلي",
   "column.direct": "الرسائل المباشرة",
   "column.domain_blocks": "النطاقات المخفية",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "الخيط العام الموحد",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "العودة",
   "column_header.hide_settings": "إخفاء الإعدادات",
   "column_header.show_settings": "عرض الإعدادات",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "هذا التبويق لن يُدرَج تحت أي وسم كان بما أنه غير مُدرَج. لا يُسمح بالبحث إلّا عن التبويقات العمومية عن طريق الوسوم.",
   "compose_form.lock_disclaimer": "حسابك ليس {locked}. يمكن لأي شخص متابعتك و عرض المنشورات.",
   "compose_form.lock_disclaimer.lock": "مقفل",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "فيمَ تفكّر؟",
   "compose_form.poll.add_option": "إضافة خيار",
   "compose_form.poll.duration": "مدة استطلاع الرأي",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "ليس هناك تبويقات!",
   "empty_column.account_unavailable": "الملف التعريفي غير متوفر",
   "empty_column.blocks": "لم تقم بحظر أي مستخدِم بعد.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "الخط العام المحلي فارغ. أكتب شيئا ما للعامة كبداية!",
   "empty_column.direct": "لم تتلق أية رسالة خاصة مباشِرة بعد. سوف يتم عرض الرسائل المباشرة هنا إن قمت بإرسال واحدة أو تلقيت البعض منها.",
   "empty_column.domain_blocks": "ليس هناك نطاقات مخفية بعد.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "لم تقم بكتم أي مستخدم بعد.",
   "empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
   "empty_column.public": "لا يوجد أي شيء هنا! قم بنشر شيء ما للعامة، أو اتبع المستخدمين الآخرين المتواجدين على الخوادم الأخرى لملء خيط المحادثات",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "ترخيص",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "أو {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_reblogs": "عرض الترقيات",
   "home.column_settings.show_replies": "اعرض الردود",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "هل تود إخفاء الإخطارات القادمة من هذا المستخدم ؟",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "الحسابات المحجوبة",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "الخيط العام المحلي",
   "navigation_bar.compose": "تحرير تبويق جديد",
   "navigation_bar.direct": "الرسائل المباشِرة",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}ي",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
   "status.block": "احجب @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "إلغاء الترقية",
   "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
   "status.copy": "نسخ رابط المنشور",
@@ -439,6 +481,7 @@
   "status.show_more": "أظهر المزيد",
   "status.show_more_all": "توسيع الكل",
   "status.show_thread": "الكشف عن المحادثة",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "فك الكتم عن المحادثة",
   "status.unpin": "فك التدبيس من الصفحة التعريفية",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index 09031554f..dac6626f8 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
   "column.blocks": "Usuarios bloquiaos",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Llinia temporal llocal",
   "column.direct": "Mensaxes direutos",
   "column.domain_blocks": "Dominios anubríos",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Llinia temporal federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "¿En qué pienses?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Entá nun bloquiesti a dengún usuariu.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add 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": "Entá nun tienes dengún mensaxe direutu. Cuando unvies o recibas dalgún, va apaecer equí.",
   "empty_column.domain_blocks": "Entá nun hai dominios anubríos.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Entá nun silenciesti a dengún usuariu.",
   "empty_column.notifications": "Entá nun tienes dengún avisu. Interactua con otros p'aniciar la conversación.",
   "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Amosar toots compartíos",
   "home.column_settings.show_replies": "Amosar rempuestes",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuarios bloquiaos",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Llinia temporal llocal",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Mensaxes direutos",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Bloquiar a @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Dexar de compartir",
   "status.cannot_reblog": "Esti artículu nun pue compartise",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Amosar más",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Desfixar del perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index 53d78b17f..674a1a9ac 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Публичен канал",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Какво си мислиш?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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 instances to fill it up",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 3b460f31a..2c5c08b82 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "এই অংশটি দেখাতে যেয়ে কোনো সমস্যা হয়েছে।",
   "bundle_modal_error.retry": "আবার চেষ্টা করুন",
   "column.blocks": "যাদের বন্ধ করে রাখা হয়েছে",
+  "column.bookmarks": "Bookmarks",
   "column.community": "স্থানীয় সময়সারি",
   "column.direct": "সরাসরি লেখা",
   "column.domain_blocks": "সরিয়ে ফেলা ওয়েবসাইট",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "যুক্ত সময়রেখা",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "পেছনে",
   "column_header.hide_settings": "সেটিংগুলো সরান",
   "column_header.show_settings": "সেটিং দেখান",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "কোনো হ্যাশট্যাগের ভেতরে এই টুটটি থাকবেনা কারণ এটি তালিকাবহির্ভূত। শুধুমাত্র প্রকাশ্য ঠোটগুলো হ্যাশট্যাগের ভেতরে খুঁজে পাওয়া যাবে।",
   "compose_form.lock_disclaimer": "আপনার নিবন্ধনে তালা দেওয়া নেই, যে কেও আপনাকে অনুসরণ করতে পারবে এবং অনুশারকদের জন্য লেখা দেখতে পারবে।",
   "compose_form.lock_disclaimer.lock": "তালা দেওয়া",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "আপনি কি ভাবছেন ?",
   "compose_form.poll.add_option": "আরেকটি বিকল্প যোগ করুন",
   "compose_form.poll.duration": "ভোটগ্রহনের সময়",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "এখানে কোনো টুট নেই!",
   "empty_column.account_unavailable": "নিজস্ব পাতা নেই",
   "empty_column.blocks": "আপনি কোনো ব্যবহারকারীদের বন্ধ করেন নি।",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "স্থানীয় সময়রেখাতে কিছু নেই। প্রকাশ্যভাবে কিছু লিখে লেখালেখির উদ্বোধন করে ফেলুন!",
   "empty_column.direct": "আপনার কাছে সরাসরি পাঠানো কোনো লেখা নেই। যদি কেও পাঠায়, সেটা এখানে দেখা যাবে।",
   "empty_column.domain_blocks": "এখনো কোনো সরানো ওয়েবসাইট নেই।",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "আপনি এখনো কোনো ব্যবহারকারীকে সরাননি।",
   "empty_column.notifications": "আপনার এখনো কোনো প্রজ্ঞাপন নেই। কথোপকথন শুরু করতে,  অন্যদের সাথে মেলামেশা করতে পারেন।",
   "empty_column.public": "এখানে এখনো কিছু নেই! প্রকাশ্য ভাবে কিছু লিখুন বা অন্য সার্ভার থেকে কাওকে অনুসরণ করে এই জায়গা ভরে ফেলুন",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "অনুমতি দিন",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "এবং {additional}",
   "hashtag.column_header.tag_mode.any": "অথবা {additional}",
   "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "এই ব্যবহারকারীর প্রজ্ঞাপন বন্ধ করবেন ?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "বন্ধ করা ব্যবহারকারী",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "স্থানীয় সময়রেখা",
   "navigation_bar.compose": "নতুন টুট লিখুন",
   "navigation_bar.direct": "সরাসরি লেখাগুলি",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} দিন",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name} র জন্য পরিচালনার ইন্টারফেসে ঢুকুন",
   "status.admin_status": "যায় লেখাটি পরিচালনার ইন্টারফেসে খুলুন",
   "status.block": "@{name}কে বন্ধ করুন",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "সমর্থন বাতিল করতে",
   "status.cannot_reblog": "এটিতে সমর্থন দেওয়া যাবেনা",
   "status.copy": "লেখাটির লিংক কপি করতে",
@@ -439,6 +481,7 @@
   "status.show_more": "আরো দেখাতে",
   "status.show_more_all": "সবগুলোতে আরো দেখতে",
   "status.show_thread": "আলোচনা দেখতে",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "আলোচনার প্রজ্ঞাপন চালু করতে",
   "status.unpin": "নিজের পাতা থেকে পিন করে রাখাটির পিন খুলতে",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index 9ebe52096..b421e7055 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Klask endro",
   "column.blocks": "Implijour·ezed·ion stanket",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Red-amzer lec'hel",
   "column.direct": "Kemennadoù prevez",
   "column.domain_blocks": "Domani kuzhet",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 45cd44fad..e906afa9c 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
   "bundle_modal_error.retry": "Torna-ho a provar",
   "column.blocks": "Usuaris bloquejats",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Línia de temps local",
   "column.direct": "Missatges directes",
   "column.domain_blocks": "Dominis ocults",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Línia de temps federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Enrere",
   "column_header.hide_settings": "Amaga la configuració",
   "column_header.show_settings": "Mostra la configuració",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Aquest toot no es mostrarà en cap etiqueta ja que no està llistat. Només els toots públics poden ser cercats per etiqueta.",
   "compose_form.lock_disclaimer": "El teu compte no està bloquejat {locked}. Tothom pot seguir-te i veure els teus missatges a seguidors.",
   "compose_form.lock_disclaimer.lock": "bloquejat",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "En què penses?",
   "compose_form.poll.add_option": "Afegeix una opció",
   "compose_form.poll.duration": "Durada de l'enquesta",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No hi ha toots aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Encara no has bloquejat cap usuari.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per a fer rodar la pilota!",
   "empty_column.direct": "Encara no tens missatges directes. Quan enviïs o rebis un, es mostrarà aquí.",
   "empty_column.domain_blocks": "Encara no hi ha dominis ocults.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Encara no has silenciat cap usuari.",
   "empty_column.notifications": "Encara no tens notificacions. Interactua amb altres per iniciar la conversa.",
   "empty_column.public": "No hi ha res aquí! Escriu públicament alguna cosa o manualment segueix usuaris d'altres servidors per omplir-ho",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autoritzar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sense {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostes",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuaris bloquejats",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Línia de temps Local",
   "navigation_bar.compose": "Redacta nou toot",
   "navigation_bar.direct": "Missatges directes",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "fa {number} dies",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Obre l'interfície de moderació per a @{name}",
   "status.admin_status": "Obre aquest toot a la interfície de moderació",
   "status.block": "Bloqueja @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Desfer l'impuls",
   "status.cannot_reblog": "Aquesta publicació no pot ser impulsada",
   "status.copy": "Copia l'enllaç al toot",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostra més",
   "status.show_more_all": "Mostra més per a tot",
   "status.show_thread": "Mostra el fil",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Activar conversació",
   "status.unpin": "Deslliga del perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 06b856af9..797e0bef2 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.",
   "bundle_modal_error.retry": "Pruvà torna",
   "column.blocks": "Utilizatori bluccati",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Linea pubblica lucale",
   "column.direct": "Missaghji diretti",
   "column.domain_blocks": "Duminii piattati",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Linea pubblica glubale",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Ritornu",
   "column_header.hide_settings": "Piattà i parametri",
   "column_header.show_settings": "Mustrà i parametri",
@@ -82,6 +84,8 @@
   "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\".",
   "compose_form.lock_disclaimer": "U vostru contu ùn hè micca {locked}. Tuttu u mondu pò seguitavi è vede i vostri statuti privati.",
   "compose_form.lock_disclaimer.lock": "privatu",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "À chè pensate?",
   "compose_form.poll.add_option": "Aghjunghje scelta",
   "compose_form.poll.duration": "Durata di u scandagliu",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Nisun statutu quì!",
   "empty_column.account_unavailable": "Prufile micca dispunibule",
   "empty_column.blocks": "Per avà ùn avete bluccatu manc'un utilizatore.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Ùn c'hè nunda indè a linea lucale. Scrivete puru qualcosa!",
   "empty_column.direct": "Ùn avete ancu nisun missaghju direttu. S'è voi mandate o ricevete unu, u vidarete quì.",
   "empty_column.domain_blocks": "Ùn c'hè manc'un duminiu bluccatu avà.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Per avà ùn avete manc'un utilizatore piattatu.",
   "empty_column.notifications": "Ùn avete ancu nisuna nutificazione. Interact with others to start the conversation.",
   "empty_column.public": "Ùn c'hè nunda quì! Scrivete qualcosa in pubblicu o seguitate utilizatori d'altri servori per empie a linea pubblica",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Auturizà",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "è {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Piattà nutificazione da st'utilizatore?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Utilizatori bluccati",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
   "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.direct": "Missaghji diretti",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}ghj",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Apre l'interfaccia di muderazione per @{name}",
   "status.admin_status": "Apre stu statutu in l'interfaccia di muderazione",
   "status.block": "Bluccà @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Ùn sparte più",
   "status.cannot_reblog": "Stu statutu ùn pò micca esse spartutu",
   "status.copy": "Cupià ligame indè u statutu",
@@ -439,6 +481,7 @@
   "status.show_more": "Slibrà",
   "status.show_more_all": "Slibrà tuttu",
   "status.show_thread": "Vede u filu",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",
   "status.unpin": "Spuntarulà da u prufile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 263487fb9..1600f9499 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.",
   "bundle_modal_error.retry": "Zkusit znovu",
   "column.blocks": "Blokovaní uživatelé",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Místní zeď",
   "column.direct": "Přímé zprávy",
   "column.domain_blocks": "Skryté domény",
@@ -72,6 +73,7 @@
   "column.preferences": "Preference",
   "column.public": "Federovaná zeď",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Zpět",
   "column_header.hide_settings": "Skrýt nastavení",
   "column_header.show_settings": "Zobrazit nastavení",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Tento příspěvěk nebude zobrazen pod žádným hashtagem, neboť je neuvedený. Pouze veřejné příspěvky mohou být vyhledány podle hashtagu.",
   "compose_form.lock_disclaimer": "Váš účet není {locked}. Kdokoliv vás může sledovat a vidět vaše příspěvky pouze pro sledující.",
   "compose_form.lock_disclaimer.lock": "uzamčen",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Co se vám honí hlavou?",
   "compose_form.poll.add_option": "Přidat volbu",
   "compose_form.poll.duration": "Délka ankety",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Tady nejsou žádné příspěvky!",
   "empty_column.account_unavailable": "Profil nedostupný",
   "empty_column.blocks": "Ještě jste nezablokoval/a žádného uživatele.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Místní zeď je prázdná. Napište něco veřejně a rozhýbejte to tu!",
   "empty_column.direct": "Ještě nemáte žádné přímé zprávy. Pokud nějakou pošlete nebo dostanete, zobrazí se zde.",
   "empty_column.domain_blocks": "Ještě nejsou žádné skryté domény.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Ještě jste neskryl/a žádné uživatele.",
   "empty_column.notifications": "Ještě nemáte žádná oznámení. Začněte konverzaci komunikováním s ostatními.",
   "empty_column.public": "Tady nic není! Napište něco veřejně, nebo začněte ručně sledovat uživatele z jiných serverů, aby tu něco přibylo",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} je členem Fediverse, sociální síť složená z tisíce nezávislých serverů. Příspěvky které zde vidíte pochází ze serverů třetí strany. Máte možnost se servery komunikovat či blokovat. Dávejte si pozor na druhou část jména za druhým @, ta indikuje z jakého serveru uživat pochází. Aby jste viděly pouze příspěvky z {site_title}, navštivte {local}.",
   "fediverse_tab.explanation_box.title": "Co je to Fediverse?",
   "follow_request.authorize": "Autorizovat",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "nebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Základní",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Skrýt oznámení od tohoto uživatele?",
   "navigation_bar.admin_settings": "Adminské menu",
   "navigation_bar.blocks": "Blokovaní uživatelé",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Místní zeď",
   "navigation_bar.compose": "Vytvořit nový příspěvek",
   "navigation_bar.direct": "Přímé zprávy",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Heslo",
   "registration.fields.username_placeholder": "Jméno",
   "registration.lead": "S účtem na {instance} budete moci sledovat další uživatele na fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Registrovat",
   "registration.tos": "Podmínky služby",
   "relative_time.days": "{number} d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Heslo úspěšně změněno.",
   "signup_panel.subtitle": "Registrujte se pro diskuzi.",
   "signup_panel.title": "Nový na {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Otevřít moderátorské rozhraní pro uživatele @{name}",
   "status.admin_status": "Otevřít tento toot v moderátorském rozhraní",
   "status.block": "Zablokovat uživatele @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Zrušit boost",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
   "status.copy": "Kopírovat odkaz k tootu",
@@ -439,6 +481,7 @@
   "status.show_more": "Zobrazit více",
   "status.show_more_all": "Zobrazit více pro všechny",
   "status.show_thread": "Zobrazit vlákno",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Odkrýt konverzaci",
   "status.unpin": "Odepnout z profilu",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index 4296abf9d..7119cc115 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
   "bundle_modal_error.retry": "Ceiswich eto",
   "column.blocks": "Defnyddwyr a flociwyd",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Ffrwd lleol",
   "column.direct": "Negeseuon preifat",
   "column.domain_blocks": "Parthau cuddiedig",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Ffrwd y ffederasiwn",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Nôl",
   "column_header.hide_settings": "Cuddio dewisiadau",
   "column_header.show_settings": "Dangos gosodiadau",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich tŵtiau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
   "compose_form.poll.add_option": "Ychwanegu Dewisiad",
   "compose_form.poll.duration": "Cyfnod pleidlais",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Dim tŵtiau fama!",
   "empty_column.account_unavailable": "Proffil ddim ar gael",
   "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Ysgrifenwch rhywbeth yn gyhoeddus i gael dechrau arni!",
   "empty_column.direct": "Nid oes gennych unrhyw negeseuon preifat eto. Pan y byddwch yn anfon neu derbyn un, mi fydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes yna unrhyw barthau cuddiedig eto.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Nid ydych wedi tawelu unrhyw ddefnyddwyr eto.",
   "empty_column.notifications": "Nid oes gennych unrhyw hysbysiadau eto. Rhyngweithiwch ac eraill i ddechrau'r sgwrs.",
   "empty_column.public": "Does dim byd yma! Ysgrifennwch rhywbeth yn gyhoeddus, neu dilynwch ddefnyddwyr o achosion eraill i'w lenwi",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Caniatau",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "neu {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Syml",
   "home.column_settings.show_reblogs": "Dangos bŵstiau",
   "home.column_settings.show_replies": "Dangos ymatebion",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Cuddio hysbysiadau rhag y defnyddiwr hwn?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Ffrwd leol",
   "navigation_bar.compose": "Cyfansoddi tŵt newydd",
   "navigation_bar.direct": "Negeseuon preifat",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}dydd",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Agor rhyngwyneb goruwchwylio ar gyfer @{name}",
   "status.admin_status": "Agor y tŵt yn y rhyngwyneb goruwchwylio",
   "status.block": "Blocio @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Dadfŵstio",
   "status.cannot_reblog": "Ni ellir sbarduno'r tŵt hwn",
   "status.copy": "Copïo cysylltiad i'r tŵt",
@@ -439,6 +481,7 @@
   "status.show_more": "Dangos mwy",
   "status.show_more_all": "Dangos mwy i bawb",
   "status.show_thread": "Dangos edefyn",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Dad-dawelu sgwrs",
   "status.unpin": "Dadbinio o'r proffil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index abf2ca76b..a0e6bf859 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af dette komponent.",
   "bundle_modal_error.retry": "Prøv igen",
   "column.blocks": "Blokerede brugere",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direkte beskeder",
   "column.domain_blocks": "Skjulte domæner",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Fælles tidslinje",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tilbage",
   "column_header.hide_settings": "Skjul indstillinger",
   "column_header.show_settings": "Vis indstillinger",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Dette trut vil ikke blive vist under noget hashtag da det ikke er listet. Kun offentlige trut kan blive vist under søgninger med hashtags.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Alle kan følge dig for at se dine følger-kun indlæg.",
   "compose_form.lock_disclaimer.lock": "låst",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Hvad har du på hjertet?",
   "compose_form.poll.add_option": "Tilføj valgmulighed",
   "compose_form.poll.duration": "Afstemningens varighed",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Ingen bidrag her!",
   "empty_column.account_unavailable": "Profil utilgængelig",
   "empty_column.blocks": "Du har ikke blokeret nogen endnu.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at starte lavinen!",
   "empty_column.direct": "Du har endnu ingen direkte beskeder. Når du sender eller modtager en, vil den vises her.",
   "empty_column.domain_blocks": "Der er endnu ikke nogle skjulte domæner.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Du har endnu ikke dæmpet nogen som helst bruger.",
   "empty_column.notifications": "Du har endnu ingen notifikationer. Tag ud og bland dig med folkemængden for at starte samtalen.",
   "empty_column.public": "Der er ikke noget at se her! Skriv noget offentligt eller start ud med manuelt at følge brugere fra andre server for at udfylde tomrummet",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Godkend",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokerede brugere",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Skriv nyt trut",
   "navigation_bar.direct": "Direkte beskeder",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Åben modereringsvisning for @{name}",
   "status.admin_status": "Åben denne status i modereringsvisningen",
   "status.block": "Bloker @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Fjern boost",
   "status.cannot_reblog": "Denne post kan ikke boostes",
   "status.copy": "Kopiér link til status",
@@ -439,6 +481,7 @@
   "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
   "status.show_thread": "Vis tråd",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Genaktivér samtale",
   "status.unpin": "Frigør fra profil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 36a224446..b9001448d 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
   "column.blocks": "Blockierte Profile",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokale Zeitleiste",
   "column.direct": "Direktnachrichten",
   "column.domain_blocks": "Versteckte Domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Einstellungen",
   "column.public": "Föderierte Zeitleiste",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Zurück",
   "column_header.hide_settings": "Einstellungen verbergen",
   "column_header.show_settings": "Einstellungen anzeigen",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht durch Hashtags auffindbar sein, weil er ungelistet ist. Nur öffentliche Beiträge tauchen in Hashtag-Zeitleisten auf.",
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.",
   "compose_form.lock_disclaimer.lock": "auf privat gestellt",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Was gibt's Neues?",
   "compose_form.poll.add_option": "Eine Antwortmöglichkeit hinzufügen",
   "compose_form.poll.duration": "Umfragedauer",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Keine Beiträge!",
   "empty_column.account_unavailable": "Konto nicht verfügbar",
   "empty_column.blocks": "Du hast keine Profile blockiert.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Die lokale Zeitleiste ist leer. Schreibe einen öffentlichen Beitrag, um den Ball ins Rollen zu bringen!",
   "empty_column.direct": "Du hast noch keine Direktnachrichten erhalten. Wenn du eine sendest oder empfängst, wird sie hier zu sehen sein.",
   "empty_column.domain_blocks": "Bisher wurden noch keine Domains blockiert.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
   "empty_column.notifications": "Du hast noch keine Mitteilungen. Interagiere mit anderen, um ins Gespräch zu kommen.",
   "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Zeitleiste aufzufüllen",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} ist Teil des Fediverse, einem Sozialen Netzwerk, das aus tausenden unabhängigen Instanzen (aka \"Servern\") besteht. Die Beiträge, die du hier siehst, stammen überwiegend von anderen Servern. Du kannst auf alle Einträge reagieren oder jeden Server blockieren, der dir nicht gefällt. Die Bezeichnung hinter dem zweiten @-Symbol ist der Name des entsprechenden Servers. Um nur Beiträge von {site_title} zu sehen, wähle {local} aus.",
   "fediverse_tab.explanation_box.title": "Was ist das Fediverse?",
   "follow_request.authorize": "Bestätigen",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basiseinstellungen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blockierte Profile",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokale Zeitleiste",
   "navigation_bar.compose": "Neuen Beitrag verfassen",
   "navigation_bar.direct": "Direktnachrichten",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Passwort",
   "registration.fields.username_placeholder": "Nutzername",
   "registration.lead": "Mit einem Konto auf {instance} kannst du Nutzern im gesamten Fediverse folgen.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Registrieren",
   "registration.tos": "Nutzungsbedingungen",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Das Passwort wurde erfolgreich geändert.",
   "signup_panel.subtitle": "Jetzt anmelden, um mitzureden.",
   "signup_panel.title": "Neu auf {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Öffne Moderationsoberfläche für @{name}",
   "status.admin_status": "Öffne Beitrag in der Moderationsoberfläche",
   "status.block": "Blockiere @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Nicht mehr teilen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.copy": "Kopiere Link zum Beitrag",
@@ -439,6 +481,7 @@
   "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alle Inhaltswarnungen aufklappen",
   "status.show_thread": "Zeige Konversation",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Stummschaltung von Konversation aufheben",
   "status.unpin": "Vom Profil lösen",
   "status_list.queue_label": "{count, plural, one {Ein neuer Beitrag} other {# neue Beiträge}}. Hier klicken, um {count, plural, one {ihn} other {sie}} anzuzeigen.",
diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index f26413b9e..563385671 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -365,6 +365,10 @@
         "defaultMessage": "Lists",
         "id": "column.lists"
       },
+      {
+        "defaultMessage": "Bookmarks",
+        "id": "column.bookmarks"
+      },
       {
         "defaultMessage": "Apps",
         "id": "tabs_bar.apps"
@@ -446,6 +450,14 @@
         "defaultMessage": "Expand this post",
         "id": "status.open"
       },
+      {
+        "defaultMessage": "Bookmark",
+        "id": "status.bookmark"
+      },
+      {
+        "defaultMessage": "Remove bookmark",
+        "id": "status.unbookmark"
+      },
       {
         "defaultMessage": "Report @{name}",
         "id": "status.report"
@@ -709,22 +721,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Unfollow",
-        "id": "account.unfollow"
-      },
-      {
-        "defaultMessage": "Follow",
-        "id": "account.follow"
-      },
-      {
-        "defaultMessage": "Awaiting approval. Click to cancel follow request",
-        "id": "account.requested"
-      },
-      {
-        "defaultMessage": "Unblock @{name}",
-        "id": "account.unblock"
-      },
       {
         "defaultMessage": "Edit profile",
         "id": "account.edit_profile"
@@ -948,6 +944,19 @@
     ],
     "path": "app/soapbox/features/blocks/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Bookmarks",
+        "id": "column.bookmarks"
+      },
+      {
+        "defaultMessage": "You don't have any bookmarks yet. When you add one, it will show up here.",
+        "id": "empty_column.bookmarks"
+      }
+    ],
+    "path": "app/soapbox/features/bookmarks/index.json"
+  },
   {
     "descriptors": [
       {
@@ -984,6 +993,10 @@
         "defaultMessage": "Lists",
         "id": "navigation_bar.lists"
       },
+      {
+        "defaultMessage": "Bookmarks",
+        "id": "navigation_bar.bookmarks"
+      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -1271,7 +1284,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+        "defaultMessage": "Add media attachment",
         "id": "upload_button.label"
       }
     ],
@@ -1303,6 +1316,19 @@
     ],
     "path": "app/soapbox/features/compose/components/upload.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Post markdown enabled",
+        "id": "compose_form.markdown.marked"
+      },
+      {
+        "defaultMessage": "Post markdown disabled",
+        "id": "compose_form.markdown.unmarked"
+      }
+    ],
+    "path": "app/soapbox/features/compose/containers/markdown_button_container.json"
+  },
   {
     "descriptors": [
       {
@@ -1395,6 +1421,123 @@
     ],
     "path": "app/soapbox/features/compose/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Soapbox settings",
+        "id": "column.soapbox_settings"
+      },
+      {
+        "defaultMessage": "Copyright footer",
+        "id": "soapbox_settings.copyright_footer.meta_fields.label_placeholder"
+      },
+      {
+        "defaultMessage": "Icon",
+        "id": "soapbox_settings.promo_panel.meta_fields.icon_placeholder"
+      },
+      {
+        "defaultMessage": "Label",
+        "id": "soapbox_settings.promo_panel.meta_fields.label_placeholder"
+      },
+      {
+        "defaultMessage": "URL",
+        "id": "soapbox_settings.promo_panel.meta_fields.url_placeholder"
+      },
+      {
+        "defaultMessage": "Label",
+        "id": "soapbox_settings.home_footer.meta_fields.label_placeholder"
+      },
+      {
+        "defaultMessage": "URL",
+        "id": "soapbox_settings.home_footer.meta_fields.url_placeholder"
+      },
+      {
+        "defaultMessage": "URL",
+        "id": "soapbox_settings.custom_css.meta_fields.url_placeholder"
+      },
+      {
+        "defaultMessage": "Logo",
+        "id": "soapbox_settings.fields.logo_label"
+      },
+      {
+        "defaultMessage": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+        "id": "soapbox_settings.hints.logo"
+      },
+      {
+        "defaultMessage": "Banner",
+        "id": "soapbox_settings.fields.banner_label"
+      },
+      {
+        "defaultMessage": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+        "id": "soapbox_settings.hints.banner"
+      },
+      {
+        "defaultMessage": "Brand color",
+        "id": "soapbox_settings.fields.brand_color_label"
+      },
+      {
+        "defaultMessage": "Patron module",
+        "id": "soapbox_settings.fields.patron_enabled_label"
+      },
+      {
+        "defaultMessage": "Enables display of Patron module.  Requires installation of Patron module.",
+        "id": "soapbox_settings.hints.patron_enabled"
+      },
+      {
+        "defaultMessage": "Auto-play GIFs",
+        "id": "soapbox_settings.fields.auto_play_gif_label"
+      },
+      {
+        "defaultMessage": "Enable auto-playing of GIF files in timeline",
+        "id": "soapbox_settings.hints.auto_play_gif"
+      },
+      {
+        "defaultMessage": "Promo panel items",
+        "id": "soapbox_settings.fields.promo_panel_fields_label"
+      },
+      {
+        "defaultMessage": "You can have custom defined links displayed on the left panel of the timelines page.",
+        "id": "soapbox_settings.hints.promo_panel_fields"
+      },
+      {
+        "defaultMessage": "{ link }",
+        "id": "soapbox_settings.hints.promo_panel_icons"
+      },
+      {
+        "defaultMessage": "Add new Promo panel item",
+        "id": "soapbox_settings.fields.promo_panel.add"
+      },
+      {
+        "defaultMessage": "Home footer items",
+        "id": "soapbox_settings.fields.home_footer_fields_label"
+      },
+      {
+        "defaultMessage": "You can have custom defined links displayed on the footer of your static pages",
+        "id": "soapbox_settings.hints.home_footer_fields"
+      },
+      {
+        "defaultMessage": "Add new Home Footer Item",
+        "id": "soapbox_settings.fields.home_footer.add"
+      },
+      {
+        "defaultMessage": "Custom CSS",
+        "id": "soapbox_settings.fields.custom_css_fields_label"
+      },
+      {
+        "defaultMessage": "You can have custom CSS definitions",
+        "id": "soapbox_settings.hints.custom_css_fields"
+      },
+      {
+        "defaultMessage": "Add new Custom CSS item",
+        "id": "soapbox_settings.fields.custom_css.add"
+      },
+      {
+        "defaultMessage": "Save",
+        "id": "soapbox_settings.save"
+      }
+    ],
+    "path": "app/soapbox/features/configuration/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1862,6 +2005,14 @@
         "defaultMessage": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
         "id": "registration.lead"
       },
+      {
+        "defaultMessage": "Why do you want to join?",
+        "id": "registration.reason"
+      },
+      {
+        "defaultMessage": "This will help us review your application",
+        "id": "registration.reason_hint"
+      },
       {
         "defaultMessage": "Sign up",
         "id": "registration.sign_up"
@@ -2287,6 +2438,36 @@
     ],
     "path": "app/soapbox/features/preferences/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Follows you",
+        "id": "account.follows_you"
+      }
+    ],
+    "path": "app/soapbox/features/profile_hover_card/profile_hover_card_container.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Home",
+        "id": "header.home.label"
+      },
+      {
+        "defaultMessage": "About",
+        "id": "header.about.label"
+      },
+      {
+        "defaultMessage": "Back to",
+        "id": "header.back_to.label"
+      },
+      {
+        "defaultMessage": "Log in",
+        "id": "header.login.label"
+      }
+    ],
+    "path": "app/soapbox/features/public_layout/components/header.json"
+  },
   {
     "descriptors": [
       {
@@ -2570,6 +2751,31 @@
     ],
     "path": "app/soapbox/features/status/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Unfollow",
+        "id": "account.unfollow"
+      },
+      {
+        "defaultMessage": "Follow",
+        "id": "account.follow"
+      },
+      {
+        "defaultMessage": "Awaiting approval. Click to cancel follow request",
+        "id": "account.requested"
+      },
+      {
+        "defaultMessage": "Unblock @{name}",
+        "id": "account.unblock"
+      },
+      {
+        "defaultMessage": "Edit profile",
+        "id": "account.edit_profile"
+      }
+    ],
+    "path": "app/soapbox/features/ui/components/action_button.json"
+  },
   {
     "descriptors": [
       {
@@ -2668,6 +2874,19 @@
     ],
     "path": "app/soapbox/features/ui/components/embed_modal.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Collapse explanation box",
+        "id": "explanation_box.collapse"
+      },
+      {
+        "defaultMessage": "Expand explanation box",
+        "id": "explanation_box.expand"
+      }
+    ],
+    "path": "app/soapbox/features/ui/components/explanation_box.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index cd214a75a..3b827c809 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.",
   "bundle_modal_error.retry": "Δοκίμασε ξανά",
   "column.blocks": "Αποκλεισμένοι χρήστες",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Τοπική ροή",
   "column.direct": "Προσωπικά μηνύματα",
   "column.domain_blocks": "Κρυμμένοι τομείς",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Ομοσπονδιακή ροή",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Πίσω",
   "column_header.hide_settings": "Απόκρυψη ρυθμίσεων",
   "column_header.show_settings": "Εμφάνιση ρυθμίσεων",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Αυτό το τουτ δεν θα εμφανίζεται κάτω από κανένα hashtag καθώς είναι αφανές. Μόνο τα δημόσια τουτ μπορούν να αναζητηθούν ανά hashtag.",
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σας προς τους ακολούθους σας.",
   "compose_form.lock_disclaimer.lock": "κλειδωμένο",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Τι σκέφτεσαι;",
   "compose_form.poll.add_option": "Προσθήκη επιλογής",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Δεν έχει τουτ εδώ!",
   "empty_column.account_unavailable": "Μη διαθέσιμο προφίλ",
   "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
   "empty_column.direct": "Δεν έχεις προσωπικά μηνύματα ακόμα. Όταν στείλεις ή λάβεις κανένα, θα εμφανιστεί εδώ.",
   "empty_column.domain_blocks": "Δεν υπάρχουν αποκλεισμένοι τομείς ακόμα.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Δεν έχεις αποσιωπήσει κανένα χρήστη ακόμα.",
   "empty_column.notifications": "Δεν έχεις ειδοποιήσεις ακόμα. Αλληλεπίδρασε με άλλους χρήστες για να ξεκινήσεις την κουβέντα.",
   "empty_column.public": "Δεν υπάρχει τίποτα εδώ! Γράψε κάτι δημόσιο, ή ακολούθησε χειροκίνητα χρήστες από άλλους κόμβους για να τη γεμίσεις",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Ενέκρινε",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "και {additional}",
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Απόκρυψη ειδοποιήσεων αυτού του χρήστη;",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Τοπική ροή",
   "navigation_bar.compose": "Γράψε νέο τουτ",
   "navigation_bar.direct": "Προσωπικά μηνύματα",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}η",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Άνοιγμα λειτουργίας διαμεσολάβησης για τον/την @{name}",
   "status.admin_status": "Άνοιγμα αυτής της δημοσίευσης στη λειτουργία διαμεσολάβησης",
   "status.block": "Αποκλεισμός @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Ακύρωσε την προώθηση",
   "status.cannot_reblog": "Αυτή η δημοσίευση δεν μπορεί να προωθηθεί",
   "status.copy": "Αντιγραφή συνδέσμου της δημοσίευσης",
@@ -439,6 +481,7 @@
   "status.show_more": "Δείξε περισσότερα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",
   "status.show_thread": "Εμφάνιση νήματος",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Διέκοψε την αποσιώπηση της συζήτησης",
   "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 8d958e687..ba6df7918 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What's on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index f0de3c639..4e05276e1 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
   "bundle_modal_error.retry": "Bonvolu reprovi",
   "column.blocks": "Blokitaj uzantoj",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Loka tempolinio",
   "column.direct": "Rektaj mesaĝoj",
   "column.domain_blocks": "Kaŝitaj domajnoj",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Fratara tempolinio",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Reveni",
   "column_header.hide_settings": "Kaŝi agordojn",
   "column_header.show_settings": "Montri agordojn",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Ĉi tiu mesaĝo ne estos listigita per ajna kradvorto. Nur publikaj mesaĝoj estas serĉeblaj per kradvortoj.",
   "compose_form.lock_disclaimer": "Via konta ne estas {locked}. Iu ajn povas sekvi vin por vidi viajn mesaĝojn, kiuj estas nur por sekvantoj.",
   "compose_form.lock_disclaimer.lock": "ŝlosita",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Pri kio vi pensas?",
   "compose_form.poll.add_option": "Aldoni elekteblon",
   "compose_form.poll.duration": "Balotenketa daŭro",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Neniu mesaĝo ĉi tie!",
   "empty_column.account_unavailable": "Profilo ne disponebla",
   "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "La loka tempolinio estas malplena. Skribu ion por plenigi ĝin!",
   "empty_column.direct": "Vi ankoraŭ ne havas rektan mesaĝon. Kiam vi sendos aŭ ricevos iun, ĝi aperos ĉi tie.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Vi ne ankoraŭ silentigis iun uzanton.",
   "empty_column.notifications": "Vi ankoraŭ ne havas sciigojn. Interagu kun aliaj por komenci konversacion.",
   "empty_column.public": "Estas nenio ĉi tie! Publike skribu ion, aŭ mane sekvu uzantojn de aliaj serviloj por plenigi la publikan tempolinion",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Rajtigi",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "kaj {additional}",
   "hashtag.column_header.tag_mode.any": "aŭ {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Ĉu vi volas kaŝi la sciigojn de ĉi tiu uzanto?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokitaj uzantoj",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Loka tempolinio",
   "navigation_bar.compose": "Skribi novan mesaĝon",
   "navigation_bar.direct": "Rektaj mesaĝoj",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}t",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Malfermi la kontrolan interfacon por @{name}",
   "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
   "status.block": "Bloki @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Ne plu diskonigi",
   "status.cannot_reblog": "Ĉi tiu mesaĝo ne diskonigeblas",
   "status.copy": "Kopii la ligilon al la mesaĝo",
@@ -439,6 +481,7 @@
   "status.show_more": "Grandigi",
   "status.show_more_all": "Grandigi ĉiujn",
   "status.show_thread": "Montri la fadenon",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Malsilentigi la konversacion",
   "status.unpin": "Depingli de profilo",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 0209e8c72..1d13d2d64 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Intentá de nuevo",
   "column.blocks": "Usuarios bloqueados",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Línea temporal local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultos",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Línea temporal federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Volver",
   "column_header.hide_settings": "Ocultar configuración",
   "column_header.show_settings": "Mostrar configuración",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está {locked}. Todos pueden seguirte para ver tus toots marcados como \"sólo para seguidores\".",
   "compose_form.lock_disclaimer.lock": "bloqueada",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "¿Qué onda?",
   "compose_form.poll.add_option": "Agregá una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "¡No hay toots aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Todavía no bloqueaste a ningún usuario.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
   "empty_column.direct": "Todavía no tenés ningún mensaje directo. Cuando enviés o recibás uno, se mostrará acá.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Todavía no silenciaste a ningún usuario.",
   "empty_column.notifications": "Todavía no tenés ninguna notificación. Interactuá con otros para iniciar la conversación.",
   "empty_column.public": "¡Naranja! Escribí algo públicamente, o seguí usuarios manualmente de otros servidores para ir llenando esta línea temporal.",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "¿Querés ocultar las notificaciones de este usuario?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuarios bloqueados",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Línea temporal local",
   "navigation_bar.compose": "Redactar un nuevo toot",
   "navigation_bar.direct": "Mensajes directos",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_status": "Abrir este estado en la interface de moderación",
   "status.block": "Bloquear a @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Quitar retoot",
   "status.cannot_reblog": "No se puede retootear este toot",
   "status.copy": "Copiar enlace al estado",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_thread": "Mostrar hilo",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Desmarcar del perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 806de6154..a26e28b13 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Inténtalo de nuevo",
   "column.blocks": "Usuarios bloqueados",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Línea de tiempo local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultados",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Línea de tiempo federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Ocultar configuración",
   "column_header.show_settings": "Mostrar ajustes",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Este toot no se mostrará bajo hashtags porque no es público. Sólo los toots públicos se pueden buscar por hashtag.",
   "compose_form.lock_disclaimer": "Tu cuenta no está bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "¿En qué estás pensando?",
   "compose_form.poll.add_option": "Añadir una opción",
   "compose_form.poll.duration": "Duración de la encuesta",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "¡No hay toots aquí!",
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
   "empty_column.direct": "Aún no tienes ningún mensaje directo. Cuando envíes o recibas uno, se mostrará aquí.",
   "empty_column.domain_blocks": "Todavía no hay dominios ocultos.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuarios bloqueados",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Historia local",
   "navigation_bar.compose": "Escribir un nuevo toot",
   "navigation_bar.direct": "Mensajes directos",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Abrir interfaz de moderación para @{name}",
   "status.admin_status": "Abrir este estado en la interfaz de moderación",
   "status.block": "Bloquear a @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Des-impulsar",
   "status.cannot_reblog": "Este toot no puede retootearse",
   "status.copy": "Copiar enlace al estado",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_thread": "Ver hilo",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Dejar de silenciar conversación",
   "status.unpin": "Dejar de fijar",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index f2c6d0804..8e8b5f509 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Selle komponendi laadimisel läks midagi viltu.",
   "bundle_modal_error.retry": "Proovi uuesti",
   "column.blocks": "Blokeeritud kasutajad",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Kohalik ajajoon",
   "column.direct": "Otsesõnumid",
   "column.domain_blocks": "Peidetud domeenid",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Föderatiivne ajajoon",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tagasi",
   "column_header.hide_settings": "Peida sätted",
   "column_header.show_settings": "Näita sätteid",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Seda tuuti ei kuvata ühegi sildi all, sest see on kirjendamata. Ainult avalikud tuutid on sildi järgi otsitavad.",
   "compose_form.lock_disclaimer": "Sinu konto ei ole {locked}. Igaüks saab sind jälgida ja näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Millest mõtled?",
   "compose_form.poll.add_option": "Lisa valik",
   "compose_form.poll.duration": "Küsitluse kestus",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Siin tuute ei ole!",
   "empty_column.account_unavailable": "Profiil pole saadaval",
   "empty_column.blocks": "Sa ei ole veel ühtegi kasutajat blokeerinud.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Kohalik ajajoon on tühi. Kirjuta midagi avalikult, et pall veerema saada!",
   "empty_column.direct": "Sul ei veel otsesõnumeid. Kui saadad või võtad mõne vastu, ilmuvad nad siia.",
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
   "empty_column.notifications": "Sul ei ole veel teateid. Suhtle teistega alustamaks vestlust.",
   "empty_column.public": "Siin pole midagi! Kirjuta midagi avalikut või jälgi ise kasutajaid täitmaks seda ruumi",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autoriseeri",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "või {additional}",
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Peamine",
   "home.column_settings.show_reblogs": "Näita upitusi",
   "home.column_settings.show_replies": "Näita vastuseid",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Kas peita teated sellelt kasutajalt?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokeeritud kasutajad",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Kohalik ajajoon",
   "navigation_bar.compose": "Koosta uus tuut",
   "navigation_bar.direct": "Otsesõnumid",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}p",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Ava moderaatoriliides kasutajale @{name}",
   "status.admin_status": "Ava see staatus moderaatoriliites",
   "status.block": "Blokeeri @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Äraupita",
   "status.cannot_reblog": "Seda postitust ei saa upitada",
   "status.copy": "Kopeeri link staatusesse",
@@ -439,6 +481,7 @@
   "status.show_more": "Näita veel",
   "status.show_more_all": "Näita enam kõigile",
   "status.show_thread": "Kuva lõim",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ära vaigista vestlust",
   "status.unpin": "Kinnita profiililt lahti",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index d2d53623f..efae00665 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.",
   "bundle_modal_error.retry": "Saiatu berriro",
   "column.blocks": "Blokeatutako erabiltzaileak",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Denbora-lerro lokala",
   "column.direct": "Mezu zuzenak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federatutako denbora-lerroa",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Atzera",
   "column_header.hide_settings": "Ezkutatu ezarpenak",
   "column_header.show_settings": "Erakutsi ezarpenak",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Toot hau ez da traoletan agertuko zerrendatu gabekoa baita. Traoletan toot publikoak besterik ez dira agertzen.",
   "compose_form.lock_disclaimer": "Zure kontua ez dago {locked}. Edonork jarraitu zaitzake zure jarraitzaileentzako soilik diren mezuak ikusteko.",
   "compose_form.lock_disclaimer.lock": "giltzapetuta",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Zer duzu buruan?",
   "compose_form.poll.add_option": "Gehitu aukera bat",
   "compose_form.poll.duration": "Inkestaren iraupena",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Ez dago toot-ik hemen!",
   "empty_column.account_unavailable": "Profila ez dago eskuragarri",
   "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Denbora-lerro lokala hutsik dago. Idatzi zerbait publikoki pilota biraka jartzeko!",
   "empty_column.direct": "Ez duzu mezu zuzenik oraindik. Baten bat bidali edo jasotzen duzunean, hemen agertuko da.",
   "empty_column.domain_blocks": "Ez dago ezkutatutako domeinurik oraindik.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste zerbitzari batzuetako erabiltzaileak hau betetzen joateko",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Baimendu",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "eta {additional}",
   "hashtag.column_header.tag_mode.any": "edo {additional}",
   "hashtag.column_header.tag_mode.none": "gabe {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Denbora-lerro lokala",
   "navigation_bar.compose": "Idatzi toot berria",
   "navigation_bar.direct": "Mezu zuzenak",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}e",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Ireki @{name} erabiltzailearen moderazio interfazea",
   "status.admin_status": "Ireki mezu hau moderazio interfazean",
   "status.block": "Blokeatu @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Kendu bultzada",
   "status.cannot_reblog": "Mezu honi ezin zaio bultzada eman",
   "status.copy": "Kopiatu mezuaren esteka",
@@ -439,6 +481,7 @@
   "status.show_more": "Erakutsi gehiago",
   "status.show_more_all": "Erakutsi denetarik gehiago",
   "status.show_thread": "Erakutsi haria",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Desmututu elkarrizketa",
   "status.unpin": "Desfinkatu profiletik",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index 353b9645b..8abef5053 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "هنگام بازکردن این بخش خطایی رخ داد.",
   "bundle_modal_error.retry": "تلاش دوباره",
   "column.blocks": "کاربران مسدودشده",
+  "column.bookmarks": "Bookmarks",
   "column.community": "نوشته‌های محلی",
   "column.direct": "پیغام‌های خصوصی",
   "column.domain_blocks": "دامین‌های پنهان‌شده",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "نوشته‌های همه‌جا",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "بازگشت",
   "column_header.hide_settings": "نهفتن تنظیمات",
   "column_header.show_settings": "نمایش تنظیمات",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "از آن‌جا که این بوق فهرست‌نشده است، در نتایج جستجوی هشتگ‌ها پیدا نخواهد شد. تنها بوق‌های عمومی را می‌توان با جستجوی هشتگ پیدا کرد.",
   "compose_form.lock_disclaimer": "حساب شما {locked} نیست. هر کسی می‌تواند پیگیر شما شود و نوشته‌های ویژهٔ پیگیران شما را ببیند.",
   "compose_form.lock_disclaimer.lock": "قفل",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "تازه چه خبر؟",
   "compose_form.poll.add_option": "افزودن گزینه",
   "compose_form.poll.duration": "مدت نظرسنجی",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "هیچ بوقی این‌جا نیست!",
   "empty_column.account_unavailable": "نمایهٔ ناموجود",
   "empty_column.blocks": "شما هنوز هیچ کسی را مسدود نکرده‌اید.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "فهرست نوشته‌های محلی خالی است. چیزی بنویسید تا چرخش بچرخد!",
   "empty_column.direct": "شما هیچ پیغام مستقیمی ندارید. اگر چنین پیغامی بگیرید یا بفرستید این‌جا نمایش خواهد یافت.",
   "empty_column.domain_blocks": "هنوز هیچ دامینی پنهان نشده است.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "شما هنوز هیچ کاربری را بی‌صدا نکرده‌اید.",
   "empty_column.notifications": "هنوز هیچ اعلانی ندارید. به نوشته‌های دیگران واکنش نشان دهید تا گفتگو آغاز شود.",
   "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران سرورهای دیگر را پی بگیرید تا این‌جا پر شود",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "اجازه دهید",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "اصلی",
   "home.column_settings.show_reblogs": "نمایش بازبوق‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "اعلان‌های این کاربر پنهان شود؟",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "کاربران مسدودشده",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "نوشته‌های محلی",
   "navigation_bar.compose": "نوشتن بوق تازه",
   "navigation_bar.direct": "پیغام‌های مستقیم",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} روز",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "محیط مدیریت مربوط به @{name} را باز کن",
   "status.admin_status": "این نوشته را در محیط مدیریت باز کن",
   "status.block": "مسدودسازی @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "حذف بازبوق",
   "status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید",
   "status.copy": "رونوشت‌برداری از نشانی این نوشته",
@@ -439,6 +481,7 @@
   "status.show_more": "نمایش",
   "status.show_more_all": "نمایش بیشتر همه",
   "status.show_thread": "نمایش گفتگو",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "باصداکردن گفتگو",
   "status.unpin": "برداشتن نوشتهٔ ثابت نمایه",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index e7488b710..9e5c60405 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Jokin meni vikaan komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudestaan",
   "column.blocks": "Estetyt käyttäjät",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Paikallinen aikajana",
   "column.direct": "Viestit",
   "column.domain_blocks": "Piilotetut verkkotunnukset",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Yleinen aikajana",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Takaisin",
   "column_header.hide_settings": "Piilota asetukset",
   "column_header.show_settings": "Näytä asetukset",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Tämä tuuttaus ei näy hashtag-hauissa, koska se on listaamaton. Hashtagien avulla voi hakea vain julkisia tuuttauksia.",
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
   "compose_form.lock_disclaimer.lock": "lukittu",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Mitä mietit?",
   "compose_form.poll.add_option": "Lisää valinta",
   "compose_form.poll.duration": "Äänestyksen kesto",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Ei ole 'toots' täällä!",
   "empty_column.account_unavailable": "Profiilia ei löydy",
   "empty_column.blocks": "Et ole vielä estänyt yhtään käyttäjää.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Homma lähtee käyntiin, kun kirjoitat jotain julkista!",
   "empty_column.direct": "Sinulla ei ole vielä yhtään viestiä yksittäiselle käyttäjälle. Kun lähetät tai vastaanotat sellaisen, se näkyy täällä.",
   "empty_column.domain_blocks": "Yhtään verkko-osoitetta ei ole vielä piilotettu.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notifications": "Sinulle ei ole vielä ilmoituksia. Aloita keskustelu juttelemalla muille.",
   "empty_column.public": "Täällä ei ole mitään! Saat sisältöä, kun kirjoitat jotain julkisesti tai käyt seuraamassa muiden instanssien käyttäjiä",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Valtuuta",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "tai {additional}",
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Piilota tältä käyttäjältä tulevat ilmoitukset?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Estetyt käyttäjät",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
   "navigation_bar.compose": "Kirjoita uusi tuuttaus",
   "navigation_bar.direct": "Viestit",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} pv",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Avaa moderaattorinäkymä tilistä @{name}",
   "status.admin_status": "Avaa tilapäivitys moderaattorinäkymässä",
   "status.block": "Estä @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Peru buustaus",
   "status.cannot_reblog": "Tätä julkaisua ei voi buustata",
   "status.copy": "Kopioi linkki tilapäivitykseen",
@@ -439,6 +481,7 @@
   "status.show_more": "Näytä lisää",
   "status.show_more_all": "Näytä lisää kaikista",
   "status.show_thread": "Näytä ketju",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Poista keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 9e9733da2..336a06f34 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_modal_error.retry": "Réessayer",
   "column.blocks": "Comptes bloqués",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Fil public local",
   "column.direct": "Messages privés",
   "column.domain_blocks": "Domaines cachés",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Fil public global",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Retour",
   "column_header.hide_settings": "Masquer les paramètres",
   "column_header.show_settings": "Afficher les paramètres",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos pouets privés.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
   "compose_form.poll.add_option": "Ajouter un choix",
   "compose_form.poll.duration": "Durée du sondage",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Aucun pouet ici !",
   "empty_column.account_unavailable": "Profil non disponible",
   "empty_column.blocks": "Vous n’avez bloqué aucun·e utilisateur·rice pour le moment.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
   "empty_column.direct": "Vous n’avez pas encore de messages directs. Lorsque vous en enverrez ou recevrez un, il s’affichera ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine caché pour le moment.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Vous n’avez pas encore mis d’utilisateur·rice·s en silence.",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres instances pour le remplir",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Accepter",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Base",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Masquer les notifications de cette personne ?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Comptes bloqués",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Fil public local",
   "navigation_bar.compose": "Rédiger un nouveau toot",
   "navigation_bar.direct": "Messages directs",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} j",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_status": "Ouvrir ce statut dans l’interface de modération",
   "status.block": "Bloquer @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Dé-booster",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.copy": "Copier le lien vers le pouet",
@@ -439,6 +481,7 @@
   "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
   "status.show_thread": "Lire le fil",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Retirer du profil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index d499674c5..6cd5aba4e 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index e6facd425..b8874032d 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Algo fallou mentras se cargaba este compoñente.",
   "bundle_modal_error.retry": "Inténteo de novo",
   "column.blocks": "Usuarias bloqueadas",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Liña temporal local",
   "column.direct": "Mensaxes directas",
   "column.domain_blocks": "Dominios agochados",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Liña temporal federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Atrás",
   "column_header.hide_settings": "Agochar axustes",
   "column_header.show_settings": "Mostras axustes",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Esta mensaxe non será listada baixo ningunha etiqueta xa que está marcada como non listada. Só os toots públicos poden buscarse por etiquetas.",
   "compose_form.lock_disclaimer": "A súa conta non está {locked}. Calquera pode seguila para ver as súas mensaxes só-para-seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Qué contas?",
   "compose_form.poll.add_option": "Engadir unha opción",
   "compose_form.poll.duration": "Duración da sondaxe",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Sen toots por aquí!",
   "empty_column.account_unavailable": "Perfil non dispoñible",
   "empty_column.blocks": "Non bloqueou ningunha usuaria polo de agora.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "A liña temporal local está baldeira. Escriba algo de xeito público para que rule!",
   "empty_column.direct": "Aínda non ten mensaxes directas. Cando envíe ou reciba unha, aparecerá aquí.",
   "empty_column.domain_blocks": "Aínda non  ocultou ningún dominio.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Non acalou ningunha usuaria polo de agora.",
   "empty_column.notifications": "Aínda non ten notificacións. Interactúe con outras para iniciar unha conversa.",
   "empty_column.public": "Nada por aquí! Escriba algo de xeito público, ou siga manualmente usuarias de outros servidores para ir enchéndoa",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar repeticións",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Esconder notificacións deste usuario?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuarias bloqueadas",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Liña temporal local",
   "navigation_bar.compose": "Escribir novo toot",
   "navigation_bar.direct": "Mensaxes directas",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_status": "Abrir este estado na interface de moderación",
   "status.block": "Bloquear @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Non promover",
   "status.cannot_reblog": "Esta mensaxe non pode ser promovida",
   "status.copy": "Copiar ligazón ao estado",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostrar máis",
   "status.show_more_all": "Mostrar máis para todas",
   "status.show_thread": "Mostrar fío",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Non acalar a conversa",
   "status.unpin": "Despegar do perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 440a6350c..c2e9997cb 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.",
   "bundle_modal_error.retry": "לנסות שוב",
   "column.blocks": "חסימות",
+  "column.bookmarks": "Bookmarks",
   "column.community": "ציר זמן מקומי",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "בפרהסיה",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "חזרה",
   "column_header.hide_settings": "הסתרת העדפות",
   "column_header.show_settings": "הצגת העדפות",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "חשבונך אינו {locked}. כל אחד יוכל לעקוב אחריך כדי לקרוא את הודעותיך המיועדות לעוקבים בלבד.",
   "compose_form.lock_disclaimer.lock": "נעול",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "מה עובר לך בראש?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "טור הסביבה ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "אין התראות עדיין. יאללה, הגיע הזמן להתחיל להתערבב.",
   "empty_column.public": "אין פה כלום! כדי למלא את הטור הזה אפשר לכתוב משהו, או להתחיל לעקוב אחרי אנשים מקהילות אחרות",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "קבלה",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "להסתיר הודעות מחשבון זה?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "חסימות",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ציר זמן מקומי",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "הראה יותר",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "הסרת השתקת שיחה",
   "status.unpin": "לשחרר מקיבוע באודות",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index f2d98d34a..8d9332eb9 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index 60e5114b0..a77faf477 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blokirani korisnici",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokalni timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federalni timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Natrag",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Tvoj račun nije {locked}. Svatko te može slijediti kako bi vidio postove namijenjene samo tvojim sljedbenicima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Što ti je na umu?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokalni timeline je prazan. Napiši nešto javno kako bi pokrenuo stvari!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Još nemaš notifikacija. Komuniciraj sa drugima kako bi započeo razgovor.",
   "empty_column.public": "Ovdje nema ništa! Napiši nešto javno, ili ručno slijedi korisnike sa drugih instanci kako bi popunio",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autoriziraj",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokirani korisnici",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalni timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "Ovaj post ne može biti boostan",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Pokaži više",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Poništi utišavanje razgovora",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index d1b96be89..aaadb693a 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Hiba történt a komponens betöltésekor.",
   "bundle_modal_error.retry": "Próbáld újra",
   "column.blocks": "Letiltott felhasználók",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Helyi idővonal",
   "column.direct": "Közvetlen üzenetek",
   "column.domain_blocks": "Rejtett domainek",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Nyilvános idővonal",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Vissza",
   "column_header.hide_settings": "Beállítások elrejtése",
   "column_header.show_settings": "Beállítások mutatása",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "A fiókod nincs {locked}. Bárki követni tud, hogy megtekintse a kizárólag követőknek szánt üzeneteidet.",
   "compose_form.lock_disclaimer.lock": "lezárva",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Mi jár a fejedben?",
   "compose_form.poll.add_option": "Lehetőség hozzáadása",
   "compose_form.poll.duration": "Szavazás időtartama",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Itt nincs tülkölés!",
   "empty_column.account_unavailable": "A profil nem elérhető",
   "empty_column.blocks": "Még senkit sem tiltottál le.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "A helyi idővonal üres. Tülkölj egyet nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy közvetlen üzeneted sem. Ha küldesz vagy kapsz egyet, itt fog megjelenni.",
   "empty_column.domain_blocks": "Még nem rejtettél el egyetlen domaint sem.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Még egy felhasználót sem némítottál le.",
   "empty_column.notifications": "Jelenleg nincsenek értesítéseid. Lépj kapcsolatba másokkal, hogy elindítsd a beszélgetést.",
   "empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más szervereken levő felhasználókat, hogy megtöltsd",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Engedélyezés",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "és {additional}",
   "hashtag.column_header.tag_mode.any": "vagy {additional}",
   "hashtag.column_header.tag_mode.none": "nélküle {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Alapértelmezések",
   "home.column_settings.show_reblogs": "Megtolások mutatása",
   "home.column_settings.show_replies": "Válaszok mutatása",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Rejtsük el a felhasználótól származó értesítéseket?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Letiltott felhasználók",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Helyi idővonal",
   "navigation_bar.compose": "Új tülk írása",
   "navigation_bar.direct": "Közvetlen üzenetek",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}nap",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Moderáció megnyitása @{name} felhasználóhoz",
   "status.admin_status": "Tülk megnyitása moderációra",
   "status.block": "@{name} letiltása",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Megtolás törlése",
   "status.cannot_reblog": "Ez a tülk nem tolható meg",
   "status.copy": "Link másolása tülkbe",
@@ -439,6 +481,7 @@
   "status.show_more": "Többet",
   "status.show_more_all": "Többet mindenhol",
   "status.show_thread": "Szál mutatása",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Beszélgetés némításának kikapcsolása",
   "status.unpin": "Kitűzés eltávolítása a profilodról",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index 195932e29..a54aa3917 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։",
   "bundle_modal_error.retry": "Կրկին փորձել",
   "column.blocks": "Արգելափակված օգտատերեր",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Տեղական հոսք",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Դաշնային հոսք",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Ետ",
   "column_header.hide_settings": "Թաքցնել կարգավորումները",
   "column_header.show_settings": "Ցուցադրել կարգավորումները",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Այս թութը չի հաշվառվի որեւէ պիտակի տակ, քանզի այն ծածուկ է։ Միայն հրապարակային թթերը հնարավոր է որոնել պիտակներով։",
   "compose_form.lock_disclaimer": "Քո հաշիվը {locked} չէ։ Յուրաքանչյուր ոք կարող է հետեւել քեզ եւ տեսնել միայն հետեւողների համար նախատեսված գրառումները։",
   "compose_form.lock_disclaimer.lock": "փակ",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Ի՞նչ կա մտքիդ",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Տեղական հոսքը դատա՛րկ է։ Հրապարակային մի բան գրիր շարժիչը խոդ տալու համար։",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Ոչ մի ծանուցում դեռ չունես։ Բզիր մյուսներին՝ խոսակցությունը սկսելու համար։",
   "empty_column.public": "Այստեղ բան չկա՛։ Հրապարակային մի բան գրիր կամ հետեւիր այլ հանգույցներից էակների՝ այն լցնելու համար։",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Վավերացնել",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Թաքցնե՞լ ցանուցումներն այս օգտատիրոջից։",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Արգելափակված օգտատերեր",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Տեղական հոսք",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}օր",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Արգելափակել @{name}֊ին",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "Այս թութը չի կարող տարածվել",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Ավելին",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ապալռեցնել խոսակցությունը",
   "status.unpin": "Հանել անձնական էջից",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index e701eb4d7..edb09eb94 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.",
   "bundle_modal_error.retry": "Coba lagi",
   "column.blocks": "Pengguna diblokir",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Linimasa Lokal",
   "column.direct": "Pesan langsung",
   "column.domain_blocks": "Topik tersembunyi",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Linimasa gabungan",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Kembali",
   "column_header.hide_settings": "Sembunyikan pengaturan",
   "column_header.show_settings": "Tampilkan pengaturan",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Toot ini tidak akan ada dalam daftar tagar manapun karena telah di set sebagai tidak terdaftar. Hanya postingan publik yang bisa dicari dengan tagar.",
   "compose_form.lock_disclaimer": "Akun anda tidak {locked}. Semua orang dapat mengikuti anda untuk melihat postingan khusus untuk pengikut anda.",
   "compose_form.lock_disclaimer.lock": "terkunci",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Apa yang ada di pikiran anda?",
   "compose_form.poll.add_option": "Tambahkan pilihan",
   "compose_form.poll.duration": "Durasi jajak pendapat",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Tidak ada toot di sini!",
   "empty_column.account_unavailable": "Profil tidak tersedia",
   "empty_column.blocks": "Anda belum memblokir siapapun.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
   "empty_column.direct": "Anda belum memiliki pesan langsung. Ketika Anda mengirim atau menerimanya, maka akan muncul di sini.",
   "empty_column.domain_blocks": "Tidak ada topik tersembunyi.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Anda belum membisukan siapapun.",
   "empty_column.notifications": "Anda tidak memiliki notifikasi apapun. Berinteraksi dengan orang lain untuk memulai percakapan.",
   "empty_column.public": "Tidak ada apapun disini! Tulis sesuatu, atau ikuti pengguna lain dari server lain untuk mengisi ini",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Izinkan",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan repost",
   "home.column_settings.show_replies": "Tampilkan balasan",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Sembunyikan notifikasi dari pengguna ini?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Pengguna diblokir",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Linimasa lokal",
   "navigation_bar.compose": "Tulis toot baru",
   "navigation_bar.direct": "Pesan langsung",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Tampilkan semua",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index 25a1fcd27..3fb947d5e 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blokusita uzeri",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokala tempolineo",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federata tempolineo",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Retro",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Quo esas en tua spirito?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "La lokala tempolineo esas vakua. Skribez ulo publike por iniciar la agiveso!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Tu havas ankore nula savigo. Komunikez kun altri por debutar la konverso.",
   "empty_column.public": "Esas nulo hike! Skribez ulo publike, o manuale sequez uzeri de altra instaluri por plenigar ol.",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Yurizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokusita uzeri",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokala tempolineo",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Montrar plue",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 7e4d70354..11b82e6be 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.",
   "bundle_modal_error.retry": "Riprova",
   "column.blocks": "Utenti bloccati",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Timeline locale",
   "column.direct": "Messaggi diretti",
   "column.domain_blocks": "Domini nascosti",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Timeline federata",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
   "column_header.show_settings": "Mostra impostazioni",
@@ -82,6 +84,8 @@
   "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 è {locked}. Chiunque può decidere di seguirti per vedere i tuoi post per soli seguaci.",
   "compose_form.lock_disclaimer.lock": "bloccato",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "A cosa stai pensando?",
   "compose_form.poll.add_option": "Aggiungi una scelta",
   "compose_form.poll.duration": "Durata del sondaggio",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Non ci sono toot qui!",
   "empty_column.account_unavailable": "Profilo non disponibile",
   "empty_column.blocks": "Non hai ancora bloccato nessun utente.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "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.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Non hai ancora silenziato nessun utente.",
   "empty_column.notifications": "Non hai ancora nessuna notifica. Interagisci con altri per iniziare conversazioni.",
   "empty_column.public": "Qui non c'è nulla! Scrivi qualcosa pubblicamente, o aggiungi utenti da altri server per riempire questo spazio",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizza",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Semplice",
   "home.column_settings.show_reblogs": "Mostra post condivisi",
   "home.column_settings.show_replies": "Mostra risposte",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Nascondere le notifiche da quest'utente?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Utenti bloccati",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Timeline locale",
   "navigation_bar.compose": "Componi nuovo toot",
   "navigation_bar.direct": "Messaggi diretti",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}g",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
   "status.admin_status": "Apri questo status nell'interfaccia di moderazione",
   "status.block": "Blocca @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Annulla condivisione",
   "status.cannot_reblog": "Questo post non può essere condiviso",
   "status.copy": "Copia link allo status",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostra di più",
   "status.show_more_all": "Mostra di più per tutti",
   "status.show_thread": "Mostra thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Annulla silenzia conversazione",
   "status.unpin": "Non fissare in cima al profilo",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index abfdadc24..18718a074 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_modal_error.retry": "再試行",
   "column.blocks": "ブロックしたユーザー",
+  "column.bookmarks": "Bookmarks",
   "column.community": "ローカルタイムライン",
   "column.direct": "ダイレクトメッセージ",
   "column.domain_blocks": "非表示にしたドメイン",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "連合タイムライン",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "戻る",
   "column_header.hide_settings": "設定を隠す",
   "column_header.show_settings": "設定を表示",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "このトゥートは公開設定ではないのでハッシュタグの一覧に表示されません。公開トゥートだけがハッシュタグで検索できます。",
   "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。",
   "compose_form.lock_disclaimer.lock": "承認制",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "今なにしてる？",
   "compose_form.poll.add_option": "追加",
   "compose_form.poll.duration": "アンケート期間",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "トゥートがありません！",
   "empty_column.account_unavailable": "プロフィールは利用できません",
   "empty_column.blocks": "まだ誰もブロックしていません。",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "ローカルタイムラインはまだ使われていません。何か書いてみましょう！",
   "empty_column.direct": "ダイレクトメッセージはまだありません。ダイレクトメッセージをやりとりすると、ここに表示されます。",
   "empty_column.domain_blocks": "非表示にしているドメインはありません。",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "まだ誰もミュートしていません。",
   "empty_column.notifications": "まだ通知がありません。他の人とふれ合って会話を始めましょう。",
   "empty_column.public": "ここにはまだ何もありません！ 公開で何かを投稿したり、他のサーバーのユーザーをフォローしたりしていっぱいにしましょう",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "許可",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "と {additional}",
   "hashtag.column_header.tag_mode.any": "か {additional}",
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "ブロックしたユーザー",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ローカルタイムライン",
   "navigation_bar.compose": "トゥートの新規作成",
   "navigation_bar.direct": "ダイレクトメッセージ",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}日前",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name} のモデレーション画面を開く",
   "status.admin_status": "このトゥートをモデレーション画面で開く",
   "status.block": "@{name}さんをブロック",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "ブースト解除",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.copy": "トゥートへのリンクをコピー",
@@ -439,6 +481,7 @@
   "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
   "status.show_thread": "スレッドを表示",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "会話のミュートを解除",
   "status.unpin": "プロフィールへの固定を解除",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index eacf39646..5413175b0 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.",
   "bundle_modal_error.retry": "სცადეთ კიდევ ერთხელ",
   "column.blocks": "დაბლოკილი მომხმარებლები",
+  "column.bookmarks": "Bookmarks",
   "column.community": "ლოკალური თაიმლაინი",
   "column.direct": "პირდაპირი წერილები",
   "column.domain_blocks": "დამალული დომენები",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "ფედერალური თაიმლაინი",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "უკან",
   "column_header.hide_settings": "პარამეტრების დამალვა",
   "column_header.show_settings": "პარამეტრების ჩვენება",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "ეს ტუტი არ მოექცევა ჰეშტეგების ქვეს, რამეთუ ის არაა მითითებული. მხოლოდ ღია ტუტები მოიძებნება ჰეშტეგით.",
   "compose_form.lock_disclaimer": "თქვენი ანგარიში არაა {locked}. ნებისმიერს შეიძლია გამოგყვეთ, რომ იხილოს თქვენი მიმდევრებზე გათვლილი პოსტები.",
   "compose_form.lock_disclaimer.lock": "ჩაკეტილი",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "რაზე ფიქრობ?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "ლოკალური თაიმლაინი ცარიელია. დაწერეთ რაიმე ღიად ან ქენით რაიმე სხვა!",
   "empty_column.direct": "ჯერ პირდაპირი წერილები არ გაქვთ. როდესაც მიიღებთ ან გააგზავნით, გამოჩნდება აქ.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "ჯერ შეტყობინებები არ გაქვთ. საუბრის დასაწყებად იურთიერთქმედეთ სხვებთან.",
   "empty_column.public": "აქ არაფერია! შესავსებად, დაწერეთ რაიმე ღიად ან ხელით გაჰყევით მომხმარებლებს სხვა ინსტანციებისგან",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "ავტორიზაცია",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "დავმალოთ შეტყობინებები ამ მომხმარებლისგან?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "დაბლოკილი მომხმარებლები",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "ლოკალური თაიმლაინი",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "პირდაპირი წერილები",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}დღ",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "დაბლოკე @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "ბუსტის მოშორება",
   "status.cannot_reblog": "ეს პოსტი ვერ დაიბუსტება",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "აჩვენე მეტი",
   "status.show_more_all": "აჩვენე მეტი ყველაზე",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "საუბარზე გაჩუმების მოშორება",
   "status.unpin": "პროფილიდან პინის მოშორება",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 8369a8e3f..69d8b5293 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Бұл компонентті жүктеген кезде бір қате пайда болды.",
   "bundle_modal_error.retry": "Қайтадан көріңіз",
   "column.blocks": "Бұғатталғандар",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Жергілікті желі",
   "column.direct": "Жеке хаттар",
   "column.domain_blocks": "Жасырылған домендер",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Жаһандық желі",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Артқа",
   "column_header.hide_settings": "Баптауларды жасыр",
   "column_header.show_settings": "Баптауларды көрсет",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Бұл пост іздеуде хэштегпен шықпайды, өйткені ол бәріне ашық емес. Тек ашық жазбаларды ғана хэштег арқылы іздеп табуға болады.",
   "compose_form.lock_disclaimer": "Аккаунтыңыз {locked} емес. Кез келген адам жазылып, сізді оқи алады.",
   "compose_form.lock_disclaimer.lock": "жабық",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Не бөліскіңіз келеді?",
   "compose_form.poll.add_option": "Жауап қос",
   "compose_form.poll.duration": "Сауалнама мерзімі",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Жазба жоқ ешқандай!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Ешкімді бұғаттамағансыз.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Жергілікті желі бос. Сіз бастап жазыңыз!",
   "empty_column.direct": "Әзірше дым хат жоқ. Өзіңіз жазып көріңіз алдымен.",
   "empty_column.domain_blocks": "Бұғатталған домен жоқ.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Әзірше ешқандай үнсізге қойылған қолданушы жоқ.",
   "empty_column.notifications": "Әзірше ешқандай ескертпе жоқ. Басқалармен араласуды бастаңыз және пікірталастарға қатысыңыз.",
   "empty_column.public": "Ештеңе жоқ бұл жерде! Өзіңіз бастап жазып көріңіз немесе басқаларға жазылыңыз",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Авторизация",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "және {additional}",
   "hashtag.column_header.tag_mode.any": "немесе {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} болмай",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Бұл қолданушы ескертпелерін жасырамыз ба?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Бұғатталғандар",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Жергілікті желі",
   "navigation_bar.compose": "Жаңа жазба бастау",
   "navigation_bar.direct": "Жеке хаттар",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}күн",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name} үшін модерация интерфейсін аш",
   "status.admin_status": "Бұл жазбаны модерация интерфейсінде аш",
   "status.block": "Бұғаттау @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Бөліспеу",
   "status.cannot_reblog": "Бұл жазба бөлісілмейді",
   "status.copy": "Жазба сілтемесін көшір",
@@ -439,6 +481,7 @@
   "status.show_more": "Толығырақ",
   "status.show_more_all": "Бәрін толығымен",
   "status.show_thread": "Желіні көрсет",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Пікірталасты үнсіз қылмау",
   "status.unpin": "Профильден алып тастау",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index 4f8172afc..b117568be 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
   "column.blocks": "차단 중인 사용자",
+  "column.bookmarks": "Bookmarks",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.domain_blocks": "숨겨진 도메인",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "연합 타임라인",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "돌아가기",
   "column_header.hide_settings": "설정 숨기기",
   "column_header.show_settings": "설정 보이기",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "이 툿은 어떤 해시태그로도 검색 되지 않습니다. 전체공개로 게시 된 툿만이 해시태그로 검색 될 수 있습니다.",
   "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
   "compose_form.lock_disclaimer.lock": "비공개",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "지금 무엇을 하고 있나요?",
   "compose_form.poll.add_option": "항목 추가",
   "compose_form.poll.duration": "투표 기간",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "여긴 툿이 없어요!",
   "empty_column.account_unavailable": "프로필 사용 불가",
   "empty_column.blocks": "아직 아무도 차단하지 않았습니다.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "아직 다이렉트 메시지가 없습니다. 다이렉트 메시지를 보내거나 받은 경우, 여기에 표시 됩니다.",
   "empty_column.domain_blocks": "아직 숨겨진 도메인이 없습니다.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "아직 아무도 뮤트하지 않았습니다.",
   "empty_column.notifications": "아직 알림이 없습니다. 다른 사람과 대화를 시작해 보세요.",
   "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 서버의 유저를 팔로우 해서 채워보세요",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "허가",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "그리고 {additional}",
   "hashtag.column_header.tag_mode.any": "또는 {additional}",
   "hashtag.column_header.tag_mode.none": "({additional}를 제외)",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "기본 설정",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "이 사용자로부터의 알림을 뮤트하시겠습니까?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "차단한 사용자",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "로컬 타임라인",
   "navigation_bar.compose": "새 툿 작성",
   "navigation_bar.direct": "다이렉트 메시지",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}일 전",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name}에 대한 모더레이션 인터페이스 열기",
   "status.admin_status": "모더레이션 인터페이스에서 이 게시물 열기",
   "status.block": "@{name} 차단",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "부스트 취소",
   "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
   "status.copy": "게시물 링크 복사",
@@ -439,6 +481,7 @@
   "status.show_more": "더 보기",
   "status.show_more_all": "모두 펼치기",
   "status.show_thread": "글타래 보기",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
   "status.unpin": "고정 해제",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index a006305b0..186b19234 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What's on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index ff733946a..2c10cbde8 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Kaut kas nogāja greizi ielādējot šo komponenti.",
   "bundle_modal_error.retry": "Mēģini vēlreiz",
   "column.blocks": "Bloķētie lietotāji",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokālā laika līnija",
   "column.direct": "Privātās ziņas",
   "column.domain_blocks": "Paslēptie domēni",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federatīvā laika līnija",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Atpakaļ",
   "column_header.hide_settings": "Paslēpt iestatījumus",
   "column_header.show_settings": "Rādīt iestatījumus",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Ziņojumu nebūs iespējams atrast zem haštagiem jo tas nav publisks. Tikai publiskos ziņojumus ir iespējams meklēt pēc tiem.",
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot lai apskatītu tikai sekotājiem paredzētos ziņojumus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Ko vēlies publicēt?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Šeit ziņojumu nav!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Tu neesi vēl nevienu bloķējis.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokālā laika līnija ir tukša. :/ Ieraksti kaut ko lai sākas rosība!",
   "empty_column.direct": "Tev nav privāto ziņu. Tiklīdz saņemsi tās šeit parādīsies.",
   "empty_column.domain_blocks": "Slēpto domēnu vēl nav.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Tu neesi nevienu apklusinājis.",
   "empty_column.notifications": "Tev nav paziņojumu. Iesaisties sarunās ar citiem.",
   "empty_column.public": "Šeit nekā nav, tukšums! Ieraksti kaut ko publiski, vai uzmeklē un seko kādam no citas instances",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizēt",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index b5bcd4b14..c693ff955 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Настана грешка при прикажувањето на оваа веб-страница.",
   "bundle_modal_error.retry": "Обидете се повторно",
   "column.blocks": "Блокирани корисници",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Local timeline",
   "column.direct": "Директна порака",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 91bad4375..2ac445ac0 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -58,6 +58,7 @@
   "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.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federated timeline",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.show_settings": "Show settings",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
   "compose_form.lock_disclaimer.lock": "locked",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "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 instances to fill it up",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Authorize",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index 37ec6e6d2..1fcc20d82 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
   "bundle_modal_error.retry": "Opnieuw proberen",
   "column.blocks": "Geblokkeerde gebruikers",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokale tijdlijn",
   "column.direct": "Directe berichten",
   "column.domain_blocks": "Genegeerde servers",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Globale tijdlijn",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Terug",
   "column_header.hide_settings": "Instellingen verbergen",
   "column_header.show_settings": "Instellingen tonen",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Jouw account is niet {locked}. Iedereen kan jou volgen en kan de toots zien die je alleen aan jouw volgers hebt gericht.",
   "compose_form.lock_disclaimer.lock": "besloten",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Wat wil je kwijt?",
   "compose_form.poll.add_option": "Keuze toevoegen",
   "compose_form.poll.duration": "Duur van de poll",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Hier zijn geen toots!",
   "empty_column.account_unavailable": "Profiel is niet beschikbaar",
   "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
   "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
   "empty_column.domain_blocks": "Er zijn nog geen genegeerde servers.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Jij hebt nog geen gebruikers genegeerd.",
   "empty_column.notifications": "Je hebt nog geen meldingen. Begin met iemand een gesprek.",
   "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere servers om het te vullen",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Goedkeuren",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "of {additional}",
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Reposts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokale tijdlijn",
   "navigation_bar.compose": "Nieuw toot schrijven",
   "navigation_bar.direct": "Directe berichten",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_status": "Deze toot in de moderatie-omgeving openen",
   "status.block": "Blokkeer @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Niet langer reposten",
   "status.cannot_reblog": "Deze toot kan niet gerepost worden",
   "status.copy": "Link naar toot kopiëren",
@@ -439,6 +481,7 @@
   "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
   "status.show_thread": "Gesprek tonen",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Gesprek niet langer negeren",
   "status.unpin": "Van profielpagina losmaken",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 6a8aceac7..62e7ffc10 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Noko gikk gale mens komponent var i ferd med å bli nedlasta.",
   "bundle_modal_error.retry": "Prøv igjen",
   "column.blocks": "Blokka brukare",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokal samtid",
   "column.direct": "Direkte meldingar",
   "column.domain_blocks": "Gøymte domener",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federert samtid",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tilbake",
   "column_header.hide_settings": "Skjul innstillingar",
   "column_header.show_settings": "Vis innstillingar",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Denne tuten vill ikkje bli lista under nokon knagg ettersom den ikkje er opplista. Berre offentlege tutar kan ble søkt på ved emneknagg.",
   "compose_form.lock_disclaimer": "Din brukar er ikkje {locked}. Alle kan følje deg for å sjå føljar-modus poster.",
   "compose_form.lock_disclaimer.lock": "låst",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Kva har du på hjartet?",
   "compose_form.poll.add_option": "Legg til eit punkt",
   "compose_form.poll.duration": "Varigheit for spørring",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Ikkje nokon tutar her!",
   "empty_column.account_unavailable": "Profil ikkje tilgjengelig",
   "empty_column.blocks": "Du har ikkje blokkért nokon brukarar ennå.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Den lokale samtiden er tom. Skriv noko offentleg å få ballen til å rulle!",
   "empty_column.direct": "Du har ikkje nokon direkte meldingar ennå. Når du sendar eller får ein, så vill den ende opp her.",
   "empty_column.domain_blocks": "Der er ikkje nokon gøymte domener enno.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Du har ikkje dempet nokon brukare enno.",
   "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",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autoriser",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Vis fremhevingar",
   "home.column_settings.show_replies": "Vis svar",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Hide notifications from this user?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blocked users",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local timeline",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "This post cannot be reposted",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Unmute conversation",
   "status.unpin": "Unpin from profile",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index f64edfb0d..fc172c890 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Noe gikk galt da denne komponenten lastet.",
   "bundle_modal_error.retry": "Prøv igjen",
   "column.blocks": "Blokkerte brukere",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Felles tidslinje",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tilbake",
   "column_header.hide_settings": "Gjem  innstillinger",
   "column_header.show_settings": "Vis innstillinger",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Hvem som helst kan følge deg og se dine private poster.",
   "compose_form.lock_disclaimer.lock": "låst",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Hva har du på hjertet?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for å få snøballen til å rulle!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Du har ingen varsler ennå. Kommuniser med andre for å begynne samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller følg brukere manuelt fra andre instanser for å fylle den opp",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorisér",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Enkel",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokkerte brukere",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Vis mer",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ikke demp samtale",
   "status.unpin": "Angre festing på profilen",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index 7f7f48215..6f6bf07f8 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.",
   "bundle_modal_error.retry": "Tornar ensajar",
   "column.blocks": "Personas blocadas",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Flux public local",
   "column.direct": "Messatges dirèctes",
   "column.domain_blocks": "Domenis resconduts",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Flux public global",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tornar",
   "column_header.hide_settings": "Amagar los paramètres",
   "column_header.show_settings": "Mostrar los paramètres",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo monde pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "A de qué pensatz ?",
   "compose_form.poll.add_option": "Ajustar una causida",
   "compose_form.poll.duration": "Durada del sondatge",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Cap de tuts aquí !",
   "empty_column.account_unavailable": "Perfil pas disponible",
   "empty_column.blocks": "Avètz pas blocat degun pel moment.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lo flux public local es void. Escrivètz quicòm per lo garnir !",
   "empty_column.direct": "Avètz pas encara cap de messatges. Quand ne mandatz un o que ne recebètz un, serà mostrat aquí.",
   "empty_column.domain_blocks": "I a pas encara cap de domeni amagat.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Encara avètz pas mes en silenci degun.",
   "empty_column.notifications": "Avètz pas encara de notificacions. Respondètz a qualqu’un per començar una conversacion.",
   "empty_column.public": "I a pas res aquí ! Escrivètz quicòm de public, o seguètz de personas d’autres servidors per garnir lo flux public",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Acceptar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sens {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Rescondre las notificacions d’aquesta persona ?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Personas blocadas",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Flux public local",
   "navigation_bar.compose": "Escriure un nòu tut",
   "navigation_bar.direct": "Messatges dirèctes",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "fa {number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Dobrir l’interfàcia de moderacion per @{name}",
   "status.admin_status": "Dobrir aqueste estatut dins l’interfàcia de moderacion",
   "status.block": "Blocar @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Quitar de partejar",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
   "status.copy": "Copiar lo ligam de l’estatut",
@@ -439,6 +481,7 @@
   "status.show_more": "Desplegar",
   "status.show_more_all": "Los desplegar totes",
   "status.show_thread": "Mostrar lo fil",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Tornar mostrar la conversacion",
   "status.unpin": "Tirar del perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index fc29622ea..d09ffc4fb 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_modal_error.retry": "Spróbuj ponownie",
   "column.blocks": "Zablokowani użytkownicy",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokalna oś czasu",
   "column.direct": "Wiadomości bezpośrednie",
   "column.domain_blocks": "Ukryte domeny",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Globalna oś czasu",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Wróć",
   "column_header.hide_settings": "Ukryj ustawienia",
   "column_header.show_settings": "Pokaż ustawienia",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje wpisy przeznaczone tylko dla śledzących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Co Ci chodzi po głowie?",
   "compose_form.poll.add_option": "Dodaj opcję",
   "compose_form.poll.duration": "Czas trwania głosowania",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Brak wpisów tutaj!",
   "empty_column.account_unavailable": "Profil niedostępny",
   "empty_column.blocks": "Nie zablokowałeś(-aś) jeszcze żadnego użytkownika.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby zagaić!",
   "empty_column.direct": "Nie masz żadnych wiadomości bezpośrednich. Kiedy dostaniesz lub wyślesz jakąś, pojawi się ona tutaj.",
   "empty_column.domain_blocks": "Brak ukrytych domen.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Nie wyciszyłeś(-aś) jeszcze żadnego użytkownika.",
   "empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
   "empty_column.public": "Tu nic nie ma! Napisz coś publicznie, lub dodaj ludzi z innych serwerów, aby to wyświetlić",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autoryzuj",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "lub {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna oś czasu",
   "navigation_bar.compose": "Utwórz nowy wpis",
   "navigation_bar.direct": "Wiadomości bezpośrednie",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} dni",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Otwórz interfejs moderacyjny dla @{name}",
   "status.admin_status": "Otwórz ten wpis w interfejsie moderacyjnym",
   "status.block": "Zablokuj @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Cofnij podbicie",
   "status.cannot_reblog": "Ten wpis nie może zostać podbity",
   "status.copy": "Skopiuj odnośnik do wpisu",
@@ -439,6 +481,7 @@
   "status.show_more": "Rozwiń",
   "status.show_more_all": "Rozwiń wszystkie",
   "status.show_thread": "Pokaż wątek",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Cofnij wyciszenie konwersacji",
   "status.unpin": "Odepnij z profilu",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 8fbcaffe7..e67f98131 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente novamente",
   "column.blocks": "Usuários bloqueados",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Local",
   "column.direct": "Mensagens diretas",
   "column.domain_blocks": "Domínios escondidos",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Global",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Voltar",
   "column_header.hide_settings": "Esconder configurações",
   "column_header.show_settings": "Mostrar configurações",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Esse toot não será listado em nenhuma hashtag por ser não listado. Somente toots públicos podem ser pesquisados por hashtag.",
   "compose_form.lock_disclaimer": "A sua conta não está {locked}. Qualquer pessoa pode te seguir e visualizar postagens direcionadas a apenas seguidores.",
   "compose_form.lock_disclaimer.lock": "trancada",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "No que você está pensando?",
   "compose_form.poll.add_option": "Adicionar uma opção",
   "compose_form.poll.duration": "Duração da enquete",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Não há toots aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Você ainda não bloqueou nenhum usuário.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "A timeline local está vazia. Escreva algo publicamente para começar!",
   "empty_column.direct": "Você não tem nenhuma mensagem direta ainda. Quando você enviar ou receber uma, as mensagens aparecerão por aqui.",
   "empty_column.domain_blocks": "Ainda não há nenhum domínio escondido.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Você ainda não silenciou nenhum usuário.",
   "empty_column.notifications": "Você ainda não possui notificações. Interaja com outros usuários para começar a conversar.",
   "empty_column.public": "Não há nada aqui! Escreva algo publicamente ou siga manualmente usuários de outras instâncias",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar compartilhamentos",
   "home.column_settings.show_replies": "Mostrar as respostas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Esconder notificações deste usuário?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Usuários bloqueados",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Local",
   "navigation_bar.compose": "Compor um novo toot",
   "navigation_bar.direct": "Mensagens diretas",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_status": "Abrir esse status na interface de moderação",
   "status.block": "Bloquear @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Desfazer compartilhamento",
   "status.cannot_reblog": "Esta postagem não pode ser compartilhada",
   "status.copy": "Copiar o link para o status",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas as mensagens",
   "status.show_thread": "Mostrar sequência",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Desativar silêncio desta conversa",
   "status.unpin": "Desafixar do perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index 74351dfce..6abbc9410 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
   "column.blocks": "Utilizadores Bloqueados",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Cronologia local",
   "column.direct": "Mensagens directas",
   "column.domain_blocks": "Domínios escondidos",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Cronologia federada",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Voltar",
   "column_header.hide_settings": "Esconder configurações",
   "column_header.show_settings": "Mostrar configurações",
@@ -82,6 +84,8 @@
   "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.",
   "compose_form.lock_disclaimer": "A tua conta não está {locked}. Qualquer pessoa pode seguir-te e ver as publicações direcionadas apenas a seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Em que estás a pensar?",
   "compose_form.poll.add_option": "Adicionar uma opção",
   "compose_form.poll.duration": "Duração da votação",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Sem toots por aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
   "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "A timeline local está vazia. Escreve algo publicamente para começar!",
   "empty_column.direct": "Ainda não tens qualquer mensagem directa. Quando enviares ou receberes alguma, ela irá aparecer aqui.",
   "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
   "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizar",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Esconder notificações deste utilizador?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Utilizadores bloqueados",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Cronologia local",
   "navigation_bar.compose": "Escrever novo toot",
   "navigation_bar.direct": "Mensagens directas",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
   "status.block": "Bloquear @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Remover boost",
   "status.cannot_reblog": "Não é possível fazer boost a esta publicação",
   "status.copy": "Copiar o link para a publicação",
@@ -439,6 +481,7 @@
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
   "status.show_thread": "Mostrar conversa",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Deixar de silenciar esta conversa",
   "status.unpin": "Não fixar no perfil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 2d070e549..23a437bd8 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Ceva nu a funcționat în timupul încărcării acestui component.",
   "bundle_modal_error.retry": "Încearcă din nou",
   "column.blocks": "Utilizatori blocați",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Fluxul Local",
   "column.direct": "Mesaje directe",
   "column.domain_blocks": "Domenii ascunse",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Flux global",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Înapoi",
   "column_header.hide_settings": "Ascunde setările",
   "column_header.show_settings": "Arată setările",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Această postare nu va fi listată sub nici un hastag. Doar postările publice pot fi găsite dupa un hastag.",
   "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.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "La ce te gândești?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Nici o postare aici!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Nu ai blocat nici un utilizator incă.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Fluxul local este gol. Scrie ceva public pentru a împinge bila la vale!",
   "empty_column.direct": "Nu ai nici un mesaj direct incă. Când trimiți sau primești unul, va fi afișat aici.",
   "empty_column.domain_blocks": "Nu sunt domenii ascunse incă.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Nu ai oprit nici un utilizator incă.",
   "empty_column.notifications": "Nu ai nici o notificare încă. Interacționează cu alții pentru a începe o conversație.",
   "empty_column.public": "Nu este nimci aici încă! Scrie ceva public, sau urmărește alți utilizatori din alte instanțe pentru a porni fluxul",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizează",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "și {additional}",
   "hashtag.column_header.tag_mode.any": "sau {additional}",
   "hashtag.column_header.tag_mode.none": "fără {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "De bază",
   "home.column_settings.show_reblogs": "Arată redistribuirile",
   "home.column_settings.show_replies": "Arată răspunsurile",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Ascunzi notificările de la acest utilizator?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Utilizatori blocați",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Flux local",
   "navigation_bar.compose": "Compune o nouă postare",
   "navigation_bar.direct": "Mesaje directe",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}z",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Blochează @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Nedistribuit",
   "status.cannot_reblog": "Această postare nu poate fi redistribuită",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Arată mai mult",
   "status.show_more_all": "Arată mai mult pentru toți",
   "status.show_thread": "Arată topicul",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Repornește conversația",
   "status.unpin": "Eliberează din profil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 3346cd062..5a7a81836 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
   "column.blocks": "Список блокировки",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Локальная лента",
   "column.direct": "Личные сообщения",
   "column.domain_blocks": "Скрытые домены",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Глобальная лента",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Скрыть настройки",
   "column_header.show_settings": "Показать настройки",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Этот пост не будет показывается в поиске по хэштегу, т.к. он непубличный. Только публичные посты можно найти в поиске по хэштегу.",
   "compose_form.lock_disclaimer": "Ваш аккаунт не {locked}. Любой человек может подписаться на Вас и просматривать посты для подписчиков.",
   "compose_form.lock_disclaimer.lock": "закрыт",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "О чем вы думаете?",
   "compose_form.poll.add_option": "Добавить",
   "compose_form.poll.duration": "Длительность опроса",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Здесь нет постов!",
   "empty_column.account_unavailable": "Профиль недоступен",
   "empty_column.blocks": "Вы ещё никого не заблокировали.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Локальная лента пуста. Напишите что-нибудь, чтобы разогреть народ!",
   "empty_column.direct": "У вас пока нет личных сообщений. Как только вы отправите или получите одно, оно появится здесь.",
   "empty_column.domain_blocks": "Скрытых доменов пока нет.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Вы ещё никого не скрывали.",
   "empty_column.notifications": "У вас пока нет уведомлений. Взаимодействуйте с другими, чтобы завести разговор.",
   "empty_column.public": "Здесь ничего нет! Опубликуйте что-нибудь или подпишитесь на пользователей с других узлов, чтобы заполнить ленту.",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Авторизовать",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Основные",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Убрать уведомления от этого пользователя?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Список блокировки",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Локальная лента",
   "navigation_bar.compose": "Создать новый статус",
   "navigation_bar.direct": "Личные сообщения",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}д",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_status": "Открыть этот статус в интерфейсе модератора",
   "status.block": "Заблокировать @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Не продвигать",
   "status.cannot_reblog": "Этот статус не может быть продвинут",
   "status.copy": "Копировать ссылку на запись",
@@ -439,6 +481,7 @@
   "status.show_more": "Развернуть",
   "status.show_more_all": "Развернуть для всех",
   "status.show_thread": "Показать обсуждение",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Снять глушение с обсуждения",
   "status.unpin": "Открепить от профиля",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index faec1cb8a..8fedd96a4 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
   "bundle_modal_error.retry": "Skúsiť znova",
   "column.blocks": "Blokovaní užívatelia",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Miestna časová os",
   "column.direct": "Súkromné správy",
   "column.domain_blocks": "Skryté domény",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federovaná časová os",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Späť",
   "column_header.hide_settings": "Skryť nastavenia",
   "column_header.show_settings": "Ukáž nastavenia",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Tento toot nebude zobrazený pod žiadným haštagom lebo nieje listovaný. Iba verejné tooty môžu byť nájdené podľa haštagu.",
   "compose_form.lock_disclaimer": "Tvoj účet nie je {locked}. Ktokoľvek ťa môže nasledovať a vidieť tvoje správy pre sledujúcich.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Čo máš na mysli?",
   "compose_form.poll.add_option": "Pridaj voľbu",
   "compose_form.poll.duration": "Trvanie ankety",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Niesú tu žiadne príspevky!",
   "empty_column.account_unavailable": "Profil nedostupný",
   "empty_column.blocks": "Ešte si nikoho nezablokoval/a.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokálna časová os je prázdna. Napíšte niečo, aby sa to tu začalo hýbať!",
   "empty_column.direct": "Ešte nemáš žiadne súkromné správy. Keď nejakú pošleš, alebo dostaneš, ukáže sa tu.",
   "empty_column.domain_blocks": "Žiadne domény ešte niesú skryté.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Ešte si nestĺmil žiadných užívateľov.",
   "empty_column.notifications": "Ešte nemáš žiadne oznámenia. Začni komunikovať s ostatnými, aby diskusia mohla začať.",
   "empty_column.public": "Ešte tu nič nie je. Napíš niečo verejne, alebo začni sledovať užívateľov z iných serverov, aby tu niečo pribudlo",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Povoľ prístup",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Základné",
   "home.column_settings.show_reblogs": "Zobraziť povýšené",
   "home.column_settings.show_replies": "Ukázať odpovede",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Skry oznámenia od tohto používateľa?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokovaní užívatelia",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Miestna časová os",
   "navigation_bar.compose": "Napíš nový príspevok",
   "navigation_bar.direct": "Súkromné správy",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}dní",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Otvor moderovacie rozhranie užívateľa @{name}",
   "status.admin_status": "Otvor tento príspevok v moderovacom rozhraní",
   "status.block": "Blokuj @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Nezdieľaj",
   "status.cannot_reblog": "Tento príspevok nemôže byť zdieľaný",
   "status.copy": "Skopíruj odkaz na príspevok",
@@ -439,6 +481,7 @@
   "status.show_more": "Ukáž viac",
   "status.show_more_all": "Všetkým ukáž viac",
   "status.show_thread": "Ukáž diskusné vlákno",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Prestaň ignorovať konverzáciu",
   "status.unpin": "Odopni z profilu",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index dbfbd9f6a..39dae4f02 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Med nalaganjem te komponente je prišlo do napake.",
   "bundle_modal_error.retry": "Poskusi ponovno",
   "column.blocks": "Blokirani uporabniki",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokalna časovnica",
   "column.direct": "Neposredna sporočila",
   "column.domain_blocks": "Skrite domene",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Združena časovnica",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Nazaj",
   "column_header.hide_settings": "Skrij nastavitve",
   "column_header.show_settings": "Prikaži nastavitve",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim ključnikom, ker ni javen. Samo javne tute lahko iščete s ključniki.",
   "compose_form.lock_disclaimer": "Vaš račun ni {locked}. Vsakdo vam lahko sledi in si ogleda objave, ki so namenjene samo sledilcem.",
   "compose_form.lock_disclaimer.lock": "zaklenjen",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "O čem razmišljaš?",
   "compose_form.poll.add_option": "Dodaj izbiro",
   "compose_form.poll.duration": "Trajanje ankete",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Tukaj ni tutov!",
   "empty_column.account_unavailable": "Profil ni na voljo",
   "empty_column.blocks": "Niste še blokirali nobenega uporabnika.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokalna časovnica je prazna. Napišite nekaj javnega, da se bo žoga zakotalila!",
   "empty_column.direct": "Nimate še nobenih neposrednih sporočil. Ko ga boste poslali ali prejeli, se bo prikazal tukaj.",
   "empty_column.domain_blocks": "Še vedno ni skritih domen.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Niste utišali še nobenega uporabnika.",
   "empty_column.notifications": "Nimate še nobenih obvestil. Povežite se z drugimi, da začnete pogovor.",
   "empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Overi",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "in {additional}",
   "hashtag.column_header.tag_mode.any": "ali {additional}",
   "hashtag.column_header.tag_mode.none": "brez {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Pokaži spodbude",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Skrij obvestila tega uporabnika?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokirani uporabniki",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna časovnica",
   "navigation_bar.compose": "Sestavi nov tut",
   "navigation_bar.direct": "Neposredna sporočila",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Odpri vmesnik za moderiranje za @{name}",
   "status.admin_status": "Odpri status v vmesniku za moderiranje",
   "status.block": "Blokiraj @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Prekini spodbudo",
   "status.cannot_reblog": "Te objave ni mogoče spodbuditi",
   "status.copy": "Kopiraj povezavo do statusa",
@@ -439,6 +481,7 @@
   "status.show_more": "Prikaži več",
   "status.show_more_all": "Prikaži več za vse",
   "status.show_thread": "Prikaži objavo",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Odtišaj pogovor",
   "status.unpin": "Odpni iz profila",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 0d297feb1..1fcf9c49b 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -58,6 +58,7 @@
   "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": "Bookmarks",
   "column.community": "Rrjedhë kohore vendore",
   "column.direct": "Mesazhe të drejtpërdrejta",
   "column.domain_blocks": "Përkatësi të fshehura",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Rrjedhë kohore e federuar",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Mbrapsht",
   "column_header.hide_settings": "Fshihi rregullimet",
   "column_header.show_settings": "Shfaq rregullime",
@@ -82,6 +84,8 @@
   "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.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Ç’bluani në mendje?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "S’ka mesazhe këtu!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "S’keni bllokuar ende ndonjë përdorues.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "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.",
@@ -165,6 +170,8 @@
   "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ë",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Autorizoje",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "dhe {additional}",
   "hashtag.column_header.tag_mode.any": "ose {additional}",
   "hashtag.column_header.tag_mode.none": "pa {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Bazë",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Të fshihen njoftimet prej këtij përdoruesi?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Përdorues të bllokuar",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Rrjedhë kohore vendore",
   "navigation_bar.compose": "Hartoni mesazh të ri",
   "navigation_bar.direct": "Mesazhe të drejtpërdrejta",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
   "status.admin_status": "Hape këtë gjendje te ndërfaqja e moderimit",
   "status.block": "Blloko @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Shpërforcojeni",
   "status.cannot_reblog": "Ky postim s’mund të përforcohet",
   "status.copy": "Kopjoje lidhjen te gjendje",
@@ -439,6 +481,7 @@
   "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.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Ktheji zërin bisedës",
   "status.unpin": "Shfiksoje nga profili",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index ebcbe0129..9f1dc4a58 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovo",
   "column.blocks": "Blokirani korisnici",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokalna lajna",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federisana lajna",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Nazad",
   "column_header.hide_settings": "Sakrij postavke",
   "column_header.show_settings": "Prikaži postavke",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer": "Vaš nalog nije {locked}. Svako može da Vas zaprati i da vidi objave namenjene samo Vašim pratiocima.",
   "compose_form.lock_disclaimer.lock": "zaključan",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Šta Vam je na umu?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Lokalna lajna je prazna. Napišite nešto javno da lajna produva!",
   "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "Trenutno nemate obaveštenja. Družite se malo da započnete razgovore.",
   "empty_column.public": "Ovde nema ničega! Napišite nešto javno, ili nađite korisnike sa drugih instanci koje ćete zapratiti da popunite ovu prazninu",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Odobri",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "Prikaži i podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Sakrij obaveštenja od ovog korisnika?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blokirani korisnici",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokalna lajna",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "Direct messages",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Un-repost",
   "status.cannot_reblog": "Ovaj status ne može da se podrži",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Prikaži više",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Uključi prepisku",
   "status.unpin": "Otkači sa profila",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 64971a485..17e66daa4 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
   "column.blocks": "Блокирани корисници",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
   "column.domain_blocks": "Скривени домени",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Здружена временска линија",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Сакриј поставке",
   "column_header.show_settings": "Прикажи поставке",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Ова труба неће бити излистана под било којом тарабом јер је сакривена. Само јавне трубе могу бити претражене тарабом.",
   "compose_form.lock_disclaimer": "Ваш налог није {locked}. Свако може да Вас запрати и да види објаве намењене само Вашим пратиоцима.",
   "compose_form.lock_disclaimer.lock": "закључан",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Шта Вам је на уму?",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "Још увек немате блокираних корисника.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Локална временска линија је празна. Напишите нешто јавно да започнете!",
   "empty_column.direct": "Још увек немате директних порука. Када пошаљете или примите једну, појавиће се овде.",
   "empty_column.domain_blocks": "Још увек нема сакривених домена.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Још увек немате ућутканих корисника.",
   "empty_column.notifications": "Тренутно немате обавештења. Дружите се мало да започнете разговор.",
   "empty_column.public": "Овде нема ничега! Напишите нешто јавно, или нађите кориснике са других инстанци које ћете запратити да попуните ову празнину",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Одобри",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Основно",
   "home.column_settings.show_reblogs": "Прикажи и подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Сакриј обавештења од овог корисника?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Блокирани корисници",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Локална временска линија",
   "navigation_bar.compose": "Саставите нову трубу",
   "navigation_bar.direct": "Директне поруке",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "Блокирај @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Уклони подршку",
   "status.cannot_reblog": "Овај статус не може да се подржи",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "Прикажи више",
   "status.show_more_all": "Прикажи више за све",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Укључи преписку",
   "status.unpin": "Откачи са профила",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index b070ce903..cbfd31fe8 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Något gick fel när denna komponent laddades.",
   "bundle_modal_error.retry": "Försök igen",
   "column.blocks": "Blockerade användare",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direktmeddelanden",
   "column.domain_blocks": "Dolda domäner",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Förenad tidslinje",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Tillbaka",
   "column_header.hide_settings": "Dölj inställningar",
   "column_header.show_settings": "Visa inställningar",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Denna toot kommer inte att listas under någon hashtag eftersom den är onoterad. Endast offentliga toots kan sökas med hashtag.",
   "compose_form.lock_disclaimer": "Ditt konto är inte {locked}. Vem som helst kan följa dig och även se dina inlägg som bara är för följare.",
   "compose_form.lock_disclaimer.lock": "låst",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Vad funderar du på?",
   "compose_form.poll.add_option": "Nytt alternativ",
   "compose_form.poll.duration": "Varaktighet för omröstning",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Inga inlägg här!",
   "empty_column.account_unavailable": "Profilen är inte tillgänglig",
   "empty_column.blocks": "Du har ännu inte blockerat några användare.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Den lokala tidslinjen är tom. Skriv något offentligt för att sätta bollen i rullning!",
   "empty_column.direct": "Du har inga direktmeddelanden än. När du skickar eller tar emot ett kommer det att dyka upp här.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Du har ännu inte tystat några användare.",
   "empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
   "empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Godkänn",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "och {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Dölj notifikationer från denna användare?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Blockerade användare",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Lokal tidslinje",
   "navigation_bar.compose": "Författa ny toot",
   "navigation_bar.direct": "Direktmeddelanden",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
   "status.admin_status": "Öppna denna status i modereringsgränssnittet",
   "status.block": "Blockera @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Ta bort knuff",
   "status.cannot_reblog": "Detta inlägg kan inte knuffas",
   "status.copy": "Kopiera länk till status",
@@ -439,6 +481,7 @@
   "status.show_more": "Visa mer",
   "status.show_more_all": "Visa mer för alla",
   "status.show_thread": "Visa tråd",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Öppna konversation",
   "status.unpin": "Ångra fäst i profil",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index 90ab46ec8..6f4687b05 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
+  "column.bookmarks": "Bookmarks",
   "column.community": "உள்ளூர் காலக்கெடு",
   "column.direct": "நேரடி செய்திகள்",
   "column.domain_blocks": "மறைந்த களங்கள்",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "கூட்டாட்சி காலக்கெடு",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "ஆதரி",
   "column_header.hide_settings": "அமைப்புகளை மறை",
   "column_header.show_settings": "அமைப்புகளைக் காட்டு",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "இந்த toot பட்டியலிடப்படாதது போல எந்த ஹேஸ்டேக்கின் கீழ் பட்டியலிடப்படாது. ஹேஸ்டேக் மூலம் பொது டோட்டல்கள் மட்டுமே தேட முடியும்.",
   "compose_form.lock_disclaimer": "உங்கள் கணக்கு அல்ல {locked}. உங்களுடைய பின்தொடர்பவர் மட்டும் இடுகைகளை யாராவது காணலாம்.",
   "compose_form.lock_disclaimer.lock": "தாழிடு",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.add_option": "ஒரு விருப்பத்தைச் சேர்க்கவும்",
   "compose_form.poll.duration": "வாக்கெடுப்பு காலம்",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "இல்லை toots இங்கே!",
   "empty_column.account_unavailable": "சுயவிவரம் கிடைக்கவில்லை",
   "empty_column.blocks": "இதுவரை எந்த பயனர்களும் தடுக்கவில்லை.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "உள்ளூர் காலக்கெடு காலியாக உள்ளது. பந்தை உருட்டிக்கொள்வதற்கு பகிரங்கமாக ஒன்றை எழுதுங்கள்!",
   "empty_column.direct": "உங்களிடம் நேரடியான செய்திகள் எதுவும் இல்லை. நீங்கள் ஒன்றை அனுப்பி அல்லது பெறும் போது, அது இங்கே காண்பிக்கும்.",
   "empty_column.domain_blocks": "இன்னும் மறைந்த களங்கள் இல்லை.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "நீங்கள் இதுவரை எந்த பயனர்களையும் முடக்கியிருக்கவில்லை.",
   "empty_column.notifications": "உங்களிடம் எந்த அறிவிப்புகளும் இல்லை. உரையாடலைத் தொடங்க பிறருடன் தொடர்புகொள்ளவும்.",
   "empty_column.public": "இங்கே எதுவும் இல்லை! பகிரங்கமாக ஒன்றை எழுதவும் அல்லது மற்ற நிகழ்வுகளிலிருந்து பயனர்களை அதை நிரப்புவதற்கு கைமுறையாக பின்பற்றவும்",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "அதிகாரமளி",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
   "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
   "hashtag.column_header.tag_mode.none": "இல்லாமல் {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "அடிப்படையான",
   "home.column_settings.show_reblogs": "காட்டு boosts",
   "home.column_settings.show_replies": "பதில்களைக் காண்பி",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "இந்த பயனரின் அறிவிப்புகளை மறைக்கவா?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "தடுக்கப்பட்ட பயனர்கள்",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "உள்ளூர் காலக்கெடு",
   "navigation_bar.compose": "புதியவற்றை எழுதுக toot",
   "navigation_bar.direct": "நேரடி செய்திகள்",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "மிதமான இடைமுகத்தை திறக்க @{name}",
   "status.admin_status": "மிதமான இடைமுகத்தில் இந்த நிலையை திறக்கவும்",
   "status.block": "Block @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "இல்லை பூஸ்ட்",
   "status.cannot_reblog": "இந்த இடுகை அதிகரிக்க முடியாது",
   "status.copy": "நிலைக்கு இணைப்பை நகலெடு",
@@ -439,6 +481,7 @@
   "status.show_more": "மேலும் காட்ட",
   "status.show_more_all": "அனைவருக்கும் மேலும் காட்டு",
   "status.show_thread": "நூல் காட்டு",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "ஊமையாக உரையாடல் இல்லை",
   "status.unpin": "சுயவிவரத்திலிருந்து நீக்கவும்",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index d783b2963..0b7a674ec 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
   "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి",
   "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
+  "column.bookmarks": "Bookmarks",
   "column.community": "స్థానిక కాలక్రమం",
   "column.direct": "ప్రత్యక్ష సందేశాలు",
   "column.domain_blocks": "దాచిన డొమైన్లు",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "సమాఖ్య కాలక్రమం",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "వెనక్కి",
   "column_header.hide_settings": "అమర్పులను దాచిపెట్టు",
   "column_header.show_settings": "అమర్పులను చూపించు",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "ఈ టూట్ అన్లిస్టెడ్ కాబట్టి ఏ హాష్ ట్యాగ్ క్రిందకూ రాదు. పబ్లిక్ టూట్ లను మాత్రమే హాష్ ట్యాగ్ ద్వారా శోధించవచ్చు.",
   "compose_form.lock_disclaimer": "మీ ఖాతా {locked} చేయబడలేదు. ఎవరైనా మిమ్మల్ని అనుసరించి మీ అనుచరులకు-మాత్రమే పోస్ట్లను వీక్షించవచ్చు.",
   "compose_form.lock_disclaimer.lock": "బిగించబడినది",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "మీ మనస్సులో ఏముంది?",
   "compose_form.poll.add_option": "ఒక ఎంపికను చేర్చండి",
   "compose_form.poll.duration": "ఎన్నిక వ్యవధి",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "ఇక్కడ ఏ టూట్లూ లేవు!No toots here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "మీరు ఇంకా ఏ వినియోగదారులనూ బ్లాక్ చేయలేదు.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "స్థానిక కాలక్రమం ఖాళీగా ఉంది. మొదలుపెట్టడానికి బహిరంగంగా ఏదో ఒకటి వ్రాయండి!",
   "empty_column.direct": "మీకు ఇంకా ఏ ప్రత్యక్ష సందేశాలు లేవు. మీరు ఒకదాన్ని పంపినప్పుడు లేదా స్వీకరించినప్పుడు, అది ఇక్కడ చూపబడుతుంది.",
   "empty_column.domain_blocks": "దాచబడిన డొమైన్లు ఇంకా ఏమీ లేవు.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "మీరు ఇంకా ఏ వినియోగదారులనూ మ్యూట్ చేయలేదు.",
   "empty_column.notifications": "మీకు ఇంకా ఏ నోటిఫికేషన్లు లేవు. సంభాషణను ప్రారంభించడానికి ఇతరులతో ప్రతిస్పందించండి.",
   "empty_column.public": "ఇక్కడ ఏమీ లేదు! దీన్ని నింపడానికి బహిరంగంగా ఏదైనా వ్రాయండి, లేదా ఇతర సేవికల నుండి వినియోగదారులను అనుసరించండి",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "అనుమతించు",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "మరియు {additional}",
   "hashtag.column_header.tag_mode.any": "లేదా {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} లేకుండా",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "ఈ వినియోగదారు నుండి నోటిఫికేషన్లను దాచాలా?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "స్థానిక కాలక్రమం",
   "navigation_bar.compose": "కొత్త టూట్ను రాయండి",
   "navigation_bar.direct": "ప్రత్యక్ష సందేశాలు",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}d",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name} కొరకు సమన్వయ వినిమయసీమను తెరువు",
   "status.admin_status": "సమన్వయ వినిమయసీమలో ఈ స్టేటస్ ను తెరవండి",
   "status.block": "@{name} ను బ్లాక్ చేయి",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "బూస్ట్ను తొలగించు",
   "status.cannot_reblog": "ఈ పోస్ట్ను బూస్ట్ చేయడం సాధ్యం కాదు",
   "status.copy": "లంకెను స్టేటస్కు కాపీ చేయి",
@@ -439,6 +481,7 @@
   "status.show_more": "ఇంకా చూపించు",
   "status.show_more_all": "అన్నిటికీ ఇంకా చూపించు",
   "status.show_thread": "గొలుసును చూపించు",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "సంభాషణను అన్మ్యూట్ చేయి",
   "status.unpin": "ప్రొఫైల్ నుండి పీకివేయు",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 3d69d4ef7..f33013378 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
   "bundle_modal_error.retry": "ลองอีกครั้ง",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
+  "column.bookmarks": "Bookmarks",
   "column.community": "เส้นเวลาในเว็บ",
   "column.direct": "ข้อความโดยตรง",
   "column.domain_blocks": "โดเมนที่ซ่อนอยู่",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "เส้นเวลาที่ติดต่อกับภายนอก",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "ย้อนกลับ",
   "column_header.hide_settings": "ซ่อนการตั้งค่า",
   "column_header.show_settings": "แสดงการตั้งค่า",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "จะไม่แสดงรายการโพสต์นี้ภายใต้แฮชแท็กใด ๆ เนื่องจากไม่อยู่ในรายการ เฉพาะโพสต์สาธารณะเท่านั้นที่สามารถค้นหาโดยแฮชแท็ก",
   "compose_form.lock_disclaimer": "บัญชีของคุณไม่ได้ {locked} ใครก็ตามสามารถติดตามคุณเพื่อดูโพสต์สำหรับผู้ติดตามเท่านั้นของคุณ",
   "compose_form.lock_disclaimer.lock": "ล็อคอยู่",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "คุณกำลังคิดอะไรอยู่?",
   "compose_form.poll.add_option": "เพิ่มทางเลือก",
   "compose_form.poll.duration": "ระยะเวลาโพล",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "ไม่มีโพสต์ที่นี่!",
   "empty_column.account_unavailable": "ไม่มีโปรไฟล์",
   "empty_column.blocks": "คุณยังไม่ได้ปิดกั้นผู้ใช้ใด ๆ",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "เส้นเวลาในเว็บว่างเปล่า เขียนบางอย่างเป็นสาธารณะเพื่อเริ่มต้น!",
   "empty_column.direct": "คุณยังไม่มีข้อความโดยตรงใด ๆ เมื่อคุณส่งหรือรับข้อความ ข้อความจะปรากฏที่นี่",
   "empty_column.domain_blocks": "ยังไม่มีโดเมนที่ซ่อนอยู่",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "คุณยังไม่ได้ปิดเสียงผู้ใช้ใด ๆ",
   "empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ โต้ตอบกับผู้อื่นเพื่อเริ่มการสนทนา",
   "empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมให้เต็ม",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "อนุญาต",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "และ {additional}",
   "hashtag.column_header.tag_mode.any": "หรือ {additional}",
   "hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "ซ่อนการแจ้งเตือนจากผู้ใช้นี้?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "เส้นเวลาในเว็บ",
   "navigation_bar.compose": "เขียนโพสต์ใหม่",
   "navigation_bar.direct": "ข้อความโดยตรง",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} วัน",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "เปิดส่วนติดต่อการควบคุมสำหรับ @{name}",
   "status.admin_status": "เปิดสถานะนี้ในส่วนติดต่อการควบคุม",
   "status.block": "ปิดกั้น @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "เลิกดัน",
   "status.cannot_reblog": "ไม่สามารถดันโพสต์นี้",
   "status.copy": "คัดลอกลิงก์ไปยังสถานะ",
@@ -439,6 +481,7 @@
   "status.show_more": "แสดงเพิ่มเติม",
   "status.show_more_all": "แสดงเพิ่มเติมทั้งหมด",
   "status.show_thread": "แสดงกระทู้",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "เลิกปิดเสียงการสนทนา",
   "status.unpin": "ถอนหมุดจากโปรไฟล์",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 697a2cb99..2b843b001 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
   "column.blocks": "Engellenen kullanıcılar",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Yerel zaman tüneli",
   "column.direct": "Doğrudan mesajlar",
   "column.domain_blocks": "Gizli alan adları",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Federe zaman tüneli",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Geri",
   "column_header.hide_settings": "Ayarları gizle",
   "column_header.show_settings": "Ayarları göster",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Bu paylaşım liste dışı olduğu için hiç bir hashtag'de yer almayacak. Sadece herkese açık gönderiler hashtaglerde bulunabilir.",
   "compose_form.lock_disclaimer": "Hesabınız {locked} değil. Sadece takipçilerle paylaştığınız gönderileri görebilmek için sizi herhangi bir kullanıcı takip edebilir.",
   "compose_form.lock_disclaimer.lock": "kilitli",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Aklınızdan ne geçiyor?",
   "compose_form.poll.add_option": "Bir seçenek ekleyin",
   "compose_form.poll.duration": "Anket süresi",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Burada hiç gönderi yok!",
   "empty_column.account_unavailable": "Profil kullanılamıyor",
   "empty_column.blocks": "Henüz bir kullanıcıyı engellemediniz.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Yerel zaman çizelgesi boş. Daha fazla eğlence için herkese açık bir gönderi paylaşın!",
   "empty_column.direct": "Henüz doğrudan mesajınız yok. Bir tane gönderdiğinizde veya aldığınızda burada görünecektir.",
   "empty_column.domain_blocks": "Henüz hiçbir gizli alan adı yok.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Henüz hiçbir kullanıcıyı sessize almadınız.",
   "empty_column.notifications": "Henüz hiçbir bildiriminiz yok. Diğer insanlarla sobhet edebilmek için etkileşime geçebilirsiniz.",
   "empty_column.public": "Burada hiçbir şey yok! Herkese açık bir şeyler yazın veya burayı doldurmak için diğer sunuculardaki kullanıcıları takip edin",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Yetkilendir",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Boost edilenleri göster",
   "home.column_settings.show_replies": "Cevapları göster",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Bu kullanıcıdan bildirimler gizlensin mı?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Yerel zaman tüneli",
   "navigation_bar.compose": "Yeni bir gönderi yazın",
   "navigation_bar.direct": "Direkt Mesajlar",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}g",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "@{name} için denetim arayüzünü açın",
   "status.admin_status": "Denetim arayüzünde bu durumu açın",
   "status.block": "Engelle : @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Boost'u geri al",
   "status.cannot_reblog": "Bu gönderi boost edilemez",
   "status.copy": "Bağlantı durumunu kopyala",
@@ -439,6 +481,7 @@
   "status.show_more": "Daha fazla göster",
   "status.show_more_all": "Hepsi için daha fazla göster",
   "status.show_thread": "Başlığı göster",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Sohbeti aç",
   "status.unpin": "Profilden sabitlemeyi kaldır",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index 31805ad90..2dd633e1a 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.",
   "bundle_modal_error.retry": "Спробувати ще раз",
   "column.blocks": "Заблоковані користувачі",
+  "column.bookmarks": "Bookmarks",
   "column.community": "Локальна стрічка",
   "column.direct": "Прямі повідомлення",
   "column.domain_blocks": "Приховані домени",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "Глобальна стрічка",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Приховати налаштування",
   "column_header.show_settings": "Показати налаштування",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "Цей дмух не буде відображений у жодній стрічці хештеґу, оскільки він прихований. Тільки публічні дмухи можуть бути знайдені за хештеґом.",
   "compose_form.lock_disclaimer": "Ваш акаунт не {locked}. Кожен може підписатися на Вас та бачити Ваші приватні пости.",
   "compose_form.lock_disclaimer.lock": "приватний",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "Що у Вас на думці?",
   "compose_form.poll.add_option": "Додати варіант",
   "compose_form.poll.duration": "Тривалість опитування",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "Тут дмухалок немає!",
   "empty_column.account_unavailable": "Профіль недоступний",
   "empty_column.blocks": "Ви ще не заблокували жодного користувача.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "Локальна стрічка пуста. Напишіть щось, щоб розігріти народ!",
   "empty_column.direct": "У вас ще немає прямих повідомлень. Коли ви відправите чи отримаєте якесь, воно з'явиться тут.",
   "empty_column.domain_blocks": "Тут поки немає прихованих доменів.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "Ви ще не заглушили жодного користувача.",
   "empty_column.notifications": "У вас ще немає сповіщень. Переписуйтесь з іншими користувачами, щоб почати розмову.",
   "empty_column.public": "Тут поки нічого немає! Опублікуйте щось, або вручну підпишіться на користувачів інших інстанцій, щоб заповнити стрічку",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "Авторизувати",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "та {additional}",
   "hashtag.column_header.tag_mode.any": "або {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "Основні",
   "home.column_settings.show_reblogs": "Показувати передмухи",
   "home.column_settings.show_replies": "Показувати відповіді",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "Приховати сповіщення від користувача?",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "Заблоковані користувачі",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "Локальна стрічка",
   "navigation_bar.compose": "Написати новий дмух",
   "navigation_bar.direct": "Прямі повідомлення",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}д",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
   "status.admin_status": "Відкрити цей статус в інтерфейсі модерації",
   "status.block": "Заблокувати @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Відмінити передмухання",
   "status.cannot_reblog": "Цей допис не може бути передмухнутий",
   "status.copy": "Копіювати посилання до статусу",
@@ -439,6 +481,7 @@
   "status.show_more": "Розгорнути",
   "status.show_more_all": "Show more for all",
   "status.show_thread": "Показати ланцюжок",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "Зняти глушення з діалогу",
   "status.unpin": "Відкріпити від профілю",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 836c7ccd2..a6f99e071 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
   "column.blocks": "已屏蔽的用户",
+  "column.bookmarks": "Bookmarks",
   "column.community": "本站时间轴",
   "column.direct": "私信",
   "column.domain_blocks": "已屏蔽的网站",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "跨站公共时间轴",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "返回",
   "column_header.hide_settings": "隐藏设置",
   "column_header.show_settings": "显示设置",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
   "compose_form.lock_disclaimer": "你的帐户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
   "compose_form.lock_disclaimer.lock": "开启保护",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "在想啥？",
   "compose_form.poll.add_option": "添加一个选项",
   "compose_form.poll.duration": "投票持续时间",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "这里没有嘟文！",
   "empty_column.account_unavailable": "个人资料不可用",
   "empty_column.blocks": "你目前没有屏蔽任何用户。",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "你还没有使用过私信。当你发出或者收到私信时，它会在这里显示。",
   "empty_column.domain_blocks": "目前没有被隐藏的站点。",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "你没有隐藏任何用户。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "同意",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "以及 {additional}",
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "基本设置",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知？",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "已屏蔽的用户",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "本站时间轴",
   "navigation_bar.compose": "撰写新嘟文",
   "navigation_bar.direct": "私信",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}天",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "打开 @{name} 的管理界面",
   "status.admin_status": "打开这条嘟文的管理界面",
   "status.block": "屏蔽 @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "取消转嘟",
   "status.cannot_reblog": "这条嘟文不允许被转嘟",
   "status.copy": "复制嘟文链接",
@@ -439,6 +481,7 @@
   "status.show_more": "显示内容",
   "status.show_more_all": "显示所有内容",
   "status.show_thread": "显示全部对话",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "不再隐藏此对话",
   "status.unpin": "在个人资料页面取消置顶",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index c79aa4256..3d4413fe9 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "加載本組件出錯。",
   "bundle_modal_error.retry": "重試",
   "column.blocks": "封鎖用戶",
+  "column.bookmarks": "Bookmarks",
   "column.community": "本站時間軸",
   "column.direct": "個人訊息",
   "column.domain_blocks": "隱藏的服務站",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "跨站時間軸",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "返回",
   "column_header.hide_settings": "隱藏設定",
   "column_header.show_settings": "顯示設定",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "這文章因為不是公開，所以不會被標籤搜索。只有公開的文章才會被標籤搜索。",
   "compose_form.lock_disclaimer": "你的用戶狀態為「{locked}」，任何人都能立即關注你，然後看到「只有關注者能看」的文章。",
   "compose_form.lock_disclaimer.lock": "公共",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "你在想甚麼？",
   "compose_form.poll.add_option": "Add a choice",
   "compose_form.poll.duration": "Poll duration",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "No posts here!",
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "本站時間軸暫時未有內容，快寫一點東西來搶頭香啊！",
   "empty_column.direct": "你沒有個人訊息。當你發出或接收個人訊息，就會在這裡出現。",
   "empty_column.domain_blocks": "There are no hidden domains yet.",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "You haven't muted any users yet.",
   "empty_column.notifications": "你沒有任何通知紀錄，快向其他用戶搭訕吧。",
   "empty_column.public": "跨站時間軸暫時沒有內容！快寫一些公共的文章，或者關注另一些服務站的用戶吧！你和本站、友站的交流，將決定這裏出現的內容。",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "批准",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "隱藏來自這用戶的通知嗎？",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "被你封鎖的用戶",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "本站時間軸",
   "navigation_bar.compose": "Compose new post",
   "navigation_bar.direct": "個人訊息",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number}日",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_status": "Open this post in the moderation interface",
   "status.block": "封鎖 @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "取消轉推",
   "status.cannot_reblog": "這篇文章無法被轉推",
   "status.copy": "Copy link to post",
@@ -439,6 +481,7 @@
   "status.show_more": "顯示更多",
   "status.show_more_all": "顯示更多這類文章",
   "status.show_thread": "Show thread",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "解禁對話",
   "status.unpin": "解除置頂",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index 8a930f6cc..de8b6ae05 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -58,6 +58,7 @@
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
   "column.blocks": "封鎖的使用者",
+  "column.bookmarks": "Bookmarks",
   "column.community": "本機時間軸",
   "column.direct": "私訊",
   "column.domain_blocks": "隱藏的網域",
@@ -72,6 +73,7 @@
   "column.preferences": "Preferences",
   "column.public": "聯邦時間軸",
   "column.security": "Security",
+  "column.soapbox_settings": "Soapbox settings",
   "column_back_button.label": "上一頁",
   "column_header.hide_settings": "隱藏設定",
   "column_header.show_settings": "顯示設定",
@@ -82,6 +84,8 @@
   "compose_form.hashtag_warning": "由於這則嘟文被設定成「不公開」，所以它將不會被列在任何主題標籤下。只有公開的嘟文才能藉主題標籤找到。",
   "compose_form.lock_disclaimer": "您的帳戶尚未{locked}。任何人都能關注您並看到您設定成只有關注者能看的嘟文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
+  "compose_form.markdown.marked": "Post markdown enabled",
+  "compose_form.markdown.unmarked": "Post markdown disabled",
   "compose_form.placeholder": "您正在想些什麼？",
   "compose_form.poll.add_option": "新增選擇",
   "compose_form.poll.duration": "投票期限",
@@ -149,6 +153,7 @@
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人資料",
   "empty_column.blocks": "你還沒有封鎖任何使用者。",
+  "empty_column.bookmarks": "You don't have any bookmarks yet. When you add one, it will show up here.",
   "empty_column.community": "本地時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
   "empty_column.domain_blocks": "尚未隱藏任何網域。",
@@ -165,6 +170,8 @@
   "empty_column.mutes": "你尚未靜音任何使用者。",
   "empty_column.notifications": "您尚未收到任何通知，和別人互動開啟對話吧。",
   "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或著自己關注其他伺服器的使用者後就會有嘟文出現了",
+  "explanation_box.collapse": "Collapse explanation box",
+  "explanation_box.expand": "Expand explanation box",
   "fediverse_tab.explanation_box.explanation": "{site_title} is part of the Fediverse, a social network made up of thousands of independent social media sites (aka \"servers\"). The posts you see here are from 3rd-party servers. You have the freedom to engage with them, or to block any server you don't like. Pay attention to the full username after the second @ symbol to know which server a post is from. To see only {site_title} posts, visit {local}.",
   "fediverse_tab.explanation_box.title": "What is the Fediverse?",
   "follow_request.authorize": "授權",
@@ -192,6 +199,10 @@
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
   "hashtag.column_header.tag_mode.none": "而無需{additional}",
+  "header.about.label": "About",
+  "header.back_to.label": "Back to",
+  "header.home.label": "Home",
+  "header.login.label": "Log in",
   "home.column_settings.basic": "基本",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
@@ -261,6 +272,7 @@
   "mute_modal.hide_notifications": "隱藏來自這位使用者的通知？",
   "navigation_bar.admin_settings": "Admin settings",
   "navigation_bar.blocks": "封鎖使用者",
+  "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.community_timeline": "本機時間軸",
   "navigation_bar.compose": "撰寫新嘟文",
   "navigation_bar.direct": "私訊",
@@ -352,6 +364,8 @@
   "registration.fields.password_placeholder": "Password",
   "registration.fields.username_placeholder": "Username",
   "registration.lead": "With an account on {instance} you'll be able to follow people on any server in the fediverse.",
+  "registration.reason": "Why do you want to join?",
+  "registration.reason_hint": "This will help us review your application",
   "registration.sign_up": "Sign up",
   "registration.tos": "Terms of Service",
   "relative_time.days": "{number} 天",
@@ -400,9 +414,37 @@
   "security.update_password.success": "Password successfully updated.",
   "signup_panel.subtitle": "Sign up now to discuss.",
   "signup_panel.title": "New to {site_title}?",
+  "soapbox_settings.copyright_footer.meta_fields.label_placeholder": "Copyright footer",
+  "soapbox_settings.custom_css.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.fields.auto_play_gif_label": "Auto-play GIFs",
+  "soapbox_settings.fields.banner_label": "Banner",
+  "soapbox_settings.fields.brand_color_label": "Brand color",
+  "soapbox_settings.fields.custom_css.add": "Add new Custom CSS item",
+  "soapbox_settings.fields.custom_css_fields_label": "Custom CSS",
+  "soapbox_settings.fields.home_footer.add": "Add new Home Footer Item",
+  "soapbox_settings.fields.home_footer_fields_label": "Home footer items",
+  "soapbox_settings.fields.logo_label": "Logo",
+  "soapbox_settings.fields.patron_enabled_label": "Patron module",
+  "soapbox_settings.fields.promo_panel.add": "Add new Promo panel item",
+  "soapbox_settings.fields.promo_panel_fields_label": "Promo panel items",
+  "soapbox_settings.hints.auto_play_gif": "Enable auto-playing of GIF files in timeline",
+  "soapbox_settings.hints.banner": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
+  "soapbox_settings.hints.custom_css_fields": "You can have custom CSS definitions",
+  "soapbox_settings.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages",
+  "soapbox_settings.hints.logo": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
+  "soapbox_settings.hints.patron_enabled": "Enables display of Patron module.  Requires installation of Patron module.",
+  "soapbox_settings.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.",
+  "soapbox_settings.hints.promo_panel_icons": "{ link }",
+  "soapbox_settings.home_footer.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.home_footer.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.promo_panel.meta_fields.icon_placeholder": "Icon",
+  "soapbox_settings.promo_panel.meta_fields.label_placeholder": "Label",
+  "soapbox_settings.promo_panel.meta_fields.url_placeholder": "URL",
+  "soapbox_settings.save": "Save",
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_status": "在管理介面開啟此嘟文",
   "status.block": "封鎖 @{name}",
+  "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "取消轉嘟",
   "status.cannot_reblog": "這篇嘟文無法被轉嘟",
   "status.copy": "將連結複製到嘟文中",
@@ -439,6 +481,7 @@
   "status.show_more": "顯示更多",
   "status.show_more_all": "顯示更多這類嘟文",
   "status.show_thread": "顯示討論串",
+  "status.unbookmark": "Remove bookmark",
   "status.unmute_conversation": "解除此對話的靜音",
   "status.unpin": "解除置頂",
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",

From d70aa302b2e2fe44186c80b9cb6b8355d4d26453 Mon Sep 17 00:00:00 2001
From: crockwave <curtis.rock@wirelessmessaging.com>
Date: Fri, 7 Aug 2020 16:58:10 -0500
Subject: [PATCH 04/56] Added suffix to Back to <instance> button on
 public_layout header and created translations

---
 .../public_layout/components/header.js        |   5 +-
 app/soapbox/locales/ar.json                   |  34 ++++
 app/soapbox/locales/ast.json                  |  34 ++++
 app/soapbox/locales/bg.json                   |  34 ++++
 app/soapbox/locales/bn.json                   |  34 ++++
 app/soapbox/locales/br.json                   |  34 ++++
 app/soapbox/locales/ca.json                   |  34 ++++
 app/soapbox/locales/co.json                   |  34 ++++
 app/soapbox/locales/cs.json                   |  34 ++++
 app/soapbox/locales/cy.json                   |  34 ++++
 app/soapbox/locales/da.json                   |  34 ++++
 app/soapbox/locales/de.json                   |  34 ++++
 app/soapbox/locales/defaultMessages.json      | 162 ++++++++++++++++++
 app/soapbox/locales/el.json                   |  34 ++++
 app/soapbox/locales/en.json                   |  34 ++++
 app/soapbox/locales/eo.json                   |  34 ++++
 app/soapbox/locales/es-AR.json                |  34 ++++
 app/soapbox/locales/es.json                   |  34 ++++
 app/soapbox/locales/et.json                   |  34 ++++
 app/soapbox/locales/eu.json                   |  34 ++++
 app/soapbox/locales/fa.json                   |  34 ++++
 app/soapbox/locales/fi.json                   |  34 ++++
 app/soapbox/locales/fr.json                   |  34 ++++
 app/soapbox/locales/ga.json                   |  34 ++++
 app/soapbox/locales/gl.json                   |  34 ++++
 app/soapbox/locales/he.json                   |  34 ++++
 app/soapbox/locales/hi.json                   |  34 ++++
 app/soapbox/locales/hr.json                   |  34 ++++
 app/soapbox/locales/hu.json                   |  34 ++++
 app/soapbox/locales/hy.json                   |  34 ++++
 app/soapbox/locales/id.json                   |  34 ++++
 app/soapbox/locales/io.json                   |  34 ++++
 app/soapbox/locales/it.json                   |  34 ++++
 app/soapbox/locales/ja.json                   |  34 ++++
 app/soapbox/locales/ka.json                   |  34 ++++
 app/soapbox/locales/kk.json                   |  34 ++++
 app/soapbox/locales/ko.json                   |  34 ++++
 app/soapbox/locales/lt.json                   |  34 ++++
 app/soapbox/locales/lv.json                   |  34 ++++
 app/soapbox/locales/mk.json                   |  34 ++++
 app/soapbox/locales/ms.json                   |  34 ++++
 app/soapbox/locales/nl.json                   |  34 ++++
 app/soapbox/locales/nn.json                   |  34 ++++
 app/soapbox/locales/no.json                   |  34 ++++
 app/soapbox/locales/oc.json                   |  34 ++++
 app/soapbox/locales/pl.json                   |  34 ++++
 app/soapbox/locales/pt-BR.json                |  34 ++++
 app/soapbox/locales/pt.json                   |  34 ++++
 app/soapbox/locales/ro.json                   |  34 ++++
 app/soapbox/locales/ru.json                   |  34 ++++
 app/soapbox/locales/sk.json                   |  34 ++++
 app/soapbox/locales/sl.json                   |  34 ++++
 app/soapbox/locales/sq.json                   |  34 ++++
 app/soapbox/locales/sr-Latn.json              |  34 ++++
 app/soapbox/locales/sr.json                   |  34 ++++
 app/soapbox/locales/sv.json                   |  34 ++++
 app/soapbox/locales/ta.json                   |  34 ++++
 app/soapbox/locales/te.json                   |  34 ++++
 app/soapbox/locales/th.json                   |  34 ++++
 app/soapbox/locales/tr.json                   |  34 ++++
 app/soapbox/locales/uk.json                   |  34 ++++
 app/soapbox/locales/zh-CN.json                |  34 ++++
 app/soapbox/locales/zh-HK.json                |  34 ++++
 app/soapbox/locales/zh-TW.json                |  34 ++++
 64 files changed, 2273 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js
index a66a2fca9..14c40d71f 100644
--- a/app/soapbox/features/public_layout/components/header.js
+++ b/app/soapbox/features/public_layout/components/header.js
@@ -17,6 +17,7 @@ const messages = defineMessages({
   home: { id: 'header.home.label', defaultMessage: 'Home' },
   about: { id: 'header.about.label', defaultMessage: 'About' },
   backTo: { id: 'header.back_to.label', defaultMessage: 'Back to' },
+  backToEnding: { id: 'header.back_to_ending.label', defaultMessage: ' ' },
   login: { id: 'header.login.label', defaultMessage: 'Log in' },
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });
@@ -102,13 +103,13 @@ class Header extends ImmutablePureComponent {
           <div className='nav-right'>
             <div className='hidden-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')}</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')} {intl.formatMessage(messages.backToEnding)}</Link>
                 : <LoginForm handleSubmit={this.handleSubmit} isLoading={isLoading} />
               }
             </div>
             <div className='visible-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')}</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')} {intl.formatMessage(messages.backToEnding)}</Link>
                 : <Link className='nav-link nav-button webapp-btn' to='/auth/sign_in'>{intl.formatMessage(messages.login)}</Link>
               }
             </div>
diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index c5ee247d1..9ca1c6d42 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "الرئيسية",
   "column.lists": "القوائم",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "الحسابات المكتومة",
   "column.notifications": "الإخطارات",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "الأساسية",
@@ -260,11 +266,28 @@
   "lists.subheading": "قوائمك",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "تحميل...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "عرض / إخفاء",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "غير موجود",
   "missing_indicator.sublabel": "تعذر العثور على هذا المورد",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "الترقيّات:",
   "notifications.column_settings.show": "اعرِضها في عمود",
   "notifications.column_settings.sound": "أصدر صوتا",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "الكل",
   "notifications.filter.boosts": "الترقيات",
   "notifications.filter.favourites": "المفضلة",
@@ -393,8 +418,12 @@
   "search_results.statuses": "التبويقات",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} و {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index dac6626f8..05ce608a3 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Aniciu",
   "column.lists": "Llistes",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuarios silenciaos",
   "column.notifications": "Avisos",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Les tos llistes",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Cargando...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nun s'alcontró",
   "missing_indicator.sublabel": "Esti recursu nun pudo alcontrase",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Toots compartíos:",
   "notifications.column_settings.show": "Amosar en columna",
   "notifications.column_settings.sound": "Reproducir soníu",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index 674a1a9ac..69cbaf16c 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Начало",
   "column.lists": "Списъци",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Известия",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Зареждане...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Споделяния:",
   "notifications.column_settings.show": "Покажи в колона",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 2c5c08b82..a637c0d63 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "বাড়ি",
   "column.lists": "তালিকাগুলো",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "যাদের কার্যক্রম দেখা বন্ধ আছে",
   "column.notifications": "প্রজ্ঞাপনগুলো",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "সাধারণ",
@@ -260,11 +266,28 @@
   "lists.subheading": "আপনার তালিকা",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "আসছে...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "দৃশ্যতার অবস্থা বদলান",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "খুঁজে পাওয়া যায়নি",
   "missing_indicator.sublabel": "জিনিসটা খুঁজে পাওয়া যায়নি",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "সমর্থনগুলো:",
   "notifications.column_settings.show": "কলামে দেখানো",
   "notifications.column_settings.sound": "শব্দ বাজানো",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "সব",
   "notifications.filter.boosts": "সমর্থনগুলো",
   "notifications.filter.favourites": "পছন্দের গুলো",
@@ -393,8 +418,12 @@
   "search_results.statuses": "টুট",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {ফলাফল} other {ফলাফল}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index b421e7055..7c352bef7 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index e906afa9c..296fb75d3 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Inici",
   "column.lists": "Llistes",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuaris silenciats",
   "column.notifications": "Notificacions",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sense {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Bàsic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Les teves llistes",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Carregant...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Alternar visibilitat",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "No trobat",
   "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar en la columna",
   "notifications.column_settings.sound": "Reproduïr so",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tots",
   "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favorits",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 797e0bef2..354a7d765 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Accolta",
   "column.lists": "Liste",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utilizatori piattati",
   "column.notifications": "Nutificazione",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "senza {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Bàsichi",
@@ -260,11 +266,28 @@
   "lists.subheading": "E vo liste",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Caricamentu...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Cambià a visibilità",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Micca trovu",
   "missing_indicator.sublabel": "Ùn era micca pussivule di truvà sta risorsa",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Spartere:",
   "notifications.column_settings.show": "Mustrà indè a colonna",
   "notifications.column_settings.sound": "Sunà",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tuttu",
   "notifications.filter.boosts": "Spartere",
   "notifications.filter.favourites": "Favuriti",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Statuti",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 1600f9499..0eeab8161 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -68,6 +68,11 @@
   "column.groups": "Skupiny",
   "column.home": "Domů",
   "column.lists": "Seznamy",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Skrytí uživatelé",
   "column.notifications": "Oznámení",
   "column.preferences": "Preference",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Základní",
@@ -260,11 +266,28 @@
   "lists.subheading": "Vaše seznamy",
   "lists.view_all": "Zobrazit všechny seznamy",
   "loading_indicator.label": "Načítám…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Heslo",
   "login.fields.username_placeholder": "Jméno",
   "login.log_in": "Přihlásit se",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Problémy s přihlášením?",
   "media_gallery.toggle_visible": "Přepínat viditelnost",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nenalezeno",
   "missing_indicator.sublabel": "Tento zdroj se nepodařilo najít",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Boosty:",
   "notifications.column_settings.show": "Zobrazit ve sloupci",
   "notifications.column_settings.sound": "Přehrát zvuk",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Vše",
   "notifications.filter.boosts": "Boosty",
   "notifications.filter.favourites": "Oblíbení",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Příspěvky",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {výsledek} few {výsledky} many {výsledku} other {výsledků}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Emailová addresa",
   "security.fields.new_password.label": "Nové heslo",
   "security.fields.old_password.label": "Současné heslo",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Změnit email",
   "security.headers.update_password": "Změnit heslo",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Uložit změny",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index 7119cc115..5095448c5 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hafan",
   "column.lists": "Rhestrau",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Defnyddwyr a ddistewyd",
   "column.notifications": "Hysbysiadau",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "heb {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Syml",
@@ -260,11 +266,28 @@
   "lists.subheading": "Eich rhestrau",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Llwytho...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toglo gwelededd",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Heb ei ganfod",
   "missing_indicator.sublabel": "Ni ellid canfod yr adnodd hwn",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Hybiadau:",
   "notifications.column_settings.show": "Dangos yn y golofn",
   "notifications.column_settings.sound": "Chwarae sain",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Pob",
   "notifications.filter.boosts": "Hybiadau",
   "notifications.filter.favourites": "Ffefrynnau",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tŵtiau",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index a0e6bf859..04a9ca8a2 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hjem",
   "column.lists": "Lister",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Dæmpede brugere",
   "column.notifications": "Notifikationer",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "uden {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Grundlæggende",
@@ -260,11 +266,28 @@
   "lists.subheading": "Dine lister",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Indlæser...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Ændre synlighed",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ikke fundet",
   "missing_indicator.sublabel": "Denne ressource kunne ikke blive fundet",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favoritter",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Trut",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index b9001448d..a9776b20d 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -68,6 +68,11 @@
   "column.groups": "Gruppen",
   "column.home": "Startseite",
   "column.lists": "Listen",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Stummgeschaltete Profile",
   "column.notifications": "Benachrichtigungen",
   "column.preferences": "Einstellungen",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basiseinstellungen",
@@ -260,11 +266,28 @@
   "lists.subheading": "Deine Listen",
   "lists.view_all": "Alle Listen anzeigen",
   "loading_indicator.label": "Wird geladen …",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Passwort",
   "login.fields.username_placeholder": "Nutzername",
   "login.log_in": "Anmelden",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Probleme beim Anmelden?",
   "media_gallery.toggle_visible": "Sichtbarkeit umschalten",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nicht gefunden",
   "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
   "notifications.column_settings.show": "In der Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Alle",
   "notifications.filter.boosts": "Geteilte Beiträge",
   "notifications.filter.favourites": "Favorisierungen",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Beiträge",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Emailaddresse",
   "security.fields.new_password.label": "Neues Passwort",
   "security.fields.old_password.label": "Bisheriges Passwort",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Email ändern",
   "security.headers.update_password": "Passwort ändern",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Änderungen speichern",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index 563385671..132c75a6c 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -931,6 +931,31 @@
     ],
     "path": "app/soapbox/features/auth_login/components/login_form.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+        "id": "login.fields.otp_code_hint"
+      },
+      {
+        "defaultMessage": "Two-factor code:",
+        "id": "login.fields.otp_code_label"
+      },
+      {
+        "defaultMessage": "OTP Login",
+        "id": "login.otp_log_in"
+      },
+      {
+        "defaultMessage": "Invalid code, please try again.",
+        "id": "login.otp_log_in.fail"
+      },
+      {
+        "defaultMessage": "Log in",
+        "id": "login.log_in"
+      }
+    ],
+    "path": "app/soapbox/features/auth_login/components/otp_auth_form.json"
+  },
   {
     "descriptors": [
       {
@@ -2225,6 +2250,10 @@
         "defaultMessage": "Desktop notifications",
         "id": "notifications.column_settings.alert"
       },
+      {
+        "defaultMessage": "Play sound for all notifications",
+        "id": "notifications.column_settings.sounds.all_sounds"
+      },
       {
         "defaultMessage": "Show in column",
         "id": "notifications.column_settings.show"
@@ -2237,6 +2266,10 @@
         "defaultMessage": "Push notifications",
         "id": "notifications.column_settings.push"
       },
+      {
+        "defaultMessage": "Sounds",
+        "id": "notifications.column_settings.sounds"
+      },
       {
         "defaultMessage": "Quick filter bar",
         "id": "notifications.column_settings.filter_bar.category"
@@ -2461,9 +2494,17 @@
         "defaultMessage": "Back to",
         "id": "header.back_to.label"
       },
+      {
+        "defaultMessage": " ",
+        "id": "header.back_to_ending.label"
+      },
       {
         "defaultMessage": "Log in",
         "id": "header.login.label"
+      },
+      {
+        "defaultMessage": "Close",
+        "id": "lightbox.close"
       }
     ],
     "path": "app/soapbox/features/public_layout/components/header.json"
@@ -2601,10 +2642,131 @@
       {
         "defaultMessage": "Account deletion failed.",
         "id": "security.delete_account.fail"
+      },
+      {
+        "defaultMessage": "Set up 2-Factor Auth",
+        "id": "security.mfa"
+      },
+      {
+        "defaultMessage": "Configure multi-factor authentication with OTP",
+        "id": "security.mfa_setup_hint"
+      },
+      {
+        "defaultMessage": "You have multi-factor authentication set up with OTP.",
+        "id": "security.mfa_enabled"
+      },
+      {
+        "defaultMessage": "Disable",
+        "id": "security.disable_mfa"
+      },
+      {
+        "defaultMessage": "Authorization Methods",
+        "id": "security.mfa_header"
       }
     ],
     "path": "app/soapbox/features/security/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Security",
+        "id": "column.security"
+      },
+      {
+        "defaultMessage": "Multi-Factor Authentication",
+        "id": "column.mfa"
+      },
+      {
+        "defaultMessage": "Cancel",
+        "id": "column.mfa_cancel"
+      },
+      {
+        "defaultMessage": "Proceed to Setup",
+        "id": "column.mfa_setup"
+      },
+      {
+        "defaultMessage": "Confirm",
+        "id": "column.mfa_confirm_button"
+      },
+      {
+        "defaultMessage": "Disable",
+        "id": "column.mfa_disable_button"
+      },
+      {
+        "defaultMessage": "Password",
+        "id": "security.fields.password.label"
+      },
+      {
+        "defaultMessage": "Incorrect code or password. Try again.",
+        "id": "security.confirm.fail"
+      },
+      {
+        "defaultMessage": "Failed to fetch setup key",
+        "id": "security.qr.fail"
+      },
+      {
+        "defaultMessage": "Failed to fetch backup codes",
+        "id": "security.codes.fail"
+      },
+      {
+        "defaultMessage": "Incorrect password. Try again.",
+        "id": "security.disable.fail"
+      },
+      {
+        "defaultMessage": "OTP Enabled",
+        "id": "mfa.otp_enabled_title"
+      },
+      {
+        "defaultMessage": "You have enabled two-factor authentication via OTP.",
+        "id": "mfa.otp_enabled_description"
+      },
+      {
+        "defaultMessage": "Enter your current password to disable two-factor auth:",
+        "id": "mfa.mfa_disable_enter_password"
+      },
+      {
+        "defaultMessage": "OTP Disabled",
+        "id": "mfa.setup_otp_title"
+      },
+      {
+        "defaultMessage": "Follow these steps to set up multi-factor authentication on your account with OTP",
+        "id": "mfa.setup_hint"
+      },
+      {
+        "defaultMessage": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+        "id": "mfa.setup_warning"
+      },
+      {
+        "defaultMessage": "Recovery codes",
+        "id": "mfa.setup_recoverycodes"
+      },
+      {
+        "defaultMessage": "Scan",
+        "id": "mfa.mfa_setup_scan_title"
+      },
+      {
+        "defaultMessage": "Using your two-factor app, scan this QR code or enter text key:",
+        "id": "mfa.mfa_setup_scan_description"
+      },
+      {
+        "defaultMessage": "Key:",
+        "id": "mfa.mfa_setup_scan_key"
+      },
+      {
+        "defaultMessage": "Verify",
+        "id": "mfa.mfa_setup_verify_title"
+      },
+      {
+        "defaultMessage": "To enable two-factor authentication, enter the code from your two-factor app:",
+        "id": "mfa.mfa_setup_verify_description"
+      },
+      {
+        "defaultMessage": "Enter your current password to confirm your identity:",
+        "id": "mfa.mfa_setup_enter_password"
+      }
+    ],
+    "path": "app/soapbox/features/security/mfa_form.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 3b827c809..de2947519 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Αρχική",
   "column.lists": "Λίστες",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Αποσιωπημένοι χρήστες",
   "column.notifications": "Ειδοποιήσεις",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Βασικές ρυθμίσεις",
@@ -260,11 +266,28 @@
   "lists.subheading": "Οι λίστες σου",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Φορτώνει...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Εναλλαγή ορατότητας",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Δε βρέθηκε",
   "missing_indicator.sublabel": "Αδύνατη η εύρεση αυτού του πόρου",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Προωθήσεις:",
   "notifications.column_settings.show": "Εμφάνισε σε στήλη",
   "notifications.column_settings.sound": "Ηχητική ειδοποίηση",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Όλες",
   "notifications.filter.boosts": "Προωθήσεις",
   "notifications.filter.favourites": "Αγαπημένα",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Τουτ",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, zero {αποτελέσματα} one {αποτέλεσμα} other {αποτελέσματα}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index ba6df7918..1c1a6d7c3 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Likes",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 4e05276e1..c0251caa3 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hejmo",
   "column.lists": "Listoj",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Silentigitaj uzantoj",
   "column.notifications": "Sciigoj",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sen {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Bazaj agordoj",
@@ -260,11 +266,28 @@
   "lists.subheading": "Viaj listoj",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Ŝargado…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Baskuligi videblecon",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "Ĉi tiu elemento ne estis trovita",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Ĉiuj",
   "notifications.filter.boosts": "Diskonigoj",
   "notifications.filter.favourites": "Stelumoj",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Mesaĝoj",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezultoj}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 1d13d2d64..39d5d20a8 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Principal",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
@@ -260,11 +266,28 @@
   "lists.subheading": "Tus listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Cargando…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "No se encontró",
   "missing_indicator.sublabel": "No se encontró este recurso",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index a26e28b13..d3677cf1a 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Inicio",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuarios silenciados",
   "column.notifications": "Notificaciones",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sin {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
@@ -260,11 +266,28 @@
   "lists.subheading": "Tus listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Cargando…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Cambiar visibilidad",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "No encontrado",
   "missing_indicator.sublabel": "No se encontró este recurso",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Todos",
   "notifications.filter.boosts": "Retoots",
   "notifications.filter.favourites": "Favoritos",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index 8e8b5f509..58fe071f1 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Kodu",
   "column.lists": "Nimekirjad",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Vaigistatud kasutajad",
   "column.notifications": "Teated",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Peamine",
@@ -260,11 +266,28 @@
   "lists.subheading": "Sinu nimistud",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Laeb..",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Lülita nähtavus",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ei leitud",
   "missing_indicator.sublabel": "Seda ressurssi ei leitud",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Upitused:",
   "notifications.column_settings.show": "Kuva tulbas",
   "notifications.column_settings.sound": "Mängi heli",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Kõik",
   "notifications.filter.boosts": "Upitused",
   "notifications.filter.favourites": "Lemmikud",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tuudid",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {tulemus} other {tulemust}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index efae00665..aabdb5306 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hasiera",
   "column.lists": "Zerrendak",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Mutututako erabiltzaileak",
   "column.notifications": "Jakinarazpenak",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "gabe {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Oinarrizkoa",
@@ -260,11 +266,28 @@
   "lists.subheading": "Zure zerrendak",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Kargatzen...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Txandakatu ikusgaitasuna",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ez aurkitua",
   "missing_indicator.sublabel": "Baliabide hau ezin izan da aurkitu",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Bultzadak:",
   "notifications.column_settings.show": "Erakutsi zutabean",
   "notifications.column_settings.sound": "Jo soinua",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Denak",
   "notifications.filter.boosts": "Bultzadak",
   "notifications.filter.favourites": "Gogokoak",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Toot-ak",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {emaitza} other {emaitzak}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index 8abef5053..123106133 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "خانه",
   "column.lists": "فهرست‌ها",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "کاربران بی‌صداشده",
   "column.notifications": "اعلان‌ها",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "اصلی",
@@ -260,11 +266,28 @@
   "lists.subheading": "فهرست‌های شما",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "بارگیری...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "تغییر پیدایی",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "پیدا نشد",
   "missing_indicator.sublabel": "این منبع پیدا نشد",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "بازبوق‌ها:",
   "notifications.column_settings.show": "نمایش در ستون",
   "notifications.column_settings.sound": "پخش صدا",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "همه",
   "notifications.filter.boosts": "بازبوق‌ها",
   "notifications.filter.favourites": "پسندیده‌ها",
@@ -393,8 +418,12 @@
   "search_results.statuses": "بوق‌ها",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 9e5c60405..db8cc59ab 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Koti",
   "column.lists": "Listat",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Mykistetyt käyttäjät",
   "column.notifications": "Ilmoitukset",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Perusasetukset",
@@ -260,11 +266,28 @@
   "lists.subheading": "Omat listat",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Ladataan...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Säädä näkyvyyttä",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ei löytynyt",
   "missing_indicator.sublabel": "Tätä resurssia ei löytynyt",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Buustit:",
   "notifications.column_settings.show": "Näytä sarakkeessa",
   "notifications.column_settings.sound": "Äänimerkki",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Kaikki",
   "notifications.filter.boosts": "Buustit",
   "notifications.filter.favourites": "Suosikit",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tuuttaukset",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {tulos} other {tulosta}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index 336a06f34..03ed1c78b 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Accueil",
   "column.lists": "Listes",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Comptes masqués",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sans {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Base",
@@ -260,11 +266,28 @@
   "lists.subheading": "Vos listes",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Chargement…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Modifier la visibilité",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Non trouvé",
   "missing_indicator.sublabel": "Ressource introuvable",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Émettre un son",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tout",
   "notifications.filter.boosts": "Repartages",
   "notifications.filter.favourites": "Favoris",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Pouets",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index 6cd5aba4e..da848a4d5 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index b8874032d..ffe06b894 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Inicio",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuarias acaladas",
   "column.notifications": "Notificacións",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sen {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
@@ -260,11 +266,28 @@
   "lists.subheading": "As túas listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Cargando...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Ocultar",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Non atopado",
   "missing_indicator.sublabel": "Non se puido atopar o recurso",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Promocións:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir son",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Todo",
   "notifications.filter.boosts": "Promocións",
   "notifications.filter.favourites": "Favoritos",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count,plural,one {result} outros {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index c2e9997cb..cf7538431 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "בבית",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "השתקות",
   "column.notifications": "התראות",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "למתחילים",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "טוען...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "נראה בלתי נראה",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "לא נמצא",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 8d9332eb9..0063ebf44 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index a77faf477..c29e2bf90 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Dom",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utišani korisnici",
   "column.notifications": "Notifikacije",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Učitavam...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Preklopi vidljivost",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nije nađen",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Boostovi:",
   "notifications.column_settings.show": "Prikaži u stupcu",
   "notifications.column_settings.sound": "Sviraj zvuk",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index aaadb693a..6be16efb2 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Kezdőlap",
   "column.lists": "Listák",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Némított felhasználók",
   "column.notifications": "Értesítések",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "nélküle {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Alapértelmezések",
@@ -260,11 +266,28 @@
   "lists.subheading": "Listáid",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Betöltés...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Láthatóság állítása",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nincs találat",
   "missing_indicator.sublabel": "Ez az erőforrás nem található",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Megtolások:",
   "notifications.column_settings.show": "Oszlopban mutatás",
   "notifications.column_settings.sound": "Hang lejátszása",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Mind",
   "notifications.filter.boosts": "Megtolások",
   "notifications.filter.favourites": "Kedvencnek jelölések",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tülkök",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {találat} other {találat}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index a54aa3917..fb5bc9d2e 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Հիմնական",
   "column.lists": "Ցանկեր",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Լռեցրած օգտատերեր",
   "column.notifications": "Ծանուցումներ",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Հիմնական",
@@ -260,11 +266,28 @@
   "lists.subheading": "Քո ցանկերը",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Բեռնվում է…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Ցուցադրել/թաքցնել",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Չգտնվեց",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Տարածածներից՝",
   "notifications.column_settings.show": "Ցուցադրել սյունում",
   "notifications.column_settings.sound": "Ձայն հանել",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {արդյունք} other {արդյունք}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index edb09eb94..361b814b1 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Beranda",
   "column.lists": "List",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Pengguna yang dibisukan",
   "column.notifications": "Notifikasi",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Dasar",
@@ -260,11 +266,28 @@
   "lists.subheading": "Daftar Anda",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Tunggu sebentar...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Tampil/Sembunyikan",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Tidak ditemukan",
   "missing_indicator.sublabel": "Sumber daya tak bisa ditemukan",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Repost:",
   "notifications.column_settings.show": "Tampilkan dalam kolom",
   "notifications.column_settings.sound": "Mainkan suara",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Semua",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorit",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index 3fb947d5e..08dd2a638 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hemo",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Celita uzeri",
   "column.notifications": "Savigi",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Simpla",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Kargante...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Chanjar videbleso",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Repeti:",
   "notifications.column_settings.show": "Montrar en kolumno",
   "notifications.column_settings.sound": "Plear sono",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 11b82e6be..32aa75063 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Liste",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "senza {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Semplice",
@@ -260,11 +266,28 @@
   "lists.subheading": "Le tue liste",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Caricamento...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Imposta visibilità",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Non trovato",
   "missing_indicator.sublabel": "Risorsa non trovata",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Post condivisi:",
   "notifications.column_settings.show": "Mostra in colonna",
   "notifications.column_settings.sound": "Riproduci suono",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tutti",
   "notifications.filter.boosts": "Condivisioni",
   "notifications.filter.favourites": "Apprezzati",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Toot",
   "search_results.top": "Top",
   "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index 18718a074..145982f57 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "ホーム",
   "column.lists": "リスト",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "ミュートしたユーザー",
   "column.notifications": "通知",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "基本設定",
@@ -260,11 +266,28 @@
   "lists.subheading": "あなたのリスト",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "読み込み中...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "表示切り替え",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "見つかりません",
   "missing_indicator.sublabel": "見つかりませんでした",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "ブースト:",
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "すべて",
   "notifications.filter.boosts": "ブースト",
   "notifications.filter.favourites": "お気に入り",
@@ -393,8 +418,12 @@
   "search_results.statuses": "トゥート",
   "search_results.top": "Top",
   "search_results.total": "{count, number}件の結果",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 5413175b0..e9043a36e 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "სახლი",
   "column.lists": "სიები",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "გაჩუმებული მომხმარებლები",
   "column.notifications": "შეტყობინებები",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "ძირითადი",
@@ -260,11 +266,28 @@
   "lists.subheading": "თქვენი სიები",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "იტვირთება...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "ხილვადობის ჩართვა",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "არაა ნაპოვნი",
   "missing_indicator.sublabel": "ამ რესურსის პოვნა ვერ მოხერხდა",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "ბუსტები:",
   "notifications.column_settings.show": "გამოჩნდეს სვეტში",
   "notifications.column_settings.sound": "ხმის დაკვრა",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "ტუტები",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index 69d8b5293..ce4568c28 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Басты бет",
   "column.lists": "Тізімдер",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Үнсіз қолданушылар",
   "column.notifications": "Ескертпелер",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "{additional} болмай",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Негізгі",
@@ -260,11 +266,28 @@
   "lists.subheading": "Тізімдеріңіз",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Жүктеу...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Көрінуді қосу",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Табылмады",
   "missing_indicator.sublabel": "Бұл ресурс табылмады",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Бөлісулер:",
   "notifications.column_settings.show": "Бағанда көрсет",
   "notifications.column_settings.sound": "Дыбысын қос",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Барлығы",
   "notifications.filter.boosts": "Бөлісулер",
   "notifications.filter.favourites": "Таңдаулылар",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Жазбалар",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index b117568be..61e119767 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "홈",
   "column.lists": "리스트",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "뮤트 중인 사용자",
   "column.notifications": "알림",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "({additional}를 제외)",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "기본 설정",
@@ -260,11 +266,28 @@
   "lists.subheading": "당신의 리스트",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "불러오는 중...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "표시 전환",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "찾을 수 없습니다",
   "missing_indicator.sublabel": "이 리소스를 찾을 수 없었습니다",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "부스트:",
   "notifications.column_settings.show": "컬럼에 표시",
   "notifications.column_settings.sound": "효과음 재생",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "모두",
   "notifications.filter.boosts": "부스트",
   "notifications.filter.favourites": "즐겨찾기",
@@ -393,8 +418,12 @@
   "search_results.statuses": "툿",
   "search_results.top": "Top",
   "search_results.total": "{count, number}건의 결과",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index 186b19234..fe42ebddb 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 2c10cbde8..542fe4a27 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Sākums",
   "column.lists": "Saraksti",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Apklusinātie lietotāji",
   "column.notifications": "Paziņojumi",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index c693ff955..bbb1d5404 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Дома",
   "column.lists": "Листа",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Известувања",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 2ac445ac0..408623c2b 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "Lists",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Muted users",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Your lists",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Loading...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index 1fcc20d82..0e1dbcc03 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Start",
   "column.lists": "Lijsten",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Genegeerde gebruikers",
   "column.notifications": "Meldingen",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Algemeen",
@@ -260,11 +266,28 @@
   "lists.subheading": "Jouw lijsten",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Laden…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Media wel/niet tonen",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorieten",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 62e7ffc10..8f23053b0 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Heim",
   "column.lists": "Lister",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Målbindte brukare",
   "column.notifications": "Varslingar",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "uten {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Dine lister",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Laster...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Toggle visibility",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ikkje funne",
   "missing_indicator.sublabel": "Denne ressursen ble ikkje funne",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Framhevinger:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Framhevinger",
   "notifications.filter.favourites": "Favoritter",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index fc172c890..c16e926ca 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hjem",
   "column.lists": "Lister",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Dempede brukere",
   "column.notifications": "Varsler",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Enkel",
@@ -260,11 +266,28 @@
   "lists.subheading": "Dine lister",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Laster...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Veksle synlighet",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ikke funnet",
   "missing_indicator.sublabel": "Denne ressursen ble ikke funnet",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Fremhevet:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spill lyd",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index 6f6bf07f8..c2e3afd9d 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Acuèlh",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Personas rescondudas",
   "column.notifications": "Notificacions",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sens {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Basic",
@@ -260,11 +266,28 @@
   "lists.subheading": "Vòstras listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Cargament…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Modificar la visibilitat",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Pas trobat",
   "missing_indicator.sublabel": "Aquesta ressorsa es pas estada trobada",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Partatges :",
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Totas",
   "notifications.filter.boosts": "Partages",
   "notifications.filter.favourites": "Favorits",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tuts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index d09ffc4fb..b6d245b05 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Strona główna",
   "column.lists": "Listy",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Wyciszeni użytkownicy",
   "column.notifications": "Powiadomienia",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Podstawowe",
@@ -260,11 +266,28 @@
   "lists.subheading": "Twoje listy",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Ładowanie…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Przełącz widoczność",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nie znaleziono",
   "missing_indicator.sublabel": "Nie można odnaleźć tego zasobu",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Podbicia:",
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Wszystkie",
   "notifications.filter.boosts": "Podbicia",
   "notifications.filter.favourites": "Ulubione",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Wpisy",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index e67f98131..3aafe0220 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Página inicial",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Usuários silenciados",
   "column.notifications": "Notificações",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sem {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
@@ -260,11 +266,28 @@
   "lists.subheading": "Suas listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Carregando...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Esconder/Mostrar",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Esse recurso não pôde ser encontrado",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Compartilhamento:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tudo",
   "notifications.filter.boosts": "Compartilhamentos",
   "notifications.filter.favourites": "Favoritos",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index 6abbc9410..cd084e863 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Início",
   "column.lists": "Listas",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utilizadores silenciados",
   "column.notifications": "Notificações",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "sem {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Básico",
@@ -260,11 +266,28 @@
   "lists.subheading": "As tuas listas",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "A carregar...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Mostrar/ocultar",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Não encontrado",
   "missing_indicator.sublabel": "Este recurso não foi encontrado",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Reposts:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Reproduzir som",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Todas",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favoritos",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 23a437bd8..f7e968cea 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Acasă",
   "column.lists": "Liste",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utilizatori opriți",
   "column.notifications": "Notificări",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "fără {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "De bază",
@@ -260,11 +266,28 @@
   "lists.subheading": "Listele tale",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Încărcare...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Comutați vizibilitatea",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nu a fost găsit",
   "missing_indicator.sublabel": "Această resursă nu a putut fi găsită",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Redistribuite:",
   "notifications.column_settings.show": "Arată în coloană",
   "notifications.column_settings.sound": "Redă sunet",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Toate",
   "notifications.filter.boosts": "Redistribuiri",
   "notifications.filter.favourites": "Favorite",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Postări",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 5a7a81836..537967f56 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Главная",
   "column.lists": "Списки",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Список скрытых пользователей",
   "column.notifications": "Уведомления",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "без {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Основные",
@@ -260,11 +266,28 @@
   "lists.subheading": "Ваши списки",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Загрузка...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Показать/скрыть",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Не найдено",
   "missing_indicator.sublabel": "Запрашиваемый ресурс не найден",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Продвижения:",
   "notifications.column_settings.show": "Показывать в колонке",
   "notifications.column_settings.sound": "Проигрывать звук",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Все",
   "notifications.filter.boosts": "Продвижения",
   "notifications.filter.favourites": "Отметки \"нравится\"",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Посты",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index 8fedd96a4..0f7a70153 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Domov",
   "column.lists": "Zoznamy",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Ignorovaní užívatelia",
   "column.notifications": "Oboznámenia",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "bez {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Základné",
@@ -260,11 +266,28 @@
   "lists.subheading": "Tvoje zoznamy",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Načítam...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Zapni/Vypni viditeľnosť",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nenájdené",
   "missing_indicator.sublabel": "Tento zdroj sa ešte nepodarilo nájsť",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Vyzdvihnutia:",
   "notifications.column_settings.show": "Zobraz v stĺpci",
   "notifications.column_settings.sound": "Prehraj zvuk",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Všetky",
   "notifications.filter.boosts": "Vyzdvihnutia",
   "notifications.filter.favourites": "Obľúbené",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Príspevky",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {výsledok} many {výsledkov} other {výsledky}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 39dae4f02..141b4f42e 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Domov",
   "column.lists": "Seznami",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Utišani uporabniki",
   "column.notifications": "Obvestila",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "brez {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
@@ -260,11 +266,28 @@
   "lists.subheading": "Vaši seznami",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Nalaganje...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Preklopi vidljivost",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Ni najdeno",
   "missing_indicator.sublabel": "Tega vira ni bilo mogoče najti",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Spodbude:",
   "notifications.column_settings.show": "Prikaži v stolpcu",
   "notifications.column_settings.sound": "Predvajaj zvok",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Vse",
   "notifications.filter.boosts": "Spodbude",
   "notifications.filter.favourites": "Priljubljeni",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Tuti",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultatov}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 1fcf9c49b..a354d496e 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Kreu",
   "column.lists": "Lista",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Përdorues të heshtuar",
   "column.notifications": "Njoftime",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "pa {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Bazë",
@@ -260,11 +266,28 @@
   "lists.subheading": "Listat tuaja",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Po ngarkohet…",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Ndërroni dukshmërinë",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "S’u gjet",
   "missing_indicator.sublabel": "Ky burim s’u gjet dot",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Përforcime:",
   "notifications.column_settings.show": "Shfaq në shtylla",
   "notifications.column_settings.sound": "Luaj një tingull",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Krejt",
   "notifications.filter.boosts": "Përforcime",
   "notifications.filter.favourites": "Të parapëlqyer",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Mesazhe",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {rezultat} other {rezultate}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index 9f1dc4a58..c711c9987 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Početna",
   "column.lists": "Liste",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Ućutkani korisnici",
   "column.notifications": "Obaveštenja",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Osnovno",
@@ -260,11 +266,28 @@
   "lists.subheading": "Vaše liste",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Učitavam...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Uključi/isključi vidljivost",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Nije pronađeno",
   "missing_indicator.sublabel": "This resource could not be found",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Podrški:",
   "notifications.column_settings.show": "Prikaži u koloni",
   "notifications.column_settings.sound": "Puštaj zvuk",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {rezultat} few {rezultata} other {rezultata}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 17e66daa4..9260e6615 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Почетна",
   "column.lists": "Листе",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Ућуткани корисници",
   "column.notifications": "Обавештења",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Основно",
@@ -260,11 +266,28 @@
   "lists.subheading": "Ваше листе",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Учитавам...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Укључи/искључи видљивост",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Није пронађено",
   "missing_indicator.sublabel": "Овај ресурс није пронађен",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Подршки:",
   "notifications.column_settings.show": "Прикажи у колони",
   "notifications.column_settings.sound": "Пуштај звук",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Трубе",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {резултат} few {резултата} other {резултата}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index cbfd31fe8..c06ebf23d 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Hem",
   "column.lists": "Listor",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Tystade användare",
   "column.notifications": "Meddelanden",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "utan {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Grundläggande",
@@ -260,11 +266,28 @@
   "lists.subheading": "Dina listor",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Laddar...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Växla synlighet",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Hittades inte",
   "missing_indicator.sublabel": "Den här resursen kunde inte hittas",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Knuffar:",
   "notifications.column_settings.show": "Visa i kolumnen",
   "notifications.column_settings.sound": "Spela upp ljud",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Alla",
   "notifications.filter.boosts": "Knuffar",
   "notifications.filter.favourites": "Favoriter",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index 6f4687b05..4d033e28b 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Home",
   "column.lists": "குதிரை வீர்ர்கள்",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "முடக்கப்பட்ட பயனர்கள்",
   "column.notifications": "Notifications",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "இல்லாமல் {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "அடிப்படையான",
@@ -260,11 +266,28 @@
   "lists.subheading": "உங்கள் பட்டியல்கள்",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "ஏற்றுதல்...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "நிலைமாற்று தெரியும்",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "கிடைக்கவில்லை",
   "missing_indicator.sublabel": "இந்த ஆதாரத்தை காண முடியவில்லை",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "மதிப்பை உயர்த்து:",
   "notifications.column_settings.show": "பத்தியில் காண்பி",
   "notifications.column_settings.sound": "ஒலி விளையாட",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "எல்லா",
   "notifications.filter.boosts": "மதிப்பை உயர்த்து",
   "notifications.filter.favourites": "விருப்பத்துக்குகந்த",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Posts",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} மற்ற {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 0b7a674ec..66c0f75c5 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "హోమ్",
   "column.lists": "జాబితాలు",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "మ్యూట్ చేయబడిన వినియోగదారులు",
   "column.notifications": "ప్రకటనలు",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "{additional} లేకుండా",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "ప్రాథమిక",
@@ -260,11 +266,28 @@
   "lists.subheading": "మీ జాబితాలు",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "లోడ్ అవుతోంది...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "దృశ్యమానతను టోగుల్ చేయండి",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "దొరకలేదు",
   "missing_indicator.sublabel": "ఈ వనరు కనుగొనబడలేదు",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "బూస్ట్ లు:",
   "notifications.column_settings.show": "నిలువు వరుసలో చూపు",
   "notifications.column_settings.sound": "ధ్వనిని ప్లే చేయి",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "అన్నీ",
   "notifications.filter.boosts": "బూస్ట్లు",
   "notifications.filter.favourites": "ఇష్టాలు",
@@ -393,8 +418,12 @@
   "search_results.statuses": "టూట్లు",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index f33013378..81c005c47 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "หน้าแรก",
   "column.lists": "รายการ",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "ผู้ใช้ที่ปิดเสียงอยู่",
   "column.notifications": "การแจ้งเตือน",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "พื้นฐาน",
@@ -260,11 +266,28 @@
   "lists.subheading": "รายการของคุณ",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "กำลังโหลด...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "เปิด/ปิดการมองเห็น",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "ไม่พบ",
   "missing_indicator.sublabel": "ไม่พบทรัพยากรนี้",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "การดัน:",
   "notifications.column_settings.show": "แสดงในคอลัมน์",
   "notifications.column_settings.sound": "เล่นเสียง",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "ทั้งหมด",
   "notifications.filter.boosts": "การดัน",
   "notifications.filter.favourites": "รายการโปรด",
@@ -393,8 +418,12 @@
   "search_results.statuses": "โพสต์",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, other {ผลลัพธ์}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 2b843b001..d0c69c2c2 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Anasayfa",
   "column.lists": "Listeler",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Susturulmuş kullanıcılar",
   "column.notifications": "Bildirimler",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Temel",
@@ -260,11 +266,28 @@
   "lists.subheading": "Listeleriniz",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Yükleniyor...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Görünürlüğü değiştir",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Bulunamadı",
   "missing_indicator.sublabel": "Bu kaynak bulunamadı",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Boostlar:",
   "notifications.column_settings.show": "Bildirimlerde göster",
   "notifications.column_settings.sound": "Ses çal",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Tümü",
   "notifications.filter.boosts": "Boostlar",
   "notifications.filter.favourites": "Favoriler",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Gönderiler",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index 2dd633e1a..f488a736f 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "Головна",
   "column.lists": "Списки",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "Заглушені користувачі",
   "column.notifications": "Сповіщення",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "без {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "Основні",
@@ -260,11 +266,28 @@
   "lists.subheading": "Ваші списки",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "Завантаження...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "Показати/приховати",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "Не знайдено",
   "missing_indicator.sublabel": "Ресурс не знайдений",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "Передмухи:",
   "notifications.column_settings.show": "Показати в колонці",
   "notifications.column_settings.sound": "Відтворювати звуки",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "Усі",
   "notifications.filter.boosts": "Передмухи",
   "notifications.filter.favourites": "Улюблені",
@@ -393,8 +418,12 @@
   "search_results.statuses": "Дмухів",
   "search_results.top": "Top",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index a6f99e071..4c6e7d3c6 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "主页",
   "column.lists": "列表",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "已隐藏的用户",
   "column.notifications": "通知",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "基本设置",
@@ -260,11 +266,28 @@
   "lists.subheading": "你的列表",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "加载中……",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "切换显示/隐藏",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "找不到内容",
   "missing_indicator.sublabel": "无法找到此资源",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "当有人转嘟了你的嘟文时：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "全部",
   "notifications.filter.boosts": "转嘟",
   "notifications.filter.favourites": "收藏",
@@ -393,8 +418,12 @@
   "search_results.statuses": "嘟文",
   "search_results.top": "Top",
   "search_results.total": "共 {count, number} 个结果",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index 3d4413fe9..c32c5b0b7 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "主頁",
   "column.lists": "列表",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "靜音名單",
   "column.notifications": "通知",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "without {additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "基本",
@@ -260,11 +266,28 @@
   "lists.subheading": "列表",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "載入中...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "打開或關上",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "找不到內容",
   "missing_indicator.sublabel": "無法找到內容",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "轉推你的文章：",
   "notifications.column_settings.show": "在通知欄顯示",
   "notifications.column_settings.sound": "播放音效",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "All",
   "notifications.filter.boosts": "Reposts",
   "notifications.filter.favourites": "Favorites",
@@ -393,8 +418,12 @@
   "search_results.statuses": "文章",
   "search_results.top": "Top",
   "search_results.total": "{count, number} 項結果",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index de8b6ae05..f7da145c9 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -68,6 +68,11 @@
   "column.groups": "Groups",
   "column.home": "主頁",
   "column.lists": "名單",
+  "column.mfa": "Multi-Factor Authentication",
+  "column.mfa_cancel": "Cancel",
+  "column.mfa_confirm_button": "Confirm",
+  "column.mfa_disable_button": "Disable",
+  "column.mfa_setup": "Proceed to Setup",
   "column.mutes": "被靜音的使用者",
   "column.notifications": "通知",
   "column.preferences": "Preferences",
@@ -201,6 +206,7 @@
   "hashtag.column_header.tag_mode.none": "而無需{additional}",
   "header.about.label": "About",
   "header.back_to.label": "Back to",
+  "header.back_to_ending.label": " ",
   "header.home.label": "Home",
   "header.login.label": "Log in",
   "home.column_settings.basic": "基本",
@@ -260,11 +266,28 @@
   "lists.subheading": "您的名單",
   "lists.view_all": "View all lists",
   "loading_indicator.label": "讀取中...",
+  "login.fields.otp_code_hint": "Enter the two-factor code generated by your phone app or use one of your recovery codes",
+  "login.fields.otp_code_label": "Two-factor code:",
   "login.fields.password_placeholder": "Password",
   "login.fields.username_placeholder": "Username",
   "login.log_in": "Log in",
+  "login.otp_log_in": "OTP Login",
+  "login.otp_log_in.fail": "Invalid code, please try again.",
   "login.reset_password_hint": "Trouble logging in?",
   "media_gallery.toggle_visible": "切換可見性",
+  "mfa.mfa_disable_enter_password": "Enter your current password to disable two-factor auth:",
+  "mfa.mfa_setup_enter_password": "Enter your current password to confirm your identity:",
+  "mfa.mfa_setup_scan_description": "Using your two-factor app, scan this QR code or enter text key:",
+  "mfa.mfa_setup_scan_key": "Key:",
+  "mfa.mfa_setup_scan_title": "Scan",
+  "mfa.mfa_setup_verify_description": "To enable two-factor authentication, enter the code from your two-factor app:",
+  "mfa.mfa_setup_verify_title": "Verify",
+  "mfa.otp_enabled_description": "You have enabled two-factor authentication via OTP.",
+  "mfa.otp_enabled_title": "OTP Enabled",
+  "mfa.setup_hint": "Follow these steps to set up multi-factor authentication on your account with OTP",
+  "mfa.setup_otp_title": "OTP Disabled",
+  "mfa.setup_recoverycodes": "Recovery codes",
+  "mfa.setup_warning": "Write these codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
   "missing_indicator.label": "找不到",
   "missing_indicator.sublabel": "找不到此資源",
   "morefollows.followers_label": "…and {count} more {count, plural, one {follower} other {followers}} on remote sites.",
@@ -313,6 +336,8 @@
   "notifications.column_settings.reblog": "轉嘟：",
   "notifications.column_settings.show": "在欄位中顯示",
   "notifications.column_settings.sound": "播放音效",
+  "notifications.column_settings.sounds": "Sounds",
+  "notifications.column_settings.sounds.all_sounds": "Play sound for all notifications",
   "notifications.filter.all": "全部",
   "notifications.filter.boosts": "轉嘟",
   "notifications.filter.favourites": "最愛",
@@ -393,8 +418,12 @@
   "search_results.statuses": "嘟文",
   "search_results.top": "Top",
   "search_results.total": "{count, number} 項結果",
+  "security.codes.fail": "Failed to fetch backup codes",
+  "security.confirm.fail": "Incorrect code or password. Try again.",
   "security.delete_account.fail": "Account deletion failed.",
   "security.delete_account.success": "Account successfully deleted.",
+  "security.disable.fail": "Incorrect password. Try again.",
+  "security.disable_mfa": "Disable",
   "security.fields.email.label": "Email address",
   "security.fields.new_password.label": "New password",
   "security.fields.old_password.label": "Current password",
@@ -404,6 +433,11 @@
   "security.headers.tokens": "Sessions",
   "security.headers.update_email": "Change Email",
   "security.headers.update_password": "Change Password",
+  "security.mfa": "Set up 2-Factor Auth",
+  "security.mfa_enabled": "You have multi-factor authentication set up with OTP.",
+  "security.mfa_header": "Authorization Methods",
+  "security.mfa_setup_hint": "Configure multi-factor authentication with OTP",
+  "security.qr.fail": "Failed to fetch setup key",
   "security.submit": "Save changes",
   "security.submit.delete": "Delete Account",
   "security.text.delete": "To delete your account, enter your password then click Delete Account. This is a permanent action that cannot be undone. Your account will be destroyed from this server, and a deletion request will be sent to other servers. It's not guaranteed that all servers will purge your account.",

From d8d5186a0172b16539a675b5b723a4784894a108 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 4 Sep 2020 20:17:03 -0500
Subject: [PATCH 05/56] Chats: basic display of attachments

---
 .../chats/components/chat_message_list.js     | 28 +++++++++++++++++--
 app/styles/chats.scss                         |  5 ++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index baa50a08f..d8568d385 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -9,6 +9,8 @@ import { fetchChatMessages } from 'soapbox/actions/chats';
 import emojify from 'soapbox/features/emoji/emoji';
 import classNames from 'classnames';
 import { escape, throttle } from 'lodash';
+import { MediaGallery } from 'soapbox/features/ui/util/async-components';
+import Bundle from 'soapbox/features/ui/components/bundle';
 
 const scrollBottom = (elem) => elem.scrollHeight - elem.offsetHeight - elem.scrollTop;
 
@@ -115,6 +117,21 @@ class ChatMessageList extends ImmutablePureComponent {
     trailing: true,
   });
 
+  maybeRenderMedia = chatMessage => {
+    const attachment = chatMessage.get('attachment');
+    if (!attachment) return null;
+    return (
+      <Bundle fetchComponent={MediaGallery}>
+        {Component => (
+          <Component
+            media={ImmutableList([attachment])}
+            height={100}
+          />
+        )}
+      </Bundle>
+    );
+  }
+
   parsePendingContent = content => {
     return escape(content).replace(/(?:\r\n|\r|\n)/g, '<br>');
   }
@@ -145,12 +162,17 @@ class ChatMessageList extends ImmutablePureComponent {
             })}
             key={chatMessage.get('id')}
           >
-            <span
+            <div
               title={this.getFormattedTimestamp(chatMessage)}
               className='chat-message__bubble'
-              dangerouslySetInnerHTML={{ __html: this.parseContent(chatMessage) }}
               ref={this.setBubbleRef}
-            />
+            >
+              <span
+                className='chat-message__content'
+                dangerouslySetInnerHTML={{ __html: this.parseContent(chatMessage) }}
+              />
+              {this.maybeRenderMedia(chatMessage)}
+            </div>
           </div>
         ))}
       </div>
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 38550ac3b..f49450155 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -290,3 +290,8 @@
     }
   }
 }
+
+.chat-message .media-gallery__item-thumbnail img,
+.chat-message .media-gallery__item-thumbnail .still-image img {
+  object-fit: contain;
+}

From 84e51754813b3aab28ee437d28b5f132721b2005 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 5 Sep 2020 16:39:57 -0500
Subject: [PATCH 06/56] Chats: improve attachments, make modal work

---
 .../features/chats/components/chat_message_list.js |  8 +++++++-
 app/styles/chats.scss                              | 14 +++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index d8568d385..d6acefe2f 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -8,6 +8,7 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { fetchChatMessages } from 'soapbox/actions/chats';
 import emojify from 'soapbox/features/emoji/emoji';
 import classNames from 'classnames';
+import { openModal } from 'soapbox/actions/modal';
 import { escape, throttle } from 'lodash';
 import { MediaGallery } from 'soapbox/features/ui/util/async-components';
 import Bundle from 'soapbox/features/ui/components/bundle';
@@ -117,6 +118,10 @@ class ChatMessageList extends ImmutablePureComponent {
     trailing: true,
   });
 
+  onOpenMedia = (media, index) => {
+    this.props.dispatch(openModal('MEDIA', { media, index }));
+  };
+
   maybeRenderMedia = chatMessage => {
     const attachment = chatMessage.get('attachment');
     if (!attachment) return null;
@@ -125,7 +130,8 @@ class ChatMessageList extends ImmutablePureComponent {
         {Component => (
           <Component
             media={ImmutableList([attachment])}
-            height={100}
+            height={120}
+            onOpenMedia={this.onOpenMedia}
           />
         )}
       </Bundle>
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index f49450155..7d8c7d6fb 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -291,7 +291,15 @@
   }
 }
 
-.chat-message .media-gallery__item-thumbnail img,
-.chat-message .media-gallery__item-thumbnail .still-image img {
-  object-fit: contain;
+.chat-message .media-gallery {
+  height: 120px !important;
+
+  .spoiler-button {
+    display: none;
+  }
+
+  &__item-thumbnail img,
+  &__item-thumbnail .still-image img {
+    object-fit: contain;
+  }
 }

From 6dc38adeaa37993fef4ae647d82d39a0250b24ca Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 5 Sep 2020 21:48:25 -0500
Subject: [PATCH 07/56] Chats: add upload button to chat input

---
 app/soapbox/features/chats/components/chat_box.js |  6 ++++++
 app/styles/chats.scss                             | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index 12b28d513..e307325a5 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -10,6 +10,7 @@ import {
 } from 'soapbox/actions/chats';
 import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import ChatMessageList from './chat_message_list';
+import UploadButton from 'soapbox/features/compose/components/upload_button';
 
 const messages = defineMessages({
   placeholder: { id: 'chat_box.input.placeholder', defaultMessage: 'Send a message…' },
@@ -91,6 +92,10 @@ class ChatBox extends ImmutablePureComponent {
       this.markRead();
   }
 
+  handleFiles = (files) => {
+    // TODO: Upload attachment
+  }
+
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
     if (!chatMessageIds) return null;
@@ -99,6 +104,7 @@ class ChatBox extends ImmutablePureComponent {
       <div className='chat-box' onMouseOver={this.handleHover}>
         <ChatMessageList chatMessageIds={chatMessageIds} chatId={chatId} />
         <div className='chat-box__actions simple_form'>
+          <UploadButton onSelectFile={this.handleFiles} />
           <textarea
             rows={1}
             placeholder={intl.formatMessage(messages.placeholder)}
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 7d8c7d6fb..7af2fb5f8 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -185,6 +185,19 @@
     background: var(--foreground-color);
     margin-top: auto;
     padding: 6px;
+    position: relative;
+
+    .icon-button {
+      position: absolute;
+      right: 10px;
+      top: 8px;
+      width: auto;
+      height: auto;
+      background: transparent !important;
+      border: 0;
+      padding: 0;
+      margin: 0;
+    }
 
     textarea {
       width: 100%;
@@ -192,11 +205,13 @@
       margin: 0;
       box-sizing: border-box;
       padding: 6px;
+      padding-right: 25px;
       background: var(--background-color);
       border: 0;
       border-radius: 6px;
       color: var(--primary-text-color);
       font-size: 15px;
+      overflow: hidden;
     }
   }
 }

From b7295e238f8fad16ffacd8977249d8358c337360 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 12:37:38 -0500
Subject: [PATCH 08/56] Chats: get media uploads working

---
 app/soapbox/features/chats/components/chat_box.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index e307325a5..41ac52b05 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -11,6 +11,7 @@ import {
 import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import ChatMessageList from './chat_message_list';
 import UploadButton from 'soapbox/features/compose/components/upload_button';
+import { uploadMedia } from 'soapbox/actions/media';
 
 const messages = defineMessages({
   placeholder: { id: 'chat_box.input.placeholder', defaultMessage: 'Send a message…' },
@@ -38,11 +39,13 @@ class ChatBox extends ImmutablePureComponent {
 
   state = {
     content: '',
+    media_id: undefined,
   }
 
   sendMessage = () => {
     const { chatId } = this.props;
-    if (this.state.content.length < 1) return;
+    const { content, media_id } = this.state;
+    if (content.length < 1 && !media_id) return;
     this.props.dispatch(sendChatMessage(chatId, this.state));
     this.setState({ content: '' });
   }
@@ -93,7 +96,11 @@ class ChatBox extends ImmutablePureComponent {
   }
 
   handleFiles = (files) => {
-    // TODO: Upload attachment
+    const data = new FormData();
+    data.append('file', files[0]);
+    this.props.dispatch(uploadMedia(data)).then(response => {
+      this.setState({ media_id: response.data.id });
+    }).catch(() => {});
   }
 
   render() {

From afd823fae05d8699d49266ac923888ac13418f81 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 13:55:24 -0500
Subject: [PATCH 09/56] Chats: refactor ChatBox state

---
 .../features/chats/components/chat_box.js     | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index 41ac52b05..7d9f03342 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -12,6 +12,7 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import ChatMessageList from './chat_message_list';
 import UploadButton from 'soapbox/features/compose/components/upload_button';
 import { uploadMedia } from 'soapbox/actions/media';
+import { Map as ImmutableMap } from 'immutable';
 
 const messages = defineMessages({
   placeholder: { id: 'chat_box.input.placeholder', defaultMessage: 'Send a message…' },
@@ -37,22 +38,42 @@ class ChatBox extends ImmutablePureComponent {
     me: PropTypes.node,
   }
 
-  state = {
+  initialParams = {
     content: '',
     media_id: undefined,
   }
 
+  state = {
+    params: ImmutableMap(this.initialParams),
+  }
+
+  setParams = newParams => {
+    const { params } = this.state;
+    this.setState({ params: params.merge(newParams) });
+  }
+
+  clearParams = () => {
+    this.setState({ params: ImmutableMap(this.initialParams) });
+  }
+
   sendMessage = () => {
     const { chatId } = this.props;
-    const { content, media_id } = this.state;
-    if (content.length < 1 && !media_id) return;
-    this.props.dispatch(sendChatMessage(chatId, this.state));
-    this.setState({ content: '' });
+    const { params } = this.state;
+
+    const conds = [
+      params.get('content', '').length > 0,
+      params.get('media_id'),
+    ];
+
+    if (conds.some(c => c)) {
+      this.props.dispatch(sendChatMessage(chatId, params.toJS()));
+      this.clearParams();
+    }
   }
 
   insertLine = () => {
-    const { content } = this.state;
-    this.setState({ content: content + '\n' });
+    const { params } = this.state;
+    this.setParams({ content: params.get('content') + '\n' });
   }
 
   handleKeyDown = (e) => {
@@ -66,7 +87,7 @@ class ChatBox extends ImmutablePureComponent {
   }
 
   handleContentChange = (e) => {
-    this.setState({ content: e.target.value });
+    this.setParams({ content: e.target.value });
   }
 
   markRead = () => {
@@ -99,12 +120,13 @@ class ChatBox extends ImmutablePureComponent {
     const data = new FormData();
     data.append('file', files[0]);
     this.props.dispatch(uploadMedia(data)).then(response => {
-      this.setState({ media_id: response.data.id });
+      this.setParams({ media_id: response.data.id });
     }).catch(() => {});
   }
 
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
+    const { params } = this.state;
     if (!chatMessageIds) return null;
 
     return (
@@ -117,7 +139,7 @@ class ChatBox extends ImmutablePureComponent {
             placeholder={intl.formatMessage(messages.placeholder)}
             onKeyDown={this.handleKeyDown}
             onChange={this.handleContentChange}
-            value={this.state.content}
+            value={params.get('content', '')}
             ref={this.setInputRef}
           />
         </div>

From 01667a005ea4ac1eb4636e829d35efe4db586764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20de=20Castro=20Fernandes?=
 <barbara.dcf@gmail.com>
Date: Sun, 6 Sep 2020 16:08:09 -0300
Subject: [PATCH 10/56] Show file icon and name for other file types

Currently the media preview looks blank when the file type is anything
other than an image, video or audio. This commit inserts a generic file
icon and also a label with the filename for these other extensions.
---
 app/soapbox/components/media_gallery.js  | 14 ++++++++++++++
 app/styles/components/media-gallery.scss |  1 +
 2 files changed, 15 insertions(+)

diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js
index f848a396f..0fc7dcb67 100644
--- a/app/soapbox/components/media_gallery.js
+++ b/app/soapbox/components/media_gallery.js
@@ -142,11 +142,25 @@ class Item extends React.PureComponent {
 
     let thumbnail = '';
 
+    const MAX_FILENAME_LENGTH = 45;
+    const getCroppedFilename = () => {
+      const remoteURL = attachment.get('remote_url');
+      const filenameLastIndex = remoteURL.lastIndexOf('/');
+      const filename = remoteURL.substr(filenameLastIndex + 1);
+      if (filename.length <= MAX_FILENAME_LENGTH)
+        return filename;
+      else
+        return filename.substr(0, MAX_FILENAME_LENGTH/2) + '...' + filename.substr(filename.length - MAX_FILENAME_LENGTH/2);
+    };
+
     if (attachment.get('type') === 'unknown') {
+      const filename = getCroppedFilename();
       return (
         <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ position, float, left, top, right, bottom, height, width: `${width}%` }}>
           <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url')} target='_blank' style={{ cursor: 'pointer' }}>
             <canvas width={32} height={32} ref={this.setCanvasRef} className='media-gallery__preview' />
+            <span className='media-gallery__item__icons'><Icon id='file' /></span>
+            <span className='media-gallery__filename__label'>{filename}</span>
           </a>
         </div>
       );
diff --git a/app/styles/components/media-gallery.scss b/app/styles/components/media-gallery.scss
index 731f361fc..02318c6d8 100644
--- a/app/styles/components/media-gallery.scss
+++ b/app/styles/components/media-gallery.scss
@@ -134,6 +134,7 @@
 }
 
 .media-gallery__gifv__label,
+.media-gallery__filename__label,
 .media-gallery__file-extension__label {
   display: block;
   position: absolute;

From 07f29ebcb94dbb71c420dcac0f9ba3d3b88ed8e6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 14:15:06 -0500
Subject: [PATCH 11/56] Chats: put attachment above content

---
 app/soapbox/features/chats/components/chat_message_list.js | 2 +-
 app/styles/chats.scss                                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index d6acefe2f..2ff423143 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -173,11 +173,11 @@ class ChatMessageList extends ImmutablePureComponent {
               className='chat-message__bubble'
               ref={this.setBubbleRef}
             >
+              {this.maybeRenderMedia(chatMessage)}
               <span
                 className='chat-message__content'
                 dangerouslySetInnerHTML={{ __html: this.parseContent(chatMessage) }}
               />
-              {this.maybeRenderMedia(chatMessage)}
             </div>
           </div>
         ))}
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 7af2fb5f8..e15dd9e90 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -308,6 +308,7 @@
 
 .chat-message .media-gallery {
   height: 120px !important;
+  margin: 4px 0 8px;
 
   .spoiler-button {
     display: none;

From cf0baab6def88ca7efd123c7a0cbe76dfb555e09 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 15:36:47 -0500
Subject: [PATCH 12/56] Chats: add upload progress

---
 .../features/chats/components/chat_box.js     | 21 ++++++++++++++-----
 app/styles/chats.scss                         | 19 +++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index 7d9f03342..89f7008ea 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -13,6 +13,7 @@ import ChatMessageList from './chat_message_list';
 import UploadButton from 'soapbox/features/compose/components/upload_button';
 import { uploadMedia } from 'soapbox/actions/media';
 import { Map as ImmutableMap } from 'immutable';
+import UploadProgress from 'soapbox/features/compose/components/upload_progress';
 
 const messages = defineMessages({
   placeholder: { id: 'chat_box.input.placeholder', defaultMessage: 'Send a message…' },
@@ -45,6 +46,8 @@ class ChatBox extends ImmutablePureComponent {
 
   state = {
     params: ImmutableMap(this.initialParams),
+    isUploading: false,
+    uploadProgress: 0,
   }
 
   setParams = newParams => {
@@ -58,14 +61,14 @@ class ChatBox extends ImmutablePureComponent {
 
   sendMessage = () => {
     const { chatId } = this.props;
-    const { params } = this.state;
+    const { params, isUploading } = this.state;
 
     const conds = [
       params.get('content', '').length > 0,
       params.get('media_id'),
     ];
 
-    if (conds.some(c => c)) {
+    if (!isUploading && conds.some(c => c)) {
       this.props.dispatch(sendChatMessage(chatId, params.toJS()));
       this.clearParams();
     }
@@ -116,22 +119,30 @@ class ChatBox extends ImmutablePureComponent {
       this.markRead();
   }
 
+  onUploadProgress = (e) => {
+    const { loaded, total } = e;
+    this.setState({ uploadProgress: loaded/total });
+  }
+
   handleFiles = (files) => {
+    this.setState({ isUploading: true });
     const data = new FormData();
     data.append('file', files[0]);
-    this.props.dispatch(uploadMedia(data)).then(response => {
-      this.setParams({ media_id: response.data.id });
+    this.props.dispatch(uploadMedia(data, this.onUploadProgress)).then(response => {
+      const newParams = this.state.params.merge({ media_id: response.data.id });
+      this.setState({ params: newParams, isUploading: false });
     }).catch(() => {});
   }
 
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
-    const { params } = this.state;
+    const { params, isUploading, uploadProgress } = this.state;
     if (!chatMessageIds) return null;
 
     return (
       <div className='chat-box' onMouseOver={this.handleHover}>
         <ChatMessageList chatMessageIds={chatMessageIds} chatId={chatId} />
+        <UploadProgress active={isUploading} progress={uploadProgress*100} />
         <div className='chat-box__actions simple_form'>
           <UploadButton onSelectFile={this.handleFiles} />
           <textarea
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index e15dd9e90..00c0e4b94 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -181,6 +181,25 @@
 }
 
 .chat-box {
+  .upload-progress {
+    padding: 0 10px;
+    align-items: center;
+
+    .fa {
+      font-size: 22px;
+    }
+
+    &__message {
+      font-size: 13px;
+      flex: 1;
+      align-items: center;
+    }
+
+    &__backdrop {
+      margin-top: 2px;
+    }
+  }
+
   &__actions {
     background: var(--foreground-color);
     margin-top: auto;

From ed41b13064693c96bedd6016c6db3b3717e3252f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 16:24:34 -0500
Subject: [PATCH 13/56] Chats: refactor ChatBox state yet again, display unsent
 attachment

---
 .../features/chats/components/chat_box.js     | 76 ++++++++++++-------
 1 file changed, 48 insertions(+), 28 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index 89f7008ea..a6befbfd2 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -12,7 +12,6 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import ChatMessageList from './chat_message_list';
 import UploadButton from 'soapbox/features/compose/components/upload_button';
 import { uploadMedia } from 'soapbox/actions/media';
-import { Map as ImmutableMap } from 'immutable';
 import UploadProgress from 'soapbox/features/compose/components/upload_progress';
 
 const messages = defineMessages({
@@ -39,44 +38,48 @@ class ChatBox extends ImmutablePureComponent {
     me: PropTypes.node,
   }
 
-  initialParams = {
+  initialState = () => ({
     content: '',
-    media_id: undefined,
-  }
-
-  state = {
-    params: ImmutableMap(this.initialParams),
+    attachment: undefined,
     isUploading: false,
     uploadProgress: 0,
-  }
+  })
+
+  state = this.initialState()
 
-  setParams = newParams => {
-    const { params } = this.state;
-    this.setState({ params: params.merge(newParams) });
+  clearState = () => {
+    this.setState(this.initialState());
   }
 
-  clearParams = () => {
-    this.setState({ params: ImmutableMap(this.initialParams) });
+  getParams = () => {
+    const { content, attachment } = this.state;
+
+    return {
+      content,
+      media_id: attachment && attachment.id,
+    };
   }
 
   sendMessage = () => {
-    const { chatId } = this.props;
-    const { params, isUploading } = this.state;
+    const { dispatch, chatId } = this.props;
+    const { content, attachment, isUploading } = this.state;
 
     const conds = [
-      params.get('content', '').length > 0,
-      params.get('media_id'),
+      content.length > 0,
+      attachment,
     ];
 
     if (!isUploading && conds.some(c => c)) {
-      this.props.dispatch(sendChatMessage(chatId, params.toJS()));
-      this.clearParams();
+      const params = this.getParams();
+
+      dispatch(sendChatMessage(chatId, params));
+      this.clearState();
     }
   }
 
   insertLine = () => {
-    const { params } = this.state;
-    this.setParams({ content: params.get('content') + '\n' });
+    const { content } = this.state;
+    this.setState({ content: content + '\n' });
   }
 
   handleKeyDown = (e) => {
@@ -90,7 +93,7 @@ class ChatBox extends ImmutablePureComponent {
   }
 
   handleContentChange = (e) => {
-    this.setParams({ content: e.target.value });
+    this.setState({ content: e.target.value });
   }
 
   markRead = () => {
@@ -125,23 +128,40 @@ class ChatBox extends ImmutablePureComponent {
   }
 
   handleFiles = (files) => {
+    const { dispatch } = this.props;
+
     this.setState({ isUploading: true });
+
     const data = new FormData();
     data.append('file', files[0]);
-    this.props.dispatch(uploadMedia(data, this.onUploadProgress)).then(response => {
-      const newParams = this.state.params.merge({ media_id: response.data.id });
-      this.setState({ params: newParams, isUploading: false });
-    }).catch(() => {});
+
+    dispatch(uploadMedia(data, this.onUploadProgress)).then(response => {
+      this.setState({ attachment: response.data, isUploading: false });
+    }).catch(() => {
+      this.setState({ isUploading: false });
+    });
+  }
+
+  renderAttachment = () => {
+    const { attachment } = this.state;
+    if (!attachment) return null;
+
+    return (
+      <div className='chat-box__attachment'>
+        {attachment.preview_url}
+      </div>
+    );
   }
 
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
-    const { params, isUploading, uploadProgress } = this.state;
+    const { content, isUploading, uploadProgress } = this.state;
     if (!chatMessageIds) return null;
 
     return (
       <div className='chat-box' onMouseOver={this.handleHover}>
         <ChatMessageList chatMessageIds={chatMessageIds} chatId={chatId} />
+        {this.renderAttachment()}
         <UploadProgress active={isUploading} progress={uploadProgress*100} />
         <div className='chat-box__actions simple_form'>
           <UploadButton onSelectFile={this.handleFiles} />
@@ -150,7 +170,7 @@ class ChatBox extends ImmutablePureComponent {
             placeholder={intl.formatMessage(messages.placeholder)}
             onKeyDown={this.handleKeyDown}
             onChange={this.handleContentChange}
-            value={params.get('content', '')}
+            value={content}
             ref={this.setInputRef}
           />
         </div>

From 5aef50b89ede5b82bcb5e482407a85b2af17503e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 16:44:19 -0500
Subject: [PATCH 14/56] Composer: refactor filename truncation

---
 app/soapbox/components/media_gallery.js | 16 ++++------------
 app/soapbox/utils/media.js              | 10 ++++++++++
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 app/soapbox/utils/media.js

diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js
index 0fc7dcb67..845b68db2 100644
--- a/app/soapbox/components/media_gallery.js
+++ b/app/soapbox/components/media_gallery.js
@@ -6,6 +6,7 @@ import { is } from 'immutable';
 import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { isIOS } from '../is_mobile';
+import { truncateFilename } from 'soapbox/utils/media';
 import classNames from 'classnames';
 import { decode } from 'blurhash';
 import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio';
@@ -14,6 +15,8 @@ import { getSettings } from 'soapbox/actions/settings';
 import Icon from 'soapbox/components/icon';
 import StillImage from 'soapbox/components/still_image';
 
+const MAX_FILENAME_LENGTH = 45;
+
 const messages = defineMessages({
   toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
 });
@@ -142,19 +145,8 @@ class Item extends React.PureComponent {
 
     let thumbnail = '';
 
-    const MAX_FILENAME_LENGTH = 45;
-    const getCroppedFilename = () => {
-      const remoteURL = attachment.get('remote_url');
-      const filenameLastIndex = remoteURL.lastIndexOf('/');
-      const filename = remoteURL.substr(filenameLastIndex + 1);
-      if (filename.length <= MAX_FILENAME_LENGTH)
-        return filename;
-      else
-        return filename.substr(0, MAX_FILENAME_LENGTH/2) + '...' + filename.substr(filename.length - MAX_FILENAME_LENGTH/2);
-    };
-
     if (attachment.get('type') === 'unknown') {
-      const filename = getCroppedFilename();
+      const filename = truncateFilename(attachment.get('remote_url'), MAX_FILENAME_LENGTH);
       return (
         <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ position, float, left, top, right, bottom, height, width: `${width}%` }}>
           <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url')} target='_blank' style={{ cursor: 'pointer' }}>
diff --git a/app/soapbox/utils/media.js b/app/soapbox/utils/media.js
new file mode 100644
index 000000000..c8266c646
--- /dev/null
+++ b/app/soapbox/utils/media.js
@@ -0,0 +1,10 @@
+export const truncateFilename = (url, maxLength) => {
+  const filename = url.split('/').pop();
+
+  if (filename.length <= maxLength) return filename;
+
+  return [
+    filename.substr(0, maxLength/2),
+    filename.substr(filename.length - maxLength/2),
+  ].join('…');
+};

From 49d2121017f3495dee1d0af3155ff55984f3df45 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 16:50:54 -0500
Subject: [PATCH 15/56] Chats: improve display of images, because we can

---
 app/styles/chats.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 00c0e4b94..62a9424ae 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -326,13 +326,17 @@
 }
 
 .chat-message .media-gallery {
-  height: 120px !important;
+  height: auto !important;
   margin: 4px 0 8px;
 
   .spoiler-button {
     display: none;
   }
 
+  &__preview {
+    background-color: transparent;
+  }
+
   &__item-thumbnail img,
   &__item-thumbnail .still-image img {
     object-fit: contain;

From a02155846dc74a07fe36f018da8e4e076e25f9aa Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 17:09:06 -0500
Subject: [PATCH 16/56] Chats: allow files to be removed before sending

---
 .../features/chats/components/chat_box.js     | 20 ++++++++++++++++---
 app/styles/chats.scss                         | 18 +++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index a6befbfd2..bde2f9dbf 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -13,6 +13,8 @@ import ChatMessageList from './chat_message_list';
 import UploadButton from 'soapbox/features/compose/components/upload_button';
 import { uploadMedia } from 'soapbox/actions/media';
 import UploadProgress from 'soapbox/features/compose/components/upload_progress';
+import { truncateFilename } from 'soapbox/utils/media';
+import IconButton from 'soapbox/components/icon_button';
 
 const messages = defineMessages({
   placeholder: { id: 'chat_box.input.placeholder', defaultMessage: 'Send a message…' },
@@ -24,6 +26,8 @@ const mapStateToProps = (state, { chatId }) => ({
   chatMessageIds: state.getIn(['chat_message_lists', chatId], ImmutableOrderedSet()),
 });
 
+const fileKeyGen = () => Math.floor((Math.random() * 0x10000));
+
 export default @connect(mapStateToProps)
 @injectIntl
 class ChatBox extends ImmutablePureComponent {
@@ -43,6 +47,7 @@ class ChatBox extends ImmutablePureComponent {
     attachment: undefined,
     isUploading: false,
     uploadProgress: 0,
+    resetFileKey: fileKeyGen(),
   })
 
   state = this.initialState()
@@ -122,6 +127,10 @@ class ChatBox extends ImmutablePureComponent {
       this.markRead();
   }
 
+  handleRemoveFile = (e) => {
+    this.setState({ attachment: undefined, resetFileKey: fileKeyGen() });
+  }
+
   onUploadProgress = (e) => {
     const { loaded, total } = e;
     this.setState({ uploadProgress: loaded/total });
@@ -148,14 +157,19 @@ class ChatBox extends ImmutablePureComponent {
 
     return (
       <div className='chat-box__attachment'>
-        {attachment.preview_url}
+        <div className='chat-box__filename'>
+          {truncateFilename(attachment.preview_url, 20)}
+        </div>
+        <div class='chat-box__remove-attachment'>
+          <IconButton icon='remove' onClick={this.handleRemoveFile} />
+        </div>
       </div>
     );
   }
 
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
-    const { content, isUploading, uploadProgress } = this.state;
+    const { content, isUploading, uploadProgress, resetFileKey } = this.state;
     if (!chatMessageIds) return null;
 
     return (
@@ -164,7 +178,7 @@ class ChatBox extends ImmutablePureComponent {
         {this.renderAttachment()}
         <UploadProgress active={isUploading} progress={uploadProgress*100} />
         <div className='chat-box__actions simple_form'>
-          <UploadButton onSelectFile={this.handleFiles} />
+          <UploadButton onSelectFile={this.handleFiles} resetFileKey={resetFileKey} />
           <textarea
             rows={1}
             placeholder={intl.formatMessage(messages.placeholder)}
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 62a9424ae..1f47cd57f 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -184,6 +184,7 @@
   .upload-progress {
     padding: 0 10px;
     align-items: center;
+    height: 25px;
 
     .fa {
       font-size: 22px;
@@ -200,6 +201,23 @@
     }
   }
 
+  &__attachment {
+    display: flex;
+    align-items: center;
+    font-size: 13px;
+    padding: 0 10px;
+    height: 25px;
+
+    .chat-box__remove-attachment {
+      margin-left: auto;
+
+      .icon-button > div {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+
   &__actions {
     background: var(--foreground-color);
     margin-top: auto;

From 024e9209afa3086cab5f1660cac83edca873a5ba Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 17:20:26 -0500
Subject: [PATCH 17/56] Chats: display of non-image attachments

---
 app/soapbox/components/media_gallery.js | 2 +-
 app/styles/chats.scss                   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js
index 845b68db2..3eda57795 100644
--- a/app/soapbox/components/media_gallery.js
+++ b/app/soapbox/components/media_gallery.js
@@ -220,7 +220,7 @@ class Item extends React.PureComponent {
     }
 
     return (
-      <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ position, float, left, top, right, bottom, height, width: `${width}%` }}>
+      <div className={classNames('media-gallery__item', `media-gallery__item--${attachment.get('type')}`, { standalone })} key={attachment.get('id')} style={{ position, float, left, top, right, bottom, height, width: `${width}%` }}>
         <canvas width={32} height={32} ref={this.setCanvasRef} className={classNames('media-gallery__preview', { 'media-gallery__preview--hidden': visible && this.state.loaded })} />
         {visible && thumbnail}
       </div>
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 1f47cd57f..0d882fa02 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -351,6 +351,12 @@
     display: none;
   }
 
+  .media-gallery__item:not(.media-gallery__item--image) {
+    max-width: 100%;
+    width: 120px !important;
+    height: 70px !important;
+  }
+
   &__preview {
     background-color: transparent;
   }

From 60402a74029e0c4527d84f0648ff8618174fc53a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 6 Sep 2020 17:43:16 -0500
Subject: [PATCH 18/56] Chats: add submit button, fixes #356

---
 .../features/chats/components/chat_box.js     | 30 +++++++++++++++----
 app/styles/chats.scss                         |  4 +++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js
index bde2f9dbf..ee2b7cd20 100644
--- a/app/soapbox/features/chats/components/chat_box.js
+++ b/app/soapbox/features/chats/components/chat_box.js
@@ -65,16 +65,22 @@ class ChatBox extends ImmutablePureComponent {
     };
   }
 
-  sendMessage = () => {
-    const { dispatch, chatId } = this.props;
-    const { content, attachment, isUploading } = this.state;
+  canSubmit = () => {
+    const { content, attachment } = this.state;
 
     const conds = [
       content.length > 0,
       attachment,
     ];
 
-    if (!isUploading && conds.some(c => c)) {
+    return conds.some(c => c);
+  }
+
+  sendMessage = () => {
+    const { dispatch, chatId } = this.props;
+    const { isUploading } = this.state;
+
+    if (this.canSubmit() && !isUploading) {
       const params = this.getParams();
 
       dispatch(sendChatMessage(chatId, params));
@@ -167,9 +173,21 @@ class ChatBox extends ImmutablePureComponent {
     );
   }
 
+  renderActionButton = () => {
+    const { resetFileKey } = this.state;
+
+    return this.canSubmit() ? (
+      <div className='chat-box__send'>
+        <IconButton icon='send' size={16} onClick={this.sendMessage} />
+      </div>
+    ) : (
+      <UploadButton onSelectFile={this.handleFiles} resetFileKey={resetFileKey} />
+    );
+  }
+
   render() {
     const { chatMessageIds, chatId, intl } = this.props;
-    const { content, isUploading, uploadProgress, resetFileKey } = this.state;
+    const { content, isUploading, uploadProgress } = this.state;
     if (!chatMessageIds) return null;
 
     return (
@@ -178,7 +196,7 @@ class ChatBox extends ImmutablePureComponent {
         {this.renderAttachment()}
         <UploadProgress active={isUploading} progress={uploadProgress*100} />
         <div className='chat-box__actions simple_form'>
-          <UploadButton onSelectFile={this.handleFiles} resetFileKey={resetFileKey} />
+          {this.renderActionButton()}
           <textarea
             rows={1}
             placeholder={intl.formatMessage(messages.placeholder)}
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 0d882fa02..49719a638 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -236,6 +236,10 @@
       margin: 0;
     }
 
+    .chat-box__send .icon-button {
+      top: 12px;
+    }
+
     textarea {
       width: 100%;
       height: 100%;

From 458bdef63355effb7092feb964568ab2f5e58ed0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20de=20Castro=20Fernandes?=
 <barbara.dcf@gmail.com>
Date: Mon, 7 Sep 2020 15:39:44 -0300
Subject: [PATCH 19/56] Enable empty poll removal by deleting one of its
 options

Previously, the user had to click on the "poll" icon at the bottom of
the compose form in order to remove a poll. This commit changes how poll
options behave so as to enable an empty poll to be removed through the
deletion of either one of its options.

This closes #317.
---
 app/soapbox/features/compose/components/poll_form.js  | 11 ++++++++---
 .../compose/containers/poll_form_container.js         |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/compose/components/poll_form.js b/app/soapbox/features/compose/components/poll_form.js
index efbaa3e19..f0db95f44 100644
--- a/app/soapbox/features/compose/components/poll_form.js
+++ b/app/soapbox/features/compose/components/poll_form.js
@@ -38,6 +38,8 @@ class Option extends React.PureComponent {
     onSuggestionSelected: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     maxChars: PropTypes.number.isRequired,
+    onRemovePoll: PropTypes.func.isRequired,
+    numOptions: PropTypes.number.isRequired,
   };
 
   handleOptionTitleChange = e => {
@@ -45,10 +47,12 @@ class Option extends React.PureComponent {
   };
 
   handleOptionRemove = () => {
-    this.props.onRemove(this.props.index);
+    if (this.props.numOptions > 2)
+      this.props.onRemove(this.props.index);
+    else
+      this.props.onRemovePoll();
   };
 
-
   handleToggleMultiple = e => {
     this.props.onToggleMultiple();
     e.preventDefault();
@@ -95,7 +99,7 @@ class Option extends React.PureComponent {
         </label>
 
         <div className='poll__cancel'>
-          <IconButton disabled={index <= 1} title={intl.formatMessage(messages.remove_option)} icon='times' onClick={this.handleOptionRemove} />
+          <IconButton title={intl.formatMessage(messages.remove_option)} icon='times' onClick={this.handleOptionRemove} />
         </div>
       </li>
     );
@@ -156,6 +160,7 @@ class PollForm extends ImmutablePureComponent {
               isPollMultiple={isMultiple}
               onToggleMultiple={this.handleToggleMultiple}
               maxChars={maxOptionChars}
+              numOptions={options.size}
               {...other}
             />
           ))}
diff --git a/app/soapbox/features/compose/containers/poll_form_container.js b/app/soapbox/features/compose/containers/poll_form_container.js
index dfb3a1af2..9e3cb3c43 100644
--- a/app/soapbox/features/compose/containers/poll_form_container.js
+++ b/app/soapbox/features/compose/containers/poll_form_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import PollForm from '../components/poll_form';
-import { addPollOption, removePollOption, changePollOption, changePollSettings } from '../../../actions/compose';
+import { addPollOption, removePollOption, changePollOption, changePollSettings, removePoll } from '../../../actions/compose';
 import {
   clearComposeSuggestions,
   fetchComposeSuggestions,
@@ -43,6 +43,10 @@ const mapDispatchToProps = dispatch => ({
     dispatch(selectComposeSuggestion(position, token, accountId, path));
   },
 
+  onRemovePoll() {
+    dispatch(removePoll());
+  },
+
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(PollForm);

From 9247f37e75abd41c1338ef5cbc73fa54203d03e2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 7 Sep 2020 16:07:05 -0500
Subject: [PATCH 20/56] Chats: fix #399 scrolling in FireFox

---
 .../chats/components/chat_message_list.js     | 40 ++++++++++++++-----
 app/soapbox/reducers/chat_message_lists.js    |  4 +-
 app/styles/chats.scss                         |  8 +---
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index 2ff423143..826f23b6b 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -13,8 +13,6 @@ import { escape, throttle } from 'lodash';
 import { MediaGallery } from 'soapbox/features/ui/util/async-components';
 import Bundle from 'soapbox/features/ui/components/bundle';
 
-const scrollBottom = (elem) => elem.scrollHeight - elem.offsetHeight - elem.scrollTop;
-
 const makeEmojiMap = record => record.get('emojis', ImmutableList()).reduce((map, emoji) => {
   return map.set(`:${emoji.get('shortcode')}:`, emoji);
 }, ImmutableMap());
@@ -45,12 +43,13 @@ class ChatMessageList extends ImmutablePureComponent {
   }
 
   state = {
+    initialLoad: true,
     isLoading: false,
   }
 
   scrollToBottom = () => {
     if (!this.messagesEnd) return;
-    this.messagesEnd.scrollIntoView();
+    this.messagesEnd.scrollIntoView(false);
   }
 
   setMessageEndRef = (el) => {
@@ -82,22 +81,40 @@ class ChatMessageList extends ImmutablePureComponent {
     });
   }
 
+  isNearBottom = () => {
+    const elem = this.node;
+    if (!elem) return false;
+
+    const scrollBottom = elem.scrollHeight - elem.offsetHeight - elem.scrollTop;
+    return scrollBottom < elem.offsetHeight * 1.5;
+  }
+
   componentDidMount() {
     const { dispatch, chatId } = this.props;
     dispatch(fetchChatMessages(chatId));
 
     this.node.addEventListener('scroll', this.handleScroll);
+    this.scrollToBottom();
   }
 
-  componentDidUpdate(prevProps) {
+  getSnapshotBeforeUpdate(prevProps, prevState) {
+    const { scrollHeight, scrollTop } = this.node;
+    return scrollHeight - scrollTop;
+  }
+
+  componentDidUpdate(prevProps, prevState, scrollBottom) {
+    const { initialLoad } = this.state;
     const oldCount = prevProps.chatMessages.count();
     const newCount = this.props.chatMessages.count();
-    const isNearBottom = scrollBottom(this.node) < 150;
-    const historyAdded = prevProps.chatMessages.getIn([-1, 'id']) !== this.props.chatMessages.getIn([-1, 'id']);
+    const isNearBottom = this.isNearBottom();
+    const historyAdded = prevProps.chatMessages.getIn([0, 'id']) !== this.props.chatMessages.getIn([0, 'id']);
+
+    // Retain scroll bar position when loading old messages
+    this.node.scrollTop = this.node.scrollHeight - scrollBottom;
 
     if (oldCount !== newCount) {
-      if (isNearBottom) this.scrollToBottom();
-      if (historyAdded) this.setState({ isLoading: false });
+      if (isNearBottom || initialLoad) this.scrollToBottom();
+      if (historyAdded) this.setState({ isLoading: false, initialLoad: false });
     }
   }
 
@@ -107,13 +124,14 @@ class ChatMessageList extends ImmutablePureComponent {
 
   handleLoadMore = () => {
     const { dispatch, chatId, chatMessages } = this.props;
-    const maxId = chatMessages.getIn([-1, 'id']);
+    const maxId = chatMessages.getIn([0, 'id']);
     dispatch(fetchChatMessages(chatId, maxId));
     this.setState({ isLoading: true });
   }
 
   handleScroll = throttle(() => {
-    if (this.node.scrollTop < 150 && !this.state.isLoading) this.handleLoadMore();
+    if (this.node.scrollTop < this.node.offsetHeight * 2 && !this.state.isLoading)
+      this.handleLoadMore();
   }, 150, {
     trailing: true,
   });
@@ -159,7 +177,6 @@ class ChatMessageList extends ImmutablePureComponent {
 
     return (
       <div className='chat-messages' ref={this.setRef}>
-        <div style={{ float: 'left', clear: 'both' }} ref={this.setMessageEndRef} />
         {chatMessages.map(chatMessage => (
           <div
             className={classNames('chat-message', {
@@ -181,6 +198,7 @@ class ChatMessageList extends ImmutablePureComponent {
             </div>
           </div>
         ))}
+        <div style={{ float: 'left', clear: 'both' }} ref={this.setMessageEndRef} />
       </div>
     );
   }
diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js
index b584dca72..3e2d1dbae 100644
--- a/app/soapbox/reducers/chat_message_lists.js
+++ b/app/soapbox/reducers/chat_message_lists.js
@@ -10,8 +10,8 @@ import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutabl
 const initialState = ImmutableMap();
 
 const idComparator = (a, b) => {
-  if (a < b) return 1;
-  if (a > b) return -1;
+  if (a < b) return -1;
+  if (a > b) return 1;
   return 0;
 };
 
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 49719a638..c11f122f9 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -99,18 +99,12 @@
 .chat-messages {
   overflow-y: scroll;
   flex: 1;
-  display: flex;
-  flex-direction: column-reverse;
 }
 
 .chat-message {
-  padding: 7px 10px;
+  margin: 14px 10px;
   display: flex;
 
-  &:last-child {
-    padding-top: 14px;
-  }
-
   &__bubble {
     font-size: 15px;
     padding: 4px 10px;

From 54a772190d1402482bd1aac37ea6db387cd2a759 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 7 Sep 2020 16:10:45 -0500
Subject: [PATCH 21/56] Chats: fix send icon on light theme

---
 app/styles/chats.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index c11f122f9..e524de2ab 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -219,6 +219,7 @@
     position: relative;
 
     .icon-button {
+      color: var(--primary-text-color--faint);
       position: absolute;
       right: 10px;
       top: 8px;

From fb35417fe226cd82edeb6d09809aa433bf808089 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 7 Sep 2020 18:42:59 -0500
Subject: [PATCH 22/56] Chats: prevent repeat API calls

---
 .../chats/components/chat_message_list.js         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index 826f23b6b..48937518d 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -102,6 +102,11 @@ class ChatMessageList extends ImmutablePureComponent {
     return scrollHeight - scrollTop;
   }
 
+  restoreScrollPosition = (scrollBottom) => {
+    this.lastComputedScroll = this.node.scrollHeight - scrollBottom;
+    this.node.scrollTop = this.lastComputedScroll;
+  }
+
   componentDidUpdate(prevProps, prevState, scrollBottom) {
     const { initialLoad } = this.state;
     const oldCount = prevProps.chatMessages.count();
@@ -110,7 +115,7 @@ class ChatMessageList extends ImmutablePureComponent {
     const historyAdded = prevProps.chatMessages.getIn([0, 'id']) !== this.props.chatMessages.getIn([0, 'id']);
 
     // Retain scroll bar position when loading old messages
-    this.node.scrollTop = this.node.scrollHeight - scrollBottom;
+    this.restoreScrollPosition(scrollBottom);
 
     if (oldCount !== newCount) {
       if (isNearBottom || initialLoad) this.scrollToBottom();
@@ -130,7 +135,13 @@ class ChatMessageList extends ImmutablePureComponent {
   }
 
   handleScroll = throttle(() => {
-    if (this.node.scrollTop < this.node.offsetHeight * 2 && !this.state.isLoading)
+    const { lastComputedScroll } = this;
+    const { isLoading, initialLoad } = this.state;
+    const { scrollTop, offsetHeight } = this.node;
+    const computedScroll = lastComputedScroll === scrollTop;
+    const nearTop = scrollTop < offsetHeight * 2;
+
+    if (nearTop && !isLoading && !initialLoad && !computedScroll)
       this.handleLoadMore();
   }, 150, {
     trailing: true,

From fdaa9f24ce7f2a5898e80f8a4df24ba2d21ded1a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 7 Sep 2020 18:51:57 -0500
Subject: [PATCH 23/56] Chats: fix position of action icons

---
 app/styles/chats.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index e524de2ab..d5cb4b361 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -222,7 +222,7 @@
       color: var(--primary-text-color--faint);
       position: absolute;
       right: 10px;
-      top: 8px;
+      top: calc(50% - 13px);
       width: auto;
       height: auto;
       background: transparent !important;
@@ -232,7 +232,7 @@
     }
 
     .chat-box__send .icon-button {
-      top: 12px;
+      top: calc(50% - 9px);
     }
 
     textarea {

From 255419a6e99eee42472e627658b08b7b6d0f0bda Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 7 Sep 2020 19:13:59 -0500
Subject: [PATCH 24/56] Chats: display attachments in a shitty letterbox to
 support FireFox

---
 .../chats/components/chat_message_list.js     | 20 ++++++++++---------
 app/styles/chats.scss                         |  8 ++++++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index 48937518d..1cfc41442 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -155,15 +155,17 @@ class ChatMessageList extends ImmutablePureComponent {
     const attachment = chatMessage.get('attachment');
     if (!attachment) return null;
     return (
-      <Bundle fetchComponent={MediaGallery}>
-        {Component => (
-          <Component
-            media={ImmutableList([attachment])}
-            height={120}
-            onOpenMedia={this.onOpenMedia}
-          />
-        )}
-      </Bundle>
+      <div className='chat-message__media'>
+        <Bundle fetchComponent={MediaGallery}>
+          {Component => (
+            <Component
+              media={ImmutableList([attachment])}
+              height={120}
+              onOpenMedia={this.onOpenMedia}
+            />
+          )}
+        </Bundle>
+      </div>
     );
   }
 
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index d5cb4b361..29c2f0c4f 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -342,8 +342,12 @@
   }
 }
 
+.chat-message__media {
+  height: 120px;
+}
+
 .chat-message .media-gallery {
-  height: auto !important;
+  height: 100% !important;
   margin: 4px 0 8px;
 
   .spoiler-button {
@@ -353,7 +357,7 @@
   .media-gallery__item:not(.media-gallery__item--image) {
     max-width: 100%;
     width: 120px !important;
-    height: 70px !important;
+    height: 100% !important;
   }
 
   &__preview {

From 3631d6d61dd7891b568ae291e81e870a621d839e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 14:35:04 -0500
Subject: [PATCH 25/56] Don't hijack scrollbar when status is unmounted, fixes
 #404

---
 app/soapbox/components/status.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index f8d46b043..8acb4e7f5 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -151,14 +151,16 @@ class Status extends ImmutablePureComponent {
   }
 
   componentWillUnmount() {
-    if (this.node && this.props.getScrollPosition) {
-      const position = this.props.getScrollPosition();
-      if (position !== null && this.node.offsetTop < position.top) {
-        requestAnimationFrame(() => {
-          this.props.updateScrollBottom(position.height - position.top);
-        });
-      }
-    }
+    // FIXME: Run this code only when a status is being deleted.
+    //
+    // if (this.node && this.props.getScrollPosition) {
+    //   const position = this.props.getScrollPosition();
+    //   if (position !== null && this.node.offsetTop < position.top) {
+    //     requestAnimationFrame(() => {
+    //       this.props.updateScrollBottom(position.height - position.top);
+    //     });
+    //   }
+    // }
   }
 
   handleToggleMediaVisibility = () => {

From 28e8ab9067d32f24dfd10f19a4d6bbd9a9edfe9e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 14:52:27 -0500
Subject: [PATCH 26/56] Highlight home tab for public timelines, fixes #406

---
 app/soapbox/features/ui/components/tabs_bar.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index e85efa40a..1440e2ae6 100644
--- a/app/soapbox/features/ui/components/tabs_bar.js
+++ b/app/soapbox/features/ui/components/tabs_bar.js
@@ -46,6 +46,11 @@ class TabsBar extends React.PureComponent {
     this.node = ref;
   }
 
+  isHomeActive = (match, location) => {
+    const { pathname } = location;
+    return pathname === '/' || pathname.startsWith('/timeline/');
+  }
+
   getNavLinks() {
     const { intl: { formatMessage }, logo, account } = this.props;
     let links = [];
@@ -57,7 +62,7 @@ class TabsBar extends React.PureComponent {
         </Link>);
     }
     links.push(
-      <NavLink key='home' className='tabs-bar__link' exact to='/' data-preview-title-id='column.home'>
+      <NavLink key='home' className='tabs-bar__link' exact to='/' data-preview-title-id='column.home' isActive={this.isHomeActive}>
         <Icon id='home' />
         <span><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></span>
       </NavLink>);

From fd971f053feaaa5aee4f04587140a4520ff0a9b4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 15:03:26 -0500
Subject: [PATCH 27/56] Scroll detailed status into view, fixes #257

---
 app/soapbox/features/status/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index d82f8c7a1..4f1fe6084 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -418,7 +418,7 @@ class Status extends ImmutablePureComponent {
     }
 
     if (prevProps.status && ancestorsIds && ancestorsIds.size > 0) {
-      const element = this.node.querySelectorAll('.focusable')[ancestorsIds.size - 1];
+      const element = this.node.querySelector('.detailed-status');
 
       window.requestAnimationFrame(() => {
         element.scrollIntoView(true);

From adc98b7ad2265069ce918368e63816bfb2f0e07d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 18:02:26 -0500
Subject: [PATCH 28/56] UserLists: use OrderedSets instead of Lists, fixes #230

---
 app/soapbox/features/blocks/index.js               |  2 +-
 app/soapbox/features/favourites/index.js           |  2 +-
 app/soapbox/features/follow_requests/index.js      |  2 +-
 app/soapbox/features/followers/index.js            |  2 +-
 app/soapbox/features/following/index.js            |  2 +-
 app/soapbox/features/groups/members/index.js       |  2 +-
 .../features/groups/removed_accounts/index.js      |  2 +-
 app/soapbox/features/mutes/index.js                |  2 +-
 app/soapbox/features/reblogs/index.js              |  2 +-
 app/soapbox/reducers/user_lists.js                 | 14 +++++++-------
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/features/blocks/index.js b/app/soapbox/features/blocks/index.js
index ef406e3be..5b34287dd 100644
--- a/app/soapbox/features/blocks/index.js
+++ b/app/soapbox/features/blocks/index.js
@@ -27,7 +27,7 @@ class Blocks extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     hasMore: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
diff --git a/app/soapbox/features/favourites/index.js b/app/soapbox/features/favourites/index.js
index 6715d3121..851a4059a 100644
--- a/app/soapbox/features/favourites/index.js
+++ b/app/soapbox/features/favourites/index.js
@@ -20,7 +20,7 @@ class Favourites extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
   };
 
   componentDidMount() {
diff --git a/app/soapbox/features/follow_requests/index.js b/app/soapbox/features/follow_requests/index.js
index e956e5c34..b0b5d54b8 100644
--- a/app/soapbox/features/follow_requests/index.js
+++ b/app/soapbox/features/follow_requests/index.js
@@ -28,7 +28,7 @@ class FollowRequests extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     hasMore: PropTypes.bool,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     intl: PropTypes.object.isRequired,
   };
 
diff --git a/app/soapbox/features/followers/index.js b/app/soapbox/features/followers/index.js
index 9c70187bc..5b7be99a5 100644
--- a/app/soapbox/features/followers/index.js
+++ b/app/soapbox/features/followers/index.js
@@ -51,7 +51,7 @@ class Followers extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     hasMore: PropTypes.bool,
     diffCount: PropTypes.number,
     isAccount: PropTypes.bool,
diff --git a/app/soapbox/features/following/index.js b/app/soapbox/features/following/index.js
index 302bcfc63..df2f55fb4 100644
--- a/app/soapbox/features/following/index.js
+++ b/app/soapbox/features/following/index.js
@@ -51,7 +51,7 @@ class Following extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     hasMore: PropTypes.bool,
     isAccount: PropTypes.bool,
     unavailable: PropTypes.bool,
diff --git a/app/soapbox/features/groups/members/index.js b/app/soapbox/features/groups/members/index.js
index 72151e146..5629dcfcd 100644
--- a/app/soapbox/features/groups/members/index.js
+++ b/app/soapbox/features/groups/members/index.js
@@ -26,7 +26,7 @@ class GroupMembers extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     hasMore: PropTypes.bool,
   };
 
diff --git a/app/soapbox/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js
index e32637e7c..02f87630d 100644
--- a/app/soapbox/features/groups/removed_accounts/index.js
+++ b/app/soapbox/features/groups/removed_accounts/index.js
@@ -33,7 +33,7 @@ class GroupRemovedAccounts extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     hasMore: PropTypes.bool,
   };
 
diff --git a/app/soapbox/features/mutes/index.js b/app/soapbox/features/mutes/index.js
index 8b7368845..abcfe2ea7 100644
--- a/app/soapbox/features/mutes/index.js
+++ b/app/soapbox/features/mutes/index.js
@@ -28,7 +28,7 @@ class Mutes extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     hasMore: PropTypes.bool,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     intl: PropTypes.object.isRequired,
   };
 
diff --git a/app/soapbox/features/reblogs/index.js b/app/soapbox/features/reblogs/index.js
index 16876419d..67d36ad24 100644
--- a/app/soapbox/features/reblogs/index.js
+++ b/app/soapbox/features/reblogs/index.js
@@ -32,7 +32,7 @@ class Reblogs extends ImmutablePureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
-    accountIds: ImmutablePropTypes.list,
+    accountIds: ImmutablePropTypes.orderedSet,
     status: ImmutablePropTypes.map,
   };
 
diff --git a/app/soapbox/reducers/user_lists.js b/app/soapbox/reducers/user_lists.js
index bb8ce8f1a..9dd079203 100644
--- a/app/soapbox/reducers/user_lists.js
+++ b/app/soapbox/reducers/user_lists.js
@@ -20,7 +20,7 @@ import {
   MUTES_FETCH_SUCCESS,
   MUTES_EXPAND_SUCCESS,
 } from '../actions/mutes';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
 import {
   GROUP_MEMBERS_FETCH_SUCCESS,
   GROUP_MEMBERS_EXPAND_SUCCESS,
@@ -44,7 +44,7 @@ const initialState = ImmutableMap({
 const normalizeList = (state, type, id, accounts, next) => {
   return state.setIn([type, id], ImmutableMap({
     next,
-    items: ImmutableList(accounts.map(item => item.id)),
+    items: ImmutableOrderedSet(accounts.map(item => item.id)),
   }));
 };
 
@@ -65,22 +65,22 @@ export default function userLists(state = initialState, action) {
   case FOLLOWING_EXPAND_SUCCESS:
     return appendToList(state, 'following', action.id, action.accounts, action.next);
   case REBLOGS_FETCH_SUCCESS:
-    return state.setIn(['reblogged_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
+    return state.setIn(['reblogged_by', action.id], ImmutableOrderedSet(action.accounts.map(item => item.id)));
   case FAVOURITES_FETCH_SUCCESS:
-    return state.setIn(['favourited_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
+    return state.setIn(['favourited_by', action.id], ImmutableOrderedSet(action.accounts.map(item => item.id)));
   case FOLLOW_REQUESTS_FETCH_SUCCESS:
-    return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
+    return state.setIn(['follow_requests', 'items'], ImmutableOrderedSet(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
   case FOLLOW_REQUESTS_EXPAND_SUCCESS:
     return state.updateIn(['follow_requests', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
   case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
   case FOLLOW_REQUEST_REJECT_SUCCESS:
     return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.id));
   case BLOCKS_FETCH_SUCCESS:
-    return state.setIn(['blocks', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
+    return state.setIn(['blocks', 'items'], ImmutableOrderedSet(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
   case BLOCKS_EXPAND_SUCCESS:
     return state.updateIn(['blocks', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
   case MUTES_FETCH_SUCCESS:
-    return state.setIn(['mutes', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
+    return state.setIn(['mutes', 'items'], ImmutableOrderedSet(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
   case MUTES_EXPAND_SUCCESS:
     return state.updateIn(['mutes', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
   case GROUP_MEMBERS_FETCH_SUCCESS:

From 1ace723c3e9e7843682f45a5aff415705890348c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 19:21:27 -0500
Subject: [PATCH 29/56] Hovercard: add react-popper

---
 package.json |  2 ++
 yarn.lock    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/package.json b/package.json
index e79c4356c..1c160f1f3 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "^7.3.4",
     "@clusterws/cws": "^0.16.0",
+    "@popperjs/core": "^2.4.4",
     "array-includes": "^3.0.3",
     "autoprefixer": "^9.5.1",
     "axios": "^0.19.0",
@@ -114,6 +115,7 @@
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
+    "react-popper": "^2.2.3",
     "react-redux": "^6.0.1",
     "react-redux-loading-bar": "^4.5.0",
     "react-router-dom": "^4.1.1",
diff --git a/yarn.lock b/yarn.lock
index 561257434..9c95574c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1482,6 +1482,11 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@popperjs/core@^2.4.4":
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398"
+  integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
@@ -9488,6 +9493,11 @@ react-fast-compare@^2.0.4:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9"
   integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==
 
+react-fast-compare@^3.0.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
+  integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
+
 react-helmet@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.0.0.tgz#fcb93ebaca3ba562a686eb2f1f9d46093d83b5f8"
@@ -9615,6 +9625,14 @@ react-overlays@^0.8.3:
     react-transition-group "^2.2.0"
     warning "^3.0.0"
 
+react-popper@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.3.tgz#33d425fa6975d4bd54d9acd64897a89d904b9d97"
+  integrity sha512-mOEiMNT1249js0jJvkrOjyHsGvqcJd3aGW/agkiMoZk3bZ1fXN1wQszIQSjHIai48fE67+zwF8Cs+C4fWqlfjw==
+  dependencies:
+    react-fast-compare "^3.0.1"
+    warning "^4.0.2"
+
 react-redux-loading-bar@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.5.0.tgz#96538d0ba041463d810e213fb54eadbce9628266"
@@ -11874,6 +11892,13 @@ warning@^4.0.1:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"

From 8c9206be3ee610dc77fd6e2e67ddecaba0b0ddc2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 9 Sep 2020 22:00:11 -0500
Subject: [PATCH 30/56] Use a better poll icon

---
 app/soapbox/features/compose/components/poll_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/features/compose/components/poll_button.js b/app/soapbox/features/compose/components/poll_button.js
index 02495e9ca..d774118cc 100644
--- a/app/soapbox/features/compose/components/poll_button.js
+++ b/app/soapbox/features/compose/components/poll_button.js
@@ -39,7 +39,7 @@ class PollButton extends React.PureComponent {
     return (
       <div className='compose-form__poll-button'>
         <IconButton
-          icon='tasks'
+          icon='bar-chart'
           title={intl.formatMessage(active ? messages.remove_poll : messages.add_poll)}
           disabled={disabled}
           onClick={this.handleClick}

From 98a71b3e09fab9057fbcddb351bfc6d3ca50786e Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 10 Sep 2020 18:27:09 -0500
Subject: [PATCH 31/56] Upgrade redux and react-redux to the latest versions

---
 package.json |  4 ++--
 yarn.lock    | 39 +++++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index e79c4356c..952300a2b 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "react-motion": "^0.5.2",
     "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
-    "react-redux": "^6.0.1",
+    "react-redux": "^7.2.1",
     "react-redux-loading-bar": "^4.5.0",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
@@ -124,7 +124,7 @@
     "react-textarea-autosize": "^7.1.0",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
-    "redux": "^4.0.1",
+    "redux": "^4.0.5",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
     "rellax": "^1.7.1",
diff --git a/yarn.lock b/yarn.lock
index 561257434..86d6c1cd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -978,7 +978,7 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
   integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
@@ -992,6 +992,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.5.5":
+  version "7.11.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736"
+  integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.7.2":
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a"
@@ -9563,12 +9570,12 @@ react-intl@^4.6.6:
     intl-messageformat-parser "^5.1.1"
     shallow-equal "^1.2.1"
 
-react-is@^16.12.0, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.8.6, react-is@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2:
+react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
@@ -9623,17 +9630,16 @@ react-redux-loading-bar@^4.5.0:
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.2"
 
-react-redux@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.1.tgz#0d423e2c1cb10ada87293d47e7de7c329623ba4d"
-  integrity sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ==
+react-redux@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985"
+  integrity sha512-T+VfD/bvgGTUA74iW9d2i5THrDQWbweXP0AVNI8tNd1Rk5ch1rnMiJkDD67ejw7YBKM4+REvcvqRuWJb7BLuEg==
   dependencies:
-    "@babel/runtime" "^7.3.1"
+    "@babel/runtime" "^7.5.5"
     hoist-non-react-statics "^3.3.0"
-    invariant "^2.2.4"
     loose-envify "^1.4.0"
     prop-types "^15.7.2"
-    react-is "^16.8.2"
+    react-is "^16.9.0"
 
 react-router-dom@^4.1.1:
   version "4.3.1"
@@ -9931,10 +9937,10 @@ redux-thunk@^2.2.0:
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
   integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
-  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
+redux@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
+  integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
   dependencies:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
@@ -9966,6 +9972,11 @@ regenerator-runtime@^0.13.2:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
   integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
 
+regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+
 regenerator-transform@^0.13.4:
   version "0.13.4"
   resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb"

From 3cff9538e22cc599ec7704ff8341dd33031b1dcd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 10 Sep 2020 18:43:57 -0500
Subject: [PATCH 32/56] Upgrade uglifyjs-webpack-plugin to latest version

---
 package.json          |  2 +-
 webpack/production.js |  4 +---
 yarn.lock             | 44 +++++++++++++++----------------------------
 3 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 952300a2b..af64d3037 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "substring-trie": "^1.0.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uglifyjs-webpack-plugin": "^2.1.2",
+    "uglifyjs-webpack-plugin": "^2.2.0",
     "uuid": "^3.1.0",
     "webpack": "^4.41.2",
     "webpack-assets-manifest": "^3.1.1",
diff --git a/webpack/production.js b/webpack/production.js
index a788e7884..9ed66b400 100644
--- a/webpack/production.js
+++ b/webpack/production.js
@@ -40,9 +40,7 @@ module.exports = merge(sharedConfig, {
         sourceMap: true,
 
         uglifyOptions: {
-          compress: {
-            warnings: false,
-          },
+          warnings: false,
 
           output: {
             comments: false,
diff --git a/yarn.lock b/yarn.lock
index 86d6c1cd4..112457eee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3264,11 +3264,6 @@ commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@~2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -11583,27 +11578,25 @@ ua-parser-js@^0.7.18:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
   integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
 
-uglify-js@^3.0.0:
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
-  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
-  dependencies:
-    commander "~2.17.1"
-    source-map "~0.6.1"
+uglify-js@^3.6.0:
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.4.tgz#dd680f5687bc0d7a93b14a3482d16db6eba2bfbb"
+  integrity sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==
 
-uglifyjs-webpack-plugin@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.1.2.tgz#70e5c38fb2d35ee887949c2a0adb2656c23296d5"
-  integrity sha512-G1fJx2uOAAfvdZ77SVCzmFo6mv8uKaHoZBL9Qq/ciC8r6p0ANOL1uY85fIUiyWXKw5RzAaJYZfNSL58Or2hQ0A==
+uglifyjs-webpack-plugin@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz#e75bc80e7f1937f725954c9b4c5a1e967ea9d0d7"
+  integrity sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg==
   dependencies:
-    cacache "^11.2.0"
-    find-cache-dir "^2.0.0"
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
+    serialize-javascript "^1.7.0"
     source-map "^0.6.1"
-    uglify-js "^3.0.0"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
+    uglify-js "^3.6.0"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
 
 unicode-astral-regex@^1.0.1:
   version "1.0.1"
@@ -12150,13 +12143,6 @@ wordwrap@~1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
-  dependencies:
-    errno "~0.1.7"
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"

From 0c4eae5f10656738dd448f8947b44df6d70e0ca6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 10 Sep 2020 19:09:27 -0500
Subject: [PATCH 33/56] Hovercard: basic Redux+Popper prototype

---
 app/soapbox/actions/profile_hover_card.js     |  9 +++
 app/soapbox/components/profile_hover_card.js  | 76 +++++++++++++++++++
 app/soapbox/components/status.js              | 15 ++--
 app/soapbox/containers/status_container.js    |  5 ++
 app/soapbox/features/ui/index.js              |  2 +
 app/soapbox/reducers/index.js                 |  2 +
 app/soapbox/reducers/profile_hover_card.js    | 16 ++++
 app/styles/components/profile_hover_card.scss |  9 +--
 8 files changed, 121 insertions(+), 13 deletions(-)
 create mode 100644 app/soapbox/actions/profile_hover_card.js
 create mode 100644 app/soapbox/components/profile_hover_card.js
 create mode 100644 app/soapbox/reducers/profile_hover_card.js

diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js
new file mode 100644
index 000000000..7014858ae
--- /dev/null
+++ b/app/soapbox/actions/profile_hover_card.js
@@ -0,0 +1,9 @@
+export const PROFILE_HOVER_CARD_OPEN = 'PROFILE_HOVER_CARD_OPEN';
+
+export function openProfileHoverCard(ref, accountId) {
+  return {
+    type: PROFILE_HOVER_CARD_OPEN,
+    ref,
+    accountId,
+  };
+}
diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
new file mode 100644
index 000000000..c6319d38b
--- /dev/null
+++ b/app/soapbox/components/profile_hover_card.js
@@ -0,0 +1,76 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useSelector, useDispatch } from 'react-redux';
+import { makeGetAccount } from 'soapbox/selectors';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import UserPanel from 'soapbox/features/ui/components/user_panel';
+import ActionButton from 'soapbox/features/ui/components/action_button';
+import { isAdmin, isModerator } from 'soapbox/utils/accounts';
+import Badge from 'soapbox/components/badge';
+import classNames from 'classnames';
+import { fetchRelationships } from 'soapbox/actions/accounts';
+import { usePopper } from 'react-popper';
+
+const getAccount = makeGetAccount();
+
+const getBadges = (account) => {
+  let badges = [];
+  if (isAdmin(account)) badges.push(<Badge key='admin' slug='admin' title='Admin' />);
+  if (isModerator(account)) badges.push(<Badge key='moderator' slug='moderator' title='Moderator' />);
+  if (account.getIn(['patron', 'is_patron'])) badges.push(<Badge key='patron' slug='patron' title='Patron' />);
+  return badges;
+};
+
+export const ProfileHoverCard = ({ visible }) => {
+  const dispatch = useDispatch();
+
+  const [popperElement, setPopperElement] = useState(null);
+
+  const accountId = useSelector(state => state.getIn(['profile_hover_card', 'accountId']));
+  const account = useSelector(state => accountId && getAccount(state, accountId));
+  const targetRef = useSelector(state => state.getIn(['profile_hover_card', 'ref']));
+  const badges = account ? getBadges(account) : [];
+
+  useEffect(() => {
+    if (accountId) dispatch(fetchRelationships([accountId]));
+  }, [dispatch, accountId]);
+
+  const { styles, attributes } = usePopper(targetRef, popperElement);
+
+  if (!account) return null;
+  const accountBio = { __html: account.get('note_emojified') };
+  const followedBy  = account.getIn(['relationship', 'followed_by']);
+
+  return (
+    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper}>
+      <div className='profile-hover-card__container'>
+        {followedBy &&
+          <span className='relationship-tag'>
+            <FormattedMessage id='account.follows_you' defaultMessage='Follows you' />
+          </span>}
+        <div className='profile-hover-card__action-button'><ActionButton account={account} small /></div>
+        <UserPanel className='profile-hover-card__user' accountId={account.get('id')} />
+        {badges.length > 0 &&
+          <div className='profile-hover-card__badges'>
+            {badges}
+          </div>}
+        {account.getIn(['source', 'note'], '').length > 0 &&
+          <div className='profile-hover-card__bio' dangerouslySetInnerHTML={accountBio} />}
+      </div>
+    </div>
+  );
+};
+
+ProfileHoverCard.propTypes = {
+  visible: PropTypes.bool,
+  accountId: PropTypes.string,
+  account: ImmutablePropTypes.map,
+  intl: PropTypes.object.isRequired,
+};
+
+ProfileHoverCard.defaultProps = {
+  visible: true,
+};
+
+export default injectIntl(ProfileHoverCard);
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 8acb4e7f5..d0d182b7d 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -18,7 +18,6 @@ import classNames from 'classnames';
 import Icon from 'soapbox/components/icon';
 import PollContainer from 'soapbox/containers/poll_container';
 import { NavLink } from 'react-router-dom';
-import ProfileHoverCardContainer from '../features/profile_hover_card/profile_hover_card_container';
 import { isMobile } from '../../../app/soapbox/is_mobile';
 import { debounce } from 'lodash';
 import { getDomain } from 'soapbox/utils/accounts';
@@ -82,6 +81,7 @@ class Status extends ImmutablePureComponent {
     onEmbed: PropTypes.func,
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
+    onShowProfileCard: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -257,7 +257,8 @@ class Status extends ImmutablePureComponent {
   }
 
   showProfileCard = debounce(() => {
-    this.setState({ profileCardVisible: true });
+    const { onShowProfileCard, status } = this.props;
+    onShowProfileCard(this.profileNode, status.getIn(['account', 'id']));
   }, 1200);
 
   handleProfileHover = e => {
@@ -283,6 +284,10 @@ class Status extends ImmutablePureComponent {
     this.node = c;
   }
 
+  setProfileRef = c => {
+    this.profileNode = c;
+  }
+
   render() {
     let media = null;
     let poll = null;
@@ -457,7 +462,6 @@ class Status extends ImmutablePureComponent {
     };
 
     const statusUrl = `/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}`;
-    const { profileCardVisible } = this.state;
     const favicon = status.getIn(['account', 'pleroma', 'favicon']);
     const domain = getDomain(status.get('account'));
 
@@ -478,7 +482,7 @@ class Status extends ImmutablePureComponent {
                   <img src={favicon} alt='' title={domain} />
                 </div>}
 
-              <div className='status__profile' onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
+              <div className='status__profile' ref={this.setProfileRef} onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
                 <div className='status__avatar'>
                   <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
                   {statusAvatar}
@@ -486,9 +490,6 @@ class Status extends ImmutablePureComponent {
                 <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
                   <DisplayName account={status.get('account')} others={otherAccounts} />
                 </NavLink>
-                { profileCardVisible &&
-                  <ProfileHoverCardContainer accountId={status.getIn(['account', 'id'])} visible={!isMobile(window.innerWidth)} />
-                }
               </div>
             </div>
 
diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index 02dc76c21..d2ae6f7e6 100644
--- a/app/soapbox/containers/status_container.js
+++ b/app/soapbox/containers/status_container.js
@@ -35,6 +35,7 @@ import {
   groupRemoveStatus,
 } from '../actions/groups';
 import { getSettings } from '../actions/settings';
+import { openProfileHoverCard } from 'soapbox/actions/profile_hover_card';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -206,6 +207,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(groupRemoveStatus(groupId, statusId));
   },
 
+  onShowProfileCard(ref, accountId) {
+    dispatch(openProfileHoverCard(ref, accountId));
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index ff80086ee..3f37ffe40 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -38,6 +38,7 @@ import { Redirect } from 'react-router-dom';
 import Icon from 'soapbox/components/icon';
 import { isStaff } from 'soapbox/utils/accounts';
 import ChatPanes from 'soapbox/features/chats/components/chat_panes';
+import ProfileHoverCard from 'soapbox/components/profile_hover_card';
 
 import {
   Status,
@@ -650,6 +651,7 @@ class UI extends React.PureComponent {
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
           {me && <SidebarMenu />}
           {me && !mobile && <ChatPanes />}
+          <ProfileHoverCard />
         </div>
       </HotKeys>
     );
diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js
index 2caec469a..6f4abdafe 100644
--- a/app/soapbox/reducers/index.js
+++ b/app/soapbox/reducers/index.js
@@ -46,6 +46,7 @@ import admin from './admin';
 import chats from './chats';
 import chat_messages from './chat_messages';
 import chat_message_lists from './chat_message_lists';
+import profile_hover_card from './profile_hover_card';
 
 const reducers = {
   dropdown_menu,
@@ -95,6 +96,7 @@ const reducers = {
   chats,
   chat_messages,
   chat_message_lists,
+  profile_hover_card,
 };
 
 export default combineReducers(reducers);
diff --git a/app/soapbox/reducers/profile_hover_card.js b/app/soapbox/reducers/profile_hover_card.js
new file mode 100644
index 000000000..907142656
--- /dev/null
+++ b/app/soapbox/reducers/profile_hover_card.js
@@ -0,0 +1,16 @@
+import { PROFILE_HOVER_CARD_OPEN } from 'soapbox/actions/profile_hover_card';
+import { Map as ImmutableMap } from 'immutable';
+
+const initialState = ImmutableMap();
+
+export default function profileHoverCard(state = initialState, action) {
+  switch(action.type) {
+  case PROFILE_HOVER_CARD_OPEN:
+    return ImmutableMap({
+      ref: action.ref,
+      accountId: action.accountId,
+    });
+  default:
+    return state;
+  }
+}
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index decb68711..6d2ead6e1 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -15,7 +15,8 @@
   transition-duration: 0.2s;
   width: 320px;
   z-index: 200;
-  left: -10px;
+  top: 0;
+  left: 0;
   padding: 20px;
   margin-bottom: 10px;
 
@@ -24,10 +25,6 @@
     pointer-events: all;
   }
 
-  @media(min-width: 750px) {
-    left: -100px;
-  }
-
   .profile-hover-card__container {
     @include standard-panel;
     position: relative;
@@ -114,7 +111,7 @@
 .detailed-status {
   .profile-hover-card {
     top: 0;
-    left: 60px;
+    left: 0;
   }
 }
 

From 4630a5cd04c95683c65be080839dbe794ecdd8e9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 10 Sep 2020 20:18:04 -0500
Subject: [PATCH 34/56] Hovercard: mouseout clears the card

---
 app/soapbox/actions/profile_hover_card.js           |  7 +++++++
 app/soapbox/components/status.js                    | 13 +++++++------
 app/soapbox/containers/status_container.js          | 11 +++++++++--
 .../features/status/components/detailed_status.js   |  6 +++---
 app/soapbox/reducers/profile_hover_card.js          |  7 ++++++-
 app/styles/components/profile_hover_card.scss       |  1 -
 6 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js
index 7014858ae..83b81d984 100644
--- a/app/soapbox/actions/profile_hover_card.js
+++ b/app/soapbox/actions/profile_hover_card.js
@@ -1,4 +1,5 @@
 export const PROFILE_HOVER_CARD_OPEN = 'PROFILE_HOVER_CARD_OPEN';
+export const PROFILE_HOVER_CARD_CLEAR = 'PROFILE_HOVER_CARD_CLEAR';
 
 export function openProfileHoverCard(ref, accountId) {
   return {
@@ -7,3 +8,9 @@ export function openProfileHoverCard(ref, accountId) {
     accountId,
   };
 }
+
+export function clearProfileHoverCard() {
+  return {
+    type: PROFILE_HOVER_CARD_CLEAR,
+  };
+}
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index d0d182b7d..e81ed9ccb 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -81,7 +81,7 @@ class Status extends ImmutablePureComponent {
     onEmbed: PropTypes.func,
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
-    onShowProfileCard: PropTypes.func,
+    onShowHoverProfileCard: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
@@ -256,17 +256,18 @@ class Status extends ImmutablePureComponent {
     this.handleToggleMediaVisibility();
   }
 
-  showProfileCard = debounce(() => {
-    const { onShowProfileCard, status } = this.props;
-    onShowProfileCard(this.profileNode, status.getIn(['account', 'id']));
+  showProfileHoverCard = debounce(() => {
+    const { onShowProfileHoverCard, status } = this.props;
+    onShowProfileHoverCard(this.profileNode, status.getIn(['account', 'id']));
   }, 1200);
 
   handleProfileHover = e => {
-    if (!isMobile(window.innerWidth)) this.showProfileCard();
+    if (!isMobile(window.innerWidth)) this.showProfileHoverCard();
   }
 
   handleProfileLeave = e => {
-    this.showProfileCard.cancel();
+    this.showProfileHoverCard.cancel();
+    this.props.onClearProfileHoverCard();
     this.setState({ profileCardVisible: false });
   }
 
diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index d2ae6f7e6..015256169 100644
--- a/app/soapbox/containers/status_container.js
+++ b/app/soapbox/containers/status_container.js
@@ -35,7 +35,10 @@ import {
   groupRemoveStatus,
 } from '../actions/groups';
 import { getSettings } from '../actions/settings';
-import { openProfileHoverCard } from 'soapbox/actions/profile_hover_card';
+import {
+  openProfileHoverCard,
+  clearProfileHoverCard,
+} from 'soapbox/actions/profile_hover_card';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -207,10 +210,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(groupRemoveStatus(groupId, statusId));
   },
 
-  onShowProfileCard(ref, accountId) {
+  onShowProfileHoverCard(ref, accountId) {
     dispatch(openProfileHoverCard(ref, accountId));
   },
 
+  onClearProfileHoverCard() {
+    dispatch(clearProfileHoverCard());
+  },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index d58bd7e72..ca3a90b88 100644
--- a/app/soapbox/features/status/components/detailed_status.js
+++ b/app/soapbox/features/status/components/detailed_status.js
@@ -86,16 +86,16 @@ export default class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
-  showProfileCard = debounce(() => {
+  showProfileHoverCard = debounce(() => {
     this.setState({ profileCardVisible: true });
   }, 1200);
 
   handleProfileHover = e => {
-    if (!isMobile(window.innerWidth)) this.showProfileCard();
+    if (!isMobile(window.innerWidth)) this.showProfileHoverCard();
   }
 
   handleProfileLeave = e => {
-    this.showProfileCard.cancel();
+    this.showProfileHoverCard.cancel();
     this.setState({ profileCardVisible: false });
   }
 
diff --git a/app/soapbox/reducers/profile_hover_card.js b/app/soapbox/reducers/profile_hover_card.js
index 907142656..09e3a92fc 100644
--- a/app/soapbox/reducers/profile_hover_card.js
+++ b/app/soapbox/reducers/profile_hover_card.js
@@ -1,4 +1,7 @@
-import { PROFILE_HOVER_CARD_OPEN } from 'soapbox/actions/profile_hover_card';
+import {
+  PROFILE_HOVER_CARD_OPEN,
+  PROFILE_HOVER_CARD_CLEAR,
+} from 'soapbox/actions/profile_hover_card';
 import { Map as ImmutableMap } from 'immutable';
 
 const initialState = ImmutableMap();
@@ -10,6 +13,8 @@ export default function profileHoverCard(state = initialState, action) {
       ref: action.ref,
       accountId: action.accountId,
     });
+  case PROFILE_HOVER_CARD_CLEAR:
+    return ImmutableMap();
   default:
     return state;
   }
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 6d2ead6e1..ded79b5f5 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -17,7 +17,6 @@
   z-index: 200;
   top: 0;
   left: 0;
-  padding: 20px;
   margin-bottom: 10px;
 
   &--visible {

From d8ea37bf5e6650e174c7c23c3a27c6904c31558f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 10 Sep 2020 22:08:17 -0500
Subject: [PATCH 35/56] Hovercard: clear when card is unhovered

---
 app/soapbox/components/profile_hover_card.js  | 20 ++++++++++++++++---
 app/soapbox/components/status.js              |  2 --
 app/styles/components/profile_hover_card.scss |  6 ++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
index c6319d38b..c62a36422 100644
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
@@ -11,6 +11,7 @@ import Badge from 'soapbox/components/badge';
 import classNames from 'classnames';
 import { fetchRelationships } from 'soapbox/actions/accounts';
 import { usePopper } from 'react-popper';
+import { clearProfileHoverCard } from 'soapbox/actions/profile_hover_card';
 
 const getAccount = makeGetAccount();
 
@@ -22,13 +23,19 @@ const getBadges = (account) => {
   return badges;
 };
 
+const handleMouseLeave = (dispatch) => {
+  return e => {
+    dispatch(clearProfileHoverCard());
+  };
+};
+
 export const ProfileHoverCard = ({ visible }) => {
   const dispatch = useDispatch();
 
   const [popperElement, setPopperElement] = useState(null);
 
   const accountId = useSelector(state => state.getIn(['profile_hover_card', 'accountId']));
-  const account = useSelector(state => accountId && getAccount(state, accountId));
+  const account   = useSelector(state => accountId && getAccount(state, accountId));
   const targetRef = useSelector(state => state.getIn(['profile_hover_card', 'ref']));
   const badges = account ? getBadges(account) : [];
 
@@ -36,14 +43,21 @@ export const ProfileHoverCard = ({ visible }) => {
     if (accountId) dispatch(fetchRelationships([accountId]));
   }, [dispatch, accountId]);
 
-  const { styles, attributes } = usePopper(targetRef, popperElement);
+  const { styles, attributes } = usePopper(targetRef, popperElement, {
+    modifiers: [{
+      name: 'offset',
+      options: {
+        offset: [-100, 0],
+      },
+    }],
+  });
 
   if (!account) return null;
   const accountBio = { __html: account.get('note_emojified') };
   const followedBy  = account.getIn(['relationship', 'followed_by']);
 
   return (
-    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper}>
+    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper} onMouseLeave={handleMouseLeave(dispatch)}>
       <div className='profile-hover-card__container'>
         {followedBy &&
           <span className='relationship-tag'>
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index e81ed9ccb..275603bcc 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -108,7 +108,6 @@ class Status extends ImmutablePureComponent {
   state = {
     showMedia: defaultMediaVisibility(this.props.status, this.props.displayMedia),
     statusId: undefined,
-    profileCardVisible: false,
   };
 
   // Track height changes we know about to compensate scrolling
@@ -268,7 +267,6 @@ class Status extends ImmutablePureComponent {
   handleProfileLeave = e => {
     this.showProfileHoverCard.cancel();
     this.props.onClearProfileHoverCard();
-    this.setState({ profileCardVisible: false });
   }
 
   _properStatus() {
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index ded79b5f5..47a5242a2 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -125,3 +125,9 @@
     display: block;
   }
 }
+
+/* Hide the popper when the reference is hidden */
+#popper[data-popper-reference-hidden] {
+  visibility: hidden;
+  pointer-events: none;
+}

From 73dd125094950da59c1cf89548734c5c5c4589ca Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 09:30:48 -0500
Subject: [PATCH 36/56] Run yarn manage:translations

---
 app/soapbox/locales/ar.json              |  6 +++
 app/soapbox/locales/ast.json             |  6 +++
 app/soapbox/locales/bg.json              |  6 +++
 app/soapbox/locales/bn.json              |  6 +++
 app/soapbox/locales/br.json              |  6 +++
 app/soapbox/locales/ca.json              |  6 +++
 app/soapbox/locales/co.json              |  6 +++
 app/soapbox/locales/cs.json              |  6 +++
 app/soapbox/locales/cy.json              |  6 +++
 app/soapbox/locales/da.json              |  6 +++
 app/soapbox/locales/de.json              |  6 +++
 app/soapbox/locales/defaultMessages.json | 68 +++++++++++++++++++++---
 app/soapbox/locales/el.json              |  6 +++
 app/soapbox/locales/en.json              |  6 +++
 app/soapbox/locales/eo.json              |  6 +++
 app/soapbox/locales/es-AR.json           |  6 +++
 app/soapbox/locales/es.json              |  6 +++
 app/soapbox/locales/et.json              |  6 +++
 app/soapbox/locales/eu.json              |  6 +++
 app/soapbox/locales/fa.json              |  6 +++
 app/soapbox/locales/fi.json              |  6 +++
 app/soapbox/locales/fr.json              |  6 +++
 app/soapbox/locales/ga.json              |  6 +++
 app/soapbox/locales/gl.json              |  6 +++
 app/soapbox/locales/he.json              |  6 +++
 app/soapbox/locales/hi.json              |  6 +++
 app/soapbox/locales/hr.json              |  6 +++
 app/soapbox/locales/hu.json              |  6 +++
 app/soapbox/locales/hy.json              |  6 +++
 app/soapbox/locales/id.json              |  6 +++
 app/soapbox/locales/io.json              |  6 +++
 app/soapbox/locales/it.json              |  6 +++
 app/soapbox/locales/ja.json              |  6 +++
 app/soapbox/locales/ka.json              |  6 +++
 app/soapbox/locales/kk.json              |  6 +++
 app/soapbox/locales/ko.json              |  6 +++
 app/soapbox/locales/lt.json              |  6 +++
 app/soapbox/locales/lv.json              |  6 +++
 app/soapbox/locales/mk.json              |  6 +++
 app/soapbox/locales/ms.json              |  6 +++
 app/soapbox/locales/nl.json              |  6 +++
 app/soapbox/locales/nn.json              |  6 +++
 app/soapbox/locales/no.json              |  6 +++
 app/soapbox/locales/oc.json              |  6 +++
 app/soapbox/locales/pl.json              |  6 +++
 app/soapbox/locales/pt-BR.json           |  6 +++
 app/soapbox/locales/pt.json              |  6 +++
 app/soapbox/locales/ro.json              |  6 +++
 app/soapbox/locales/ru.json              |  6 +++
 app/soapbox/locales/sk.json              |  6 +++
 app/soapbox/locales/sl.json              |  6 +++
 app/soapbox/locales/sq.json              |  6 +++
 app/soapbox/locales/sr-Latn.json         |  6 +++
 app/soapbox/locales/sr.json              |  6 +++
 app/soapbox/locales/sv.json              |  6 +++
 app/soapbox/locales/ta.json              |  6 +++
 app/soapbox/locales/te.json              |  6 +++
 app/soapbox/locales/th.json              |  6 +++
 app/soapbox/locales/tr.json              |  6 +++
 app/soapbox/locales/uk.json              |  6 +++
 app/soapbox/locales/zh-CN.json           |  6 +++
 app/soapbox/locales/zh-HK.json           |  6 +++
 app/soapbox/locales/zh-TW.json           |  6 +++
 63 files changed, 432 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index a9197b3e6..c85ec3160 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "أغلق",
   "bundle_modal_error.message": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.",
   "bundle_modal_error.retry": "إعادة المحاولة",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "الحسابات المحجوبة",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "الخيط العام المحلي",
   "column.direct": "الرسائل المباشرة",
   "column.domain_blocks": "النطاقات المخفية",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "الخيط العام الموحد",
   "navigation_bar.security": "الأمان",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "أُعجِب {name} بمنشورك",
   "notification.follow": "{name} يتابعك",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "إلغاء الاقتراح",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "الرئيسية",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "الإخطارات",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index f6bc1596f..136587af9 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloquiaos",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Llinia temporal llocal",
   "column.direct": "Mensaxes direutos",
   "column.domain_blocks": "Dominios anubríos",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Llinia temporal federada",
   "navigation_bar.security": "Seguranza",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} siguióte",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Aniciu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Avisos",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index ce6fe0139..0384c7b00 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Публичен канал",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} хареса твоята публикация",
   "notification.follow": "{name} те последва",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Начало",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Известия",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index aeb4b0ce0..00f2fbec4 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "বন্ধ করুন",
   "bundle_modal_error.message": "এই অংশটি দেখাতে যেয়ে কোনো সমস্যা হয়েছে।",
   "bundle_modal_error.retry": "আবার চেষ্টা করুন",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "যাদের বন্ধ করে রাখা হয়েছে",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "স্থানীয় সময়সারি",
   "column.direct": "সরাসরি লেখা",
   "column.domain_blocks": "সরিয়ে ফেলা ওয়েবসাইট",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
   "navigation_bar.security": "নিরাপত্তা",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "সাহায্যের পরামর্শগুলো সরাতে",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "বাড়ি",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "প্রজ্ঞাপনগুলো",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index ab7711643..729a0ef8e 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Serriñ",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Klask endro",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Implijour·ezed·ion stanket",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Red-amzer lec'hel",
   "column.direct": "Kemennadoù prevez",
   "column.domain_blocks": "Domani kuzhet",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 04418cbda..b4cee2c22 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tanca",
   "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
   "bundle_modal_error.retry": "Torna-ho a provar",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuaris bloquejats",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línia de temps local",
   "column.direct": "Missatges directes",
   "column.domain_blocks": "Dominis ocults",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Línia de temps federada",
   "navigation_bar.security": "Seguretat",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ha afavorit el teu estat",
   "notification.follow": "{name} et segueix",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar suggeriment",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inici",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacions",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 7964707b5..10ab6a686 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Chjudà",
   "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.",
   "bundle_modal_error.retry": "Pruvà torna",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizatori bluccati",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Linea pubblica lucale",
   "column.direct": "Missaghji diretti",
   "column.domain_blocks": "Duminii piattati",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Linea pubblica glubale",
   "navigation_bar.security": "Sicurità",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
   "notification.follow": "{name} v'hà seguitatu",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Righjittà a pruposta",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Accolta",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Nutificazione",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 7e2497e65..b5bcbad8e 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zavřít",
   "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.",
   "bundle_modal_error.retry": "Zkusit znovu",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Místní zeď",
   "column.direct": "Přímé zprávy",
   "column.domain_blocks": "Skryté domény",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federovaná zeď",
   "navigation_bar.security": "Zabezpečení",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reagoval/a na Váš příspěvek",
   "notification.favourite": "{name} si oblíbil/a váš příspěvek",
   "notification.follow": "{name} vás začal/a sledovat",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Odmítnout návrh",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domů",
   "tabs_bar.news": "Zprávy",
   "tabs_bar.notifications": "Oznámení",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index f4facc78f..1fa612045 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cau",
   "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
   "bundle_modal_error.retry": "Ceiswich eto",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Defnyddwyr a flociwyd",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Ffrwd lleol",
   "column.direct": "Negeseuon preifat",
   "column.domain_blocks": "Parthau cuddiedig",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
   "navigation_bar.security": "Diogelwch",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "hoffodd {name} eich tŵt",
   "notification.follow": "dilynodd {name} chi",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Diswyddo",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hafan",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Hysbysiadau",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index d987da07c..b6b45f71a 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Luk",
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af dette komponent.",
   "bundle_modal_error.retry": "Prøv igen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direkte beskeder",
   "column.domain_blocks": "Skjulte domæner",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Fælles tidslinje",
   "navigation_bar.security": "Sikkerhed",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favoriserede din status",
   "notification.follow": "{name} fulgte dig",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Afvis foreslag",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hjem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikationer",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 3ba21b017..d895ee5c1 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Schließen",
   "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blockierte Profile",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokale Zeitleiste",
   "column.direct": "Direktnachrichten",
   "column.domain_blocks": "Versteckte Domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderierte Zeitleiste",
   "navigation_bar.security": "Sicherheit",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} hat auf deinen Beitrag reagiert",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
   "notification.follow": "{name} folgt dir",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "{count, plural, one {Ein neuer Beitrag} other {# neue Beiträge}}. Hier klicken, um {count, plural, one {ihn} other {sie}} anzuzeigen.",
   "suggestions.dismiss": "Empfehlung ausblenden",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Startseite",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Benachrichtigungen",
diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index 9e5729e58..5b313cd40 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -262,6 +262,15 @@
     ],
     "path": "app/soapbox/components/poll.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Follows you",
+        "id": "account.follows_you"
+      }
+    ],
+    "path": "app/soapbox/components/profile_hover_card.json"
+  },
   {
     "descriptors": [
       {
@@ -321,10 +330,6 @@
         "defaultMessage": "Profile",
         "id": "account.profile"
       },
-      {
-        "defaultMessage": "Messages",
-        "id": "navigation_bar.messages"
-      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -990,6 +995,41 @@
     ],
     "path": "app/soapbox/features/bookmarks/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Send a message…",
+        "id": "chat_box.input.placeholder"
+      }
+    ],
+    "path": "app/soapbox/features/chats/components/chat_box.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Chats",
+        "id": "chat_panels.main_window.title"
+      },
+      {
+        "defaultMessage": "No chats found. To start a chat, visit a user's profile.",
+        "id": "chat_panels.main_window.empty"
+      }
+    ],
+    "path": "app/soapbox/features/chats/components/chat_panes.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Chats",
+        "id": "column.chats"
+      },
+      {
+        "defaultMessage": "No chats found. To start a chat, visit a user's profile.",
+        "id": "chat_panels.main_window.empty"
+      }
+    ],
+    "path": "app/soapbox/features/chats/index.json"
+  },
   {
     "descriptors": [
       {
@@ -2343,6 +2383,10 @@
         "defaultMessage": "{name} followed you",
         "id": "notification.follow"
       },
+      {
+        "defaultMessage": "{name} sent you a message",
+        "id": "notification.chat_mention"
+      },
       {
         "defaultMessage": "{name} reacted to your post",
         "id": "notification.emoji_react"
@@ -2972,6 +3016,14 @@
       {
         "defaultMessage": "Copy link to post",
         "id": "status.copy"
+      },
+      {
+        "defaultMessage": "Bookmark",
+        "id": "status.bookmark"
+      },
+      {
+        "defaultMessage": "Remove bookmark",
+        "id": "status.unbookmark"
       }
     ],
     "path": "app/soapbox/features/status/components/action_bar.json"
@@ -3175,10 +3227,6 @@
         "defaultMessage": "Edit Profile",
         "id": "account.edit_profile"
       },
-      {
-        "defaultMessage": "Messages",
-        "id": "navigation_bar.messages"
-      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -3496,6 +3544,10 @@
         "defaultMessage": "Notifications",
         "id": "tabs_bar.notifications"
       },
+      {
+        "defaultMessage": "Chats",
+        "id": "tabs_bar.chats"
+      },
       {
         "defaultMessage": "Reports",
         "id": "tabs_bar.reports"
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index 02489b85b..3fc83e00f 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Κλείσιμο",
   "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.",
   "bundle_modal_error.retry": "Δοκίμασε ξανά",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Τοπική ροή",
   "column.direct": "Προσωπικά μηνύματα",
   "column.domain_blocks": "Κρυμμένοι τομείς",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
   "navigation_bar.security": "Ασφάλεια",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Απόρριψη πρότασης",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Αρχική",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ειδοποιήσεις",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 942946e24..7003f9bfe 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} liked your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 38898e491..7357fb6b9 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fermi",
   "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
   "bundle_modal_error.retry": "Bonvolu reprovi",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokitaj uzantoj",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Loka tempolinio",
   "column.direct": "Rektaj mesaĝoj",
   "column.domain_blocks": "Kaŝitaj domajnoj",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Fratara tempolinio",
   "navigation_bar.security": "Sekureco",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} stelumis vian mesaĝon",
   "notification.follow": "{name} eksekvis vin",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Forigi la proponon",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hejmo",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Sciigoj",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 71f3ceae4..c0c832026 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Intentá de nuevo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línea temporal local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultos",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Línea temporal federada",
   "navigation_bar.security": "Seguridad",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar sugerencia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Principal",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificaciones",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 66030293c..15580f2ab 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Inténtalo de nuevo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línea de tiempo local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultados",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Historia federada",
   "navigation_bar.security": "Seguridad",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar sugerencia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inicio",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificaciones",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index 4bae774a1..507523b16 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sulge",
   "bundle_modal_error.message": "Selle komponendi laadimisel läks midagi viltu.",
   "bundle_modal_error.retry": "Proovi uuesti",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Kohalik ajajoon",
   "column.direct": "Otsesõnumid",
   "column.domain_blocks": "Peidetud domeenid",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderatiivne ajajoon",
   "navigation_bar.security": "Turvalisus",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} märkis su staatuse lemmikuks",
   "notification.follow": "{name} jälgib sind",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Eira soovitust",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Kodu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Teated",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index 6d6d140ad..f0955c485 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Itxi",
   "bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.",
   "bundle_modal_error.retry": "Saiatu berriro",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Denbora-lerro lokala",
   "column.direct": "Mezu zuzenak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.security": "Segurtasuna",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}(e)k zure mezua gogoko du",
   "notification.follow": "{name}(e)k jarraitzen zaitu",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Errefusatu proposamena",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hasiera",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Jakinarazpenak",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index 54adf472a..fdd256dc0 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "بستن",
   "bundle_modal_error.message": "هنگام بازکردن این بخش خطایی رخ داد.",
   "bundle_modal_error.retry": "تلاش دوباره",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "کاربران مسدودشده",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "نوشته‌های محلی",
   "column.direct": "پیغام‌های خصوصی",
   "column.domain_blocks": "دامین‌های پنهان‌شده",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "نوشته‌های همه‌جا",
   "navigation_bar.security": "امنیت",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید",
   "notification.follow": "‫{name}‬ پیگیر شما شد",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "پیشنهاد را نادیده بگیر",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "خانه",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "اعلان‌ها",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 35dbe109e..2ddaebaac 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sulje",
   "bundle_modal_error.message": "Jokin meni vikaan komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudestaan",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Paikallinen aikajana",
   "column.direct": "Viestit",
   "column.domain_blocks": "Piilotetut verkkotunnukset",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Yleinen aikajana",
   "navigation_bar.security": "Tunnukset",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} tykkäsi tilastasi",
   "notification.follow": "{name} seurasi sinua",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Koti",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ilmoitukset",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index f89589762..667e783ad 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fermer",
   "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_modal_error.retry": "Réessayer",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Fil public local",
   "column.direct": "Messages privés",
   "column.domain_blocks": "Domaines cachés",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Fil public global",
   "navigation_bar.security": "Sécurité",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a ajouté à ses favoris :",
   "notification.follow": "{name} vous suit",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Rejeter la suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Accueil",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index 0658beb2b..ad44ad1b2 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index 34f094347..54ea94656 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Pechar",
   "bundle_modal_error.message": "Algo fallou mentras se cargaba este compoñente.",
   "bundle_modal_error.retry": "Inténteo de novo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Liña temporal local",
   "column.direct": "Mensaxes directas",
   "column.domain_blocks": "Dominios agochados",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Liña temporal federada",
   "navigation_bar.security": "Seguridade",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcou como favorito o seu estado",
   "notification.follow": "{name} está a seguila",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Rexeitar suxestión",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inicio",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacións",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index 35fa63935..53be2e329 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "לסגור",
   "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.",
   "bundle_modal_error.retry": "לנסות שוב",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "חסימות",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ציר זמן מקומי",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "חצרוצך חובב על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "בבית",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "התראות",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index 6adeb0ca1..6f8664e23 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index 613df0464..1e8098c47 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalni timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federalni timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je lajkao tvoj status",
   "notification.follow": "{name} te sada slijedi",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Dom",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikacije",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index af94f8ab0..4eea27c3f 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Bezárás",
   "bundle_modal_error.message": "Hiba történt a komponens betöltésekor.",
   "bundle_modal_error.retry": "Próbáld újra",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Helyi idővonal",
   "column.direct": "Közvetlen üzenetek",
   "column.domain_blocks": "Rejtett domainek",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderációs idővonal",
   "navigation_bar.security": "Biztonság",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} kedvencnek jelölte egy tülködet",
   "notification.follow": "{name} követ téged",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Javaslat elvetése",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Saját",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Értesítések",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index 6f48b6383..858304ff5 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Փակել",
   "bundle_modal_error.message": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։",
   "bundle_modal_error.retry": "Կրկին փորձել",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Արգելափակված օգտատերեր",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Տեղական հոսք",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Դաշնային հոսք",
   "navigation_bar.security": "Անվտանգություն",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ծանուցումներ",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index f1ba626d1..947b2a1fd 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tutup",
   "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.",
   "bundle_modal_error.retry": "Coba lagi",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Pengguna diblokir",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Linimasa Lokal",
   "column.direct": "Pesan langsung",
   "column.domain_blocks": "Topik tersembunyi",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Linimasa gabungan",
   "navigation_bar.security": "Keamanan",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} menyukai status anda",
   "notification.follow": "{name} mengikuti anda",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Beranda",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikasi",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index 1e3844f33..be6a481fd 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokusita uzeri",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokala tempolineo",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federata tempolineo",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.follow": "{name} sequeskis tu",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hemo",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Savigi",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index 392270aab..ed983f92f 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Chiudi",
   "bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.",
   "bundle_modal_error.retry": "Riprova",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Timeline locale",
   "column.direct": "Messaggi diretti",
   "column.domain_blocks": "Domini nascosti",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Timeline federata",
   "navigation_bar.security": "Sicurezza",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ha apprezzato il tuo post",
   "notification.follow": "{name} ha iniziato a seguirti",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Elimina suggerimento",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifiche",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index 0d404e764..a81eae9be 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "閉じる",
   "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_modal_error.retry": "再試行",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ローカルタイムライン",
   "column.direct": "ダイレクトメッセージ",
   "column.domain_blocks": "非表示にしたドメイン",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.security": "セキュリティ",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "隠す",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "ホーム",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index c1acdba06..0f402aa18 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "დახურვა",
   "bundle_modal_error.message": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.",
   "bundle_modal_error.retry": "სცადეთ კიდევ ერთხელ",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "დაბლოკილი მომხმარებლები",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ლოკალური თაიმლაინი",
   "column.direct": "პირდაპირი წერილები",
   "column.domain_blocks": "დამალული დომენები",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
   "navigation_bar.security": "უსაფრთხოება",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად",
   "notification.follow": "{name} გამოგყვათ",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "სახლი",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "შეტყობინებები",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index a5e4e73b1..0f13a01a2 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Жабу",
   "bundle_modal_error.message": "Бұл компонентті жүктеген кезде бір қате пайда болды.",
   "bundle_modal_error.retry": "Қайтадан көріңіз",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Бұғатталғандар",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Жергілікті желі",
   "column.direct": "Жеке хаттар",
   "column.domain_blocks": "Жасырылған домендер",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Жаһандық желі",
   "navigation_bar.security": "Қауіпсіздік",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} жазбаңызды таңдаулыға қосты",
   "notification.follow": "{name} сізге жазылды",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Өткізіп жіберу",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Басты бет",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ескертпелер",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index a33bb9bf6..05c42aef1 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "닫기",
   "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "차단 중인 사용자",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.domain_blocks": "숨겨진 도메인",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "연합 타임라인",
   "navigation_bar.security": "보안",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}님이 즐겨찾기 했습니다",
   "notification.follow": "{name}님이 나를 팔로우 했습니다",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "추천 지우기",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "홈",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "알림",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index fda05193a..5d11fc863 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 2e09b2cc8..3ec93b2b0 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Aizvērt",
   "bundle_modal_error.message": "Kaut kas nogāja greizi ielādējot šo komponenti.",
   "bundle_modal_error.retry": "Mēģini vēlreiz",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokālā laika līnija",
   "column.direct": "Privātās ziņas",
   "column.domain_blocks": "Paslēptie domēni",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index b87a648e9..f7fabd82e 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Настана грешка при прикажувањето на оваа веб-страница.",
   "bundle_modal_error.retry": "Обидете се повторно",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Директна порака",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Дома",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 1d2a357b0..665e3785e 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index f0dadd79c..e42ba4155 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sluiten",
   "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
   "bundle_modal_error.retry": "Opnieuw proberen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokale tijdlijn",
   "column.direct": "Directe berichten",
   "column.domain_blocks": "Genegeerde servers",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Globale tijdlijn",
   "navigation_bar.security": "Beveiliging",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} voegde jouw toot als favoriet toe",
   "notification.follow": "{name} volgt jou nu",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Voorstel verwerpen",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Start",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Meldingen",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 373886f74..501bd9f0a 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Lukk",
   "bundle_modal_error.message": "Noko gikk gale mens komponent var i ferd med å bli nedlasta.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokka brukare",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal samtid",
   "column.direct": "Direkte meldingar",
   "column.domain_blocks": "Gøymte domener",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federert tidslinje",
   "navigation_bar.security": "Sikkerheit",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Heim",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 7e8b7f89d..775f00bb2 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Lukk",
   "bundle_modal_error.message": "Noe gikk galt da denne komponenten lastet.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokkerte brukere",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Felles tidslinje",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hjem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Varslinger",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index c2de76af7..8b7056395 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tampar",
   "bundle_modal_error.message": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.",
   "bundle_modal_error.retry": "Tornar ensajar",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Flux public local",
   "column.direct": "Messatges dirèctes",
   "column.domain_blocks": "Domenis resconduts",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Flux public global",
   "navigation_bar.security": "Seguretat",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a ajustat a sos favorits",
   "notification.follow": "{name} vos sèc",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Regetar la suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Acuèlh",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacions",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index a1899bc8e..9b09236df 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zamknij",
   "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_modal_error.retry": "Spróbuj ponownie",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Zablokowani użytkownicy",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna oś czasu",
   "column.direct": "Wiadomości bezpośrednie",
   "column.domain_blocks": "Ukryte domeny",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Globalna oś czasu",
   "navigation_bar.security": "Bezpieczeństwo",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
   "notification.follow": "{name} zaczął(-ęła) Cię śledzić",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Odrzuć sugestię",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Strona główna",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Powiadomienia",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 1146ff8fc..cdafe104f 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente novamente",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local",
   "column.direct": "Mensagens diretas",
   "column.domain_blocks": "Domínios escondidos",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Global",
   "navigation_bar.security": "Segurança",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} adicionou a sua postagem aos favoritos",
   "notification.follow": "{name} te seguiu",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Ignorar a sugestão",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Página inicial",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificações",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index f68d6e812..461e962f6 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizadores Bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Cronologia local",
   "column.direct": "Mensagens directas",
   "column.domain_blocks": "Domínios escondidos",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.security": "Segurança",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} adicionou o teu estado aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dispensar a sugestão",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Início",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificações",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 4e4c42d98..44d0a648c 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Închide",
   "bundle_modal_error.message": "Ceva nu a funcționat în timupul încărcării acestui component.",
   "bundle_modal_error.retry": "Încearcă din nou",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Fluxul Local",
   "column.direct": "Mesaje directe",
   "column.domain_blocks": "Domenii ascunse",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Flux global",
   "navigation_bar.security": "Securitate",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a adăugat statusul tău la favorite",
   "notification.follow": "{name} te urmărește",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Omite sugestia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Acasă",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificări",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index b21d7c53e..72e08f475 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Закрыть",
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Список блокировки",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локальная лента",
   "column.direct": "Личные сообщения",
   "column.domain_blocks": "Скрытые домены",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Глобальная лента",
   "navigation_bar.security": "Безопасность",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} понравился Ваш статус",
   "notification.follow": "{name} подписался (-лась) на вас",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Удалить предложение",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Главная",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Уведомления",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index fada6510e..0b8932353 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zatvor",
   "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
   "bundle_modal_error.retry": "Skúsiť znova",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokovaní užívatelia",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Miestna časová os",
   "column.direct": "Súkromné správy",
   "column.domain_blocks": "Skryté domény",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federovaná časová os",
   "navigation_bar.security": "Zabezbečenie",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
   "notification.follow": "{name} ťa začal/a následovať",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Zavrhni návrh",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domovská",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Oboznámenia",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index 581ab2aa9..b7f1e1c1f 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zapri",
   "bundle_modal_error.message": "Med nalaganjem te komponente je prišlo do napake.",
   "bundle_modal_error.retry": "Poskusi ponovno",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani uporabniki",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna časovnica",
   "column.direct": "Neposredna sporočila",
   "column.domain_blocks": "Skrite domene",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Združena časovnica",
   "navigation_bar.security": "Varnost",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je vzljubil/a vaš status",
   "notification.follow": "{name} vam sledi",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Zavrni predlog",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domov",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Obvestila",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 076506d56..2843e032d 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Mbylle",
   "bundle_modal_error.message": "Diç shkoi ters teksa ngarkohej ky përbërës.",
   "bundle_modal_error.retry": "Riprovoni",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Rrjedhë kohore vendore",
   "column.direct": "Mesazhe të drejtpërdrejta",
   "column.domain_blocks": "Përkatësi të fshehura",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish",
   "navigation_bar.security": "Siguri",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} parapëlqeu gjendjen tuaj",
   "notification.follow": "{name} zuri t’ju ndjekë",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Mos e merr parasysh sugjerimin",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Kreu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Njoftime",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index 19c382258..0f597a79f 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna lajna",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federisana lajna",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je stavio Vaš status kao omiljeni",
   "notification.follow": "{name} Vas je zapratio",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Početna",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Obaveštenja",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 638352b20..a2a01a9ee 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
   "column.domain_blocks": "Скривени домени",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Здружена временска линија",
   "navigation_bar.security": "Безбедност",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени",
   "notification.follow": "{name} Вас је запратио/ла",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Почетна",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Обавештења",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index 88992aee8..165e8c2f5 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Stäng",
   "bundle_modal_error.message": "Något gick fel när denna komponent laddades.",
   "bundle_modal_error.retry": "Försök igen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direktmeddelanden",
   "column.domain_blocks": "Dolda domäner",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Förenad tidslinje",
   "navigation_bar.security": "Säkerhet",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favoriserade din status",
   "notification.follow": "{name} följer dig",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Meddelanden",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index fbdadedda..eecb76d69 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "நெருக்கமாக",
   "bundle_modal_error.message": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "உள்ளூர் காலக்கெடு",
   "column.direct": "நேரடி செய்திகள்",
   "column.domain_blocks": "மறைந்த களங்கள்",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு",
   "navigation_bar.security": "பத்திரம்",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை",
   "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "பரிந்துரை விலக்க",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index 6c175dbd2..ba2a3c790 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "మూసివేయు",
   "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
   "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "స్థానిక కాలక్రమం",
   "column.direct": "ప్రత్యక్ష సందేశాలు",
   "column.domain_blocks": "దాచిన డొమైన్లు",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
   "navigation_bar.security": "భద్రత",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "సూచనను రద్దు చేయి",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "హోమ్",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "ప్రకటనలు",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 9bb15172f..183d954ac 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "ปิด",
   "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
   "bundle_modal_error.retry": "ลองอีกครั้ง",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "เส้นเวลาในเว็บ",
   "column.direct": "ข้อความโดยตรง",
   "column.domain_blocks": "โดเมนที่ซ่อนอยู่",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
   "navigation_bar.security": "ความปลอดภัย",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "ยกเลิกข้อเสนอแนะ",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "หน้าแรก",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "การแจ้งเตือน",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 992a7852f..0a45724b4 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Kapat",
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Engellenen kullanıcılar",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Yerel zaman tüneli",
   "column.direct": "Doğrudan mesajlar",
   "column.domain_blocks": "Gizli alan adları",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Federe zaman tüneli",
   "navigation_bar.security": "Güvenlik",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} senin durumunu favorilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Öneriyi görmezden gel",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Ana sayfa",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Bildirimler",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index 38807b37c..63d8cc17b 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Закрити",
   "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.",
   "bundle_modal_error.retry": "Спробувати ще раз",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Заблоковані користувачі",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локальна стрічка",
   "column.direct": "Прямі повідомлення",
   "column.domain_blocks": "Приховані домени",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "Глобальна стрічка",
   "navigation_bar.security": "Безпека",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} вподобав(-ла) ваш допис",
   "notification.follow": "{name} підписався(-лась) на Вас",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Відхилити пропозицію",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Головна",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Сповіщення",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 42c00054e..ef6dbd06b 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "关闭",
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "已屏蔽的用户",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本站时间轴",
   "column.direct": "私信",
   "column.domain_blocks": "已屏蔽的网站",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "跨站公共时间轴",
   "navigation_bar.security": "安全",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 收藏了你的嘟文",
   "notification.follow": "{name} 开始关注你",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "关闭建议",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主页",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index 4d38dde10..cb7e54d30 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "加載本組件出錯。",
   "bundle_modal_error.retry": "重試",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "封鎖用戶",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本站時間軸",
   "column.direct": "個人訊息",
   "column.domain_blocks": "隱藏的服務站",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "跨站時間軸",
   "navigation_bar.security": "安全",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 收藏了你的文章",
   "notification.follow": "{name} 開始關注你",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主頁",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index c9dc9b50a..8a345beaa 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "封鎖的使用者",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本機時間軸",
   "column.direct": "私訊",
   "column.domain_blocks": "隱藏的網域",
@@ -343,6 +347,7 @@
   "navigation_bar.public_timeline": "聯邦時間軸",
   "navigation_bar.security": "安全性",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 把你的嘟文加入了最愛",
   "notification.follow": "{name} 關注了你",
@@ -548,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "關閉建議",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主頁",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",

From 9692c7539a9492538544a552612b35549c01a137 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 10:05:52 -0500
Subject: [PATCH 37/56] Hovercard: appear and disappear properly

---
 app/soapbox/actions/profile_hover_card.js    | 14 +++++++++++---
 app/soapbox/components/profile_hover_card.js | 15 ++++++++++++---
 app/soapbox/containers/status_container.js   |  4 ++--
 app/soapbox/reducers/profile_hover_card.js   | 12 +++++++++---
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js
index 83b81d984..90543148d 100644
--- a/app/soapbox/actions/profile_hover_card.js
+++ b/app/soapbox/actions/profile_hover_card.js
@@ -1,5 +1,6 @@
 export const PROFILE_HOVER_CARD_OPEN = 'PROFILE_HOVER_CARD_OPEN';
-export const PROFILE_HOVER_CARD_CLEAR = 'PROFILE_HOVER_CARD_CLEAR';
+export const PROFILE_HOVER_CARD_UPDATE = 'PROFILE_HOVER_CARD_UPDATE';
+export const PROFILE_HOVER_CARD_CLOSE = 'PROFILE_HOVER_CARD_CLOSE';
 
 export function openProfileHoverCard(ref, accountId) {
   return {
@@ -9,8 +10,15 @@ export function openProfileHoverCard(ref, accountId) {
   };
 }
 
-export function clearProfileHoverCard() {
+export function updateProfileHoverCard() {
   return {
-    type: PROFILE_HOVER_CARD_CLEAR,
+    type: PROFILE_HOVER_CARD_UPDATE,
+  };
+}
+
+export function closeProfileHoverCard(force = false) {
+  return {
+    type: PROFILE_HOVER_CARD_CLOSE,
+    force,
   };
 }
diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
index c62a36422..ae3f8bc3a 100644
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
@@ -11,7 +11,10 @@ import Badge from 'soapbox/components/badge';
 import classNames from 'classnames';
 import { fetchRelationships } from 'soapbox/actions/accounts';
 import { usePopper } from 'react-popper';
-import { clearProfileHoverCard } from 'soapbox/actions/profile_hover_card';
+import {
+  closeProfileHoverCard,
+  updateProfileHoverCard,
+} from 'soapbox/actions/profile_hover_card';
 
 const getAccount = makeGetAccount();
 
@@ -23,9 +26,15 @@ const getBadges = (account) => {
   return badges;
 };
 
+const handleMouseEnter = (dispatch) => {
+  return e => {
+    dispatch(updateProfileHoverCard());
+  };
+};
+
 const handleMouseLeave = (dispatch) => {
   return e => {
-    dispatch(clearProfileHoverCard());
+    dispatch(closeProfileHoverCard(true));
   };
 };
 
@@ -57,7 +66,7 @@ export const ProfileHoverCard = ({ visible }) => {
   const followedBy  = account.getIn(['relationship', 'followed_by']);
 
   return (
-    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper} onMouseLeave={handleMouseLeave(dispatch)}>
+    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper} onMouseEnter={handleMouseEnter(dispatch)} onMouseLeave={handleMouseLeave(dispatch)}>
       <div className='profile-hover-card__container'>
         {followedBy &&
           <span className='relationship-tag'>
diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index 015256169..fb976a82d 100644
--- a/app/soapbox/containers/status_container.js
+++ b/app/soapbox/containers/status_container.js
@@ -37,7 +37,7 @@ import {
 import { getSettings } from '../actions/settings';
 import {
   openProfileHoverCard,
-  clearProfileHoverCard,
+  closeProfileHoverCard,
 } from 'soapbox/actions/profile_hover_card';
 
 const messages = defineMessages({
@@ -215,7 +215,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   },
 
   onClearProfileHoverCard() {
-    dispatch(clearProfileHoverCard());
+    setTimeout(() => dispatch(closeProfileHoverCard()), 300);
   },
 
 });
diff --git a/app/soapbox/reducers/profile_hover_card.js b/app/soapbox/reducers/profile_hover_card.js
index 09e3a92fc..5776a3e87 100644
--- a/app/soapbox/reducers/profile_hover_card.js
+++ b/app/soapbox/reducers/profile_hover_card.js
@@ -1,6 +1,7 @@
 import {
   PROFILE_HOVER_CARD_OPEN,
-  PROFILE_HOVER_CARD_CLEAR,
+  PROFILE_HOVER_CARD_CLOSE,
+  PROFILE_HOVER_CARD_UPDATE,
 } from 'soapbox/actions/profile_hover_card';
 import { Map as ImmutableMap } from 'immutable';
 
@@ -13,8 +14,13 @@ export default function profileHoverCard(state = initialState, action) {
       ref: action.ref,
       accountId: action.accountId,
     });
-  case PROFILE_HOVER_CARD_CLEAR:
-    return ImmutableMap();
+  case PROFILE_HOVER_CARD_UPDATE:
+    return state.set('hovered', true);
+  case PROFILE_HOVER_CARD_CLOSE:
+    if (state.get('hovered') === true && !action.force)
+      return state;
+    else
+      return ImmutableMap();
   default:
     return state;
   }

From 1d90950e59c51ffc06067daca18c81ca1848e6f0 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 11:37:05 -0500
Subject: [PATCH 38/56] Hovercard: refactor with HoverRefWrapper

---
 app/soapbox/components/hover_ref_wrapper.js   | 50 +++++++++++++++++++
 app/soapbox/components/profile_hover_card.js  |  2 +-
 app/soapbox/components/status.js              | 39 ++++-----------
 app/soapbox/containers/status_container.js    | 12 -----
 app/styles/components/profile_hover_card.scss |  1 -
 5 files changed, 62 insertions(+), 42 deletions(-)
 create mode 100644 app/soapbox/components/hover_ref_wrapper.js

diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js
new file mode 100644
index 000000000..64d62ba5c
--- /dev/null
+++ b/app/soapbox/components/hover_ref_wrapper.js
@@ -0,0 +1,50 @@
+import React, { useRef } from 'react';
+import PropTypes from 'prop-types';
+import {
+  openProfileHoverCard,
+  closeProfileHoverCard,
+} from 'soapbox/actions/profile_hover_card';
+import { useDispatch } from 'react-redux';
+import { debounce } from 'lodash';
+import { isMobile } from 'soapbox/is_mobile';
+
+const showProfileHoverCard = debounce((dispatch, ref, accountId) => {
+  dispatch(openProfileHoverCard(ref, accountId));
+}, 1200);
+
+const handleMouseEnter = (dispatch, ref, accountId) => {
+  return e => {
+    if (!isMobile(window.innerWidth))
+      showProfileHoverCard(dispatch, ref, accountId);
+  };
+};
+
+const handleMouseLeave = (dispatch) => {
+  return e => {
+    showProfileHoverCard.cancel();
+    setTimeout(() => dispatch(closeProfileHoverCard()), 300);
+  };
+};
+
+export const HoverRefWrapper = ({ accountId, children }) => {
+  const dispatch = useDispatch();
+  const ref = useRef();
+
+  return (
+    <div
+      ref={ref}
+      className='hover-ref-wrapper'
+      onMouseEnter={handleMouseEnter(dispatch, ref, accountId)}
+      onMouseLeave={handleMouseLeave(dispatch)}
+    >
+      {children}
+    </div>
+  );
+};
+
+HoverRefWrapper.propTypes = {
+  accountId: PropTypes.string,
+  children: PropTypes.node,
+};
+
+export default HoverRefWrapper;
diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
index ae3f8bc3a..b545b87bc 100644
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
@@ -45,7 +45,7 @@ export const ProfileHoverCard = ({ visible }) => {
 
   const accountId = useSelector(state => state.getIn(['profile_hover_card', 'accountId']));
   const account   = useSelector(state => accountId && getAccount(state, accountId));
-  const targetRef = useSelector(state => state.getIn(['profile_hover_card', 'ref']));
+  const targetRef = useSelector(state => state.getIn(['profile_hover_card', 'ref', 'current']));
   const badges = account ? getBadges(account) : [];
 
   useEffect(() => {
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 275603bcc..e52dfdc5c 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -18,9 +18,8 @@ import classNames from 'classnames';
 import Icon from 'soapbox/components/icon';
 import PollContainer from 'soapbox/containers/poll_container';
 import { NavLink } from 'react-router-dom';
-import { isMobile } from '../../../app/soapbox/is_mobile';
-import { debounce } from 'lodash';
 import { getDomain } from 'soapbox/utils/accounts';
+import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 
 // We use the component (and not the container) since we do not want
 // to use the progress bar to show download progress
@@ -255,20 +254,6 @@ class Status extends ImmutablePureComponent {
     this.handleToggleMediaVisibility();
   }
 
-  showProfileHoverCard = debounce(() => {
-    const { onShowProfileHoverCard, status } = this.props;
-    onShowProfileHoverCard(this.profileNode, status.getIn(['account', 'id']));
-  }, 1200);
-
-  handleProfileHover = e => {
-    if (!isMobile(window.innerWidth)) this.showProfileHoverCard();
-  }
-
-  handleProfileLeave = e => {
-    this.showProfileHoverCard.cancel();
-    this.props.onClearProfileHoverCard();
-  }
-
   _properStatus() {
     const { status } = this.props;
 
@@ -283,10 +268,6 @@ class Status extends ImmutablePureComponent {
     this.node = c;
   }
 
-  setProfileRef = c => {
-    this.profileNode = c;
-  }
-
   render() {
     let media = null;
     let poll = null;
@@ -481,15 +462,17 @@ class Status extends ImmutablePureComponent {
                   <img src={favicon} alt='' title={domain} />
                 </div>}
 
-              <div className='status__profile' ref={this.setProfileRef} onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
-                <div className='status__avatar'>
-                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
-                  {statusAvatar}
+              <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
+                <div className='status__profile'>
+                  <div className='status__avatar'>
+                    <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
+                    {statusAvatar}
+                  </div>
+                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
+                    <DisplayName account={status.get('account')} others={otherAccounts} />
+                  </NavLink>
                 </div>
-                <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
-                  <DisplayName account={status.get('account')} others={otherAccounts} />
-                </NavLink>
-              </div>
+              </HoverRefWrapper>
             </div>
 
             {!group && status.get('group') && (
diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index fb976a82d..02dc76c21 100644
--- a/app/soapbox/containers/status_container.js
+++ b/app/soapbox/containers/status_container.js
@@ -35,10 +35,6 @@ import {
   groupRemoveStatus,
 } from '../actions/groups';
 import { getSettings } from '../actions/settings';
-import {
-  openProfileHoverCard,
-  closeProfileHoverCard,
-} from 'soapbox/actions/profile_hover_card';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
@@ -210,14 +206,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(groupRemoveStatus(groupId, statusId));
   },
 
-  onShowProfileHoverCard(ref, accountId) {
-    dispatch(openProfileHoverCard(ref, accountId));
-  },
-
-  onClearProfileHoverCard() {
-    setTimeout(() => dispatch(closeProfileHoverCard()), 300);
-  },
-
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index 47a5242a2..e89998901 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -17,7 +17,6 @@
   z-index: 200;
   top: 0;
   left: 0;
-  margin-bottom: 10px;
 
   &--visible {
     opacity: 1;

From 24bf880e0b5d952dda5613dc70fd22bf050539c2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 11:42:02 -0500
Subject: [PATCH 39/56] Hovercard: refactor detailed status

---
 .../status/components/detailed_status.js      | 46 ++++++-------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index ca3a90b88..e323873a3 100644
--- a/app/soapbox/features/status/components/detailed_status.js
+++ b/app/soapbox/features/status/components/detailed_status.js
@@ -16,10 +16,8 @@ import classNames from 'classnames';
 import Icon from 'soapbox/components/icon';
 import PollContainer from 'soapbox/containers/poll_container';
 import { StatusInteractionBar } from './status_interaction_bar';
-import ProfileHoverCardContainer from 'soapbox/features/profile_hover_card/profile_hover_card_container';
-import { isMobile } from 'soapbox/is_mobile';
-import { debounce } from 'lodash';
 import { getDomain } from 'soapbox/utils/accounts';
+import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 
 export default class DetailedStatus extends ImmutablePureComponent {
 
@@ -42,7 +40,6 @@ export default class DetailedStatus extends ImmutablePureComponent {
 
   state = {
     height: null,
-    profileCardVisible: false,
   };
 
   handleOpenVideo = (media, startTime) => {
@@ -86,24 +83,10 @@ export default class DetailedStatus extends ImmutablePureComponent {
     window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
   }
 
-  showProfileHoverCard = debounce(() => {
-    this.setState({ profileCardVisible: true });
-  }, 1200);
-
-  handleProfileHover = e => {
-    if (!isMobile(window.innerWidth)) this.showProfileHoverCard();
-  }
-
-  handleProfileLeave = e => {
-    this.showProfileHoverCard.cancel();
-    this.setState({ profileCardVisible: false });
-  }
-
   render() {
     const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
     const { compact } = this.props;
-    const { profileCardVisible } = this.state;
     const favicon = status.getIn(['account', 'pleroma', 'favicon']);
     const domain = getDomain(status.get('account'));
 
@@ -181,21 +164,20 @@ export default class DetailedStatus extends ImmutablePureComponent {
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
-          <div className='detailed-status__profile' onMouseEnter={this.handleProfileHover} onMouseLeave={this.handleProfileLeave}>
-            <div className='detailed-status__display-name'>
-              <NavLink to={`/@${status.getIn(['account', 'acct'])}`}>
-                <div className='detailed-status__display-avatar'>
-                  <Avatar account={status.get('account')} size={48} />
-                </div>
-              </NavLink>
-              <DisplayName account={status.get('account')}>
-                <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
-              </DisplayName>
+          <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
+            <div className='detailed-status__profile'>
+              <div className='detailed-status__display-name'>
+                <NavLink to={`/@${status.getIn(['account', 'acct'])}`}>
+                  <div className='detailed-status__display-avatar'>
+                    <Avatar account={status.get('account')} size={48} />
+                  </div>
+                </NavLink>
+                <DisplayName account={status.get('account')}>
+                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
+                </DisplayName>
+              </div>
             </div>
-            { profileCardVisible &&
-              <ProfileHoverCardContainer accountId={status.getIn(['account', 'id'])} visible={!isMobile(window.innerWidth) && profileCardVisible} />
-            }
-          </div>
+          </HoverRefWrapper>
 
           {status.get('group') && (
             <div className='status__meta'>

From 72659f27c14b422e1351bc326055dd169bab8fcb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 12:17:32 -0500
Subject: [PATCH 40/56] Hovercard: attach to each element for better
 positioning

---
 app/soapbox/components/display_name.js        |  5 +++-
 app/soapbox/components/hover_ref_wrapper.js   | 12 ++++++---
 app/soapbox/components/profile_hover_card.js  |  9 +------
 app/soapbox/components/status.js              | 21 ++++++++-------
 .../status/components/detailed_status.js      | 26 ++++++++++---------
 app/styles/components/profile_hover_card.scss | 12 ---------
 6 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js
index 7ab8b9e60..7d848a902 100644
--- a/app/soapbox/components/display_name.js
+++ b/app/soapbox/components/display_name.js
@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import VerificationBadge from './verification_badge';
 import { acctFull } from '../utils/accounts';
 import { List as ImmutableList } from 'immutable';
+import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 
 export default class DisplayName extends React.PureComponent {
 
@@ -42,7 +43,9 @@ export default class DisplayName extends React.PureComponent {
 
     return (
       <span className='display-name'>
-        {displayName}
+        <HoverRefWrapper accountId={account.get('id')} inline>
+          {displayName}
+        </HoverRefWrapper>
         {suffix}
         {children}
       </span>
diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js
index 64d62ba5c..fe6ac2bed 100644
--- a/app/soapbox/components/hover_ref_wrapper.js
+++ b/app/soapbox/components/hover_ref_wrapper.js
@@ -26,25 +26,31 @@ const handleMouseLeave = (dispatch) => {
   };
 };
 
-export const HoverRefWrapper = ({ accountId, children }) => {
+export const HoverRefWrapper = ({ accountId, children, inline }) => {
   const dispatch = useDispatch();
   const ref = useRef();
+  const Elem = inline ? 'span' : 'div';
 
   return (
-    <div
+    <Elem
       ref={ref}
       className='hover-ref-wrapper'
       onMouseEnter={handleMouseEnter(dispatch, ref, accountId)}
       onMouseLeave={handleMouseLeave(dispatch)}
     >
       {children}
-    </div>
+    </Elem>
   );
 };
 
 HoverRefWrapper.propTypes = {
   accountId: PropTypes.string,
   children: PropTypes.node,
+  inline: PropTypes.bool,
+};
+
+HoverRefWrapper.defaultProps = {
+  inline: false,
 };
 
 export default HoverRefWrapper;
diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
index b545b87bc..8d234aa4b 100644
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
@@ -52,14 +52,7 @@ export const ProfileHoverCard = ({ visible }) => {
     if (accountId) dispatch(fetchRelationships([accountId]));
   }, [dispatch, accountId]);
 
-  const { styles, attributes } = usePopper(targetRef, popperElement, {
-    modifiers: [{
-      name: 'offset',
-      options: {
-        offset: [-100, 0],
-      },
-    }],
-  });
+  const { styles, attributes } = usePopper(targetRef, popperElement);
 
   if (!account) return null;
   const accountBio = { __html: account.get('note_emojified') };
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index e52dfdc5c..9e8a2d684 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -462,17 +462,18 @@ class Status extends ImmutablePureComponent {
                   <img src={favicon} alt='' title={domain} />
                 </div>}
 
-              <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
-                <div className='status__profile'>
-                  <div className='status__avatar'>
-                    <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
-                    {statusAvatar}
-                  </div>
-                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
-                    <DisplayName account={status.get('account')} others={otherAccounts} />
-                  </NavLink>
+              <div className='status__profile'>
+                <div className='status__avatar'>
+                  <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
+                    <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])}>
+                      {statusAvatar}
+                    </NavLink>
+                  </HoverRefWrapper>
                 </div>
-              </HoverRefWrapper>
+                <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name'>
+                  <DisplayName account={status.get('account')} others={otherAccounts} />
+                </NavLink>
+              </div>
             </div>
 
             {!group && status.get('group') && (
diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index e323873a3..131de49ec 100644
--- a/app/soapbox/features/status/components/detailed_status.js
+++ b/app/soapbox/features/status/components/detailed_status.js
@@ -164,20 +164,22 @@ export default class DetailedStatus extends ImmutablePureComponent {
     return (
       <div style={outerStyle}>
         <div ref={this.setRef} className={classNames('detailed-status', { compact })}>
-          <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
-            <div className='detailed-status__profile'>
-              <div className='detailed-status__display-name'>
-                <NavLink to={`/@${status.getIn(['account', 'acct'])}`}>
-                  <div className='detailed-status__display-avatar'>
+          <div className='detailed-status__profile'>
+            <div className='detailed-status__display-name'>
+              <NavLink to={`/@${status.getIn(['account', 'acct'])}`}>
+                <div className='detailed-status__display-avatar'>
+                  <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
                     <Avatar account={status.get('account')} size={48} />
-                  </div>
-                </NavLink>
-                <DisplayName account={status.get('account')}>
-                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='floating-link' />
-                </DisplayName>
-              </div>
+                  </HoverRefWrapper>
+                </div>
+              </NavLink>
+              <DisplayName account={status.get('account')}>
+                <HoverRefWrapper accountId={status.getIn(['account', 'id'])}>
+                  <NavLink to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} />
+                </HoverRefWrapper>
+              </DisplayName>
             </div>
-          </HoverRefWrapper>
+          </div>
 
           {status.get('group') && (
             <div className='status__meta'>
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index e89998901..b3fb4fc31 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -113,18 +113,6 @@
   }
 }
 
-/* Prevent floating avatars from intercepting with current card */
-.status,
-.detailed-status {
-  .floating-link {
-    display: none;
-  }
-
-  &:hover .floating-link {
-    display: block;
-  }
-}
-
 /* Hide the popper when the reference is hidden */
 #popper[data-popper-reference-hidden] {
   visibility: hidden;

From 9ac6f3aaabe05df9654c51e12553a5d18d65675d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 12:24:43 -0500
Subject: [PATCH 41/56] Restore old border-radius behavior, fixes #266

---
 app/styles/application.scss                |  1 -
 app/styles/chats.scss                      |  1 -
 app/styles/components/columns.scss         |  1 -
 app/styles/components/detailed-status.scss |  1 -
 app/styles/components/drawer.scss          |  2 +-
 app/styles/loading.scss                    |  1 -
 app/styles/overflow_hacks.scss             | 37 ----------------------
 7 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 app/styles/overflow_hacks.scss

diff --git a/app/styles/application.scss b/app/styles/application.scss
index 96eb4dcf4..fdce329ad 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -27,7 +27,6 @@
 @import 'dyslexic';
 @import 'demetricator';
 @import 'pro';
-@import 'overflow_hacks';
 @import 'chats';
 
 // COMPONENTS
diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 29c2f0c4f..3e2fc2e24 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -322,7 +322,6 @@
   display: flex;
   align-items: center;
   background: var(--accent-color--faint);
-  border-radius: 10px 10px 0 0;
 
   .column-back-button {
     background: transparent;
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index d8034e497..10e46e441 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -212,7 +212,6 @@
   font-size: 16px;
   line-height: inherit;
   border: 0;
-  border-radius: 10px 10px 0 0;
   text-align: unset;
   padding: 15px;
   margin: 0;
diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss
index d53b426ee..ceab5899c 100644
--- a/app/styles/components/detailed-status.scss
+++ b/app/styles/components/detailed-status.scss
@@ -62,7 +62,6 @@
   border-bottom: 1px solid var(--brand-color--faint);
   display: flex;
   flex-direction: row;
-  border-radius: 0 0 10px 10px;
 }
 
 .detailed-status__link {
diff --git a/app/styles/components/drawer.scss b/app/styles/components/drawer.scss
index 39e936158..7dc5a1a10 100644
--- a/app/styles/components/drawer.scss
+++ b/app/styles/components/drawer.scss
@@ -20,7 +20,7 @@
 .column,
 .drawer {
   flex: 1 1 100%;
-  overflow: visible;
+  overflow: hidden;
 }
 
 .drawer__pager {
diff --git a/app/styles/loading.scss b/app/styles/loading.scss
index 88705782e..42a3a0c1f 100644
--- a/app/styles/loading.scss
+++ b/app/styles/loading.scss
@@ -188,7 +188,6 @@
   align-items: center;
   justify-content: center;
   padding: 20px;
-  border-radius: 0 0 10px 10px;
 
   & > div {
     width: 100%;
diff --git a/app/styles/overflow_hacks.scss b/app/styles/overflow_hacks.scss
deleted file mode 100644
index ef72b6863..000000000
--- a/app/styles/overflow_hacks.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-// This is a file dedicated to fixing the css we broke by introducing the hover
-// card and `overflow:visible` on drawer.scss line 23. If we ever figure out how
-// to pop the hover card out while keeping `overflow:hidden`, feel free to delete
-// this entire file.
-
-button.column-header__button.active {
-  border-radius: 0 10px 0 0;
-}
-
-.column-back-button.column-back-button--slim-button {
-  border-radius: 0 10px 0 0;
-}
-
-.detailed-status__wrapper .detailed-status__action-bar {
-  border-radius: 0 0 10px 10px;
-}
-
-.slist .item-list .column-link {
-  background-color: transparent;
-  border-top: 1px solid var(--brand-color--med);
-}
-
-.focusable {
-  &:focus {
-    border-radius: 0 0 10px 10px;
-  }
-}
-
-.load-more:hover {
-  border-radius: 0 0 10px 10px;
-}
-
-// this still looks like shit but at least it's better than it overflowing
-
-.empty-column-indicator {
-  border-radius: 0 0 10px 10px;
-}

From 7494a0fd00b66062dc78e21bf5185e0e5f2046bb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 12:30:16 -0500
Subject: [PATCH 42/56] Hovercard: delete legacy code

---
 .../profile_hover_card_container.js           | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 app/soapbox/features/profile_hover_card/profile_hover_card_container.js

diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
deleted file mode 100644
index d4f706212..000000000
--- a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { makeGetAccount } from '../../selectors';
-import { injectIntl, FormattedMessage } from 'react-intl';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import UserPanel from '../ui/components/user_panel';
-import ActionButton from '../ui/components/action_button';
-import { isAdmin, isModerator } from 'soapbox/utils/accounts';
-import Badge from 'soapbox/components/badge';
-import classNames from 'classnames';
-import { fetchRelationships } from 'soapbox/actions/accounts';
-
-const getAccount = makeGetAccount();
-
-const mapStateToProps = (state, { accountId }) => {
-  return {
-    account: getAccount(state, accountId),
-  };
-};
-
-export default @connect(mapStateToProps)
-@injectIntl
-class ProfileHoverCardContainer extends ImmutablePureComponent {
-
-  static propTypes = {
-    visible: PropTypes.bool,
-    accountId: PropTypes.string,
-    account: ImmutablePropTypes.map,
-    intl: PropTypes.object.isRequired,
-    dispatch: PropTypes.func.isRequired,
-  }
-
-  static defaultProps = {
-    visible: true,
-  }
-
-  getBadges = () => {
-    const { account } = this.props;
-    let badges = [];
-    if (isAdmin(account)) badges.push(<Badge key='admin' slug='admin' title='Admin' />);
-    if (isModerator(account)) badges.push(<Badge key='moderator' slug='moderator' title='Moderator' />);
-    if (account.getIn(['patron', 'is_patron'])) badges.push(<Badge key='patron' slug='patron' title='Patron' />);
-    return badges;
-  }
-
-  componentDidMount() {
-    this.props.dispatch(fetchRelationships([this.props.accountId]));
-  }
-
-  render() {
-    const { visible, accountId, account } = this.props;
-    if (!accountId) return null;
-    const accountBio = { __html: account.get('note_emojified') };
-    const followedBy  = account.getIn(['relationship', 'followed_by']);
-    const badges = this.getBadges();
-
-    return (
-      <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })}>
-        <div className='profile-hover-card__container'>
-          {followedBy &&
-            <span className='relationship-tag'>
-              <FormattedMessage id='account.follows_you' defaultMessage='Follows you' />
-            </span>}
-          <div className='profile-hover-card__action-button'><ActionButton account={account} small /></div>
-          <UserPanel className='profile-hover-card__user' accountId={accountId} />
-          {badges.length > 0 &&
-            <div className='profile-hover-card__badges'>
-              {badges}
-            </div>}
-          {account.getIn(['source', 'note'], '').length > 0 &&
-            <div className='profile-hover-card__bio' dangerouslySetInnerHTML={accountBio} />}
-        </div>
-      </div>
-    );
-  }
-
-};

From 77339056418bfd446d3b0a1a3671d824faf2d688 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 12:38:42 -0500
Subject: [PATCH 43/56] Hovercard: update DisplayName snapshot

---
 .../__snapshots__/display_name-test.js.snap   | 24 ++++++++++++-------
 .../components/__tests__/display_name-test.js |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
index 59789099f..d26a406a2 100644
--- a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
+++ b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
@@ -4,16 +4,22 @@ exports[`<DisplayName /> renders display name + account name 1`] = `
 <span
   className="display-name"
 >
-  <bdi>
-    <strong
-      className="display-name__html"
-      dangerouslySetInnerHTML={
-        Object {
-          "__html": "<p>Foo</p>",
+  <span
+    className="hover-ref-wrapper"
+    onMouseEnter={[Function]}
+    onMouseLeave={[Function]}
+  >
+    <bdi>
+      <strong
+        className="display-name__html"
+        dangerouslySetInnerHTML={
+          Object {
+            "__html": "<p>Foo</p>",
+          }
         }
-      }
-    />
-  </bdi>
+      />
+    </bdi>
+  </span>
   <span
     className="display-name__account"
   >
diff --git a/app/soapbox/components/__tests__/display_name-test.js b/app/soapbox/components/__tests__/display_name-test.js
index 0d040c4cd..f626f94ca 100644
--- a/app/soapbox/components/__tests__/display_name-test.js
+++ b/app/soapbox/components/__tests__/display_name-test.js
@@ -1,7 +1,7 @@
 import React from 'react';
-import renderer from 'react-test-renderer';
 import { fromJS }  from 'immutable';
 import DisplayName from '../display_name';
+import { createComponent } from 'soapbox/test_helpers';
 
 describe('<DisplayName />', () => {
   it('renders display name + account name', () => {
@@ -10,7 +10,7 @@ describe('<DisplayName />', () => {
       acct: 'bar@baz',
       display_name_html: '<p>Foo</p>',
     });
-    const component = renderer.create(<DisplayName account={account} />);
+    const component = createComponent(<DisplayName account={account} />);
     const tree      = component.toJSON();
 
     expect(tree).toMatchSnapshot();

From d6a39b3e0959dc40b21ebd0bf5775d172914b073 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 13:04:31 -0500
Subject: [PATCH 44/56] Hovercard: put hovercard on chat window

---
 .../features/chats/components/chat_window.js  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat_window.js b/app/soapbox/features/chats/components/chat_window.js
index acc5c2e8e..bb1a6346b 100644
--- a/app/soapbox/features/chats/components/chat_window.js
+++ b/app/soapbox/features/chats/components/chat_window.js
@@ -14,6 +14,7 @@ import {
 } from 'soapbox/actions/chats';
 import ChatBox from './chat_box';
 import { shortNumberFormat } from 'soapbox/utils/numbers';
+import HoverRefWrapper from 'soapbox/components/hover_ref_wrapper';
 
 const mapStateToProps = (state, { pane }) => ({
   me: state.get('me'),
@@ -79,13 +80,24 @@ class ChatWindow extends ImmutablePureComponent {
     const right = (285 * (idx + 1)) + 20;
     const unreadCount = chat.get('unread');
 
+    const unreadIcon = (
+      <i className='icon-with-badge__badge'>
+        {shortNumberFormat(unreadCount)}
+      </i>
+    );
+
+    const avatar = (
+      <HoverRefWrapper accountId={account.get('id')}>
+        <Link to={`/@${account.get('acct')}`}>
+          <Avatar account={account} size={18} />
+        </Link>
+      </HoverRefWrapper>
+    );
+
     return (
       <div className={`pane pane--${pane.get('state')}`} style={{ right: `${right}px` }}>
         <div className='pane__header'>
-          {unreadCount > 0
-            ? <i className='icon-with-badge__badge'>{shortNumberFormat(unreadCount)}</i>
-            : <Link to={`/@${account.get('acct')}`}><Avatar account={account} size={18} /></Link>
-          }
+          {unreadCount > 0 ? unreadIcon : avatar }
           <button className='pane__title' onClick={this.handleChatToggle(chat.get('id'))}>
             @{acctFull(account)}
           </button>

From ec491add236b044ad0429e2f5b8a122e0be2f468 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 13:04:45 -0500
Subject: [PATCH 45/56] UserPanel: only show stats when they're available

---
 app/soapbox/features/ui/components/user_panel.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js
index 1ba4e3efc..411b9b70b 100644
--- a/app/soapbox/features/ui/components/user_panel.js
+++ b/app/soapbox/features/ui/components/user_panel.js
@@ -56,26 +56,26 @@ class UserPanel extends ImmutablePureComponent {
 
             <div className='user-panel__stats-block'>
 
-              <div className='user-panel-stats-item'>
+              {account.get('statuses_count') && <div className='user-panel-stats-item'>
                 <Link to={`/@${account.get('acct')}`} title={intl.formatNumber(account.get('statuses_count'))}>
                   <strong className='user-panel-stats-item__value'>{shortNumberFormat(account.get('statuses_count'))}</strong>
                   <span className='user-panel-stats-item__label'><FormattedMessage className='user-panel-stats-item__label' id='account.posts' defaultMessage='Posts' /></span>
                 </Link>
-              </div>
+              </div>}
 
-              <div className='user-panel-stats-item'>
+              {account.get('followers_count') && <div className='user-panel-stats-item'>
                 <Link to={`/@${account.get('acct')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
                   <strong className='user-panel-stats-item__value'>{shortNumberFormat(account.get('followers_count'))}</strong>
                   <span className='user-panel-stats-item__label'><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
                 </Link>
-              </div>
+              </div>}
 
-              <div className='user-panel-stats-item'>
+              {account.get('following_count') && <div className='user-panel-stats-item'>
                 <Link to={`/@${account.get('acct')}/following`} title={intl.formatNumber(account.get('following_count'))}>
                   <strong className='user-panel-stats-item__value'>{shortNumberFormat(account.get('following_count'))}</strong>
                   <span className='user-panel-stats-item__label'><FormattedMessage className='user-panel-stats-item__label' id='account.follows' defaultMessage='Follows' /></span>
                 </Link>
-              </div>
+              </div>}
 
             </div>
 

From 40937b9fdc2890d1f28632d1a62de09b03820057 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 13:09:39 -0500
Subject: [PATCH 46/56] Chats: allow clicking recipient in chatroom

---
 app/soapbox/features/chats/chat_room.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/chats/chat_room.js b/app/soapbox/features/chats/chat_room.js
index f3e81cc12..a9f0ccd5d 100644
--- a/app/soapbox/features/chats/chat_room.js
+++ b/app/soapbox/features/chats/chat_room.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl } from 'react-intl';
+import { Link } from 'react-router-dom';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Avatar from 'soapbox/components/avatar';
 import { acctFull } from 'soapbox/utils/accounts';
@@ -75,12 +76,12 @@ class ChatRoom extends ImmutablePureComponent {
       <Column>
         <div className='chatroom__back'>
           <ColumnBackButton />
-          <div className='chatroom__header'>
+          <Link to={`/@${account.get('acct')}`} className='chatroom__header'>
             <Avatar account={account} size={18} />
             <div className='chatroom__title'>
               @{acctFull(account)}
             </div>
-          </div>
+          </Link>
         </div>
         <ChatBox
           chatId={chat.get('id')}

From 35fe2fa4fa9e905d8e39ab37026b2994ebda779f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 15:30:37 -0500
Subject: [PATCH 47/56] Hovercard: hide on click ref

---
 .../__tests__/__snapshots__/display_name-test.js.snap    | 1 +
 app/soapbox/components/hover_ref_wrapper.js              | 8 ++++++++
 app/styles/components/profile_hover_card.scss            | 9 +--------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
index d26a406a2..6d04016b5 100644
--- a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
+++ b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap
@@ -6,6 +6,7 @@ exports[`<DisplayName /> renders display name + account name 1`] = `
 >
   <span
     className="hover-ref-wrapper"
+    onClick={[Function]}
     onMouseEnter={[Function]}
     onMouseLeave={[Function]}
   >
diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js
index fe6ac2bed..652e4a387 100644
--- a/app/soapbox/components/hover_ref_wrapper.js
+++ b/app/soapbox/components/hover_ref_wrapper.js
@@ -26,6 +26,13 @@ const handleMouseLeave = (dispatch) => {
   };
 };
 
+const handleClick = (dispatch) => {
+  return e => {
+    showProfileHoverCard.cancel();
+    dispatch(closeProfileHoverCard(true));
+  };
+};
+
 export const HoverRefWrapper = ({ accountId, children, inline }) => {
   const dispatch = useDispatch();
   const ref = useRef();
@@ -37,6 +44,7 @@ export const HoverRefWrapper = ({ accountId, children, inline }) => {
       className='hover-ref-wrapper'
       onMouseEnter={handleMouseEnter(dispatch, ref, accountId)}
       onMouseLeave={handleMouseLeave(dispatch)}
+      onClick={handleClick(dispatch)}
     >
       {children}
     </Elem>
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index b3fb4fc31..f0053a65a 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -106,15 +106,8 @@
   }
 }
 
-.detailed-status {
-  .profile-hover-card {
-    top: 0;
-    left: 0;
-  }
-}
-
 /* Hide the popper when the reference is hidden */
-#popper[data-popper-reference-hidden] {
+.profile-hover-card[data-popper-reference-hidden] {
   visibility: hidden;
   pointer-events: none;
 }

From 4d5561e9af315219ea38efba2dde35a4ce071f72 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 15:54:22 -0500
Subject: [PATCH 48/56] Hovercard: invisible hotfix

---
 app/styles/components/profile_hover_card.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index f0053a65a..b5b9da716 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -105,9 +105,3 @@
     }
   }
 }
-
-/* Hide the popper when the reference is hidden */
-.profile-hover-card[data-popper-reference-hidden] {
-  visibility: hidden;
-  pointer-events: none;
-}

From c135ccffebb575a4adc101f69f1b2eed0a37c392 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 16:02:51 -0500
Subject: [PATCH 49/56] Chats: fix verification icon in chats list

---
 app/styles/chats.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 3e2fc2e24..623835b5d 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -152,6 +152,10 @@
     .display-name {
       display: flex;
 
+      .hover-ref-wrapper {
+        display: flex;
+      }
+
       bdi {
         overflow: hidden;
         text-overflow: ellipsis;

From bdaab2110be43141efe5576c9318879c79e82cdc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 19:45:24 -0500
Subject: [PATCH 50/56] Chats: improve mobile styles

---
 app/styles/chats.scss | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 623835b5d..869f1475f 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -282,6 +282,37 @@
       }
     }
   }
+
+  @media(max-width: 630px) {
+    .columns-area__panels__main .columns-area {
+      padding: 0;
+    }
+
+    .columns-area__panels__main {
+      padding: 0;
+      max-width: none;
+    }
+
+    .columns-area--mobile .column {
+      border-radius: 0;
+    }
+
+    .page {
+      .chat-box {
+        border-radius: 0;
+        border: 2px solid var(--foreground-color);
+
+        &__actions {
+          padding: 0;
+
+          textarea {
+            height: 4em;
+            border-radius: 0;
+          }
+        }
+      }
+    }
+  }
 }
 
 @media(max-width: 630px) {

From d644ed3c55d86f29fc7d37250b4d96eea384eb3b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 19:47:45 -0500
Subject: [PATCH 51/56] Chats: remove underline from recipient name on mobile

---
 app/styles/chats.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index 869f1475f..eb7ba2834 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -332,6 +332,7 @@
   margin-left: auto;
   padding-right: 15px;
   overflow: hidden;
+  text-decoration: none;
 
   .account__avatar {
     margin-right: 7px;

From 0c15e3235ae4d87292dae7e45ae4e20496651f03 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 20:10:15 -0500
Subject: [PATCH 52/56] Chats: mobile action button padding hotfix

---
 app/styles/chats.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/styles/chats.scss b/app/styles/chats.scss
index eb7ba2834..5a8752987 100644
--- a/app/styles/chats.scss
+++ b/app/styles/chats.scss
@@ -278,7 +278,7 @@
       border-radius: 0 0 10px 10px;
 
       &__actions textarea {
-        padding: 10px;
+        padding: 10px 40px 10px 10px;
       }
     }
   }

From 5682688aedc5088385220c13d4b3812ac1a8f7a1 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Sep 2020 22:44:09 -0500
Subject: [PATCH 53/56] Chats: fix #418 scrolling resize issue

---
 app/soapbox/features/chats/components/chat_message_list.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js
index 1cfc41442..bd20ffade 100644
--- a/app/soapbox/features/chats/components/chat_message_list.js
+++ b/app/soapbox/features/chats/components/chat_message_list.js
@@ -89,11 +89,16 @@ class ChatMessageList extends ImmutablePureComponent {
     return scrollBottom < elem.offsetHeight * 1.5;
   }
 
+  handleResize = (e) => {
+    if (this.isNearBottom()) this.scrollToBottom();
+  }
+
   componentDidMount() {
     const { dispatch, chatId } = this.props;
     dispatch(fetchChatMessages(chatId));
 
     this.node.addEventListener('scroll', this.handleScroll);
+    window.addEventListener('resize', this.handleResize);
     this.scrollToBottom();
   }
 
@@ -125,6 +130,7 @@ class ChatMessageList extends ImmutablePureComponent {
 
   componentWillUnmount() {
     this.node.removeEventListener('scroll', this.handleScroll);
+    window.removeEventListener('resize', this.handleResize);
   }
 
   handleLoadMore = () => {

From 556e11a9cbc40eb2b0aee53c50f6faa2417dcb70 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 15 Sep 2020 10:19:27 -0500
Subject: [PATCH 54/56] Skip importing empty accounts, fixes #424

---
 app/soapbox/actions/importer/index.js | 4 ++++
 app/soapbox/reducers/notifications.js | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/actions/importer/index.js b/app/soapbox/actions/importer/index.js
index 0736dd7ce..44de245cf 100644
--- a/app/soapbox/actions/importer/index.js
+++ b/app/soapbox/actions/importer/index.js
@@ -46,6 +46,8 @@ export function importFetchedAccounts(accounts) {
   const normalAccounts = [];
 
   function processAccount(account) {
+    if (!account.id) return;
+
     pushUnique(normalAccounts, normalizeAccount(account));
 
     if (account.moved) {
@@ -69,6 +71,8 @@ export function importFetchedStatuses(statuses) {
     const polls = [];
 
     function processStatus(status) {
+      if (!status.account.id) return;
+
       const normalOldStatus = getState().getIn(['statuses', status.id]);
       const expandSpoilers = getSettings(getState()).get('expandSpoilers');
 
diff --git a/app/soapbox/reducers/notifications.js b/app/soapbox/reducers/notifications.js
index c4c97c73f..e121c4e82 100644
--- a/app/soapbox/reducers/notifications.js
+++ b/app/soapbox/reducers/notifications.js
@@ -61,8 +61,9 @@ const normalizeNotification = (state, notification) => {
 const expandNormalizedNotifications = (state, notifications, next) => {
   let items = ImmutableList();
 
-  notifications.forEach((n, i) => {
-    items = items.set(i, notificationToMap(n));
+  notifications.forEach((n) => {
+    if (!n.account.id) return;
+    items = items.push(notificationToMap(n));
   });
 
   return state.withMutations(mutable => {

From 61c7e968e4c7bbd195f8ab1dd4e4f13837c38c7d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 17 Sep 2020 22:06:17 -0500
Subject: [PATCH 55/56] Throw out i18n changes

---
 app/soapbox/locales/ar.json              |  12 +-
 app/soapbox/locales/ast.json             |  12 +-
 app/soapbox/locales/bg.json              |  12 +-
 app/soapbox/locales/bn.json              |  12 +-
 app/soapbox/locales/br.json              |  12 +-
 app/soapbox/locales/ca.json              |  12 +-
 app/soapbox/locales/co.json              |  12 +-
 app/soapbox/locales/cs.json              |  12 +-
 app/soapbox/locales/cy.json              |  12 +-
 app/soapbox/locales/da.json              |  12 +-
 app/soapbox/locales/de.json              |  12 +-
 app/soapbox/locales/defaultMessages.json | 217 +++++++----------------
 app/soapbox/locales/el.json              |  12 +-
 app/soapbox/locales/en.json              |  12 +-
 app/soapbox/locales/eo.json              |  12 +-
 app/soapbox/locales/es-AR.json           |  12 +-
 app/soapbox/locales/es.json              |  12 +-
 app/soapbox/locales/et.json              |  12 +-
 app/soapbox/locales/eu.json              |  12 +-
 app/soapbox/locales/fa.json              |  12 +-
 app/soapbox/locales/fi.json              |  12 +-
 app/soapbox/locales/fr.json              |  12 +-
 app/soapbox/locales/ga.json              |  12 +-
 app/soapbox/locales/gl.json              |  12 +-
 app/soapbox/locales/he.json              |  12 +-
 app/soapbox/locales/hi.json              |  12 +-
 app/soapbox/locales/hr.json              |  12 +-
 app/soapbox/locales/hu.json              |  12 +-
 app/soapbox/locales/hy.json              |  12 +-
 app/soapbox/locales/id.json              |  12 +-
 app/soapbox/locales/io.json              |  12 +-
 app/soapbox/locales/it.json              |  12 +-
 app/soapbox/locales/ja.json              |  12 +-
 app/soapbox/locales/ka.json              |  12 +-
 app/soapbox/locales/kk.json              |  12 +-
 app/soapbox/locales/ko.json              |  12 +-
 app/soapbox/locales/lt.json              |  12 +-
 app/soapbox/locales/lv.json              |  12 +-
 app/soapbox/locales/mk.json              |  12 +-
 app/soapbox/locales/ms.json              |  12 +-
 app/soapbox/locales/nl.json              |  12 +-
 app/soapbox/locales/nn.json              |  12 +-
 app/soapbox/locales/no.json              |  12 +-
 app/soapbox/locales/oc.json              |  12 +-
 app/soapbox/locales/pl.json              |  12 +-
 app/soapbox/locales/pt-BR.json           |  12 +-
 app/soapbox/locales/pt.json              |  12 +-
 app/soapbox/locales/ro.json              |  12 +-
 app/soapbox/locales/ru.json              |  12 +-
 app/soapbox/locales/sk.json              |  12 +-
 app/soapbox/locales/sl.json              |  12 +-
 app/soapbox/locales/sq.json              |  12 +-
 app/soapbox/locales/sr-Latn.json         |  12 +-
 app/soapbox/locales/sr.json              |  12 +-
 app/soapbox/locales/sv.json              |  12 +-
 app/soapbox/locales/ta.json              |  12 +-
 app/soapbox/locales/te.json              |  12 +-
 app/soapbox/locales/th.json              |  12 +-
 app/soapbox/locales/tr.json              |  12 +-
 app/soapbox/locales/uk.json              |  12 +-
 app/soapbox/locales/zh-CN.json           |  12 +-
 app/soapbox/locales/zh-HK.json           |  12 +-
 app/soapbox/locales/zh-TW.json           |  12 +-
 63 files changed, 432 insertions(+), 529 deletions(-)

diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json
index ca3a635f5..c85ec3160 100644
--- a/app/soapbox/locales/ar.json
+++ b/app/soapbox/locales/ar.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "أغلق",
   "bundle_modal_error.message": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.",
   "bundle_modal_error.retry": "إعادة المحاولة",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "الحسابات المحجوبة",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "الخيط العام المحلي",
   "column.direct": "الرسائل المباشرة",
   "column.domain_blocks": "النطاقات المخفية",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "أو {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "الأساسية",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "عرض الترقيات",
   "home.column_settings.show_replies": "اعرض الردود",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "الخيط العام الموحد",
   "navigation_bar.security": "الأمان",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "أُعجِب {name} بمنشورك",
   "notification.follow": "{name} يتابعك",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "إلغاء الاقتراح",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "الرئيسية",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "الإخطارات",
diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json
index dcc347e85..136587af9 100644
--- a/app/soapbox/locales/ast.json
+++ b/app/soapbox/locales/ast.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloquiaos",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Llinia temporal llocal",
   "column.direct": "Mensaxes direutos",
   "column.domain_blocks": "Dominios anubríos",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Amosar toots compartíos",
   "home.column_settings.show_replies": "Amosar rempuestes",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Llinia temporal federada",
   "navigation_bar.security": "Seguranza",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} siguióte",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Aniciu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Avisos",
diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json
index 2877f1cd7..0384c7b00 100644
--- a/app/soapbox/locales/bg.json
+++ b/app/soapbox/locales/bg.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Публичен канал",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} хареса твоята публикация",
   "notification.follow": "{name} те последва",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Начало",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Известия",
diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json
index 6051add27..00f2fbec4 100644
--- a/app/soapbox/locales/bn.json
+++ b/app/soapbox/locales/bn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "বন্ধ করুন",
   "bundle_modal_error.message": "এই অংশটি দেখাতে যেয়ে কোনো সমস্যা হয়েছে।",
   "bundle_modal_error.retry": "আবার চেষ্টা করুন",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "যাদের বন্ধ করে রাখা হয়েছে",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "স্থানীয় সময়সারি",
   "column.direct": "সরাসরি লেখা",
   "column.domain_blocks": "সরিয়ে ফেলা ওয়েবসাইট",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "এবং {additional}",
   "hashtag.column_header.tag_mode.any": "অথবা {additional}",
   "hashtag.column_header.tag_mode.none": "বাদ দিয়ে {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "সাধারণ",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "সমর্থনগুলো দেখান",
   "home.column_settings.show_replies": "মতামত দেখান",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা",
   "navigation_bar.security": "নিরাপত্তা",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন",
   "notification.follow": "{name} আপনাকে অনুসরণ করেছেন",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "সাহায্যের পরামর্শগুলো সরাতে",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "বাড়ি",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "প্রজ্ঞাপনগুলো",
diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json
index 4a1b0463b..729a0ef8e 100644
--- a/app/soapbox/locales/br.json
+++ b/app/soapbox/locales/br.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Serriñ",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Klask endro",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Implijour·ezed·ion stanket",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Red-amzer lec'hel",
   "column.direct": "Kemennadoù prevez",
   "column.domain_blocks": "Domani kuzhet",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json
index 3c4a130c9..b4cee2c22 100644
--- a/app/soapbox/locales/ca.json
+++ b/app/soapbox/locales/ca.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tanca",
   "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.",
   "bundle_modal_error.retry": "Torna-ho a provar",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuaris bloquejats",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línia de temps local",
   "column.direct": "Missatges directes",
   "column.domain_blocks": "Dominis ocults",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sense {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Bàsic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostes",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Línia de temps federada",
   "navigation_bar.security": "Seguretat",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ha afavorit el teu estat",
   "notification.follow": "{name} et segueix",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar suggeriment",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inici",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacions",
diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json
index 045f8e0f7..10ab6a686 100644
--- a/app/soapbox/locales/co.json
+++ b/app/soapbox/locales/co.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Chjudà",
   "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.",
   "bundle_modal_error.retry": "Pruvà torna",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizatori bluccati",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Linea pubblica lucale",
   "column.direct": "Missaghji diretti",
   "column.domain_blocks": "Duminii piattati",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "è {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Bàsichi",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Linea pubblica glubale",
   "navigation_bar.security": "Sicurità",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti",
   "notification.follow": "{name} v'hà seguitatu",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Righjittà a pruposta",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Accolta",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Nutificazione",
diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json
index 7e4a47bd0..b5bcbad8e 100644
--- a/app/soapbox/locales/cs.json
+++ b/app/soapbox/locales/cs.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zavřít",
   "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.",
   "bundle_modal_error.retry": "Zkusit znovu",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Místní zeď",
   "column.direct": "Přímé zprávy",
   "column.domain_blocks": "Skryté domény",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "nebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Základní",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federovaná zeď",
   "navigation_bar.security": "Zabezpečení",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reagoval/a na Váš příspěvek",
   "notification.favourite": "{name} si oblíbil/a váš příspěvek",
   "notification.follow": "{name} vás začal/a sledovat",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Odmítnout návrh",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domů",
   "tabs_bar.news": "Zprávy",
   "tabs_bar.notifications": "Oznámení",
diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json
index f6852f3e9..1fa612045 100644
--- a/app/soapbox/locales/cy.json
+++ b/app/soapbox/locales/cy.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cau",
   "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
   "bundle_modal_error.retry": "Ceiswich eto",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Defnyddwyr a flociwyd",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Ffrwd lleol",
   "column.direct": "Negeseuon preifat",
   "column.domain_blocks": "Parthau cuddiedig",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "neu {additional}",
   "hashtag.column_header.tag_mode.none": "heb {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Syml",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Dangos bŵstiau",
   "home.column_settings.show_replies": "Dangos ymatebion",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
   "navigation_bar.security": "Diogelwch",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "hoffodd {name} eich tŵt",
   "notification.follow": "dilynodd {name} chi",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Diswyddo",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hafan",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Hysbysiadau",
diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json
index ae39a4c1e..b6b45f71a 100644
--- a/app/soapbox/locales/da.json
+++ b/app/soapbox/locales/da.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Luk",
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af dette komponent.",
   "bundle_modal_error.retry": "Prøv igen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direkte beskeder",
   "column.domain_blocks": "Skjulte domæner",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Grundlæggende",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Fælles tidslinje",
   "navigation_bar.security": "Sikkerhed",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favoriserede din status",
   "notification.follow": "{name} fulgte dig",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Afvis foreslag",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hjem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikationer",
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 81044ba70..d895ee5c1 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Schließen",
   "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blockierte Profile",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokale Zeitleiste",
   "column.direct": "Direktnachrichten",
   "column.domain_blocks": "Versteckte Domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "und {additional}",
   "hashtag.column_header.tag_mode.any": "oder {additional}",
   "hashtag.column_header.tag_mode.none": "ohne {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basiseinstellungen",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderierte Zeitleiste",
   "navigation_bar.security": "Sicherheit",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} hat auf deinen Beitrag reagiert",
   "notification.favourite": "{name} hat deinen Beitrag favorisiert",
   "notification.follow": "{name} folgt dir",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "{count, plural, one {Ein neuer Beitrag} other {# neue Beiträge}}. Hier klicken, um {count, plural, one {ihn} other {sie}} anzuzeigen.",
   "suggestions.dismiss": "Empfehlung ausblenden",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Startseite",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Benachrichtigungen",
diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json
index da99b5cf7..5b313cd40 100644
--- a/app/soapbox/locales/defaultMessages.json
+++ b/app/soapbox/locales/defaultMessages.json
@@ -262,6 +262,15 @@
     ],
     "path": "app/soapbox/components/poll.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Follows you",
+        "id": "account.follows_you"
+      }
+    ],
+    "path": "app/soapbox/components/profile_hover_card.json"
+  },
   {
     "descriptors": [
       {
@@ -321,10 +330,6 @@
         "defaultMessage": "Profile",
         "id": "account.profile"
       },
-      {
-        "defaultMessage": "Messages",
-        "id": "navigation_bar.messages"
-      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -993,8 +998,41 @@
   {
     "descriptors": [
       {
-<<<<<<< app/soapbox/locales/defaultMessages.json
-=======
+        "defaultMessage": "Send a message…",
+        "id": "chat_box.input.placeholder"
+      }
+    ],
+    "path": "app/soapbox/features/chats/components/chat_box.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Chats",
+        "id": "chat_panels.main_window.title"
+      },
+      {
+        "defaultMessage": "No chats found. To start a chat, visit a user's profile.",
+        "id": "chat_panels.main_window.empty"
+      }
+    ],
+    "path": "app/soapbox/features/chats/components/chat_panes.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Chats",
+        "id": "column.chats"
+      },
+      {
+        "defaultMessage": "No chats found. To start a chat, visit a user's profile.",
+        "id": "chat_panels.main_window.empty"
+      }
+    ],
+    "path": "app/soapbox/features/chats/index.json"
+  },
+  {
+    "descriptors": [
+      {
         "defaultMessage": "Show reposts",
         "id": "home.column_settings.show_reblogs"
       },
@@ -1003,7 +1041,6 @@
         "id": "home.column_settings.show_replies"
       },
       {
->>>>>>> app/soapbox/locales/defaultMessages.json
         "defaultMessage": "Media Only",
         "id": "community.column_settings.media_only"
       }
@@ -1469,123 +1506,6 @@
     ],
     "path": "app/soapbox/features/compose/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Soapbox settings",
-        "id": "column.soapbox_settings"
-      },
-      {
-        "defaultMessage": "Copyright footer",
-        "id": "soapbox_settings.copyright_footer.meta_fields.label_placeholder"
-      },
-      {
-        "defaultMessage": "Icon",
-        "id": "soapbox_settings.promo_panel.meta_fields.icon_placeholder"
-      },
-      {
-        "defaultMessage": "Label",
-        "id": "soapbox_settings.promo_panel.meta_fields.label_placeholder"
-      },
-      {
-        "defaultMessage": "URL",
-        "id": "soapbox_settings.promo_panel.meta_fields.url_placeholder"
-      },
-      {
-        "defaultMessage": "Label",
-        "id": "soapbox_settings.home_footer.meta_fields.label_placeholder"
-      },
-      {
-        "defaultMessage": "URL",
-        "id": "soapbox_settings.home_footer.meta_fields.url_placeholder"
-      },
-      {
-        "defaultMessage": "URL",
-        "id": "soapbox_settings.custom_css.meta_fields.url_placeholder"
-      },
-      {
-        "defaultMessage": "Logo",
-        "id": "soapbox_settings.fields.logo_label"
-      },
-      {
-        "defaultMessage": "SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio",
-        "id": "soapbox_settings.hints.logo"
-      },
-      {
-        "defaultMessage": "Banner",
-        "id": "soapbox_settings.fields.banner_label"
-      },
-      {
-        "defaultMessage": "PNG, GIF or JPG. At most 2 MB. Will be downscaled to 400x400px",
-        "id": "soapbox_settings.hints.banner"
-      },
-      {
-        "defaultMessage": "Brand color",
-        "id": "soapbox_settings.fields.brand_color_label"
-      },
-      {
-        "defaultMessage": "Patron module",
-        "id": "soapbox_settings.fields.patron_enabled_label"
-      },
-      {
-        "defaultMessage": "Enables display of Patron module.  Requires installation of Patron module.",
-        "id": "soapbox_settings.hints.patron_enabled"
-      },
-      {
-        "defaultMessage": "Auto-play GIFs",
-        "id": "soapbox_settings.fields.auto_play_gif_label"
-      },
-      {
-        "defaultMessage": "Enable auto-playing of GIF files in timeline",
-        "id": "soapbox_settings.hints.auto_play_gif"
-      },
-      {
-        "defaultMessage": "Promo panel items",
-        "id": "soapbox_settings.fields.promo_panel_fields_label"
-      },
-      {
-        "defaultMessage": "You can have custom defined links displayed on the left panel of the timelines page.",
-        "id": "soapbox_settings.hints.promo_panel_fields"
-      },
-      {
-        "defaultMessage": "{ link }",
-        "id": "soapbox_settings.hints.promo_panel_icons"
-      },
-      {
-        "defaultMessage": "Add new Promo panel item",
-        "id": "soapbox_settings.fields.promo_panel.add"
-      },
-      {
-        "defaultMessage": "Home footer items",
-        "id": "soapbox_settings.fields.home_footer_fields_label"
-      },
-      {
-        "defaultMessage": "You can have custom defined links displayed on the footer of your static pages",
-        "id": "soapbox_settings.hints.home_footer_fields"
-      },
-      {
-        "defaultMessage": "Add new Home Footer Item",
-        "id": "soapbox_settings.fields.home_footer.add"
-      },
-      {
-        "defaultMessage": "Custom CSS",
-        "id": "soapbox_settings.fields.custom_css_fields_label"
-      },
-      {
-        "defaultMessage": "You can have custom CSS definitions",
-        "id": "soapbox_settings.hints.custom_css_fields"
-      },
-      {
-        "defaultMessage": "Add new Custom CSS item",
-        "id": "soapbox_settings.fields.custom_css.add"
-      },
-      {
-        "defaultMessage": "Save",
-        "id": "soapbox_settings.save"
-      }
-    ],
-    "path": "app/soapbox/features/configuration/index.json"
-  },
   {
     "descriptors": [
       {
@@ -2463,6 +2383,10 @@
         "defaultMessage": "{name} followed you",
         "id": "notification.follow"
       },
+      {
+        "defaultMessage": "{name} sent you a message",
+        "id": "notification.chat_mention"
+      },
       {
         "defaultMessage": "{name} reacted to your post",
         "id": "notification.emoji_react"
@@ -2613,26 +2537,6 @@
   },
   {
     "descriptors": [
-      {
-        "defaultMessage": "Home",
-        "id": "header.home.label"
-      },
-      {
-        "defaultMessage": "About",
-        "id": "header.about.label"
-      },
-      {
-        "defaultMessage": "Back to",
-        "id": "header.back_to.label"
-      },
-      {
-        "defaultMessage": " ",
-        "id": "header.back_to_ending.label"
-      },
-      {
-        "defaultMessage": "Log in",
-        "id": "header.login.label"
-      },
       {
         "defaultMessage": "Close",
         "id": "lightbox.close"
@@ -2643,8 +2547,6 @@
   {
     "descriptors": [
       {
-<<<<<<< app/soapbox/locales/defaultMessages.json
-=======
         "defaultMessage": "Show reposts",
         "id": "home.column_settings.show_reblogs"
       },
@@ -2653,7 +2555,6 @@
         "id": "home.column_settings.show_replies"
       },
       {
->>>>>>> app/soapbox/locales/defaultMessages.json
         "defaultMessage": "Media Only",
         "id": "community.column_settings.media_only"
       }
@@ -3115,6 +3016,14 @@
       {
         "defaultMessage": "Copy link to post",
         "id": "status.copy"
+      },
+      {
+        "defaultMessage": "Bookmark",
+        "id": "status.bookmark"
+      },
+      {
+        "defaultMessage": "Remove bookmark",
+        "id": "status.unbookmark"
       }
     ],
     "path": "app/soapbox/features/status/components/action_bar.json"
@@ -3187,13 +3096,10 @@
         "id": "account.requested"
       },
       {
-<<<<<<< app/soapbox/locales/defaultMessages.json
-=======
         "defaultMessage": "Awaiting approval",
         "id": "account.requested_small"
       },
       {
->>>>>>> app/soapbox/locales/defaultMessages.json
         "defaultMessage": "Unblock @{name}",
         "id": "account.unblock"
       },
@@ -3318,15 +3224,9 @@
   {
     "descriptors": [
       {
-<<<<<<< app/soapbox/locales/defaultMessages.json
-=======
         "defaultMessage": "Edit Profile",
         "id": "account.edit_profile"
       },
-      {
-        "defaultMessage": "Messages",
-        "id": "navigation_bar.messages"
-      },
       {
         "defaultMessage": "Preferences",
         "id": "navigation_bar.preferences"
@@ -3349,7 +3249,6 @@
   {
     "descriptors": [
       {
->>>>>>> app/soapbox/locales/defaultMessages.json
         "defaultMessage": "Close",
         "id": "lightbox.close"
       },
@@ -3645,6 +3544,10 @@
         "defaultMessage": "Notifications",
         "id": "tabs_bar.notifications"
       },
+      {
+        "defaultMessage": "Chats",
+        "id": "tabs_bar.chats"
+      },
       {
         "defaultMessage": "Reports",
         "id": "tabs_bar.reports"
diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json
index c238759c4..3fc83e00f 100644
--- a/app/soapbox/locales/el.json
+++ b/app/soapbox/locales/el.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Κλείσιμο",
   "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.",
   "bundle_modal_error.retry": "Δοκίμασε ξανά",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Τοπική ροή",
   "column.direct": "Προσωπικά μηνύματα",
   "column.domain_blocks": "Κρυμμένοι τομείς",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "και {additional}",
   "hashtag.column_header.tag_mode.any": "ή {additional}",
   "hashtag.column_header.tag_mode.none": "χωρίς {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Βασικές ρυθμίσεις",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Ομοσπονδιακή ροή",
   "navigation_bar.security": "Ασφάλεια",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Απόρριψη πρότασης",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Αρχική",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ειδοποιήσεις",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index 1c091ce2d..7003f9bfe 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} liked your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json
index 502ce3f43..7357fb6b9 100644
--- a/app/soapbox/locales/eo.json
+++ b/app/soapbox/locales/eo.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fermi",
   "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
   "bundle_modal_error.retry": "Bonvolu reprovi",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokitaj uzantoj",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Loka tempolinio",
   "column.direct": "Rektaj mesaĝoj",
   "column.domain_blocks": "Kaŝitaj domajnoj",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "kaj {additional}",
   "hashtag.column_header.tag_mode.any": "aŭ {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Fratara tempolinio",
   "navigation_bar.security": "Sekureco",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} stelumis vian mesaĝon",
   "notification.follow": "{name} eksekvis vin",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Forigi la proponon",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hejmo",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Sciigoj",
diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json
index 115e08dbf..c0c832026 100644
--- a/app/soapbox/locales/es-AR.json
+++ b/app/soapbox/locales/es-AR.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Intentá de nuevo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línea temporal local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultos",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Línea temporal federada",
   "navigation_bar.security": "Seguridad",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar sugerencia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Principal",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificaciones",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 32e589b0c..15580f2ab 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Cerrar",
   "bundle_modal_error.message": "Algo salió mal al cargar este componente.",
   "bundle_modal_error.retry": "Inténtalo de nuevo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Línea de tiempo local",
   "column.direct": "Mensajes directos",
   "column.domain_blocks": "Dominios ocultados",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Historia federada",
   "navigation_bar.security": "Seguridad",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcó tu estado como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Descartar sugerencia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inicio",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificaciones",
diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json
index e57e0759e..507523b16 100644
--- a/app/soapbox/locales/et.json
+++ b/app/soapbox/locales/et.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sulge",
   "bundle_modal_error.message": "Selle komponendi laadimisel läks midagi viltu.",
   "bundle_modal_error.retry": "Proovi uuesti",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Kohalik ajajoon",
   "column.direct": "Otsesõnumid",
   "column.domain_blocks": "Peidetud domeenid",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "või {additional}",
   "hashtag.column_header.tag_mode.none": "ilma {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Peamine",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Näita upitusi",
   "home.column_settings.show_replies": "Näita vastuseid",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderatiivne ajajoon",
   "navigation_bar.security": "Turvalisus",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} märkis su staatuse lemmikuks",
   "notification.follow": "{name} jälgib sind",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Eira soovitust",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Kodu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Teated",
diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json
index 2cbbb89b3..f0955c485 100644
--- a/app/soapbox/locales/eu.json
+++ b/app/soapbox/locales/eu.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Itxi",
   "bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.",
   "bundle_modal_error.retry": "Saiatu berriro",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokeatutako erabiltzaileak",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Denbora-lerro lokala",
   "column.direct": "Mezu zuzenak",
   "column.domain_blocks": "Ezkutatutako domeinuak",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "eta {additional}",
   "hashtag.column_header.tag_mode.any": "edo {additional}",
   "hashtag.column_header.tag_mode.none": "gabe {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federatutako denbora-lerroa",
   "navigation_bar.security": "Segurtasuna",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}(e)k zure mezua gogoko du",
   "notification.follow": "{name}(e)k jarraitzen zaitu",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Errefusatu proposamena",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hasiera",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Jakinarazpenak",
diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json
index b7d9637c2..fdd256dc0 100644
--- a/app/soapbox/locales/fa.json
+++ b/app/soapbox/locales/fa.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "بستن",
   "bundle_modal_error.message": "هنگام بازکردن این بخش خطایی رخ داد.",
   "bundle_modal_error.retry": "تلاش دوباره",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "کاربران مسدودشده",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "نوشته‌های محلی",
   "column.direct": "پیغام‌های خصوصی",
   "column.domain_blocks": "دامین‌های پنهان‌شده",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
   "hashtag.column_header.tag_mode.none": "بدون {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "اصلی",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "نمایش بازبوق‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "نوشته‌های همه‌جا",
   "navigation_bar.security": "امنیت",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید",
   "notification.follow": "‫{name}‬ پیگیر شما شد",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "پیشنهاد را نادیده بگیر",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "خانه",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "اعلان‌ها",
diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json
index 467af3349..2ddaebaac 100644
--- a/app/soapbox/locales/fi.json
+++ b/app/soapbox/locales/fi.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sulje",
   "bundle_modal_error.message": "Jokin meni vikaan komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudestaan",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Paikallinen aikajana",
   "column.direct": "Viestit",
   "column.domain_blocks": "Piilotetut verkkotunnukset",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "ja {additional}",
   "hashtag.column_header.tag_mode.any": "tai {additional}",
   "hashtag.column_header.tag_mode.none": "ilman {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Näytä buustaukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Yleinen aikajana",
   "navigation_bar.security": "Tunnukset",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} tykkäsi tilastasi",
   "notification.follow": "{name} seurasi sinua",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Koti",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ilmoitukset",
diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json
index bab9d3a70..667e783ad 100644
--- a/app/soapbox/locales/fr.json
+++ b/app/soapbox/locales/fr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fermer",
   "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.",
   "bundle_modal_error.retry": "Réessayer",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Fil public local",
   "column.direct": "Messages privés",
   "column.domain_blocks": "Domaines cachés",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Base",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Fil public global",
   "navigation_bar.security": "Sécurité",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a ajouté à ses favoris :",
   "notification.follow": "{name} vous suit",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Rejeter la suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Accueil",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json
index e5899213b..ad44ad1b2 100644
--- a/app/soapbox/locales/ga.json
+++ b/app/soapbox/locales/ga.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json
index 018262da7..54ea94656 100644
--- a/app/soapbox/locales/gl.json
+++ b/app/soapbox/locales/gl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Pechar",
   "bundle_modal_error.message": "Algo fallou mentras se cargaba este compoñente.",
   "bundle_modal_error.retry": "Inténteo de novo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Liña temporal local",
   "column.direct": "Mensaxes directas",
   "column.domain_blocks": "Dominios agochados",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar repeticións",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Liña temporal federada",
   "navigation_bar.security": "Seguridade",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} marcou como favorito o seu estado",
   "notification.follow": "{name} está a seguila",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Rexeitar suxestión",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Inicio",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacións",
diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json
index f45b583d1..53be2e329 100644
--- a/app/soapbox/locales/he.json
+++ b/app/soapbox/locales/he.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "לסגור",
   "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.",
   "bundle_modal_error.retry": "לנסות שוב",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "חסימות",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ציר זמן מקומי",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "למתחילים",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "ציר זמן בין-קהילתי",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "חצרוצך חובב על ידי {name}",
   "notification.follow": "{name} במעקב אחרייך",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "בבית",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "התראות",
diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json
index d9e114a62..6f8664e23 100644
--- a/app/soapbox/locales/hi.json
+++ b/app/soapbox/locales/hi.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json
index 122fe0e6e..1e8098c47 100644
--- a/app/soapbox/locales/hr.json
+++ b/app/soapbox/locales/hr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalni timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Pokaži boostove",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federalni timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je lajkao tvoj status",
   "notification.follow": "{name} te sada slijedi",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Dom",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikacije",
diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json
index 8975de636..4eea27c3f 100644
--- a/app/soapbox/locales/hu.json
+++ b/app/soapbox/locales/hu.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Bezárás",
   "bundle_modal_error.message": "Hiba történt a komponens betöltésekor.",
   "bundle_modal_error.retry": "Próbáld újra",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Helyi idővonal",
   "column.direct": "Közvetlen üzenetek",
   "column.domain_blocks": "Rejtett domainek",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "és {additional}",
   "hashtag.column_header.tag_mode.any": "vagy {additional}",
   "hashtag.column_header.tag_mode.none": "nélküle {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Alapértelmezések",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Megtolások mutatása",
   "home.column_settings.show_replies": "Válaszok mutatása",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Föderációs idővonal",
   "navigation_bar.security": "Biztonság",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} kedvencnek jelölte egy tülködet",
   "notification.follow": "{name} követ téged",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Javaslat elvetése",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Saját",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Értesítések",
diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json
index a1ce9707b..858304ff5 100644
--- a/app/soapbox/locales/hy.json
+++ b/app/soapbox/locales/hy.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Փակել",
   "bundle_modal_error.message": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։",
   "bundle_modal_error.retry": "Կրկին փորձել",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Արգելափակված օգտատերեր",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Տեղական հոսք",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Հիմնական",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Ցուցադրել տարածածները",
   "home.column_settings.show_replies": "Ցուցադրել պատասխանները",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Դաշնային հոսք",
   "navigation_bar.security": "Անվտանգություն",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} հավանեց թութդ",
   "notification.follow": "{name} սկսեց հետեւել քեզ",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Հիմնական",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ծանուցումներ",
diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json
index 022f371d2..947b2a1fd 100644
--- a/app/soapbox/locales/id.json
+++ b/app/soapbox/locales/id.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tutup",
   "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.",
   "bundle_modal_error.retry": "Coba lagi",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Pengguna diblokir",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Linimasa Lokal",
   "column.direct": "Pesan langsung",
   "column.domain_blocks": "Topik tersembunyi",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
   "hashtag.column_header.tag_mode.none": "tanpa {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Dasar",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Tampilkan repost",
   "home.column_settings.show_replies": "Tampilkan balasan",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Linimasa gabungan",
   "navigation_bar.security": "Keamanan",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} menyukai status anda",
   "notification.follow": "{name} mengikuti anda",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Beranda",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifikasi",
diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json
index d9e74e090..be6a481fd 100644
--- a/app/soapbox/locales/io.json
+++ b/app/soapbox/locales/io.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokusita uzeri",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokala tempolineo",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Simpla",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federata tempolineo",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.follow": "{name} sequeskis tu",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hemo",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Savigi",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index c26ef5f5a..ed983f92f 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Chiudi",
   "bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.",
   "bundle_modal_error.retry": "Riprova",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Timeline locale",
   "column.direct": "Messaggi diretti",
   "column.domain_blocks": "Domini nascosti",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "senza {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Semplice",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostra post condivisi",
   "home.column_settings.show_replies": "Mostra risposte",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Timeline federata",
   "navigation_bar.security": "Sicurezza",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ha apprezzato il tuo post",
   "notification.follow": "{name} ha iniziato a seguirti",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Elimina suggerimento",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifiche",
diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json
index 91b932637..a81eae9be 100644
--- a/app/soapbox/locales/ja.json
+++ b/app/soapbox/locales/ja.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "閉じる",
   "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_modal_error.retry": "再試行",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ローカルタイムライン",
   "column.direct": "ダイレクトメッセージ",
   "column.domain_blocks": "非表示にしたドメイン",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "と {additional}",
   "hashtag.column_header.tag_mode.any": "か {additional}",
   "hashtag.column_header.tag_mode.none": "({additional} を除く)",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "基本設定",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "連合タイムライン",
   "navigation_bar.security": "セキュリティ",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました",
   "notification.follow": "{name}さんにフォローされました",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "隠す",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "ホーム",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json
index 4db883f47..0f402aa18 100644
--- a/app/soapbox/locales/ka.json
+++ b/app/soapbox/locales/ka.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "დახურვა",
   "bundle_modal_error.message": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.",
   "bundle_modal_error.retry": "სცადეთ კიდევ ერთხელ",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "დაბლოკილი მომხმარებლები",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "ლოკალური თაიმლაინი",
   "column.direct": "პირდაპირი წერილები",
   "column.domain_blocks": "დამალული დომენები",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "ძირითადი",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "ბუსტების ჩვენება",
   "home.column_settings.show_replies": "პასუხების ჩვენება",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "ფედერალური თაიმლაინი",
   "navigation_bar.security": "უსაფრთხოება",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად",
   "notification.follow": "{name} გამოგყვათ",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "სახლი",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "შეტყობინებები",
diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json
index a9d12a853..0f13a01a2 100644
--- a/app/soapbox/locales/kk.json
+++ b/app/soapbox/locales/kk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Жабу",
   "bundle_modal_error.message": "Бұл компонентті жүктеген кезде бір қате пайда болды.",
   "bundle_modal_error.retry": "Қайтадан көріңіз",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Бұғатталғандар",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Жергілікті желі",
   "column.direct": "Жеке хаттар",
   "column.domain_blocks": "Жасырылған домендер",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "және {additional}",
   "hashtag.column_header.tag_mode.any": "немесе {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} болмай",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Негізгі",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Бөлісулерді көрсету",
   "home.column_settings.show_replies": "Жауаптарды көрсету",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Жаһандық желі",
   "navigation_bar.security": "Қауіпсіздік",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} жазбаңызды таңдаулыға қосты",
   "notification.follow": "{name} сізге жазылды",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Өткізіп жіберу",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Басты бет",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Ескертпелер",
diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json
index 027577862..05c42aef1 100644
--- a/app/soapbox/locales/ko.json
+++ b/app/soapbox/locales/ko.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "닫기",
   "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "차단 중인 사용자",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "로컬 타임라인",
   "column.direct": "다이렉트 메시지",
   "column.domain_blocks": "숨겨진 도메인",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "그리고 {additional}",
   "hashtag.column_header.tag_mode.any": "또는 {additional}",
   "hashtag.column_header.tag_mode.none": "({additional}를 제외)",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "기본 설정",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "연합 타임라인",
   "navigation_bar.security": "보안",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name}님이 즐겨찾기 했습니다",
   "notification.follow": "{name}님이 나를 팔로우 했습니다",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "추천 지우기",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "홈",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "알림",
diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json
index 27b44fc3d..5d11fc863 100644
--- a/app/soapbox/locales/lt.json
+++ b/app/soapbox/locales/lt.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json
index 31ba234eb..3ec93b2b0 100644
--- a/app/soapbox/locales/lv.json
+++ b/app/soapbox/locales/lv.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Aizvērt",
   "bundle_modal_error.message": "Kaut kas nogāja greizi ielādējot šo komponenti.",
   "bundle_modal_error.retry": "Mēģini vēlreiz",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Bloķētie lietotāji",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokālā laika līnija",
   "column.direct": "Privātās ziņas",
   "column.domain_blocks": "Paslēptie domēni",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json
index 9ca1f09cb..f7fabd82e 100644
--- a/app/soapbox/locales/mk.json
+++ b/app/soapbox/locales/mk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Настана грешка при прикажувањето на оваа веб-страница.",
   "bundle_modal_error.retry": "Обидете се повторно",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Директна порака",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Дома",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json
index 265684fc6..665e3785e 100644
--- a/app/soapbox/locales/ms.json
+++ b/app/soapbox/locales/ms.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Close",
   "bundle_modal_error.message": "Something went wrong while loading this component.",
   "bundle_modal_error.retry": "Try again",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local timeline",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Show reposts",
   "home.column_settings.show_replies": "Show replies",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federated timeline",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favorited your post",
   "notification.follow": "{name} followed you",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json
index ae7b09847..e42ba4155 100644
--- a/app/soapbox/locales/nl.json
+++ b/app/soapbox/locales/nl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Sluiten",
   "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
   "bundle_modal_error.retry": "Opnieuw proberen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokale tijdlijn",
   "column.direct": "Directe berichten",
   "column.domain_blocks": "Genegeerde servers",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "en {additional}",
   "hashtag.column_header.tag_mode.any": "of {additional}",
   "hashtag.column_header.tag_mode.none": "zonder {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Reposts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Globale tijdlijn",
   "navigation_bar.security": "Beveiliging",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} voegde jouw toot als favoriet toe",
   "notification.follow": "{name} volgt jou nu",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Voorstel verwerpen",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Start",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Meldingen",
diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json
index 82759bbee..501bd9f0a 100644
--- a/app/soapbox/locales/nn.json
+++ b/app/soapbox/locales/nn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Lukk",
   "bundle_modal_error.message": "Noko gikk gale mens komponent var i ferd med å bli nedlasta.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokka brukare",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal samtid",
   "column.direct": "Direkte meldingar",
   "column.domain_blocks": "Gøymte domener",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "og {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uten {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Vis fremhevingar",
   "home.column_settings.show_replies": "Vis svar",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federert tidslinje",
   "navigation_bar.security": "Sikkerheit",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Heim",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json
index 2b2bb7d70..775f00bb2 100644
--- a/app/soapbox/locales/no.json
+++ b/app/soapbox/locales/no.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Lukk",
   "bundle_modal_error.message": "Noe gikk galt da denne komponenten lastet.",
   "bundle_modal_error.retry": "Prøv igjen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokkerte brukere",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Enkel",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Felles tidslinje",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} likte din status",
   "notification.follow": "{name} fulgte deg",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hjem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Varslinger",
diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json
index 6ae7d8fcf..8b7056395 100644
--- a/app/soapbox/locales/oc.json
+++ b/app/soapbox/locales/oc.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Tampar",
   "bundle_modal_error.message": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.",
   "bundle_modal_error.retry": "Tornar ensajar",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Personas blocadas",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Flux public local",
   "column.direct": "Messatges dirèctes",
   "column.domain_blocks": "Domenis resconduts",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sens {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Basic",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Flux public global",
   "navigation_bar.security": "Seguretat",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a ajustat a sos favorits",
   "notification.follow": "{name} vos sèc",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Regetar la suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Acuèlh",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificacions",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 5e53505e0..9b09236df 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zamknij",
   "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_modal_error.retry": "Spróbuj ponownie",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Zablokowani użytkownicy",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna oś czasu",
   "column.direct": "Wiadomości bezpośrednie",
   "column.domain_blocks": "Ukryte domeny",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "lub {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Globalna oś czasu",
   "navigation_bar.security": "Bezpieczeństwo",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych",
   "notification.follow": "{name} zaczął(-ęła) Cię śledzić",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Odrzuć sugestię",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Strona główna",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Powiadomienia",
diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json
index 33e3aa4a9..cdafe104f 100644
--- a/app/soapbox/locales/pt-BR.json
+++ b/app/soapbox/locales/pt-BR.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente novamente",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Local",
   "column.direct": "Mensagens diretas",
   "column.domain_blocks": "Domínios escondidos",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar compartilhamentos",
   "home.column_settings.show_replies": "Mostrar as respostas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Global",
   "navigation_bar.security": "Segurança",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} adicionou a sua postagem aos favoritos",
   "notification.follow": "{name} te seguiu",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Ignorar a sugestão",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Página inicial",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificações",
diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json
index ac8b356a6..461e962f6 100644
--- a/app/soapbox/locales/pt.json
+++ b/app/soapbox/locales/pt.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Fechar",
   "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.",
   "bundle_modal_error.retry": "Tente de novo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizadores Bloqueados",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Cronologia local",
   "column.direct": "Mensagens directas",
   "column.domain_blocks": "Domínios escondidos",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Básico",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Cronologia federada",
   "navigation_bar.security": "Segurança",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} adicionou o teu estado aos favoritos",
   "notification.follow": "{name} começou a seguir-te",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dispensar a sugestão",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Início",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificações",
diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json
index 827d72a65..44d0a648c 100644
--- a/app/soapbox/locales/ro.json
+++ b/app/soapbox/locales/ro.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Închide",
   "bundle_modal_error.message": "Ceva nu a funcționat în timupul încărcării acestui component.",
   "bundle_modal_error.retry": "Încearcă din nou",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Utilizatori blocați",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Fluxul Local",
   "column.direct": "Mesaje directe",
   "column.domain_blocks": "Domenii ascunse",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "și {additional}",
   "hashtag.column_header.tag_mode.any": "sau {additional}",
   "hashtag.column_header.tag_mode.none": "fără {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "De bază",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Arată redistribuirile",
   "home.column_settings.show_replies": "Arată răspunsurile",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Flux global",
   "navigation_bar.security": "Securitate",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} a adăugat statusul tău la favorite",
   "notification.follow": "{name} te urmărește",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Omite sugestia",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Acasă",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notificări",
diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json
index 07f2c05f8..72e08f475 100644
--- a/app/soapbox/locales/ru.json
+++ b/app/soapbox/locales/ru.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Закрыть",
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Список блокировки",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локальная лента",
   "column.direct": "Личные сообщения",
   "column.domain_blocks": "Скрытые домены",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Основные",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Глобальная лента",
   "navigation_bar.security": "Безопасность",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} понравился Ваш статус",
   "notification.follow": "{name} подписался (-лась) на вас",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Удалить предложение",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Главная",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Уведомления",
diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json
index 01f2fc0ba..0b8932353 100644
--- a/app/soapbox/locales/sk.json
+++ b/app/soapbox/locales/sk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zatvor",
   "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.",
   "bundle_modal_error.retry": "Skúsiť znova",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokovaní užívatelia",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Miestna časová os",
   "column.direct": "Súkromné správy",
   "column.domain_blocks": "Skryté domény",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Základné",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Zobraziť povýšené",
   "home.column_settings.show_replies": "Ukázať odpovede",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federovaná časová os",
   "navigation_bar.security": "Zabezbečenie",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} si obľúbil/a tvoj príspevok",
   "notification.follow": "{name} ťa začal/a následovať",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Zavrhni návrh",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domovská",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Oboznámenia",
diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json
index a74fc48d2..b7f1e1c1f 100644
--- a/app/soapbox/locales/sl.json
+++ b/app/soapbox/locales/sl.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zapri",
   "bundle_modal_error.message": "Med nalaganjem te komponente je prišlo do napake.",
   "bundle_modal_error.retry": "Poskusi ponovno",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani uporabniki",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna časovnica",
   "column.direct": "Neposredna sporočila",
   "column.domain_blocks": "Skrite domene",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "in {additional}",
   "hashtag.column_header.tag_mode.any": "ali {additional}",
   "hashtag.column_header.tag_mode.none": "brez {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Pokaži spodbude",
   "home.column_settings.show_replies": "Pokaži odgovore",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Združena časovnica",
   "navigation_bar.security": "Varnost",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je vzljubil/a vaš status",
   "notification.follow": "{name} vam sledi",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Zavrni predlog",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Domov",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Obvestila",
diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json
index 4a248f38a..2843e032d 100644
--- a/app/soapbox/locales/sq.json
+++ b/app/soapbox/locales/sq.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Mbylle",
   "bundle_modal_error.message": "Diç shkoi ters teksa ngarkohej ky përbërës.",
   "bundle_modal_error.retry": "Riprovoni",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Rrjedhë kohore vendore",
   "column.direct": "Mesazhe të drejtpërdrejta",
   "column.domain_blocks": "Përkatësi të fshehura",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "dhe {additional}",
   "hashtag.column_header.tag_mode.any": "ose {additional}",
   "hashtag.column_header.tag_mode.none": "pa {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Bazë",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish",
   "navigation_bar.security": "Siguri",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} parapëlqeu gjendjen tuaj",
   "notification.follow": "{name} zuri t’ju ndjekë",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Mos e merr parasysh sugjerimin",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Kreu",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Njoftime",
diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json
index bc1fc9801..0f597a79f 100644
--- a/app/soapbox/locales/sr-Latn.json
+++ b/app/soapbox/locales/sr-Latn.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Zatvori",
   "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.",
   "bundle_modal_error.retry": "Pokušajte ponovo",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blokirani korisnici",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokalna lajna",
   "column.direct": "Direct messages",
   "column.domain_blocks": "Hidden domains",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Prikaži i podržavanja",
   "home.column_settings.show_replies": "Prikaži odgovore",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federisana lajna",
   "navigation_bar.security": "Security",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} je stavio Vaš status kao omiljeni",
   "notification.follow": "{name} Vas je zapratio",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Početna",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Obaveštenja",
diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json
index 487adf616..a2a01a9ee 100644
--- a/app/soapbox/locales/sr.json
+++ b/app/soapbox/locales/sr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Затвори",
   "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.",
   "bundle_modal_error.retry": "Покушајте поново",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Блокирани корисници",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локална временска линија",
   "column.direct": "Директне поруке",
   "column.domain_blocks": "Скривени домени",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Основно",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Прикажи и подржавања",
   "home.column_settings.show_replies": "Прикажи одговоре",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Здружена временска линија",
   "navigation_bar.security": "Безбедност",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени",
   "notification.follow": "{name} Вас је запратио/ла",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Почетна",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Обавештења",
diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json
index a091b30a0..165e8c2f5 100644
--- a/app/soapbox/locales/sv.json
+++ b/app/soapbox/locales/sv.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Stäng",
   "bundle_modal_error.message": "Något gick fel när denna komponent laddades.",
   "bundle_modal_error.retry": "Försök igen",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Lokal tidslinje",
   "column.direct": "Direktmeddelanden",
   "column.domain_blocks": "Dolda domäner",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "och {additional}",
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "utan {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Grundläggande",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Förenad tidslinje",
   "navigation_bar.security": "Säkerhet",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} favoriserade din status",
   "notification.follow": "{name} följer dig",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Hem",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Meddelanden",
diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json
index c85be136c..eecb76d69 100644
--- a/app/soapbox/locales/ta.json
+++ b/app/soapbox/locales/ta.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "நெருக்கமாக",
   "bundle_modal_error.message": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.",
   "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "தடுக்கப்பட்ட பயனர்கள்",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "உள்ளூர் காலக்கெடு",
   "column.direct": "நேரடி செய்திகள்",
   "column.domain_blocks": "மறைந்த களங்கள்",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
   "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
   "hashtag.column_header.tag_mode.none": "இல்லாமல் {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "அடிப்படையான",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "காட்டு boosts",
   "home.column_settings.show_replies": "பதில்களைக் காண்பி",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு",
   "navigation_bar.security": "பத்திரம்",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை",
   "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "பரிந்துரை விலக்க",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Home",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Notifications",
diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json
index ddde4f4b0..ba2a3c790 100644
--- a/app/soapbox/locales/te.json
+++ b/app/soapbox/locales/te.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "మూసివేయు",
   "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.",
   "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "స్థానిక కాలక్రమం",
   "column.direct": "ప్రత్యక్ష సందేశాలు",
   "column.domain_blocks": "దాచిన డొమైన్లు",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "మరియు {additional}",
   "hashtag.column_header.tag_mode.any": "లేదా {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} లేకుండా",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "ప్రాథమిక",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "బూస్ట్ లను చూపించు",
   "home.column_settings.show_replies": "ప్రత్యుత్తరాలను చూపించు",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం",
   "navigation_bar.security": "భద్రత",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు",
   "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "సూచనను రద్దు చేయి",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "హోమ్",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "ప్రకటనలు",
diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json
index 55d59ae06..183d954ac 100644
--- a/app/soapbox/locales/th.json
+++ b/app/soapbox/locales/th.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "ปิด",
   "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้",
   "bundle_modal_error.retry": "ลองอีกครั้ง",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "เส้นเวลาในเว็บ",
   "column.direct": "ข้อความโดยตรง",
   "column.domain_blocks": "โดเมนที่ซ่อนอยู่",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "และ {additional}",
   "hashtag.column_header.tag_mode.any": "หรือ {additional}",
   "hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "พื้นฐาน",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก",
   "navigation_bar.security": "ความปลอดภัย",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "ยกเลิกข้อเสนอแนะ",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "หน้าแรก",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "การแจ้งเตือน",
diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json
index 693d12527..0a45724b4 100644
--- a/app/soapbox/locales/tr.json
+++ b/app/soapbox/locales/tr.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Kapat",
   "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.",
   "bundle_modal_error.retry": "Tekrar deneyin",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Engellenen kullanıcılar",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Yerel zaman tüneli",
   "column.direct": "Doğrudan mesajlar",
   "column.domain_blocks": "Gizli alan adları",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} olmadan",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Temel",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Boost edilenleri göster",
   "home.column_settings.show_replies": "Cevapları göster",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Federe zaman tüneli",
   "navigation_bar.security": "Güvenlik",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} senin durumunu favorilere ekledi",
   "notification.follow": "{name} seni takip ediyor",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Öneriyi görmezden gel",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Ana sayfa",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Bildirimler",
diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json
index b88e780df..63d8cc17b 100644
--- a/app/soapbox/locales/uk.json
+++ b/app/soapbox/locales/uk.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "Закрити",
   "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.",
   "bundle_modal_error.retry": "Спробувати ще раз",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "Заблоковані користувачі",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "Локальна стрічка",
   "column.direct": "Прямі повідомлення",
   "column.domain_blocks": "Приховані домени",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "та {additional}",
   "hashtag.column_header.tag_mode.any": "або {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "Основні",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "Показувати передмухи",
   "home.column_settings.show_replies": "Показувати відповіді",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "Глобальна стрічка",
   "navigation_bar.security": "Безпека",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} вподобав(-ла) ваш допис",
   "notification.follow": "{name} підписався(-лась) на Вас",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Відхилити пропозицію",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "Головна",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "Сповіщення",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index c89a0e7f5..ef6dbd06b 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "关闭",
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "已屏蔽的用户",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本站时间轴",
   "column.direct": "私信",
   "column.domain_blocks": "已屏蔽的网站",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "以及 {additional}",
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "基本设置",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "跨站公共时间轴",
   "navigation_bar.security": "安全",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 收藏了你的嘟文",
   "notification.follow": "{name} 开始关注你",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "关闭建议",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主页",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json
index 0089c5f33..cb7e54d30 100644
--- a/app/soapbox/locales/zh-HK.json
+++ b/app/soapbox/locales/zh-HK.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "加載本組件出錯。",
   "bundle_modal_error.retry": "重試",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "封鎖用戶",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本站時間軸",
   "column.direct": "個人訊息",
   "column.domain_blocks": "隱藏的服務站",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "and {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
   "hashtag.column_header.tag_mode.none": "without {additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "基本",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "顯示被轉推的文章",
   "home.column_settings.show_replies": "顯示回應文章",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "跨站時間軸",
   "navigation_bar.security": "安全",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 收藏了你的文章",
   "notification.follow": "{name} 開始關注你",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "Dismiss suggestion",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主頁",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",
diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json
index fe2a21461..8a345beaa 100644
--- a/app/soapbox/locales/zh-TW.json
+++ b/app/soapbox/locales/zh-TW.json
@@ -60,8 +60,12 @@
   "bundle_modal_error.close": "關閉",
   "bundle_modal_error.message": "載入此元件時發生錯誤。",
   "bundle_modal_error.retry": "重試",
+  "chat_box.input.placeholder": "Send a message…",
+  "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.",
+  "chat_panels.main_window.title": "Chats",
   "column.blocks": "封鎖的使用者",
   "column.bookmarks": "Bookmarks",
+  "column.chats": "Chats",
   "column.community": "本機時間軸",
   "column.direct": "私訊",
   "column.domain_blocks": "隱藏的網域",
@@ -234,12 +238,6 @@
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
   "hashtag.column_header.tag_mode.none": "而無需{additional}",
-  "header.about.label": "About",
-  "header.back_to.label": "Back to",
-  "header.back_to_ending.label": " ",
-  "header.home.label": "Home",
-  "header.login.label": "Log in",
-  "home.column_settings.basic": "基本",
   "home.column_settings.show_direct": "Show direct messages",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
@@ -349,6 +347,7 @@
   "navigation_bar.public_timeline": "聯邦時間軸",
   "navigation_bar.security": "安全性",
   "navigation_bar.soapbox_config": "Soapbox config",
+  "notification.chat_mention": "{name} sent you a message",
   "notification.emoji_react": "{name} reacted to your post",
   "notification.favourite": "{name} 把你的嘟文加入了最愛",
   "notification.follow": "{name} 關注了你",
@@ -554,6 +553,7 @@
   "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}",
   "suggestions.dismiss": "關閉建議",
   "tabs_bar.apps": "Apps",
+  "tabs_bar.chats": "Chats",
   "tabs_bar.home": "主頁",
   "tabs_bar.news": "News",
   "tabs_bar.notifications": "通知",

From 6d900d9c19ce8b43efa1d312b161ce5352b10afc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 17 Sep 2020 22:13:30 -0500
Subject: [PATCH 56/56] About i18n: improve siteTitle translation

---
 app/soapbox/features/public_layout/components/header.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js
index 14c40d71f..173df7307 100644
--- a/app/soapbox/features/public_layout/components/header.js
+++ b/app/soapbox/features/public_layout/components/header.js
@@ -16,8 +16,7 @@ import IconButton from 'soapbox/components/icon_button';
 const messages = defineMessages({
   home: { id: 'header.home.label', defaultMessage: 'Home' },
   about: { id: 'header.about.label', defaultMessage: 'About' },
-  backTo: { id: 'header.back_to.label', defaultMessage: 'Back to' },
-  backToEnding: { id: 'header.back_to_ending.label', defaultMessage: ' ' },
+  backTo: { id: 'header.back_to.label', defaultMessage: 'Back to {siteTitle}' },
   login: { id: 'header.login.label', defaultMessage: 'Log in' },
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });
@@ -103,13 +102,13 @@ class Header extends ImmutablePureComponent {
           <div className='nav-right'>
             <div className='hidden-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')} {intl.formatMessage(messages.backToEnding)}</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo, { siteTitle: instance.get('title') })}</Link>
                 : <LoginForm handleSubmit={this.handleSubmit} isLoading={isLoading} />
               }
             </div>
             <div className='visible-sm'>
               {me
-                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo)} {instance.get('title')} {intl.formatMessage(messages.backToEnding)}</Link>
+                ? <Link className='nav-link nav-button webapp-btn' to='/'>{intl.formatMessage(messages.backTo, { siteTitle: instance.get('title') })}</Link>
                 : <Link className='nav-link nav-button webapp-btn' to='/auth/sign_in'>{intl.formatMessage(messages.login)}</Link>
               }
             </div>