diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/simple_form.en.yml | |
parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r-- | config/locales/simple_form.en.yml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index f15025061..94c79490b 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -12,10 +12,12 @@ en: other: <span class="name-counter">%{count}</span> characters left fields: You can have up to 4 items displayed as a table on your profile header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + locale: The language of the user interface, e-mails and push notifications locked: Requires you to manually approve followers note: one: <span class="note-counter">1</span> character left other: <span class="note-counter">%{count}</span> characters left + setting_default_language: The language of your toots can be detected automatically, but it's not always accurate setting_hide_network: Who you follow and who follows you will not be shown on your profile setting_noindex: Affects your public profile and status pages setting_skin: Reskins the selected Mastodon flavour @@ -24,7 +26,7 @@ en: sessions: otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:' user: - filtered_languages: Checked languages will be filtered from public timelines for you + chosen_languages: When checked, only toots in selected languages will be displayed in public timelines labels: account: fields: @@ -34,6 +36,7 @@ en: autofollow: Invite to follow your account avatar: Avatar bot: This is a bot account + chosen_languages: Filter languages confirm_new_password: Confirm new password confirm_password: Confirm password current_password: Current password @@ -42,9 +45,8 @@ en: email: E-mail address expires_in: Expire after fields: Profile metadata - filtered_languages: Filtered languages header: Header - locale: Language + locale: Interface language locked: Lock account max_uses: Max number of uses new_password: New password @@ -53,6 +55,7 @@ en: password: Password setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before boosting + setting_default_language: Posting language setting_default_privacy: Post privacy setting_default_sensitive: Always mark media as sensitive setting_delete_modal: Show confirmation dialog before deleting a toot |