diff options
| author | JantsoP <jantso.porali@gmail.com> | 2017-04-05 10:07:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 10:07:17 +0200 |
| commit | 20b53e6add351e5bb5ff1bd4d675db6252e03293 (patch) | |
| tree | e252e354e63765d1f28919f2ac58de26001806cb /config/locales/simple_form.en.yml | |
| parent | 3ec221d3b7093e2a2606ec04036cca9e9f1f733d (diff) | |
| parent | ccb6a658fd1a2e596c95d5b8e7a39f72a5f5b14b (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'config/locales/simple_form.en.yml')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index df4f6ca00..dfc67fdfd 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -38,7 +38,7 @@ en: 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 - reblog: Send e-mail when someone reblogs your status + reblog: Send e-mail when someone boosts your status 'no': 'No' required: mark: "*" |