tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into french-translation

Browse Source
This commit is contained in:
nicolas
2016-11-25 13:33:00 +01:00
committed by GitHub
parent effdb42f4c 8a3745a4df
commit 959e4b8198
12 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/locales/simple_form.de.yml
View File

@ -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

3
config/locales/simple_form.en.yml
View File

@ -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