diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-04-21 20:28:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-21 20:28:24 +0200 |
| commit | a627e59116507eab6be07b3b3a49bfe4ca77385a (patch) | |
| tree | 601261c5ef16225420743f32ae2ec4ce40ceb098 /config | |
| parent | b1d4f21db0d413c887978ff69aa46b3bc8ea1f3d (diff) | |
| parent | 536892b8ae7788525e9d65481df693afe6a8bfc4 (diff) | |
Merge pull request #1523 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 88acf3164..3f3adc158 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -562,7 +562,7 @@ en: settings: activity_api_enabled: desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets - title: Publish aggregate statistics about user activity + title: Publish aggregate statistics about user activity in the API bootstrap_timeline_accounts: desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins. title: Default follows for new users @@ -593,7 +593,7 @@ en: title: Mascot image peers_api_enabled: desc_html: Domain names this server has encountered in the fediverse - title: Publish list of discovered servers + title: Publish list of discovered servers in the API 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 |