Merge branch 'master' into master

This commit is contained in:
Eugen
2017-04-03 01:07:53 +02:00
committed by GitHub
26 changed files with 238 additions and 23 deletions

View File

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