about summary refs log tree commit diff
path: root/config/locales
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-11-30 17:29:44 +0100
committerThibaut Girka <thib@sitedethib.com>2019-11-30 17:29:44 +0100
commit2b7158427f5a80728dfc04913a4d7a78471a1703 (patch)
tree4d55c1f3502880bb0f20cd1daab081a8685d0f0c /config/locales
parent93b8aec7b7cd6af1b6ef6385cfe138fb32dee6e9 (diff)
parentb532ead798c481fd03be9eb78e910d62654cdaa8 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/simple_form.en.yml16
2 files changed, 12 insertions, 8 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f672590bf..22f658c18 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -900,6 +900,10 @@ en:
       body: 'Your status was boosted by %{name}:'
       subject: "%{name} boosted your status"
       title: New boost
+  notifications:
+    email_events: Events for e-mail notifications
+    email_events_hint: 'Select events that you want to receive notifications for:'
+    other_settings: Other notifications settings
   number:
     human:
       decimal_units:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 9b467f84e..8386c8cf1 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -163,14 +163,14 @@ en:
         text: Why do you want to join?
       notification_emails:
         digest: Send digest e-mails
-        favourite: Send e-mail when someone favourites your status
-        follow: Send e-mail when someone follows you
-        follow_request: Send e-mail when someone requests to follow you
-        mention: Send e-mail when someone mentions you
-        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
+        favourite: Someone favourited your status
+        follow: Someone followed you
+        follow_request: Someone requested to follow you
+        mention: Someone mentioned you
+        pending_account: New account needs review
+        reblog: Someone boosted your status
+        report: New report is submitted
+        trending_tag: An unreviewed hashtag is trending
       tag:
         listable: Allow this hashtag to appear in searches and on the profile directory
         name: Hashtag