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

app/javascript/mastodon/locales/ja.json

@@ -188,6 +188,8 @@
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
+  "home.hide_announcements": "お知らせを隠す",
+  "home.show_announcements": "お知らせを表示",
   "intervals.full.days": "{number}日",
   "intervals.full.hours": "{number}時間",
   "intervals.full.minutes": "{number}分",
@@ -338,6 +340,7 @@
   "relative_time.just_now": "今",
   "relative_time.minutes": "{number}分前",
   "relative_time.seconds": "{number}秒前",
+  "relative_time.today": "今日",
   "reply_indicator.cancel": "キャンセル",
   "report.forward": "{target} に転送する",
   "report.forward_hint": "このアカウントは別のサーバーに所属しています。通報内容を匿名で転送しますか？",