diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
| commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
| tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /config/locales/en.yml | |
| parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
| parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) | |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/en.yml')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8e0b5f75a..ca139a35e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -229,6 +229,7 @@ en: config: Configuration feature_deletions: Account deletions feature_invites: Invite links + feature_profile_directory: Profile directory feature_registrations: Registrations feature_relay: Federation relay features: Features @@ -376,6 +377,9 @@ en: preview_sensitive_media: desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive title: Show sensitive media in OpenGraph previews + profile_directory: + desc_html: Allow users to be discoverable + title: Enable profile directory registrations: closed_message: desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags |