Merge branch 'develop' into feature/approval

This commit is contained in:
Marie 2023-10-18 05:40:32 +02:00 committed by GitHub
commit 182bf7e7d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 121 additions and 0 deletions

View file

@ -137,10 +137,13 @@ renoteMute: "Mute Renotes"
renoteUnmute: "Unmute Renotes"
block: "Block"
unblock: "Unblock"
markAsNSFW: "Mark all media from user as NSFW"
suspend: "Suspend"
unsuspend: "Unsuspend"
blockConfirm: "Are you sure that you want to block this account?"
unblockConfirm: "Are you sure that you want to unblock this account?"
nsfwConfirm: "Are you sure that you want to mark all media from this account as NSFW?"
unNsfwConfirm: "Are you sure that you want to unmark all media from this account as NSFW?"
suspendConfirm: "Are you sure that you want to suspend this account?"
approveConfirm: "Are you sure that you want to approve this account?"
unsuspendConfirm: "Are you sure that you want to unsuspend this account?"

3
locales/index.d.ts vendored
View file

@ -140,10 +140,13 @@ export interface Locale {
"renoteUnmute": string;
"block": string;
"unblock": string;
"markAsNSFW": string;
"suspend": string;
"unsuspend": string;
"blockConfirm": string;
"unblockConfirm": string;
"nsfwConfirm": string;
"unNsfwConfirm": string;
"suspendConfirm": string;
"approveConfirm": string;
"unsuspendConfirm": string;

View file

@ -137,10 +137,13 @@ renoteMute: "リノートをミュート"
renoteUnmute: "リノートのミュートを解除"
block: "ブロック"
unblock: "ブロック解除"
markAsNSFW: "ユーザーのすべてのメディアをNSFWとしてマークする"
suspend: "凍結"
unsuspend: "解凍"
blockConfirm: "ブロックしますか?"
unblockConfirm: "ブロック解除しますか?"
nsfwConfirm: "このアカウントからのすべてのメディアをNSFWとしてマークしてもよろしいですか"
unNsfwConfirm: "このアカウントのすべてのメディアをNSFWとしてマーク解除してもよろしいですか"
suspendConfirm: "凍結しますか?"
approveConfirm: "このアカウントを承認してもよろしいですか?"
unsuspendConfirm: "解凍しますか?"