diff options
| author | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-28 15:15:33 -0400 |
| commit | 1150110d50d9060fc325825c6770e7ef773ebcff (patch) | |
| tree | 816e549592c184ffe6f545e7def2f785517be0c0 /config | |
| parent | 205debc43d841afaa1b2ed7dfd05a6d1b6d9d5e0 (diff) | |
| parent | 00793a86bc52e4cb37318e42ea4ceb37a896c727 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 3 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 1ebeba2f2..fde013ca0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -175,6 +175,7 @@ en: user: User salmon_url: Salmon URL search: Search + search_same_ip: Other users with the same IP shared_inbox_url: Shared inbox URL show: created_reports: Made reports @@ -588,6 +589,7 @@ en: confirmation_dialogs: Confirmation dialogs discovery: Discovery sensitive_content: Sensitive content + toot_layout: Toot layout application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 810a3f2a7..776ac6e1b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -83,7 +83,7 @@ en: text: Custom warning type: Action types: - disable: Disable + disable: Disable login none: Do nothing silence: Silence suspend: Suspend and irreversibly delete account data @@ -118,6 +118,7 @@ en: setting_aggregate_reblogs: Group boosts in timelines setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting + setting_crop_images: Crop images in non-expanded toots to 16x9 setting_default_content_type: Default format for toots setting_default_content_type_html: HTML setting_default_content_type_markdown: Markdown diff --git a/config/settings.yml b/config/settings.yml index d13e99831..3cca40cbd 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -41,6 +41,7 @@ defaults: &defaults use_pending_items: false trends: true trendable_by_default: false + crop_images: true notification_emails: follow: false reblog: false |