mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-14 01:15:16 +00:00
9b861d56a9
Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.
24 lines
1 KiB
YAML
24 lines
1 KiB
YAML
---
|
|
en:
|
|
admin:
|
|
settings:
|
|
enable_keybase:
|
|
desc_html: Allow your users to prove their identity via keybase
|
|
title: Enable keybase integration
|
|
outgoing_spoilers:
|
|
desc_html: When federating toots, add this content warning to toots that do not have one. It is useful if your server is specialized in content other servers might want to have under a Content Warning. Media will also be marked as sensitive.
|
|
title: Content warning for outgoing toots
|
|
hide_followers_count:
|
|
desc_html: Do not show followers count on user profiles
|
|
title: Hide followers count
|
|
show_reblogs_in_public_timelines:
|
|
desc_html: Show public boosts of public toots in local and public timelines.
|
|
title: Show boosts in public timelines
|
|
show_replies_in_public_timelines:
|
|
desc_html: In addition to public self-replies (threads), show public replies in local and public timelines.
|
|
title: Show replies in public timelines
|
|
generic:
|
|
use_this: Use this
|
|
settings:
|
|
flavours: Flavours
|