diff --git a/locales/index.d.ts b/locales/index.d.ts index cc7884b8c1..6a2790c9af 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -8567,7 +8567,7 @@ export interface Locale extends ILocale { */ "write:admin:unsilence-user": string; /** - * Allow/Reject quote posts from a user + * Allow/Prohibit quote posts from a user */ "write:admin:reject-quotes": string; /** @@ -10247,11 +10247,11 @@ export interface Locale extends ILocale { */ "acceptRemoteInstanceReports": string; /** - * Rejected quotes from user + * Blocked/Stripped quote posts from user */ "rejectQuotesUser": string; /** - * Allowed quotes from user + * Allowed quote posts from user */ "allowQuotesUser": string; }; @@ -11253,15 +11253,19 @@ export interface Locale extends ILocale { */ "rejectReports": string; /** - * Reject quote posts from this instance + * Strip quote posts from this instance */ "rejectQuotesInstance": string; /** - * Reject quote posts from this user + * Strip quote posts from this user */ - "rejectQuotesUser": string; + "rejectQuotesRemoteUser": string; /** - * Are you sure you wish to reject quote posts? + * Block quote posts from this user + */ + "rejectQuotesLocalUser": string; + /** + * Are you sure you wish to strip quote posts? */ "rejectQuotesConfirm": string; /** diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index 30298a9af6..ce1fbc46a1 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -81,7 +81,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.silence }} {{ i18n.ts.suspend }} - {{ i18n.ts.rejectQuotesUser }} + {{ user.host == null ? i18n.ts.rejectQuotesLocalUser : i18n.ts.rejectQuotesRemoteUser }} {{ i18n.ts.markAsNSFW }} diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 6c21c76959..da9629a993 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -41,9 +41,10 @@ continueOnRemote: "Continue on remote instance" chooseServerOnMisskeyHub: "Choose a instance from Misskey Hub" mediaSilenceThisInstance: "Silence media from this instance" rejectReports: "Reject reports from this instance" -rejectQuotesInstance: "Reject quote posts from this instance" -rejectQuotesUser: "Reject quote posts from this user" -rejectQuotesConfirm: "Are you sure you wish to reject quote posts?" +rejectQuotesInstance: "Strip quote posts from this instance" +rejectQuotesRemoteUser: "Strip quote posts from this user" +rejectQuotesLocalUser: "Block quote posts from this user" +rejectQuotesConfirm: "Are you sure you wish to strip quote posts?" allowQuotesConfirm: "Are you sure you wish to allow quote posts?" silencedInstancesDescription: "List the host names of the instances that you want to silence, separated by a new line. All accounts belonging to the listed instances will be treated as silenced, and can only make follow requests, and cannot mention local accounts if not followed. This will not affect the blocked instances." mediaSilencedInstances: "Media-silenced instances" @@ -313,8 +314,8 @@ _moderationLogTypes: unsetRemoteInstanceNSFW: "Set remote instance as NSFW" rejectRemoteInstanceReports: "Rejected reports from remote instance" acceptRemoteInstanceReports: "Accepted reports from remote instance" - rejectQuotesUser: "Rejected quotes from user" - allowQuotesUser: "Allowed quotes from user" + rejectQuotesUser: "Blocked/Stripped quote posts from user" + allowQuotesUser: "Allowed quote posts from user" _mfm: uncommonFeature: "This is not a widespread feature, it may not display properly on most other fedi software, including other Misskey forks" intro: "MFM is a markup language used on Misskey, Sharkey, Firefish, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax." @@ -447,7 +448,7 @@ _permissions: "write:admin:cw-user": "Apply mandatory CW on users" "write:admin:silence-user": "Silence users" "write:admin:unsilence-user": "Un-silence users" - "write:admin:reject-quotes": "Allow/Reject quote posts from a user" + "write:admin:reject-quotes": "Allow/Prohibit quote posts from a user" "read:notes-schedule": "View your list of scheduled notes" "write:notes-schedule": "Compose or delete scheduled notes"