From: Tom Hughes Date: Sun, 1 Sep 2024 09:54:39 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5138' X-Git-Tag: live~670 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dbc3ab53e76f74306b2fe9722e5e77b52a45cf06?hp=84765f2e6de42bc188139cfa9fae77a233df2d68 Merge remote-tracking branch 'upstream/pull/5138' --- diff --git a/config/locales/en.yml b/config/locales/en.yml index 324a806da..593e6da24 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2865,13 +2865,11 @@ en: heading: Confirm role granting are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?" confirm: "Confirm" - fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid." revoke: title: Confirm role revoking heading: Confirm role revoking are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?" confirm: "Confirm" - fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid." user_blocks: model: non_moderator_update: "Must be a moderator to create or update a block."