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 | |
| parent | 8792128f38e19b0d7882468a4f1f9362b98793a0 (diff) | |
| parent | 2127f40e6bf6deab62f48030263c459d14fed364 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 7 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8245397d7..0c38c5ae1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -26,6 +26,8 @@ en: It is used for federation purposes and should not be blocked unless you want to block the whole instance, in which case you should use a domain block. learn_more: Learn more privacy_policy: Privacy policy + rules: Server rules + rules_html: 'Below is a summary of rules you need to follow if you want to have an account on this server of Mastodon:' see_whats_happening: See what's happening server_stats: 'Server stats:' source_code: Source code @@ -542,6 +544,11 @@ en: unassign: Unassign unresolved: Unresolved updated_at: Updated + rules: + add_new: Add rule + description: While most claim to have read and agree to the terms of service, usually people do not read through until after a problem arises. Make it easier to see your server's rules at a glance by providing them in a flat bullet point list. Try to keep individual rules short and simple, but try not to split them up into many separate items either. + edit: Edit rule + title: Server rules settings: activity_api_enabled: desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets 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 |