tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add trends UI with admin and user settings (#11502)

Browse Source
This commit is contained in:
Eugen Rochko
2019-08-06 17:57:52 +02:00
committed by GitHub
parent 82d2069c75
commit 9072fe5ab6
21 changed files with 189 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/locales/en.yml
View File

@ -460,8 +460,8 @@ en:
title: Custom terms of service
site_title: Server name
spam_check_enabled:
desc_html: Mastodon can auto-silence and auto-report accounts based on measures such as detecting accounts who send repeated unsolicited messages. There may be false positives.
title: Anti-spam
desc_html: Mastodon can auto-silence and auto-report accounts that send repeated unsolicited messages. There may be false positives.
title: Anti-spam automation
thumbnail:
desc_html: Used for previews via OpenGraph and API. 1200x630px recommended
title: Server thumbnail
@ -469,6 +469,9 @@ en:
desc_html: Display public timeline on landing page
title: Timeline preview
title: Site settings
trends:
desc_html: Publicly display previously reviewed hashtags that are currently trending
title: Trending hashtags
statuses:
back_to_account: Back to account page
batch:
@ -514,6 +517,7 @@ en:
advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.'
animations_and_accessibility: Animations and accessibility
confirmation_dialogs: Confirmation dialogs
discovery: Discovery
sensitive_content: Sensitive content
application_mailer:
notification_preferences: Change e-mail preferences