diff options
| author | Eugen <eugen@zeonfederated.com> | 2016-11-25 13:41:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 13:41:49 +0100 |
| commit | 50bec5b9990da961d97ee5ec089b924d63686c59 (patch) | |
| tree | 5db6ed034f98ac8f2ef34b48d2032b74617d21d1 | |
| parent | 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 (diff) | |
| parent | 959e4b81987080353415556cc3bbd2aab478adb4 (diff) | |
Merge pull request #276 from nclm/french-translation
French translation update
| -rw-r--r-- | app/assets/javascripts/components/locales/fr.jsx | 6 | ||||
| -rw-r--r-- | config/locales/simple_form.fr.yml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/components/locales/fr.jsx b/app/assets/javascripts/components/locales/fr.jsx index 865b52bb2..c4458a145 100644 --- a/app/assets/javascripts/components/locales/fr.jsx +++ b/app/assets/javascripts/components/locales/fr.jsx @@ -47,9 +47,9 @@ const fr = { "upload_button.label": "Joindre un média", "upload_form.undo": "Annuler", "notification.follow": "{name} vous suit.", - "notification.favourite": "{name} a ajouté à ses favoris", - "notification.reblog": "{name} a partagé votre statut", - "notification.mention": "{name} vous a mentionné⋅e" + "notification.favourite": "{name} a ajouté à ses favoris :", + "notification.reblog": "{name} a partagé votre statut :", + "notification.mention": "{name} vous a mentionné⋅e :" }; export default fr; diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 8d5bf8b4c..73905a7b3 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -21,6 +21,9 @@ fr: follow: Envoyer un courriel lorsque quelqu’un me suit mention: Envoyer un courriel lorsque quelqu’un me mentionne reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts + interactions: + must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas + must_be_following: Masquer les notifications des personnes que vous ne suivez pas 'no': Non required: mark: "*" |