diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /config/locales/en.yml | |
parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'config/locales/en.yml')
-rw-r--r-- | config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 4fc392434..d4c13481b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -338,6 +338,7 @@ en: body: "%{reporter} has reported %{target}" subject: New report for %{instance} (#%{id}) application_mailer: + notification_preferences: Change e-mail preferences salutation: "%{name}," settings: 'Change e-mail preferences: %{link}' signature: Mastodon notifications from %{instance} |