diff --git a/buildings.json b/buildings.json
index ff4f674a..3527bb0f 100644
--- a/buildings.json
+++ b/buildings.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Gebäude",
-        "en": "Buildings"
+        "en": "Buildings",
+        "fr": "Bâtiments"
     },
     "query": {
         "16": [
diff --git a/car_maxspeed.json b/car_maxspeed.json
index a8ec5307..97209661 100644
--- a/car_maxspeed.json
+++ b/car_maxspeed.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Höchstgeschwindigkeiten",
-        "en": "Maxspeed"
+        "en": "Maxspeed",
+        "fr": "Limites de vitesse"
     },
     "query": {
         "11": "way[highway~\"^(motorway|trunk)$\"];",
diff --git a/children.json b/children.json
index 0bcbd722..1ac1511a 100644
--- a/children.json
+++ b/children.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Einrichtungen für Kinder",
-        "en": "Children amenities"
+        "en": "Children amenities",
+        "fr": "Équipements pour enfants"
     },
     "query": {
         "15": [
diff --git a/construction.json b/construction.json
index 60b67850..493aa1de 100644
--- a/construction.json
+++ b/construction.json
@@ -5,7 +5,7 @@
         "cs": "Staveniště",
         "de": "Baustellen",
         "en": "Construction Sites",
-        "fr": "Sites en construction",
+        "fr": "Zones industrielles",
         "it": "Cantieri",
         "ja": "工事中",
         "nl": "Bouwterrein",
diff --git a/cycle_amenities.json b/cycle_amenities.json
index 0d49ce63..37eff0f9 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Einrichtungen",
-        "en": "Amenities"
+        "en": "Amenities",
+        "fr": "Équipements"
     },
     "query": {
         "13": [
diff --git a/cycle_routes.json b/cycle_routes.json
index 918b3748..6d27c7d7 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Radrouten",
-        "en": "Cycle Routes"
+        "en": "Cycle Routes",
+        "fr": "Itinéraires vélo"
     },
     "query": {
         "6": "relation[type=route][route=bicycle][network~'^(icn)$']",
diff --git a/education.json b/education.json
index 32b40a9d..82a9c6f0 100644
--- a/education.json
+++ b/education.json
@@ -7,7 +7,7 @@
         "el": "Υπηρεσίες Εκπαίδευσης",
         "en": "Educational Services",
         "et": "Haridusteenused",
-        "fr": "Service d'Éducation",
+        "fr": "Services éducatifs",
         "it": "Istruzione",
         "ja": "教育サービス",
         "nl": "Onderwijs",
diff --git a/emergency.json b/emergency.json
index f4e091ea..eed4da03 100644
--- a/emergency.json
+++ b/emergency.json
@@ -9,7 +9,7 @@
         "en": "Emergency Services",
         "es": "Servicios de emergencia",
         "et": "Hädaabi teenused",
-        "fr": "Service d'urgence",
+        "fr": "Services d'urgence",
         "it": "Servizi d'emergenza",
         "ja": "緊急サービス",
         "nl": "Hulpdiensten",
diff --git a/index.json b/index.json
index cb865d76..8f861b88 100644
--- a/index.json
+++ b/index.json
@@ -100,7 +100,7 @@
                 "el": "Μεταφορές",
                 "en": "Transportation",
                 "et": "Transport",
-                "fr": "Transport",
+                "fr": "Transports",
                 "hu": "Közlekedés",
                 "it": "Trasporti",
                 "ja": "輸送",
@@ -116,7 +116,8 @@
                     "type": "index",
                     "name": {
                         "de": "Zu Fuß gehen",
-                        "en": "Walking"
+                        "en": "Walking",
+                        "fr": "Marche à pied"
                     },
                     "subCategories": [
                         {
@@ -132,7 +133,8 @@
                     "type": "index",
                     "name": {
                         "de": "Radfahren",
-                        "en": "Cycling"
+                        "en": "Cycling",
+                        "fr": "Cyclisme"
                     },
                     "subCategories": [
                         {
@@ -153,7 +155,7 @@
                         "el": "Δημόσιες Μεταφορές",
                         "en": "Public Transportation",
                         "et": "Ühistransport",
-                        "fr": "Transport public",
+                        "fr": "Transports publics",
                         "hu": "Tömegközlekedés",
                         "it": "Trasporti pubblici",
                         "ja": "公共輸送",
@@ -208,7 +210,8 @@
             "type": "index",
             "name": {
                 "de": "Infrastruktur",
-                "en": "Infrastructure"
+                "en": "Infrastructure",
+                "fr": "Infrastructures"
             },
             "subCategories": [
                 {
diff --git a/lang/fr.json b/lang/fr.json
index 849d21ee..794517f9 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -3,60 +3,64 @@
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Équipement",
     "category:alternative_routes": "Routes",
-    "category:buildings": null,
+    "category:buildings": "Bâtiments",
     "category:car_amenities": "Infrastructures routières",
     "category:car_furniture": "Infrastrucutures résidentielles",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "Limites de vitesse",
+    "category:children": "Équipements pour enfants",
     "category:communication": "Communication",
-    "category:construction": "Sites en construction",
+    "category:construction": "Zones industrielles",
     "category:culture": "Culture",
     "category:culture_religion": "Culture",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
-    "category:education": "Service d'Éducation",
-    "category:emergency": "Service d'urgence",
+    "category:cycle_amenities": "Équipements",
+    "category:cycle_infrastructure": null,
+    "category:cycle_routes": "Itinéraires vélo",
+    "category:education": "Services éducatifs",
+    "category:emergency": "Services d'urgence",
     "category:financial": "Finance",
     "category:gastro": "Gastronomie",
     "category:health": "Santé",
     "category:hiking_routes": null,
     "category:historic": "Histoire",
     "category:index": null,
+    "category:infrastructure": "Infrastructures",
     "category:internet": null,
     "category:leisure": "Loisirs",
+    "category:leisure_sport_shopping": "Loisirs",
     "category:military": "Militaire",
     "category:natural": "Formation Naturelle",
     "category:other": "Autre",
     "category:phone": null,
-    "category:places": "Place",
-    "category:places_geo": "Place",
+    "category:places": "Lieux",
+    "category:places_geo": "Lieux",
     "category:playgrounds": "Jeux pour enfants",
     "category:post": null,
     "category:power": "Énergie",
     "category:pt_amenities": "Équipements",
-    "category:pt_routes": null,
+    "category:pt_routes": "Lignes",
     "category:pt_stops": "Arrêts/Stops, Stations",
     "category:public": "Services Publics",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway": "Chemins de fer",
+    "category:railway-electrification": "Électrification ferroviaire",
+    "category:railway-infrastructure": "Infrastructure ferroviaire",
     "category:religion": "Religion",
-    "category:residential": "Zone Résidentielle",
+    "category:residential": "Zones résidentielles",
     "category:resources": "Extraction des ressources",
+    "category:services": "Services",
     "category:shop": "Magasinage/Shopping",
-    "category:sport": "Other Sport",
+    "category:special": null,
+    "category:sport": "Autres sports",
     "category:tourism_attractions": "Tourisme",
     "category:tourism_services": "Tourisme",
+    "category:transport": "Transports",
     "category:transport_alternative": "Alternatif (Cyclisme, Randonnée, ...)",
-    "category:walk_amenities": null,
+    "category:transport_car": "Transport automobile",
+    "category:transport_cycle": "Cyclisme",
+    "category:transport_pt": "Transports publics",
+    "category:transport_walk": "Marche à pied",
+    "category:walk_amenities": "Équipements",
     "category:waste": "Rebuts",
-    "category:water": null,
+    "category:water": "Hydrographie",
     "category:wikipedia": null,
-    "category:works": "Construction",
-    "category:cycle_infrastructure": null,
-    "category:leisure_sport_shopping": "Loisirs",
-    "category:railway": "Chemins de fer",
-    "category:services": "Services",
-    "category:transport": "Transport",
-    "category:transport_car": "Transport automobile",
-    "category:transport_pt": "Transport public"
+    "category:works": "Construction"
 }
diff --git a/places.json b/places.json
index aceabb48..251da747 100644
--- a/places.json
+++ b/places.json
@@ -7,7 +7,7 @@
         "el": "Μέρη",
         "en": "Places",
         "et": "Kohad",
-        "fr": "Place",
+        "fr": "Lieux",
         "hu": "Helyek",
         "it": "Luoghi",
         "ja": "場所",
diff --git a/places_geo.json b/places_geo.json
index a9e6432e..850e54f4 100644
--- a/places_geo.json
+++ b/places_geo.json
@@ -7,7 +7,7 @@
         "el": "Μέρη",
         "en": "Places",
         "et": "Kohad",
-        "fr": "Place",
+        "fr": "Lieux",
         "hu": "Helyek",
         "it": "Luoghi",
         "ja": "場所",
diff --git a/pt_routes.json b/pt_routes.json
index eed3ac9d..78462e1f 100644
--- a/pt_routes.json
+++ b/pt_routes.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Routen",
-        "en": "Routes"
+        "en": "Routes",
+        "fr": "Lignes"
     },
     "query": {
         "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];",
diff --git a/railway-electrification.json b/railway-electrification.json
index 4aca9b8a..db7a89ca 100644
--- a/railway-electrification.json
+++ b/railway-electrification.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Eisenbahn Elektrifizierung",
-        "en": "Railway electrification"
+        "en": "Railway electrification",
+        "fr": "Électrification ferroviaire"
     },
     "query": {
         "11": "way[railway=rail][railway!~'^(platform|abandoned|disused|station|proposed|subway_entrance)$'][usage~'^(main|branch)$'];",
diff --git a/railway-infrastructure.json b/railway-infrastructure.json
index f2876ae9..095e9548 100644
--- a/railway-infrastructure.json
+++ b/railway-infrastructure.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Eisenbahn Infrastruktur",
-        "en": "Railway infrastructure"
+        "en": "Railway infrastructure",
+        "fr": "Infrastructure ferroviaire"
     },
     "query": {
         "11": "(way[railway=rail][usage~'^(main|branch)$'];node[railway~'^(station)$'];)",
diff --git a/residential.json b/residential.json
index b2436183..6cd2fcc4 100644
--- a/residential.json
+++ b/residential.json
@@ -7,7 +7,7 @@
         "el": "Περιοχές Κατοικίας",
         "en": "Residential Areas",
         "et": "Elamupiirkonnad",
-        "fr": "Zone Résidentielle",
+        "fr": "Zones résidentielles",
         "hu": "Lakóövezetek",
         "it": "Aree residenziali",
         "ja": "住居エリア",
diff --git a/sport.json b/sport.json
index 008c933d..4a94d8c9 100644
--- a/sport.json
+++ b/sport.json
@@ -6,7 +6,7 @@
         "de": "Sport",
         "el": "Άθληση",
         "en": "Sport",
-        "fr": "Other Sport",
+        "fr": "Autres sports",
         "hu": "Sport",
         "it": "Sport",
         "ja": "スポーツ",
diff --git a/walk_amenities.json b/walk_amenities.json
index 52959f7b..070d3642 100644
--- a/walk_amenities.json
+++ b/walk_amenities.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Einrichtungen",
-        "en": "Amenities"
+        "en": "Amenities",
+        "fr": "Équipements"
     },
     "query": {
         "13": [
diff --git a/waste.json b/waste.json
index 004827a2..e7dc3cad 100644
--- a/waste.json
+++ b/waste.json
@@ -106,4 +106,4 @@
             "sign": "<img src='maki:waste-basket'>"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/water.json b/water.json
index 1df53ae2..4f844761 100644
--- a/water.json
+++ b/water.json
@@ -2,7 +2,8 @@
     "type": "overpass",
     "name": {
         "de": "Gewässer",
-        "en": "Waterbodies"
+        "en": "Waterbodies",
+        "fr": "Hydrographie"
     },
     "query": {
         "10": [