about summary refs log tree commit diff
path: root/config/locales/simple_form.en.yml
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-08-08 10:06:09 -0700
committerReverite <github@reverite.sh>2019-08-08 10:06:09 -0700
commit9528d3eda280ffac20a18c6f21bfc51f594e2c86 (patch)
tree0b6f5b980996b2d16c2dcdd5b932075812753098 /config/locales/simple_form.en.yml
parent7a312a38f904e853f5703a0b678d0aec83fa858c (diff)
parentaa485d6f055b93fd7a9df8b47ed96122b38af39e (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'config/locales/simple_form.en.yml')
-rw-r--r--config/locales/simple_form.en.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index cd74f08c8..5da0cc45d 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -53,6 +53,8 @@ en:
         text: This will help us review your application
       sessions:
         otp: 'Enter the two-factor code generated by your phone app or use one of your recovery codes:'
+      tag:
+        name: You can only change the casing of the letters, for example, to make it more readable
       user:
         chosen_languages: When checked, only toots in selected languages will be displayed in public timelines
     labels:
@@ -123,6 +125,8 @@ en:
         setting_show_application: Disclose application used to send toots
         setting_skin: Skin
         setting_system_font_ui: Use system's default font
+        setting_theme: Site theme
+        setting_trends: Show today's trends
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         setting_use_blurhash: Show colorful gradients for hidden media
         setting_use_pending_items: Slow mode
@@ -148,6 +152,11 @@ en:
         pending_account: Send e-mail when a new account needs review
         reblog: Send e-mail when someone boosts your status
         report: Send e-mail when a new report is submitted
+        trending_tag: Send e-mail when an unreviewed hashtag is trending
+      tag:
+        listable: Allow this hashtag to appear on the profile directory
+        trendable: Allow this hashtag to appear under trends
+        usable: Allow toots to use this hashtag
     'no': 'No'
     recommended: Recommended
     required: