diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-25 13:33:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 13:33:00 +0100 |
| commit | 959e4b81987080353415556cc3bbd2aab478adb4 (patch) | |
| tree | 5db6ed034f98ac8f2ef34b48d2032b74617d21d1 /config | |
| parent | effdb42f4c63b957cfdef37a44dfa45284ece337 (diff) | |
| parent | 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'config')
| -rw-r--r-- | config/i18n-tasks.yml | 3 | ||||
| -rw-r--r-- | config/locales/simple_form.de.yml | 3 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index d345ce6c0..4dc6985b7 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -30,9 +30,6 @@ search: - app/assets/fonts - app/assets/videos -ignore_missing: - - '{devise,simple_form}.*' - ignore_unused: - 'activerecord.attributes.*' - '{devise,will_paginate,doorkeeper}.*' diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml index 36c5141a2..47e30ccb4 100644 --- a/config/locales/simple_form.de.yml +++ b/config/locales/simple_form.de.yml @@ -16,6 +16,9 @@ de: password: Passwort silenced: Öffentliche Beiträge nicht auflisten username: Nutzername + interactions: + must_be_follower: Benachrichtigungen von nicht-Folgern blockieren + must_be_following: Benachrichtigungen von Nutzern blockieren, denen ich nicht folge notification_emails: favourite: E-mail senden, wenn jemand meinen Beitrag favorisiert follow: E-mail senden, wenn mir jemand folgt diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index a7d958c06..1e975af14 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -16,6 +16,9 @@ en: password: Password silenced: Unlisted mode username: Username + interactions: + must_be_follower: Block notifications from non-followers + must_be_following: Block notifications from people you don't follow notification_emails: favourite: Send e-mail when someone favourites your status follow: Send e-mail when someone follows you |