From 6f08bc763725111b8525648c38f3f91edf8293b3 Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Mon, 14 Nov 2022 00:03:51 -0800 Subject: [PATCH 1/3] Remove last references to "silencing" in en and en_GB locales --- config/locales/en.yml | 4 ++-- config/locales/en_GB.yml | 10 +++++----- config/locales/simple_form.en_GB.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 679e356b41f57..6be8a2b8e8b9b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -386,9 +386,9 @@ en: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." + desc_html: "Limit will make the posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data from your server for any accounts at this domain. Use None if you just want to reject media files." noop: None - silence: Silence + silence: Limit suspend: Suspend title: New domain block obfuscate: Obfuscate domain name diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 2cba40da0b4d6..bb8b33ccfa947 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -124,7 +124,7 @@ en_GB: active: Active all: All pending: Pending - silenced: Silenced + silenced: Limited suspended: Suspended title: Moderation moderation_notes: Moderation notes @@ -160,8 +160,8 @@ en_GB: show: created_reports: Made reports targeted_reports: Reported by others - silence: Silence - silenced: Silenced + silence: Limit + silenced: Limited statuses: Statuses subscribe: Subscribe suspended: Suspended @@ -262,9 +262,9 @@ en_GB: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." + desc_html: "Limit will make the posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data from your server for any accounts at this domain. Use None if you just want to reject media files." noop: None - silence: Silence + silence: Limit suspend: Suspend title: New domain block reject_media: Reject media files diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml index 8752d81bb076d..765a0631416b9 100644 --- a/config/locales/simple_form.en_GB.yml +++ b/config/locales/simple_form.en_GB.yml @@ -57,7 +57,7 @@ en_GB: types: disable: Disable none: Do nothing - silence: Silence + silence: Limit suspend: Suspend and irreversibly delete account data warning_preset_id: Use a warning preset defaults: From 2f76b268179eb237b2160c6d7181027ee52a5a57 Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Mon, 14 Nov 2022 00:21:53 -0800 Subject: [PATCH 2/3] Remove stray the, rephrase a bit --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6be8a2b8e8b9b..25b6741a2b9c4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -386,7 +386,7 @@ en: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Limit will make the posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data from your server for any accounts at this domain. Use None if you just want to reject media files." + desc_html: "Limit will make posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data for this domain's accounts from your server. Use None if you just want to reject media files." noop: None silence: Limit suspend: Suspend From e8a070eb2554f6e6b22e121b89b57fef7d3092b8 Mon Sep 17 00:00:00 2001 From: Ell Bradshaw Date: Mon, 14 Nov 2022 00:25:04 -0800 Subject: [PATCH 3/3] Revert changes to generated files I assume these will get updated via Crowdin --- config/locales/en_GB.yml | 10 +++++----- config/locales/simple_form.en_GB.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index bb8b33ccfa947..2cba40da0b4d6 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -124,7 +124,7 @@ en_GB: active: Active all: All pending: Pending - silenced: Limited + silenced: Silenced suspended: Suspended title: Moderation moderation_notes: Moderation notes @@ -160,8 +160,8 @@ en_GB: show: created_reports: Made reports targeted_reports: Reported by others - silence: Limit - silenced: Limited + silence: Silence + silenced: Silenced statuses: Statuses subscribe: Subscribe suspended: Suspended @@ -262,9 +262,9 @@ en_GB: create: Create block hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts. severity: - desc_html: "Limit will make the posts from accounts at this domain invisible to anyone who isn't following them. Suspend will remove all content, media, and profile data from your server for any accounts at this domain. Use None if you just want to reject media files." + desc_html: "Silence will make the account's posts invisible to anyone who isn't following them. Suspend will remove all of the account's content, media, and profile data. Use None if you just want to reject media files." noop: None - silence: Limit + silence: Silence suspend: Suspend title: New domain block reject_media: Reject media files diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml index 765a0631416b9..8752d81bb076d 100644 --- a/config/locales/simple_form.en_GB.yml +++ b/config/locales/simple_form.en_GB.yml @@ -57,7 +57,7 @@ en_GB: types: disable: Disable none: Do nothing - silence: Limit + silence: Silence suspend: Suspend and irreversibly delete account data warning_preset_id: Use a warning preset defaults: