diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:30:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:59:53 +0200 |
| commit | 1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05 (patch) | |
| tree | 1b67879adb426809f3e00102fc2f97a8118b011e /config/locales/simple_form.en.yml | |
| parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
| parent | 8514ef723c3e3963567a9d57bd0d71a5091fc802 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 97a5e8785..e5e12c05a 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -26,12 +26,12 @@ en: password: Use at least 8 characters phrase: Will be matched regardless of casing in text or content warning of a toot scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. - setting_advanced_layout: The advanced UI consists of multiple customizable columns setting_aggregate_reblogs: Do not show new boosts for toots that have been recently boosted (only affects newly-received boosts) 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_default_sensitive: Sensitive media is hidden by default and can be revealed with a click setting_display_media_default: Hide media marked as sensitive setting_display_media_hide_all: Always hide all media setting_display_media_show_all: Always show media marked as sensitive @@ -103,7 +103,7 @@ en: setting_default_content_type_markdown: Markdown setting_default_content_type_plain: Plain text setting_default_language: Posting language - setting_default_privacy: Post privacy + setting_default_privacy: Posting privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot setting_display_media: Media display @@ -143,6 +143,7 @@ en: reblog: Send e-mail when someone boosts your status report: Send e-mail when a new report is submitted 'no': 'No' + recommended: Recommended required: mark: "*" text: required |