mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
6c99479ef4
Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.
27 lines
1.6 KiB
YAML
27 lines
1.6 KiB
YAML
---
|
|
en:
|
|
simple_form:
|
|
glitch_only: glitch-soc
|
|
hints:
|
|
defaults:
|
|
setting_default_content_type_html: When writing toots, assume they are written in raw HTML, unless specified otherwise
|
|
setting_default_content_type_markdown: When writing toots, assume they are using Markdown for rich text formatting, unless specified otherwise
|
|
setting_default_content_type_plain: When writing toots, assume they are plain text with no special formatting, unless specified otherwise (default Mastodon behavior)
|
|
setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
|
|
setting_hide_followers_count: Hide your followers count from everybody, including you. Some applications may display a negative followers count.
|
|
setting_skin: Reskins the selected Mastodon flavour
|
|
labels:
|
|
defaults:
|
|
setting_default_content_type: Default format for toots
|
|
setting_default_content_type_html: HTML
|
|
setting_default_content_type_markdown: Markdown
|
|
setting_default_content_type_plain: Plain text
|
|
setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
|
|
setting_hide_followers_count: Hide your followers count
|
|
setting_skin: Skin
|
|
setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only)
|
|
notification_emails:
|
|
trending_link: New trending link requires review
|
|
trending_status: New trending post requires review
|
|
trending_tag: New trending tag requires review
|