diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-02-22 15:23:46 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-02-22 15:23:46 +0100 |
commit | 679642e26c20bf04ceb1a90349c23eb5950bd029 (patch) | |
tree | bfe48773e2fcf9e0fa3a7753b3d8fa2de7217f52 /config/locales/simple_form.en.yml | |
parent | 8792128f38e19b0d7882468a4f1f9362b98793a0 (diff) | |
parent | 2127f40e6bf6deab62f48030263c459d14fed364 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 20c916560..4b5ff7ae8 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -73,6 +73,8 @@ en: no_access: Block access to all resources sign_up_requires_approval: New sign-ups will require your approval severity: Choose what will happen with requests from this IP + rule: + text: Describe a rule or requirement for users on this server. Try to keep it short and simple sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' webauthn: If it's an USB key be sure to insert it and, if necessary, tap it. @@ -197,6 +199,8 @@ en: reblog: Someone boosted your status report: New report is submitted trending_tag: An unreviewed hashtag is trending + rule: + text: Rule tag: listable: Allow this hashtag to appear in searches and on the profile directory name: Hashtag |