Merge branch 'master' into 'dev'

# Conflicts:
#   languages/fr.json

(and this is why we never do Merge Requests directly to the master branch.)
merge-requests/55/head
Moe 2019-03-06 16:50:46 +00:00
commit d6f83fff27
1 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@
"Add Input Feed": "Ajouter un flux d'entrée",
"Add Map": "Ajouter La Carte",
"Add Monitor": "Ajouter Moniteur",
"Add New": "Ajouter De Nouveaux",
"Add New": "Ajouter Nouveau",
"Admin": "Admin",
"Advanced": "Avancé",
"Again": "Encore",
@ -131,7 +131,7 @@
"DB Lost.. Retrying..": "Base De Données Perdues.. Réessayer..",
"DESC": "DESC",
"Dashboard": "Tableau de bord",
"Dashboard Language": "Langue Du Tableau De Bord",
"Dashboard Language": "Langue du Tableau De Bord",
"Dashcam": "Dashcam",
"Dashcam (Streamer v2)": "Dashcam (Streamer v2)",
"Date Range": "Plage De Dates",