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

app/javascript/mastodon/locales/ja.json

@@ -59,6 +59,7 @@
   "alert.unexpected.title": "エラー！",
   "announcement.announcement": "お知らせ",
   "attachments_list.unprocessed": "(未処理)",
+  "audio.hide": "Hide audio",
   "autosuggest_hashtag.per_week": "{count} 回 / 週",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。",
@@ -224,9 +225,9 @@
   "hashtag.column_settings.tag_mode.any": "いずれかを含む",
   "hashtag.column_settings.tag_mode.none": "これらを除く",
   "hashtag.column_settings.tag_toggle": "このカラムに追加のタグを含める",
-  "hashtag.follow": "Follow hashtag",
+  "hashtag.follow": "ハッシュタグをフォローする",
   "hashtag.total_volume": "Total volume in the last {days, plural, one {day} other {{days} days}}",
-  "hashtag.unfollow": "Unfollow hashtag",
+  "hashtag.unfollow": "ハッシュタグのフォローを解除",
   "home.column_settings.basic": "基本設定",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",