Merge branch 'develop' into hazelnoot/following-timeline

locales/en-US.yml

@@ -61,6 +61,9 @@ copyNoteId: "Copy note ID"
 copyFileId: "Copy file ID"
 copyFolderId: "Copy folder ID"
 copyProfileUrl: "Copy profile URL"
+trustedLinkUrlPatterns: "Link to external site warning exclusion list"
+trustedLinkUrlPatternsDescription: "Separate with spaces for an AND condition or with line breaks for an OR condition. Using surrounding keywords with slashes will turn them into a regular expression. If you write only the domain name, it will be a backward match."
+open: "Open"
 searchUser: "Search for a user"
 searchThisUsersNotes: "Search this user’s notes"
 reply: "Reply"
@@ -152,6 +155,7 @@ renoteUnmute: "Unmute Boosts"
 block: "Block"
 unblock: "Unblock"
 markAsNSFW: "Mark all media from user as NSFW"
+markInstanceAsNSFW: "Mark as NSFW"
 suspend: "Suspend"
 unsuspend: "Unsuspend"
 blockConfirm: "Are you sure that you want to block this account?"
@@ -226,6 +230,7 @@ stopActivityDelivery: "Stop sending activities"
 blockThisInstance: "Block this instance"
 silenceThisInstance: "Silence this instance"
 mediaSilenceThisInstance: "Silence media from this instance"
+rejectReports: "Reject reports from this instance"
 operations: "Operations"
 software: "Software"
 version: "Version"
@@ -266,6 +271,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"
@@ -294,7 +302,6 @@ removeAreYouSure: "Are you sure that you want to remove \"{x}\"?"
 deleteAreYouSure: "Are you sure that you want to delete \"{x}\"?"
 resetAreYouSure: "Really reset?"
 areYouSure: "Are you sure?"
-confirmRemoteUrl: "Are you sure that you want to go to \"{x}\"?"
 saved: "Saved"
 messaging: "Chat"
 upload: "Upload"
@@ -624,6 +631,7 @@ unsetUserBanner: "Unset banner"
 unsetUserBannerConfirm: "Are you sure you want to unset the banner?"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
+deleteAllFilesQueued: "Deletion of all files queued"
 removeAllFollowing: "Unfollow all followed users"
 removeAllFollowingDescription: "Executing this unfollows all accounts from {host}. Please run this if the instance e.g. no longer exists."
 userSuspended: "This user has been suspended."
@@ -1334,6 +1342,10 @@ confirmWhenRevealingSensitiveMedia: "Confirm when revealing sensitive media"
 sensitiveMediaRevealConfirm: "This media might be sensitive. Are you sure you want to reveal it?"
 createdLists: "Created lists"
 createdAntennas: "Created antennas"
+severAllFollowRelations: "Break following relationships"
+severAllFollowRelationsConfirm: "Really break all follow relationships? This is irreversible! This will break {followingCount} following and {followersCount} follower relations on {instanceName}!"
+severAllFollowRelationsQueued: "Severing all follow relations with {host} queued."
+
 _delivery:
   status: "Delivery status"
   stop: "Suspend delivery"
@@ -2576,6 +2588,10 @@ _moderationLogTypes:
   resetPassword: "Password reset"
   suspendRemoteInstance: "Remote instance suspended"
   unsuspendRemoteInstance: "Remote instance unsuspended"
+  setRemoteInstanceNSFW: "Set remote instance as NSFW"
+  unsetRemoteInstanceNSFW: "Set remote instance as NSFW"
+  rejectRemoteInstanceReports: "Rejected reports from remote instance"
+  acceptRemoteInstanceReports: "Accepted reports from remote instance"
   updateRemoteInstanceNote: "Moderation note updated for remote instance."
   markSensitiveDriveFile: "File marked as sensitive"
   unmarkSensitiveDriveFile: "File unmarked as sensitive"
@@ -2831,3 +2847,7 @@ _contextMenu:
   app: "Application"
   appWithShift: "Application with shift key"
   native: "Native"
