diff --git a/Gemfile.lock b/Gemfile.lock
index 45cfc27d8..8a63e1d65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.1.0)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
+    nokogiri (1.11.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogumbo (2.0.4)
@@ -428,7 +428,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.3.0)
+    puma (5.3.1)
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 2c886be42..22fe37731 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -304,7 +304,7 @@
   "navigation_bar.announcements": "運営からのお知らせ",
   "navigation_bar.trends": "トレンド",
   "navigation_bar.bookmarks": "ブックマーク",
-  "notification.favourite": "{name}さんがあなたのトゥートに╰( ^o^)╮-=ﾆ=一＝三★しました",
+  "notification.favourite": "{name}さんがあなたのに╰( ^o^)╮-=ﾆ=一＝三★しました",
   "navigation_bar.short.community_timeline": "ローカル",
   "navigation_bar.short.getting_started": "スタート",
   "navigation_bar.short.home": "ホーム",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 1b473ae03..8ed9bfd41 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -3781,7 +3781,6 @@ a.status-card.compact:hover {
   span {
     display: block;
     float: left;
-    margin-left: 50%;
     transform: translateX(-50%);
     margin: 82px 0 0 50%;
     white-space: nowrap;
diff --git a/config/initializers/1_hosts.rb b/config/initializers/1_hosts.rb
index f470fddb3..6ff0845c4 100644
--- a/config/initializers/1_hosts.rb
+++ b/config/initializers/1_hosts.rb
@@ -31,6 +31,6 @@ Rails.application.configure do
     config.hosts << host if host.present?
     config.hosts << web_host if web_host.present?
     config.hosts.concat(alternate_domains) if alternate_domains.present?
-    config.hosts_authorization = { exclude: ->(request) { request.path == '/health' } }
+    config.host_authorization = { exclude: ->(request) { request.path == '/health' } }
   end
 end
diff --git a/config/locales/activerecord.en.yml b/config/locales/activerecord.en.yml
index ec8dad1b1..d5f19ca64 100644
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -24,7 +24,7 @@ en:
         status:
           attributes:
             reblog:
-              taken: of status already exists
+              taken: of post already exists
         user:
           attributes:
             email:
diff --git a/config/locales/doorkeeper.en.yml b/config/locales/doorkeeper.en.yml
index ec322f071..8aa099284 100644
--- a/config/locales/doorkeeper.en.yml
+++ b/config/locales/doorkeeper.en.yml
@@ -138,12 +138,12 @@ en:
       read:notifications: see your notifications
       read:reports: see your reports
       read:search: search on your behalf
-      read:statuses: see all statuses
+      read:statuses: see all posts
       write: modify all your account's data
       write:accounts: modify your profile
       write:blocks: block accounts and domains
-      write:bookmarks: bookmark statuses
-      write:favourites: favourite statuses
+      write:bookmarks: bookmark posts
+      write:favourites: favourite posts
       write:filters: create filters
       write:follows: follow people
       write:lists: create lists
@@ -151,4 +151,4 @@ en:
       write:mutes: mute people and conversations
       write:notifications: clear your notifications
       write:reports: report other people
-      write:statuses: publish statuses
+      write:statuses: publish posts
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 441a7c0dc..54b21660f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1443,7 +1443,7 @@ en:
       edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If you’d like to review new followers before they’re allowed to follow you, you can lock your account.
       explanation: Here are some tips to get you started
       final_action: Start posting
-      final_step: 'Start posting! Even without followers your public messages may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.'
+      final_step: 'Start posting! Even without followers your public posts may be seen by others, for example on the local timeline and in hashtags. You may want to introduce yourself on the #introductions hashtag.'
       full_handle: Your full handle
       full_handle_hint: This is what you would tell your friends so they can message or follow you from another server.
       review_preferences_action: Change preferences
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 58c321968..122891b58 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -52,7 +52,8 @@ en:
         setting_display_media_hide_all: Always hide media
         setting_display_media_show_all: Always show media
         setting_hide_network: Who you follow and who follows you will be hidden on your profile
-        setting_noindex: Affects your public profile and status pages
+        setting_noindex: Affects your public profile and post pages
+        setting_show_application: The application you use to post will be displayed in the detailed view of your posts
         setting_place_tab_bar_at_bottom: When using a touch device, you can operate tabs within the reach of your fingers.
         setting_show_application: The application you use to toot will be displayed in the detailed view of your toots
         setting_show_bookmark_button: When turned off, the bookmark call will be in Mastodon's standard position (in the menu on the action bar)
@@ -208,12 +209,12 @@ en:
         severity: Rule
       notification_emails:
         digest: Send digest e-mails
-        favourite: Someone favourited your status
+        favourite: Someone favourited your post
         follow: Someone followed you
         follow_request: Someone requested to follow you
         mention: Someone mentioned you
         pending_account: New account needs review
-        reblog: Someone boosted your status
+        reblog: Someone boosted your post
         report: New report is submitted
         trending_tag: An unreviewed hashtag is trending
       rule:
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 651693152..1fe08dcab 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -54,7 +54,7 @@ ja:
         setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
         setting_place_tab_bar_at_bottom: タッチデバイス使用時に、タブの操作を指の届く範囲で行えます
-        setting_show_application: 投稿するのに使用したアプリがトゥートの詳細ビューに表示されるようになります
+        setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります
         setting_show_bookmark_button: オフにした場合、ブックマークの呼び出しはMastodon標準の位置となります（アクションバーのメニューの中）
         setting_show_follow_button_on_timeline: フォロー状態を確認し易くなり、素早くフォローリストを構築できます
         setting_show_navigation_panel: 上級者向け UI の右端にナビゲーションパネルを表示します