about summary refs log tree commit diff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-03 01:07:53 +0200
committerGitHub <noreply@github.com>2017-04-03 01:07:53 +0200
commitd2358aefecb6858eab641752a3279cdaa824eaa3 (patch)
treec9393bbbe41a1c72bc2e40e924083c242f16588b /app/assets/javascripts
parentc76d20c2a0572f1da7d2fafcd6c7a90aa6caf7f1 (diff)
parent30df1c8476739a7439762eb678962a5254918323 (diff)
Merge branch 'master' into master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/components/locales/fr.jsx8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/locales/fr.jsx b/app/assets/javascripts/components/locales/fr.jsx
index 982aea5e2..23fa9349c 100644
--- a/app/assets/javascripts/components/locales/fr.jsx
+++ b/app/assets/javascripts/components/locales/fr.jsx
@@ -34,8 +34,10 @@ const fr = {
   "column.home": "Accueil",
   "column.community": "Fil public local",
   "column.public": "Fil public global",
-  "column.mentions": "Mentions",
   "column.notifications": "Notifications",
+  "column.public": "Fil public",
+  "column.blocks": "Utilisateurs bloqués",
+  "column.favourites": "Favoris",
   "tabs_bar.compose": "Composer",
   "tabs_bar.home": "Accueil",
   "tabs_bar.mentions": "Mentions",
@@ -53,6 +55,10 @@ const fr = {
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.community_timeline": "Fil public local",
   "navigation_bar.public_timeline": "Fil public global",
+  "navigation_bar.blocks": "Utilisateurs bloqués",
+  "navigation_bar.favourites": "Favoris",
+  "navigation_bar.info": "Plus d'informations",
+  "notification.favourite": "{name} a ajouté à ses favoris :",
   "navigation_bar.logout": "Déconnexion",
   "reply_indicator.cancel": "Annuler",
   "search.placeholder": "Chercher",