+_externalNavigationWarning:
+  title: "Navigate to an external site"
+  description: "Leave {host} and go to an external site"
+  trustThisDomain: "Trust this domain on this device in the future"

locales/index.d.ts

@@ -260,6 +260,18 @@ export interface Locale extends ILocale {
      * プロフィールURLをコピー
      */
     "copyProfileUrl": string;
+    /**
+     * 外部サイトへのリンク警告 除外リスト
+     */
+    "trustedLinkUrlPatterns": string;
+    /**
+     * スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。
+     */
+    "trustedLinkUrlPatternsDescription": string;
+    /**
+     * 開く
+     */
+    "open": string;
     /**
      * ユーザーを検索
      */
@@ -624,6 +636,10 @@ export interface Locale extends ILocale {
      * ユーザーのすべてのメディアをNSFWとしてマークする
      */
     "markAsNSFW": string;
+    /**
+     * Mark as NSFW
+     */
+    "markInstanceAsNSFW": string;
     /**
      * 凍結
      */
@@ -920,6 +936,10 @@ export interface Locale extends ILocale {
      * サーバーをメディアサイレンス
      */
     "mediaSilenceThisInstance": string;
+    /**
+     * Reject reports from this instance
+     */
+    "rejectReports": string;
     /**
      * 操作
      */
@@ -1080,6 +1100,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;
     /**
      * 配信停止
      */
@@ -1192,10 +1224,6 @@ export interface Locale extends ILocale {
      * よろしいですか？
      */
     "areYouSure": string;
-    /**
-     * 「{x}」を開きますか？
-     */
-    "confirmRemoteUrl": ParameterizedString<"x">;
     /**
      * 保存しました
      */
@@ -2512,6 +2540,10 @@ export interface Locale extends ILocale {
      * すべてのファイルを削除しますか？
      */
     "deleteAllFilesConfirm": string;
+    /**
+     * キューに入れられたすべてのファイルの削除
+     */
+    "deleteAllFilesQueued": string;
     /**
      * フォローを全解除
      */
@@ -5353,6 +5385,18 @@ export interface Locale extends ILocale {
      * 作成したアンテナ
      */
     "createdAntennas": string;
+    /**
+     * 以下の関係をすべて断ち切る
+     */
+    "severAllFollowRelations": string;
+    /**
+     * すべての人間関係を壊す？これは不可逆です！これは{instanceName}の{followingCount}フォローと{followersCount}フォロワーの関係を壊す！
+     */
+    "severAllFollowRelationsConfirm": ParameterizedString<"instanceName" | "followingCount" | "followersCount">;
+    /**
+     * キューに入れられた{host}とのすべてのフォロー関係を切断する。
+     */
+    "severAllFollowRelationsQueued": ParameterizedString<"host">;
     "_delivery": {
         /**
          * 配信状態
@@ -9988,6 +10032,22 @@ export interface Locale extends ILocale {
          * リモートサーバーを再開
          */
         "unsuspendRemoteInstance": string;
+        /**
+         * Set remote instance as NSFW
+         */
+        "setRemoteInstanceNSFW": string;
+        /**
+         * Set remote instance as NSFW
+         */
+        "unsetRemoteInstanceNSFW": string;
+        /**
+         * Rejected reports from remote instance
+         */
+        "rejectRemoteInstanceReports": string;
+        /**
+         * Accepted reports from remote instance
+         */
+        "acceptRemoteInstanceReports": string;
         /**
          * リモートサーバーのモデレーションノート更新
          */
@@ -10929,6 +10989,20 @@ export interface Locale extends ILocale {
          */
         "native": string;
     };
+    "_externalNavigationWarning": {
+        /**
+         * 外部サイトに移動します
+         */
+        "title": string;
+        /**
+         * {host}を離れて外部サイトに移動します
+         */
+        "description": ParameterizedString<"host">;
+        /**
+         * このデバイスで今後このドメインを信頼する
+         */
+        "trustThisDomain": string;
+    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/ja-JP.yml

@@ -61,6 +61,9 @@ copyNoteId: "ノートIDをコピー"
 copyFileId: "ファイルIDをコピー"
 copyFolderId: "フォルダーIDをコピー"
 copyProfileUrl: "プロフィールURLをコピー"
+trustedLinkUrlPatterns: "外部サイトへのリンク警告 除外リスト"
+trustedLinkUrlPatternsDescription: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります。スラッシュで囲むと正規表現になります。ドメイン名だけ書くと後方一致になります。"
+open: "開く"
 searchUser: "ユーザーを検索"
 searchThisUsersNotes: "ユーザーのノートを検索"
 reply: "返信"
@@ -152,6 +155,7 @@ renoteUnmute: "ブーストのミュートを解除"
 block: "ブロック"
 unblock: "ブロック解除"
 markAsNSFW: "ユーザーのすべてのメディアをNSFWとしてマークする"
+markInstanceAsNSFW: "Mark as NSFW"
 suspend: "凍結"
 unsuspend: "解凍"
 blockConfirm: "ブロックしますか？"
@@ -226,6 +230,7 @@ stopActivityDelivery: "アクティビティの配送を停止"
 blockThisInstance: "このサーバーをブロック"
 silenceThisInstance: "サーバーをサイレンス"
 mediaSilenceThisInstance: "サーバーをメディアサイレンス"
+rejectReports: "Reject reports from this instance"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -266,6 +271,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: "購読中"
@@ -294,7 +302,6 @@ removeAreYouSure: "「{x}」を削除しますか？"
 deleteAreYouSure: "「{x}」を削除しますか？"
 resetAreYouSure: "リセットしますか？"
 areYouSure: "よろしいですか？"
-confirmRemoteUrl: "「{x}」を開きますか？"
 saved: "保存しました"
 messaging: "チャット"
 upload: "アップロード"
@@ -624,6 +631,7 @@ unsetUserBanner: "バナーを解除"
 unsetUserBannerConfirm: "バナーを解除しますか？"
 deleteAllFiles: "すべてのファイルを削除"
 deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
+deleteAllFilesQueued: "キューに入れられたすべてのファイルの削除"
 removeAllFollowing: "フォローを全解除"
 removeAllFollowingDescription: "{host}からのフォローをすべて解除します。そのサーバーがもう存在しなくなった場合などに実行してください。"
 userSuspended: "このユーザーは凍結されています。"
@@ -1334,6 +1342,9 @@ confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示
 sensitiveMediaRevealConfirm: "センシティブなメディアです。表示しますか？"
 createdLists: "作成したリスト"
 createdAntennas: "作成したアンテナ"
+severAllFollowRelations: "以下の関係をすべて断ち切る"
+severAllFollowRelationsConfirm: "すべての人間関係を壊す？これは不可逆です！これは{instanceName}の{followingCount}フォローと{followersCount}フォロワーの関係を壊す！"
+severAllFollowRelationsQueued: "キューに入れられた{host}とのすべてのフォロー関係を切断する。"
 
 _delivery:
   status: "配信状態"
@@ -2644,6 +2655,10 @@ _moderationLogTypes:
   resetPassword: "パスワードをリセット"
   suspendRemoteInstance: "リモートサーバーを停止"
   unsuspendRemoteInstance: "リモートサーバーを再開"
+  setRemoteInstanceNSFW: "Set remote instance as NSFW"
+  unsetRemoteInstanceNSFW: "Set remote instance as NSFW"
+  rejectRemoteInstanceReports: "Rejected reports from remote instance"
+  acceptRemoteInstanceReports: "Accepted reports from remote instance"
   updateRemoteInstanceNote: "リモートサーバーのモデレーションノート更新"
   markSensitiveDriveFile: "ファイルをセンシティブ付与"
   unmarkSensitiveDriveFile: "ファイルをセンシティブ解除"
@@ -2906,3 +2921,8 @@ _contextMenu:
   app: "アプリケーション"
   appWithShift: "Shiftキーでアプリケーション"
   native: "ブラウザのUI"
+
+_externalNavigationWarning:
+  title: "外部サイトに移動します"
+  description: "{host}を離れて外部サイトに移動します"
+  trustThisDomain: "このデバイスで今後このドメインを信頼する"