Merge branch 'develop' into hazelnoot/579-reject-reports

# Conflicts:
#	packages/frontend/src/pages/instance-info.vue

locales/en-US.yml

@@ -143,8 +143,10 @@ markAsSensitive: "Mark as sensitive"
 unmarkAsSensitive: "Unmark as sensitive"
 enterFileName: "Enter filename"
 mute: "Mute"
+muted: "Muted"
 unmute: "Unmute"
 renoteMute: "Mute Boosts"
+renoteMuted: "Boosts muted"
 renoteUnmute: "Unmute Boosts"
 block: "Block"
 unblock: "Unblock"
@@ -265,6 +267,9 @@ noCustomEmojis: "There are no emoji"
 noJobs: "There are no jobs"
 federating: "Federating"
 blocked: "Blocked"
+blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
+silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."
+mediaSilencedByBase: "This host's media is silenced implicitly because a base domain's media is silenced. To un-silence this host, first un-silence the base domain(s)."
 suspended: "Suspended"
 all: "All"
 subscribing: "Subscribing"

locales/index.d.ts

@@ -588,6 +588,10 @@ export interface Locale extends ILocale {
      * ミュート
      */
     "mute": string;
+    /**
+     * Muted
+     */
+    "muted": string;
     /**
      * ミュート解除
      */
@@ -596,6 +600,10 @@ export interface Locale extends ILocale {
      * ブーストをミュート
      */
     "renoteMute": string;
+    /**
+     * Boosts muted
+     */
+    "renoteMuted": string;
     /**
      * ブーストのミュートを解除
      */
@@ -1076,6 +1084,18 @@ export interface Locale extends ILocale {
      * ブロック中
      */
     "blocked": string;
+    /**
+     * This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s).
+     */
+    "blockedByBase": string;
+    /**
+     * This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s).
+     */
+    "silencedByBase": string;
+    /**
+     * This host's media is silenced implicitly because a base domain's media is silenced. To un-silence this host, first un-silence the base domain(s).
+     */
+    "mediaSilencedByBase": string;
     /**
      * 配信停止
      */
@@ -4441,10 +4461,6 @@ export interface Locale extends ILocale {
      * 連合なしにする
      */
     "disableFederationOk": string;
-    /**
-     * 猫の話し方を無効にする
-     */
-    "disableCatSpeak": string;
     /**
      * 現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。
      */
@@ -5789,7 +5805,7 @@ export interface Locale extends ILocale {
          */
         "social": string;
         /**
-         * バッッブルタイムラインでは、管理者が選択した接続サーバーからのメモを表示できます。
+         * バブルタイムラインでは、管理者が選択した接続サーバーからの投稿を表示できます。
          */
         "bubble": string;
         /**
@@ -9151,7 +9167,7 @@ export interface Locale extends ILocale {
          */
         "global": string;
         /**
-         * バッッブル
+         * バブル
          */
         "bubble": string;
     };

locales/ja-JP.yml

@@ -143,8 +143,10 @@ markAsSensitive: "センシティブとして設定"
 unmarkAsSensitive: "センシティブを解除する"
 enterFileName: "ファイル名を入力"
 mute: "ミュート"
+muted: "Muted"
 unmute: "ミュート解除"
 renoteMute: "ブーストをミュート"
+renoteMuted: "Boosts muted"
 renoteUnmute: "ブーストのミュートを解除"
 block: "ブロック"
 unblock: "ブロック解除"
@@ -265,6 +267,9 @@ noCustomEmojis: "絵文字はありません"
 noJobs: "ジョブはありません"
 federating: "連合中"
 blocked: "ブロック中"
+blockedByBase: "This host is blocked implicitly because a base domain is blocked. To unblock this host, first unblock the base domain(s)."
+silencedByBase: "This host is silenced implicitly because a base domain is silenced. To un-silence this host, first un-silence the base domain(s)."
+mediaSilencedByBase: "This host's media is silenced implicitly because a base domain's media is silenced. To un-silence this host, first un-silence the base domain(s)."
 suspended: "配信停止"
 all: "全て"
 subscribing: "購読中"