Merge remote-tracking branch 'origin/master'

lang/fr.json

@@ -18,7 +18,7 @@
     "category:education": "Éducation",
     "category:emergency": "Services d'urgence",
     "category:financial": "Finance",
-    "category:gastro": "Gastronomie",
+    "category:gastro": "Restauration",
     "category:health": "Santé",
     "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
@@ -47,9 +47,9 @@
     "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
     "category:services": "Services",
-    "category:shop": "Magasinage/Shopping",
-    "category:special": "Spécial",
-    "category:sport": "Autres sports",
+    "category:shop": "Magasins/Boutiques",
+    "category:special": "Catégories spéciales",
+    "category:sport": "Sports",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
     "category:transport": "Transports",