diff --git a/lang/ast.json b/lang/ast.json
index 06f3e68..6e46722 100644
--- a/lang/ast.json
+++ b/lang/ast.json
@@ -1,19 +1,23 @@
 {
+    "category:works": "Fábriques",
     "category:administrative": "Divisiones Alministratives",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Infraestructures",
     "category:alternative_routes": "Rutes",
     "category:car_amenities": "Infraestructures",
     "category:car_furniture": "Acondicionamientu urbanu",
-    "category:tourism_attractions": "Turismu",
-    "category:waste": "Basures",
-    "category:works": "Fábriques",
+    "category:communication": "Comunicaciones",
+    "category:construction": "Sitios d'obres",
+    "category:public": "Serviciu Públicu",
+    "category:religion": "Relixón",
+    "category:residential": "Zones residenciales",
+    "category:resources": "Estraición de recursos",
     "category:shop": "Compres",
     "category:sport": "Deportes",
+    "category:tourism_attractions": "Turismu",
     "category:tourism_services": "Turismu",
     "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
-    "category:communication": "Comunicaciones",
-    "category:construction": "Sitios d'obres",
+    "category:waste": "Basures",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:education": "Servicios educativos",
@@ -41,10 +45,6 @@
     "category:post": "Corréu",
     "category:pt:stops": "Paraes y estaciones",
     "category:pt_amenities": "Infraestructures",
-    "category:public": "Serviciu Públicu",
-    "category:religion": "Relixón",
-    "category:residential": "Zones residenciales",
-    "category:resources": "Estraición de recursos",
     "category:buildings": "",
     "category:buildings-entrances": "",
     "category:buildings-figure-ground": "",
diff --git a/lang/ca.json b/lang/ca.json
index 8bb9832..6731b9c 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -1,70 +1,7 @@
 {
-    "category:internet": "Accés a Internet",
-    "category:leisure": "Oci",
-    "category:memorial": "Memorials i Monuments",
-    "category:military": "Militar",
-    "category:mtb-routes": "Rutes Ciclistes de Muntanya",
-    "category:natural": "Formacions Naturals",
-    "category:office": "Oficines",
-    "category:oil_gas": "Petroli i gas natural",
-    "category:organisations": "Organitzacions",
-    "category:other": "Altres",
-    "category:outdoor": "Activitats a l'aire lliure",
-    "category:paddling": "Remar",
-    "category:paddling_amenities": "Instal·lacions de Rem",
-    "category:paddling_hazards": "Riscos de Rem",
-    "category:paddling_routes": "Rutes de Rem",
-    "category:phone": "Telèfon",
-    "category:places": "Llocs",
-    "category:places_geo": "Llocs",
-    "category:playgrounds": "Parc infantil",
-    "category:post": "Correus",
-    "category:power_routes": "Rutes d'energia",
-    "category:proposals": "Propostes",
-    "category:pt": "Mapa de transport públic",
-    "category:pt:stops": "Parades i Estacions",
-    "category:pt:routes": "Rutes",
-    "category:pt_amenities": "Serveis",
-    "category:public": "Serveis Públics",
-    "category:railway-electrification": "Electrificació de la via fèrria",
-    "category:railway-gauge": "Ample de via fèrria",
-    "category:railway-infrastructure": "Infraestructura fèrria",
-    "category:railway-maxspeed": "Velocitat màxima de la via fèrria",
-    "category:railway-routes": "Rutes Fèrries",
-    "category:religion": "Religió",
-    "category:renewables": "Renovables",
-    "category:residential": "Àrees Residencials",
-    "category:resources": "Extracció de Recursos",
-    "category:roads": "Carreteres",
-    "category:shop": "Compres",
-    "category:sport": "Esport",
-    "category:swimming_bathing": "Natació i bany",
-    "category:tourism_attractions": "Turisme",
-    "category:tourism_services": "Turisme",
-    "category:transport_alternative": "Modes Alternatius de Transport",
-    "category:walk_amenities": "Serveis",
-    "category:walk_amenities_qa": "Serveis per a peatons",
-    "category:waste": "Deixalles",
-    "category:water": "Cossos d'aigua",
     "category:wikipedia": "Viquipèdia",
     "category:works": "Treballs",
     "category:xmas": "Nadal",
-    "category:index": "Índex de Categories",
-    "category:leisure_sport_shopping": "Oci, esport i compres",
-    "category:services": "Serveis",
-    "category:transport": "Transport",
-    "category:transport_walk": "Caminar",
-    "category:transport_cycle": "Ciclisme",
-    "category:transport_pt": "Transport Públic",
-    "category:transport_car": "Trànsit Individual",
-    "category:infrastructure": "Infraestructura",
-    "category:developments": "Planificació i Construcció",
-    "category:energy": "Energia",
-    "category:railway": "Via fèrria",
-    "category:special": "Especial",
-    "category:osm-qa": "Control de Qualitat d'OpenStreetMap",
-    "category:kerbs": "Voreres",
-    "category:law": "Llei",
     "category:administrative": "Àrees Administratives",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Serveis",
@@ -86,6 +23,29 @@
     "category:construction": "Llocs en Construcció",
     "category:craft": "Artesania",
     "category:culture-media": "Cultura - Mitjans/Wikidata",
+    "category:public": "Serveis Públics",
+    "category:railway-maxspeed": "Velocitat màxima de la via fèrria",
+    "category:railway-routes": "Rutes Fèrries",
+    "category:religion": "Religió",
+    "category:renewables": "Renovables",
+    "category:residential": "Àrees Residencials",
+    "category:resources": "Extracció de Recursos",
+    "category:roads": "Carreteres",
+    "category:shop": "Compres",
+    "category:sport": "Esport",
+    "category:swimming_bathing": "Natació i bany",
+    "category:tourism_attractions": "Turisme",
+    "category:tourism_services": "Turisme",
+    "category:transport_alternative": "Modes Alternatius de Transport",
+    "category:walk_amenities": "Serveis",
+    "category:walk_amenities_qa": "Serveis per a peatons",
+    "category:waste": "Deixalles",
+    "category:water": "Cossos d'aigua",
+    "category:footways": "Camins peatonals",
+    "category:gastro-smoking": "Gastronomia Lliure de Fum",
+    "category:railway-gauge": "Ample de via fèrria",
+    "category:railway-electrification": "Electrificació de la via fèrria",
+    "category:railway-infrastructure": "Infraestructura fèrria",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura i religió",
     "category:cycle_amenities": "Serveis",
@@ -97,11 +57,51 @@
     "category:emergency": "Serveis d'emergència",
     "category:financial": "Financer",
     "category:fixme": "Corregeix-me",
-    "category:footways": "Camins peatonals",
-    "category:gastro-smoking": "Gastronomia Lliure de Fum",
     "category:gastro": "Gastronomia",
     "category:health": "Sanitat",
     "category:heritage": "Protecció del Patrimoni",
     "category:hiking_routes": "Rutes Excursionistes",
-    "category:historic": "Històric"
+    "category:historic": "Històric",
+    "category:index": "Índex de Categories",
+    "category:leisure_sport_shopping": "Oci, esport i compres",
+    "category:services": "Serveis",
+    "category:transport": "Transport",
+    "category:transport_walk": "Caminar",
+    "category:transport_cycle": "Ciclisme",
+    "category:transport_pt": "Transport Públic",
+    "category:transport_car": "Trànsit Individual",
+    "category:infrastructure": "Infraestructura",
+    "category:developments": "Planificació i Construcció",
+    "category:energy": "Energia",
+    "category:railway": "Via fèrria",
+    "category:special": "Especial",
+    "category:osm-qa": "Control de Qualitat d'OpenStreetMap",
+    "category:internet": "Accés a Internet",
+    "category:kerbs": "Voreres",
+    "category:law": "Llei",
+    "category:leisure": "Oci",
+    "category:memorial": "Memorials i Monuments",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rutes Ciclistes de Muntanya",
+    "category:natural": "Formacions Naturals",
+    "category:office": "Oficines",
+    "category:oil_gas": "Petroli i gas natural",
+    "category:organisations": "Organitzacions",
+    "category:other": "Altres",
+    "category:outdoor": "Activitats a l'aire lliure",
+    "category:paddling": "Remar",
+    "category:paddling_amenities": "Instal·lacions de Rem",
+    "category:paddling_hazards": "Riscos de Rem",
+    "category:paddling_routes": "Rutes de Rem",
+    "category:phone": "Telèfon",
+    "category:places": "Llocs",
+    "category:places_geo": "Llocs",
+    "category:playgrounds": "Parc infantil",
+    "category:post": "Correus",
+    "category:power_routes": "Rutes d'energia",
+    "category:proposals": "Propostes",
+    "category:pt": "Mapa de transport públic",
+    "category:pt:stops": "Parades i Estacions",
+    "category:pt:routes": "Rutes",
+    "category:pt_amenities": "Serveis"
 }
diff --git a/lang/cs.json b/lang/cs.json
index 02cda94..904ee1d 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1,61 +1,7 @@
 {
-    "category:internet": "Přístup k internetu",
-    "category:leisure": "Volný čas",
-    "category:memorial": "Památníky a pomníky",
-    "category:military": "Vojenské",
-    "category:mtb-routes": "Stezky pro horská kola",
-    "category:natural": "Přírodní úkazy",
-    "category:office": "Úřady",
-    "category:oil_gas": "Ropa a zemní plyn",
-    "category:organisations": "Organizace",
-    "category:other": "Jiné",
-    "category:outdoor": "Venkovní aktivity",
-    "category:phone": "Telefony",
-    "category:places": "Sídla",
-    "category:places_geo": "Sídla",
-    "category:playgrounds": "Hřiště",
-    "category:post": "Poštovní služby",
-    "category:power_routes": "Stožáry vysokého napětí",
-    "category:pt": "Mapa veřejné dopravy",
-    "category:pt:stops": "Zastávky & Stanice",
-    "category:pt:routes": "Trasy",
-    "category:pt_amenities": "Občanská vybavenost",
-    "category:public": "Veřejné služby",
-    "category:railway-electrification": "Elektrifikovaná železnice",
-    "category:railway-gauge": "Rozchod železnice",
-    "category:railway-infrastructure": "Železniční infrastruktura",
-    "category:railway-maxspeed": "Maximální rychlost železnice",
-    "category:railway-routes": "Železniční trasy",
-    "category:religion": "Náboženství",
-    "category:renewables": "Obnovitelné zdroje",
-    "category:residential": "Obytné oblasti",
-    "category:resources": "Těžba surovin",
-    "category:roads": "Silnice",
-    "category:shop": "Obchody",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Koupání",
-    "category:tourism_attractions": "Turistika",
-    "category:tourism_services": "Turistika",
-    "category:transport_alternative": "Alternativní doprava (Cyklistika, Pěší turistika, ...)",
-    "category:walk_amenities": "Veřejná zařízení",
-    "category:waste": "Nakládání s odpady",
-    "category:water": "Vodní plochy",
     "category:wikipedia": "Wikipedie",
     "category:works": "Továrny",
     "category:xmas": "Vánoce",
-    "category:index": "Rejstřík kategorií",
-    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
-    "category:services": "Služby",
-    "category:transport": "Doprava",
-    "category:transport_walk": "Turistika",
-    "category:transport_cycle": "Cyklistika",
-    "category:transport_pt": "Veřejná doprava",
-    "category:transport_car": "Individuální doprava",
-    "category:infrastructure": "Infrastruktura",
-    "category:energy": "Energie",
-    "category:railway": "Železnice",
-    "category:special": "Speciální",
-    "category:law": "Právo",
     "category:administrative": "Administrativní oblasti",
     "category:agriculture": "Zemědělství",
     "category:alternative_amenities": "Občanská vybavenost",
@@ -76,6 +22,27 @@
     "category:communication": "Komunikace",
     "category:construction": "Staveniště",
     "category:craft": "Řemeslo",
+    "category:public": "Veřejné služby",
+    "category:railway-maxspeed": "Maximální rychlost železnice",
+    "category:railway-routes": "Železniční trasy",
+    "category:religion": "Náboženství",
+    "category:renewables": "Obnovitelné zdroje",
+    "category:residential": "Obytné oblasti",
+    "category:resources": "Těžba surovin",
+    "category:roads": "Silnice",
+    "category:shop": "Obchody",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Koupání",
+    "category:tourism_attractions": "Turistika",
+    "category:tourism_services": "Turistika",
+    "category:transport_alternative": "Alternativní doprava (Cyklistika, Pěší turistika, ...)",
+    "category:walk_amenities": "Veřejná zařízení",
+    "category:waste": "Nakládání s odpady",
+    "category:water": "Vodní plochy",
+    "category:gastro-smoking": "Nekuřácké restaurace",
+    "category:railway-gauge": "Rozchod železnice",
+    "category:railway-electrification": "Elektrifikovaná železnice",
+    "category:railway-infrastructure": "Železniční infrastruktura",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura",
     "category:cycle_amenities": "veřejná zařízení",
@@ -84,11 +51,44 @@
     "category:electric_power": "Elektřina",
     "category:emergency": "Pohotovostní služby",
     "category:financial": "Finanční služby",
-    "category:gastro-smoking": "Nekuřácké restaurace",
     "category:gastro": "Stravování",
     "category:health": "Zdravotnictví",
     "category:hiking_routes": "Turistické trasy",
     "category:historic": "Historické",
+    "category:index": "Rejstřík kategorií",
+    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
+    "category:services": "Služby",
+    "category:transport": "Doprava",
+    "category:transport_walk": "Turistika",
+    "category:transport_cycle": "Cyklistika",
+    "category:transport_pt": "Veřejná doprava",
+    "category:transport_car": "Individuální doprava",
+    "category:infrastructure": "Infrastruktura",
+    "category:energy": "Energie",
+    "category:railway": "Železnice",
+    "category:special": "Speciální",
+    "category:internet": "Přístup k internetu",
+    "category:law": "Právo",
+    "category:leisure": "Volný čas",
+    "category:memorial": "Památníky a pomníky",
+    "category:military": "Vojenské",
+    "category:mtb-routes": "Stezky pro horská kola",
+    "category:natural": "Přírodní úkazy",
+    "category:office": "Úřady",
+    "category:oil_gas": "Ropa a zemní plyn",
+    "category:organisations": "Organizace",
+    "category:other": "Jiné",
+    "category:outdoor": "Venkovní aktivity",
+    "category:phone": "Telefony",
+    "category:places": "Sídla",
+    "category:places_geo": "Sídla",
+    "category:playgrounds": "Hřiště",
+    "category:post": "Poštovní služby",
+    "category:power_routes": "Stožáry vysokého napětí",
+    "category:pt": "Mapa veřejné dopravy",
+    "category:pt:stops": "Zastávky & Stanice",
+    "category:pt:routes": "Trasy",
+    "category:pt_amenities": "Občanská vybavenost",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/de.json b/lang/de.json
index 035738b..12d42c6 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -1,59 +1,7 @@
 {
-    "category:internet": "Internetzugang",
-    "category:leisure": "Freizeit",
-    "category:memorial": "Denkmäler und Monumente",
-    "category:military": "Militär",
-    "category:mtb-routes": "Mointainbikerouten",
-    "category:natural": "Naturformationen",
-    "category:office": "Ämter, Dienst- und Geschäftsstellen",
-    "category:oil_gas": "Erdöl und Erdgas",
-    "category:organisations": "Organisationen",
-    "category:other": "Andere",
-    "category:outdoor": "Freiluftaktivitäten",
-    "category:phone": "Telekommunikation",
-    "category:places": "Orte",
-    "category:places_geo": "Orte",
-    "category:playgrounds": "Spielplatz",
-    "category:post": "Post",
-    "category:power_routes": "Hochspannungsverbindungen",
-    "category:pt": "ÖV Karte",
-    "category:pt:stops": "Haltestellen",
-    "category:pt:routes": "Routen",
-    "category:pt_amenities": "Einrichtungen",
-    "category:public": "Öffentliche Dienste",
-    "category:railway-electrification": "Eisenbahn Elektrifizierung",
-    "category:railway-gauge": "Eisenbahn-Spurweite",
-    "category:railway-infrastructure": "Eisenbahn Infrastruktur",
-    "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
-    "category:railway-routes": "Eisenbahnrouten",
-    "category:religion": "Religion",
-    "category:renewables": "Erneuerbare Energien",
-    "category:residential": "Wohngebiete",
-    "category:resources": "Ressourcengewinnung",
-    "category:roads": "Straßen",
-    "category:shop": "Einkauf",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Schwimmen und Baden",
-    "category:tourism_attractions": "Tourismus",
-    "category:tourism_services": "Tourismus",
-    "category:walk_amenities": "Einrichtungen",
-    "category:waste": "Entsorgung",
-    "category:water": "Gewässer",
     "category:wikipedia": "Wikipedia",
     "category:works": "Fabriken",
     "category:xmas": "Weihnachten",
-    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
-    "category:services": "Dienste",
-    "category:transport": "Transport",
-    "category:transport_walk": "Zu Fuß gehen",
-    "category:transport_cycle": "Radfahren",
-    "category:transport_pt": "Öffentlicher Verkehr",
-    "category:transport_car": "Motorisierter Individualverkehr",
-    "category:infrastructure": "Infrastruktur",
-    "category:energy": "Energie",
-    "category:railway": "Eisenbahn",
-    "category:special": "Spezial",
-    "category:law": "Juristische Institutionen",
     "category:administrative": "Administrative Gebiete",
     "category:agriculture": "Landwirtschaft",
     "category:alternative_amenities": "Einrichtungen",
@@ -74,6 +22,26 @@
     "category:communication": "Kommunikation",
     "category:construction": "Baustellen",
     "category:craft": "Handwerk",
+    "category:public": "Öffentliche Dienste",
+    "category:railway-maxspeed": "Eisenbahn Höchstgeschwindigkeiten",
+    "category:railway-routes": "Eisenbahnrouten",
+    "category:religion": "Religion",
+    "category:renewables": "Erneuerbare Energien",
+    "category:residential": "Wohngebiete",
+    "category:resources": "Ressourcengewinnung",
+    "category:roads": "Straßen",
+    "category:shop": "Einkauf",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Schwimmen und Baden",
+    "category:tourism_attractions": "Tourismus",
+    "category:tourism_services": "Tourismus",
+    "category:walk_amenities": "Einrichtungen",
+    "category:waste": "Entsorgung",
+    "category:water": "Gewässer",
+    "category:gastro-smoking": "Rauchfreie Gastronomie",
+    "category:railway-gauge": "Eisenbahn-Spurweite",
+    "category:railway-electrification": "Eisenbahn Elektrifizierung",
+    "category:railway-infrastructure": "Eisenbahn Infrastruktur",
     "category:culture": "Kultur",
     "category:culture_religion": "Kultur und Religion",
     "category:cycle_amenities": "Einrichtungen",
@@ -83,12 +51,44 @@
     "category:electric_power": "Elektrischer Strom",
     "category:emergency": "Notfalldienste",
     "category:financial": "Finanzen",
-    "category:gastro-smoking": "Rauchfreie Gastronomie",
     "category:gastro": "Gastronomie",
     "category:health": "Gesundheitsdienste",
     "category:heritage": "Denkmalschutz",
     "category:hiking_routes": "Wanderrouten",
     "category:historic": "Geschichte",
+    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
+    "category:services": "Dienste",
+    "category:transport": "Transport",
+    "category:transport_walk": "Zu Fuß gehen",
+    "category:transport_cycle": "Radfahren",
+    "category:transport_pt": "Öffentlicher Verkehr",
+    "category:transport_car": "Motorisierter Individualverkehr",
+    "category:infrastructure": "Infrastruktur",
+    "category:energy": "Energie",
+    "category:railway": "Eisenbahn",
+    "category:special": "Spezial",
+    "category:internet": "Internetzugang",
+    "category:law": "Juristische Institutionen",
+    "category:leisure": "Freizeit",
+    "category:memorial": "Denkmäler und Monumente",
+    "category:military": "Militär",
+    "category:mtb-routes": "Mointainbikerouten",
+    "category:natural": "Naturformationen",
+    "category:office": "Ämter, Dienst- und Geschäftsstellen",
+    "category:oil_gas": "Erdöl und Erdgas",
+    "category:organisations": "Organisationen",
+    "category:other": "Andere",
+    "category:outdoor": "Freiluftaktivitäten",
+    "category:phone": "Telekommunikation",
+    "category:places": "Orte",
+    "category:places_geo": "Orte",
+    "category:playgrounds": "Spielplatz",
+    "category:post": "Post",
+    "category:power_routes": "Hochspannungsverbindungen",
+    "category:pt": "ÖV Karte",
+    "category:pt:stops": "Haltestellen",
+    "category:pt:routes": "Routen",
+    "category:pt_amenities": "Einrichtungen",
     "category:culture-media": "",
     "category:developable_areas": "",
     "category:developments": "",
diff --git a/lang/en.json b/lang/en.json
index 7bd66b7..add200a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1,70 +1,7 @@
 {
-    "category:internet": "Internet access",
-    "category:leisure": "Leisure",
-    "category:memorial": "Memorials & Monuments",
-    "category:military": "Military",
-    "category:mtb-routes": "Mountain bike routes",
-    "category:natural": "Natural Formations",
-    "category:office": "Offices",
-    "category:oil_gas": "Petroleum and natural gas",
-    "category:organisations": "Organisations",
-    "category:other": "Other",
-    "category:outdoor": "Outdoor activities",
-    "category:paddling": "Paddling",
-    "category:paddling_amenities": "Paddling Amenities",
-    "category:paddling_hazards": "Paddling Hazards",
-    "category:paddling_routes": "Paddling Routes",
-    "category:phone": "Phone",
-    "category:places": "Places",
-    "category:places_geo": "Places",
-    "category:playgrounds": "Playground",
-    "category:post": "Post",
-    "category:power_routes": "Power routes",
-    "category:proposals": "Proposals",
-    "category:pt": "Public transport map",
-    "category:pt:stops": "Stops & Stations",
-    "category:pt:routes": "Routes",
-    "category:pt_amenities": "Amenities",
-    "category:public": "Public Services",
-    "category:railway-electrification": "Railway electrification",
-    "category:railway-gauge": "Railway gauge",
-    "category:railway-infrastructure": "Railway infrastructure",
-    "category:railway-maxspeed": "Railway Maxspeed",
-    "category:railway-routes": "Railway Routes",
-    "category:religion": "Religion",
-    "category:renewables": "Renewables",
-    "category:residential": "Residential Areas",
-    "category:resources": "Resource Extraction",
-    "category:roads": "Roads",
-    "category:shop": "Shopping",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Swimming and bathing",
-    "category:tourism_attractions": "Tourism",
-    "category:tourism_services": "Tourism",
-    "category:transport_alternative": "Alternative Transportation modes",
-    "category:walk_amenities": "Amenities",
-    "category:walk_amenities_qa": "Walking Amenities",
-    "category:waste": "Disposal",
-    "category:water": "Waterbodies",
     "category:wikipedia": "Wikipedia",
     "category:works": "Works",
     "category:xmas": "Christmas",
-    "category:index": "Index of Categories",
-    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
-    "category:services": "Services",
-    "category:transport": "Transportation",
-    "category:transport_walk": "Walking",
-    "category:transport_cycle": "Cycling",
-    "category:transport_pt": "Public Transportation",
-    "category:transport_car": "Individual Traffic",
-    "category:infrastructure": "Infrastructure",
-    "category:developments": "Planning and Construction",
-    "category:energy": "Energy",
-    "category:railway": "Railway",
-    "category:special": "Special",
-    "category:osm-qa": "OpenStreetMap Quality Control",
-    "category:kerbs": "Kerbs",
-    "category:law": "Law",
     "category:administrative": "Administrative Areas",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Amenities",
@@ -86,6 +23,29 @@
     "category:construction": "Construction Sites",
     "category:craft": "Craft",
     "category:culture-media": "Culture - Media/Wikidata",
+    "category:public": "Public Services",
+    "category:railway-maxspeed": "Railway Maxspeed",
+    "category:railway-routes": "Railway Routes",
+    "category:religion": "Religion",
+    "category:renewables": "Renewables",
+    "category:residential": "Residential Areas",
+    "category:resources": "Resource Extraction",
+    "category:roads": "Roads",
+    "category:shop": "Shopping",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Swimming and bathing",
+    "category:tourism_attractions": "Tourism",
+    "category:tourism_services": "Tourism",
+    "category:transport_alternative": "Alternative Transportation modes",
+    "category:walk_amenities": "Amenities",
+    "category:walk_amenities_qa": "Walking Amenities",
+    "category:waste": "Disposal",
+    "category:water": "Waterbodies",
+    "category:footways": "Footways",
+    "category:gastro-smoking": "Smokefree Gastronomy",
+    "category:railway-gauge": "Railway gauge",
+    "category:railway-electrification": "Railway electrification",
+    "category:railway-infrastructure": "Railway infrastructure",
     "category:culture": "Culture",
     "category:culture_religion": "Culture and Religion",
     "category:cycle_amenities": "Amenities",
@@ -97,11 +57,51 @@
     "category:emergency": "Emergency Services",
     "category:financial": "Financial",
     "category:fixme": "Fix Me",
-    "category:footways": "Footways",
-    "category:gastro-smoking": "Smokefree Gastronomy",
     "category:gastro": "Gastronomy",
     "category:health": "Health",
     "category:heritage": "Heritage Protection",
     "category:hiking_routes": "Hiking routes",
-    "category:historic": "Historic"
+    "category:historic": "Historic",
+    "category:index": "Index of Categories",
+    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
+    "category:services": "Services",
+    "category:transport": "Transportation",
+    "category:transport_walk": "Walking",
+    "category:transport_cycle": "Cycling",
+    "category:transport_pt": "Public Transportation",
+    "category:transport_car": "Individual Traffic",
+    "category:infrastructure": "Infrastructure",
+    "category:developments": "Planning and Construction",
+    "category:energy": "Energy",
+    "category:railway": "Railway",
+    "category:special": "Special",
+    "category:osm-qa": "OpenStreetMap Quality Control",
+    "category:internet": "Internet access",
+    "category:kerbs": "Kerbs",
+    "category:law": "Law",
+    "category:leisure": "Leisure",
+    "category:memorial": "Memorials & Monuments",
+    "category:military": "Military",
+    "category:mtb-routes": "Mountain bike routes",
+    "category:natural": "Natural Formations",
+    "category:office": "Offices",
+    "category:oil_gas": "Petroleum and natural gas",
+    "category:organisations": "Organisations",
+    "category:other": "Other",
+    "category:outdoor": "Outdoor activities",
+    "category:paddling": "Paddling",
+    "category:paddling_amenities": "Paddling Amenities",
+    "category:paddling_hazards": "Paddling Hazards",
+    "category:paddling_routes": "Paddling Routes",
+    "category:phone": "Phone",
+    "category:places": "Places",
+    "category:places_geo": "Places",
+    "category:playgrounds": "Playground",
+    "category:post": "Post",
+    "category:power_routes": "Power routes",
+    "category:proposals": "Proposals",
+    "category:pt": "Public transport map",
+    "category:pt:stops": "Stops & Stations",
+    "category:pt:routes": "Routes",
+    "category:pt_amenities": "Amenities"
 }
diff --git a/lang/es.json b/lang/es.json
index efdec9e..20c801a 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1,61 +1,7 @@
 {
-    "category:internet": "Acceso a Internet",
-    "category:leisure": "Ocio",
-    "category:memorial": "Monumentos y lugares conmemorativos",
-    "category:military": "Militar",
-    "category:mtb-routes": "Rutas de ciclismo de montaña",
-    "category:natural": "Formaciones naturales",
-    "category:office": "Oficinas",
-    "category:oil_gas": "Petróleo y gas natural",
-    "category:organisations": "Organizaciones",
-    "category:other": "Otro",
-    "category:outdoor": "Actividades al aire libre",
-    "category:phone": "Teléfono",
-    "category:places": "Lugares",
-    "category:places_geo": "Lugares",
-    "category:playgrounds": "Parque infantil",
-    "category:post": "Correos",
-    "category:power_routes": "Rutas de energía",
-    "category:pt": "Mapa de transporte público",
-    "category:pt:stops": "Paradas y estaciones",
-    "category:pt:routes": "Rutas",
-    "category:pt_amenities": "Instalaciones",
-    "category:public": "Servicios públicos",
-    "category:railway-electrification": "Electrificación ferroviaria",
-    "category:railway-gauge": "Ancho de vía",
-    "category:railway-infrastructure": "Infraestructura ferroviaria",
-    "category:railway-maxspeed": "Velocidad máxima del ferrocarril",
-    "category:railway-routes": "Rutas de ferrocarril",
-    "category:religion": "Religión",
-    "category:renewables": "Renovables",
-    "category:residential": "Áreas residenciales",
-    "category:resources": "Extracción de recursos",
-    "category:roads": "Carreteras",
-    "category:shop": "Compras",
-    "category:sport": "Deportes",
-    "category:swimming_bathing": "Natación y baño",
-    "category:tourism_attractions": "Turismo",
-    "category:tourism_services": "Turismo",
-    "category:transport_alternative": "Modos de transporte alternativo",
-    "category:walk_amenities": "Instalaciones",
-    "category:waste": "Basura",
-    "category:water": "Cuerpos de agua",
     "category:wikipedia": "Wikipedia",
     "category:works": "Fábricas",
     "category:xmas": "Navidades",
-    "category:index": "Índice de Categorías",
-    "category:leisure_sport_shopping": "Ocio, deporte y compras",
-    "category:services": "Servicios",
-    "category:transport": "Transporte",
-    "category:transport_walk": "Viandantes",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transporte público",
-    "category:transport_car": "Tráfico individual",
-    "category:infrastructure": "Infraestructura",
-    "category:energy": "Energía",
-    "category:railway": "Ferrocarril",
-    "category:special": "Especial",
-    "category:law": "Ley",
     "category:administrative": "Áreas Administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Instalaciones",
@@ -75,6 +21,27 @@
     "category:communication": "Comunicación",
     "category:construction": "Sitios de construcción",
     "category:craft": "Artesano",
+    "category:public": "Servicios públicos",
+    "category:railway-maxspeed": "Velocidad máxima del ferrocarril",
+    "category:railway-routes": "Rutas de ferrocarril",
+    "category:religion": "Religión",
+    "category:renewables": "Renovables",
+    "category:residential": "Áreas residenciales",
+    "category:resources": "Extracción de recursos",
+    "category:roads": "Carreteras",
+    "category:shop": "Compras",
+    "category:sport": "Deportes",
+    "category:swimming_bathing": "Natación y baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Instalaciones",
+    "category:waste": "Basura",
+    "category:water": "Cuerpos de agua",
+    "category:gastro-smoking": "Gastronomía libre de humo",
+    "category:railway-gauge": "Ancho de vía",
+    "category:railway-electrification": "Electrificación ferroviaria",
+    "category:railway-infrastructure": "Infraestructura ferroviaria",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura y religión",
     "category:cycle_amenities": "Instalaciones",
@@ -83,11 +50,44 @@
     "category:electric_power": "Energía eléctrica",
     "category:emergency": "Servicios de emergencia",
     "category:financial": "Financiera",
-    "category:gastro-smoking": "Gastronomía libre de humo",
     "category:gastro": "Gastronomía",
     "category:health": "Salud",
     "category:hiking_routes": "Rutas de senderismo",
     "category:historic": "Histórico",
+    "category:index": "Índice de Categorías",
+    "category:leisure_sport_shopping": "Ocio, deporte y compras",
+    "category:services": "Servicios",
+    "category:transport": "Transporte",
+    "category:transport_walk": "Viandantes",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_car": "Tráfico individual",
+    "category:infrastructure": "Infraestructura",
+    "category:energy": "Energía",
+    "category:railway": "Ferrocarril",
+    "category:special": "Especial",
+    "category:internet": "Acceso a Internet",
+    "category:law": "Ley",
+    "category:leisure": "Ocio",
+    "category:memorial": "Monumentos y lugares conmemorativos",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rutas de ciclismo de montaña",
+    "category:natural": "Formaciones naturales",
+    "category:office": "Oficinas",
+    "category:oil_gas": "Petróleo y gas natural",
+    "category:organisations": "Organizaciones",
+    "category:other": "Otro",
+    "category:outdoor": "Actividades al aire libre",
+    "category:phone": "Teléfono",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parque infantil",
+    "category:post": "Correos",
+    "category:power_routes": "Rutas de energía",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:stops": "Paradas y estaciones",
+    "category:pt:routes": "Rutas",
+    "category:pt_amenities": "Instalaciones",
     "category:climbing": "",
     "category:culture-media": "",
     "category:cycle_directions": "",
diff --git a/lang/fr.json b/lang/fr.json
index c1e620a..14a1238 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,69 +1,7 @@
 {
-    "category:internet": "Internet",
-    "category:leisure": "Loisirs",
-    "category:memorial": "Mémoriaux et monuments commémoratifs",
-    "category:military": "Équipements et zones militaires",
-    "category:mtb-routes": "Itinéraires de VTT",
-    "category:natural": "Éléments naturels",
-    "category:office": "Bureaux",
-    "category:oil_gas": "Pétrole et gaz naturel",
-    "category:organisations": "Organisations",
-    "category:other": "Autres",
-    "category:outdoor": "Activités de plein air",
-    "category:paddling": "Pagayage",
-    "category:paddling_amenities": "Équipements de pagayage",
-    "category:paddling_hazards": "Risques en pagayage",
-    "category:paddling_routes": "Itinéraires en pagayage",
-    "category:phone": "Téléphone",
-    "category:places": "Lieux",
-    "category:places_geo": "Lieux",
-    "category:playgrounds": "Jeux pour enfants",
-    "category:post": "Poste",
-    "category:power_routes": "Réseaux électriques",
-    "category:proposals": "Propositions",
-    "category:pt": "Carte des transports publics",
-    "category:pt:stops": "Arrêts et stations",
-    "category:pt:routes": "Lignes",
-    "category:pt_amenities": "Équipements",
-    "category:public": "Services et équipements publics",
-    "category:railway-electrification": "Puissance électrique ferroviaire",
-    "category:railway-gauge": "Écartement des rails",
-    "category:railway-infrastructure": "Infrastructure ferroviaire",
-    "category:railway-maxspeed": "Limites de vitesse",
-    "category:railway-routes": "Lignes ferroviaires",
-    "category:religion": "Religion",
-    "category:renewables": "Énergies renouvelables",
-    "category:residential": "Zones résidentielles",
-    "category:resources": "Extraction des ressources",
-    "category:roads": "Routes",
-    "category:shop": "Magasins/Boutiques",
-    "category:sport": "Sports",
-    "category:swimming_bathing": "Natation, baignade et bains",
-    "category:tourism_attractions": "Tourisme",
-    "category:tourism_services": "Tourisme",
-    "category:transport_alternative": "Modes de transport alternatifs",
-    "category:walk_amenities": "Équipements piétons",
-    "category:waste": "Déchets et recyclage",
-    "category:water": "Hydrographie",
     "category:wikipedia": "Wikipédia",
     "category:works": "Zones industrielles",
     "category:xmas": "Noël",
-    "category:index": "Index des Catégories",
-    "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
-    "category:services": "Services",
-    "category:transport": "Transports",
-    "category:transport_walk": "Marche à pied",
-    "category:transport_cycle": "Cyclisme",
-    "category:transport_pt": "Transports publics",
-    "category:transport_car": "Transport automobile",
-    "category:infrastructure": "Infrastructures",
-    "category:developments": "Planification et construction",
-    "category:energy": "Énergie",
-    "category:railway": "Chemins de fer",
-    "category:special": "Catégories spéciales",
-    "category:osm-qa": "Contrôle qualité OpenStreetMap",
-    "category:kerbs": "Bordures",
-    "category:law": "Services législatifs",
     "category:administrative": "Zones administratives",
     "category:agriculture": "Agriculture",
     "category:alternative_amenities": "Équipement",
@@ -85,6 +23,28 @@
     "category:construction": "Chantiers de construction",
     "category:craft": "Artisanat",
     "category:culture-media": "Culture - Média/Wikidata",
+    "category:public": "Services et équipements publics",
+    "category:railway-maxspeed": "Limites de vitesse",
+    "category:railway-routes": "Lignes ferroviaires",
+    "category:religion": "Religion",
+    "category:renewables": "Énergies renouvelables",
+    "category:residential": "Zones résidentielles",
+    "category:resources": "Extraction des ressources",
+    "category:roads": "Routes",
+    "category:shop": "Magasins/Boutiques",
+    "category:sport": "Sports",
+    "category:swimming_bathing": "Natation, baignade et bains",
+    "category:tourism_attractions": "Tourisme",
+    "category:tourism_services": "Tourisme",
+    "category:transport_alternative": "Modes de transport alternatifs",
+    "category:walk_amenities": "Équipements piétons",
+    "category:waste": "Déchets et recyclage",
+    "category:water": "Hydrographie",
+    "category:footways": "Cheminements piétonniers",
+    "category:gastro-smoking": "Restauration sans tabac",
+    "category:railway-gauge": "Écartement des rails",
+    "category:railway-electrification": "Puissance électrique ferroviaire",
+    "category:railway-infrastructure": "Infrastructure ferroviaire",
     "category:culture": "Culture",
     "category:culture_religion": "Culture et Religion",
     "category:cycle_amenities": "Équipements vélo",
@@ -95,13 +55,53 @@
     "category:emergency": "Services d'urgence",
     "category:financial": "Finance",
     "category:fixme": "Améliorez-moi",
-    "category:footways": "Cheminements piétonniers",
-    "category:gastro-smoking": "Restauration sans tabac",
     "category:gastro": "Restauration",
     "category:health": "Santé",
     "category:heritage": "Protection patrimoniale",
     "category:hiking_routes": "Itinéraires pédestres",
     "category:historic": "Histoire",
+    "category:index": "Index des Catégories",
+    "category:leisure_sport_shopping": "Vie quotidienne, loisirs et sports",
+    "category:services": "Services",
+    "category:transport": "Transports",
+    "category:transport_walk": "Marche à pied",
+    "category:transport_cycle": "Cyclisme",
+    "category:transport_pt": "Transports publics",
+    "category:transport_car": "Transport automobile",
+    "category:infrastructure": "Infrastructures",
+    "category:developments": "Planification et construction",
+    "category:energy": "Énergie",
+    "category:railway": "Chemins de fer",
+    "category:special": "Catégories spéciales",
+    "category:osm-qa": "Contrôle qualité OpenStreetMap",
+    "category:internet": "Internet",
+    "category:kerbs": "Bordures",
+    "category:law": "Services législatifs",
+    "category:leisure": "Loisirs",
+    "category:memorial": "Mémoriaux et monuments commémoratifs",
+    "category:military": "Équipements et zones militaires",
+    "category:mtb-routes": "Itinéraires de VTT",
+    "category:natural": "Éléments naturels",
+    "category:office": "Bureaux",
+    "category:oil_gas": "Pétrole et gaz naturel",
+    "category:organisations": "Organisations",
+    "category:other": "Autres",
+    "category:outdoor": "Activités de plein air",
+    "category:paddling": "Pagayage",
+    "category:paddling_amenities": "Équipements de pagayage",
+    "category:paddling_hazards": "Risques en pagayage",
+    "category:paddling_routes": "Itinéraires en pagayage",
+    "category:phone": "Téléphone",
+    "category:places": "Lieux",
+    "category:places_geo": "Lieux",
+    "category:playgrounds": "Jeux pour enfants",
+    "category:post": "Poste",
+    "category:power_routes": "Réseaux électriques",
+    "category:proposals": "Propositions",
+    "category:pt": "Carte des transports publics",
+    "category:pt:stops": "Arrêts et stations",
+    "category:pt:routes": "Lignes",
+    "category:pt_amenities": "Équipements",
     "category:cycle_directions": "",
     "category:walk_amenities_qa": ""
 }
diff --git a/lang/gl.json b/lang/gl.json
index 05ece96..9f7567b 100644
--- a/lang/gl.json
+++ b/lang/gl.json
@@ -1,61 +1,7 @@
 {
-    "category:internet": "Acceso á internet",
-    "category:leisure": "Lecer",
-    "category:memorial": "Memoriais e monumentos",
-    "category:military": "Militar",
-    "category:mtb-routes": "Rotas de bicicleta de montaña",
-    "category:natural": "Formacións naturais",
-    "category:office": "Oficinas",
-    "category:oil_gas": "Petróleo e gas natural",
-    "category:organisations": "Organizacións",
-    "category:other": "Outros",
-    "category:outdoor": "Actividades ó ar libre",
-    "category:phone": "Teléfono",
-    "category:places": "Lugares",
-    "category:places_geo": "Lugares",
-    "category:playgrounds": "Parques infantís",
-    "category:post": "Correos",
-    "category:power_routes": "Liñas eléctricas",
-    "category:pt": "Mapa de transporte público",
-    "category:pt:stops": "Paraxes e estacións",
-    "category:pt:routes": "Rotas",
-    "category:pt_amenities": "Instalacións",
-    "category:public": "Servizos públicos",
-    "category:railway-electrification": "Ferrocarril electrificado",
-    "category:railway-gauge": "Anchura de vía",
-    "category:railway-infrastructure": "Infraestrutura do ferrocarril",
-    "category:railway-maxspeed": "Velocidade máxima do ferrocarril",
-    "category:railway-routes": "Liñas de ferrocarril",
-    "category:religion": "Relixión",
-    "category:renewables": "Renovábeis",
-    "category:residential": "Zonas residenciais",
-    "category:resources": "Estracción de recursos",
-    "category:roads": "Estradas",
-    "category:shop": "Compras",
-    "category:sport": "Deporte",
-    "category:swimming_bathing": "Natación e baño",
-    "category:tourism_attractions": "Turismo",
-    "category:tourism_services": "Turismo",
-    "category:transport_alternative": "Modos de transporte alternativo",
-    "category:walk_amenities": "Instalacións",
-    "category:waste": "Lixo",
-    "category:water": "Hidrografía",
     "category:wikipedia": "Wikipedia",
     "category:works": "Producións",
     "category:xmas": "Nadal",
-    "category:index": "Índice de categorías",
-    "category:leisure_sport_shopping": "Lecer, deporte e compras",
-    "category:services": "Servizos",
-    "category:transport": "Mobilidade",
-    "category:transport_walk": "Peonil",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transporte público",
-    "category:transport_car": "Tráfico individual",
-    "category:infrastructure": "Infraestrutura",
-    "category:energy": "Enerxía",
-    "category:railway": "Ferrocarril",
-    "category:special": "Especial",
-    "category:law": "Leis",
     "category:administrative": "Divisións administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Instalacións",
@@ -76,6 +22,27 @@
     "category:communication": "Comunicacións",
     "category:construction": "Terreos baixo construción",
     "category:craft": "Artesán",
+    "category:public": "Servizos públicos",
+    "category:railway-maxspeed": "Velocidade máxima do ferrocarril",
+    "category:railway-routes": "Liñas de ferrocarril",
+    "category:religion": "Relixión",
+    "category:renewables": "Renovábeis",
+    "category:residential": "Zonas residenciais",
+    "category:resources": "Estracción de recursos",
+    "category:roads": "Estradas",
+    "category:shop": "Compras",
+    "category:sport": "Deporte",
+    "category:swimming_bathing": "Natación e baño",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Instalacións",
+    "category:waste": "Lixo",
+    "category:water": "Hidrografía",
+    "category:gastro-smoking": "Restauración sen fume",
+    "category:railway-gauge": "Anchura de vía",
+    "category:railway-electrification": "Ferrocarril electrificado",
+    "category:railway-infrastructure": "Infraestrutura do ferrocarril",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura e relixión",
     "category:cycle_amenities": "Instalacións",
@@ -84,11 +51,44 @@
     "category:electric_power": "Enerxía eléctrica",
     "category:emergency": "Servizos de emerxencia",
     "category:financial": "Finanzas",
-    "category:gastro-smoking": "Restauración sen fume",
     "category:gastro": "Restauración",
     "category:health": "Saúde",
     "category:hiking_routes": "Rotas sendeiristas",
     "category:historic": "Histórico",
+    "category:index": "Índice de categorías",
+    "category:leisure_sport_shopping": "Lecer, deporte e compras",
+    "category:services": "Servizos",
+    "category:transport": "Mobilidade",
+    "category:transport_walk": "Peonil",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_car": "Tráfico individual",
+    "category:infrastructure": "Infraestrutura",
+    "category:energy": "Enerxía",
+    "category:railway": "Ferrocarril",
+    "category:special": "Especial",
+    "category:internet": "Acceso á internet",
+    "category:law": "Leis",
+    "category:leisure": "Lecer",
+    "category:memorial": "Memoriais e monumentos",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rotas de bicicleta de montaña",
+    "category:natural": "Formacións naturais",
+    "category:office": "Oficinas",
+    "category:oil_gas": "Petróleo e gas natural",
+    "category:organisations": "Organizacións",
+    "category:other": "Outros",
+    "category:outdoor": "Actividades ó ar libre",
+    "category:phone": "Teléfono",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parques infantís",
+    "category:post": "Correos",
+    "category:power_routes": "Liñas eléctricas",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:stops": "Paraxes e estacións",
+    "category:pt:routes": "Rotas",
+    "category:pt_amenities": "Instalacións",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/hu.json b/lang/hu.json
index e3b5bd5..dec3f2d 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1,65 +1,7 @@
 {
-    "category:internet": "Internetcsatlakozás",
-    "category:leisure": "Szabadidő",
-    "category:memorial": "Emlékművek",
-    "category:military": "Katonai objektumok",
-    "category:mtb-routes": "Hegyikerékpáros útvonalak",
-    "category:natural": "Természeti képződmények",
-    "category:office": "Irodák, hivatalok",
-    "category:oil_gas": "Kőolaj, földgáz",
-    "category:organisations": "Szervezetek",
-    "category:other": "Egyéb",
-    "category:outdoor": "Szabadtéri tevékenységek",
-    "category:phone": "Telefon",
-    "category:places": "Helyek",
-    "category:places_geo": "Helyek",
-    "category:playgrounds": "Játszóterek",
-    "category:post": "Posta",
-    "category:power_routes": "Távvezetékek",
-    "category:proposals": "Tervezett objektumok",
-    "category:pt": "Tömegközlekedési térkép",
-    "category:pt:stops": "Megállók és állomások",
-    "category:pt:routes": "Útvonalak",
-    "category:pt_amenities": "Létesítmények",
-    "category:public": "Közszolgáltatások",
-    "category:railway-electrification": "Vasút villamosítottsága",
-    "category:railway-gauge": "Vasúti nyomtáv",
-    "category:railway-infrastructure": "Vasúti infrastruktúra",
-    "category:railway-maxspeed": "Sebességkorlátozás",
-    "category:railway-routes": "Vasútvonalak",
-    "category:religion": "Vallás",
-    "category:renewables": "Megújuló energia",
-    "category:residential": "Lakóövezetek",
-    "category:resources": "Bányászat",
-    "category:roads": "Utak",
-    "category:shop": "Vásárlás",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Fürdőzés, úszás",
-    "category:tourism_attractions": "Látnivalók",
-    "category:tourism_services": "Szálláshelyek, turisztikai információk",
-    "category:transport_alternative": "Alternatív közlekedési módok",
-    "category:walk_amenities": "Gyalogos létesítmények",
-    "category:waste": "Hulladék",
-    "category:water": "Vizek",
     "category:wikipedia": "Wikipédia",
     "category:works": "Üzemek",
     "category:xmas": "Karácsony",
-    "category:index": "Kategóriák jegyzéke",
-    "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás",
-    "category:services": "Szolgáltatások",
-    "category:transport": "Közlekedés",
-    "category:transport_walk": "Gyalogos közlekedés",
-    "category:transport_cycle": "Kerékpáros közlekedés",
-    "category:transport_pt": "Tömegközlekedés",
-    "category:transport_car": "Autós közlekedés",
-    "category:infrastructure": "Infrastruktúra",
-    "category:developments": "Tervek és építkezések",
-    "category:energy": "Energiaellátás",
-    "category:railway": "Vasút",
-    "category:special": "Speciális",
-    "category:osm-qa": "OpenStreetMap minőségellenőrzés",
-    "category:kerbs": "Járdaszegélyek",
-    "category:law": "Jog",
     "category:administrative": "Közigazgatási határok",
     "category:agriculture": "Mezőgazdaság",
     "category:alternative_amenities": "Létesítmények",
@@ -81,6 +23,28 @@
     "category:construction": "Építési terület",
     "category:craft": "Műhelyek",
     "category:culture-media": "Kultúra – média/Wikidata",
+    "category:public": "Közszolgáltatások",
+    "category:railway-maxspeed": "Sebességkorlátozás",
+    "category:railway-routes": "Vasútvonalak",
+    "category:religion": "Vallás",
+    "category:renewables": "Megújuló energia",
+    "category:residential": "Lakóövezetek",
+    "category:resources": "Bányászat",
+    "category:roads": "Utak",
+    "category:shop": "Vásárlás",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Fürdőzés, úszás",
+    "category:tourism_attractions": "Látnivalók",
+    "category:tourism_services": "Szálláshelyek, turisztikai információk",
+    "category:transport_alternative": "Alternatív közlekedési módok",
+    "category:walk_amenities": "Gyalogos létesítmények",
+    "category:waste": "Hulladék",
+    "category:water": "Vizek",
+    "category:footways": "Gyalogutak",
+    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
+    "category:railway-gauge": "Vasúti nyomtáv",
+    "category:railway-electrification": "Vasút villamosítottsága",
+    "category:railway-infrastructure": "Vasúti infrastruktúra",
     "category:culture": "Kultúra",
     "category:culture_religion": "Kultúra és vallás",
     "category:cycle_amenities": "Kerékpáros létesítmények",
@@ -91,13 +55,49 @@
     "category:emergency": "Vészhelyzet",
     "category:financial": "Pénzügyek",
     "category:fixme": "Javíts ki! / Fix me",
-    "category:footways": "Gyalogutak",
-    "category:gastro-smoking": "Nem dohányzó vendéglátóhelyek",
     "category:gastro": "Vendéglátás",
     "category:health": "Egészségügy",
     "category:heritage": "Örökségvédelem",
     "category:hiking_routes": "Turistautak",
     "category:historic": "Történelmi objektumok",
+    "category:index": "Kategóriák jegyzéke",
+    "category:leisure_sport_shopping": "Szabadidő, sport és vásárlás",
+    "category:services": "Szolgáltatások",
+    "category:transport": "Közlekedés",
+    "category:transport_walk": "Gyalogos közlekedés",
+    "category:transport_cycle": "Kerékpáros közlekedés",
+    "category:transport_pt": "Tömegközlekedés",
+    "category:transport_car": "Autós közlekedés",
+    "category:infrastructure": "Infrastruktúra",
+    "category:developments": "Tervek és építkezések",
+    "category:energy": "Energiaellátás",
+    "category:railway": "Vasút",
+    "category:special": "Speciális",
+    "category:osm-qa": "OpenStreetMap minőségellenőrzés",
+    "category:internet": "Internetcsatlakozás",
+    "category:kerbs": "Járdaszegélyek",
+    "category:law": "Jog",
+    "category:leisure": "Szabadidő",
+    "category:memorial": "Emlékművek",
+    "category:military": "Katonai objektumok",
+    "category:mtb-routes": "Hegyikerékpáros útvonalak",
+    "category:natural": "Természeti képződmények",
+    "category:office": "Irodák, hivatalok",
+    "category:oil_gas": "Kőolaj, földgáz",
+    "category:organisations": "Szervezetek",
+    "category:other": "Egyéb",
+    "category:outdoor": "Szabadtéri tevékenységek",
+    "category:phone": "Telefon",
+    "category:places": "Helyek",
+    "category:places_geo": "Helyek",
+    "category:playgrounds": "Játszóterek",
+    "category:post": "Posta",
+    "category:power_routes": "Távvezetékek",
+    "category:proposals": "Tervezett objektumok",
+    "category:pt": "Tömegközlekedési térkép",
+    "category:pt:stops": "Megállók és állomások",
+    "category:pt:routes": "Útvonalak",
+    "category:pt_amenities": "Létesítmények",
     "category:cycle_directions": "",
     "category:paddling": "",
     "category:paddling_amenities": "",
diff --git a/lang/it.json b/lang/it.json
index 6868b50..c899b9f 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -1,70 +1,7 @@
 {
-    "category:internet": "Accesso a internet",
-    "category:leisure": "Tempo libero",
-    "category:memorial": "Memoriali e monumenti",
-    "category:military": "Militare",
-    "category:mtb-routes": "Percorsi per mountain bike",
-    "category:natural": "Formazioni naturali",
-    "category:office": "Uffici",
-    "category:oil_gas": "Petrolio e gas naturale",
-    "category:organisations": "Organizzazioni",
-    "category:other": "Altro",
-    "category:outdoor": "Attività all'aperto",
-    "category:paddling": "Navigazione a remo",
-    "category:paddling_amenities": "Equipaggiamento per la navigazione a remo",
-    "category:paddling_hazards": "Pericoli per la navigazione a remo",
-    "category:paddling_routes": "Rotte per la navigazione a remo",
-    "category:phone": "Telefono",
-    "category:places": "Luoghi",
-    "category:places_geo": "Luoghi",
-    "category:playgrounds": "Parco giochi",
-    "category:post": "Posta",
-    "category:power_routes": "Linee energetiche",
-    "category:proposals": "Proposte",
-    "category:pt": "Mappa del trasporto pubblico",
-    "category:pt:stops": "Fermate e stazioni",
-    "category:pt:routes": "Percorsi",
-    "category:pt_amenities": "Servizi",
-    "category:public": "Servizi pubblici",
-    "category:railway-electrification": "Elettrificazione ferroviaria",
-    "category:railway-gauge": "Scartamento Ferroviario",
-    "category:railway-infrastructure": "Infrastruttura ferroviaria",
-    "category:railway-maxspeed": "Velocità ferroviaria massima",
-    "category:railway-routes": "Percorsi ferroviari",
-    "category:religion": "Religione",
-    "category:renewables": "Energie rinnovabili",
-    "category:residential": "Aree residenziali",
-    "category:resources": "Aree estrattive",
-    "category:roads": "Strade",
-    "category:shop": "Acquisti",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Nuoto e balneazione",
-    "category:tourism_attractions": "Turismo",
-    "category:tourism_services": "Turismo",
-    "category:transport_alternative": "Mezzi di trasporto alternativi",
-    "category:walk_amenities": "Servizi",
-    "category:walk_amenities_qa": "Servizi per i pedoni",
-    "category:waste": "Smaltimento",
-    "category:water": "Masse d'acqua",
     "category:wikipedia": "Wikipedia",
     "category:works": "Fabbriche",
     "category:xmas": "Natale",
-    "category:index": "Indice delle Categorie",
-    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
-    "category:services": "Servizi",
-    "category:transport": "Trasporti",
-    "category:transport_walk": "Pedonale",
-    "category:transport_cycle": "Ciclistico",
-    "category:transport_pt": "Trasporti pubblici",
-    "category:transport_car": "Trasporto individuale",
-    "category:infrastructure": "Infrastrutture",
-    "category:developments": "Pianificazione e costruzione",
-    "category:energy": "Energia",
-    "category:railway": "Ferrovia",
-    "category:special": "Speciali",
-    "category:osm-qa": "Controllo della qualità di OpenStreetMap",
-    "category:kerbs": "Cordoli",
-    "category:law": "Legge",
     "category:administrative": "Suddivisioni amministrative",
     "category:agriculture": "Agricoltura",
     "category:alternative_amenities": "Infrastrutture",
@@ -86,6 +23,29 @@
     "category:construction": "Cantieri",
     "category:craft": "Artigianato",
     "category:culture-media": "Cultura - Immagini/Wikidata",
+    "category:public": "Servizi pubblici",
+    "category:railway-maxspeed": "Velocità ferroviaria massima",
+    "category:railway-routes": "Percorsi ferroviari",
+    "category:religion": "Religione",
+    "category:renewables": "Energie rinnovabili",
+    "category:residential": "Aree residenziali",
+    "category:resources": "Aree estrattive",
+    "category:roads": "Strade",
+    "category:shop": "Acquisti",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Nuoto e balneazione",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Mezzi di trasporto alternativi",
+    "category:walk_amenities": "Servizi",
+    "category:walk_amenities_qa": "Servizi per i pedoni",
+    "category:waste": "Smaltimento",
+    "category:water": "Masse d'acqua",
+    "category:footways": "Percorsi pedonali",
+    "category:gastro-smoking": "Gastronomia non fumatori",
+    "category:railway-gauge": "Scartamento Ferroviario",
+    "category:railway-electrification": "Elettrificazione ferroviaria",
+    "category:railway-infrastructure": "Infrastruttura ferroviaria",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura e religione",
     "category:cycle_amenities": "Infrastrutture",
@@ -97,11 +57,51 @@
     "category:emergency": "Servizi d'emergenza",
     "category:financial": "Finanziario",
     "category:fixme": "Correggimi",
-    "category:footways": "Percorsi pedonali",
-    "category:gastro-smoking": "Gastronomia non fumatori",
     "category:gastro": "Gastronomia",
     "category:health": "Salute",
     "category:heritage": "Protezione del patrimonio",
     "category:hiking_routes": "Percorsi escursionistici",
-    "category:historic": "Storia"
+    "category:historic": "Storia",
+    "category:index": "Indice delle Categorie",
+    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
+    "category:services": "Servizi",
+    "category:transport": "Trasporti",
+    "category:transport_walk": "Pedonale",
+    "category:transport_cycle": "Ciclistico",
+    "category:transport_pt": "Trasporti pubblici",
+    "category:transport_car": "Trasporto individuale",
+    "category:infrastructure": "Infrastrutture",
+    "category:developments": "Pianificazione e costruzione",
+    "category:energy": "Energia",
+    "category:railway": "Ferrovia",
+    "category:special": "Speciali",
+    "category:osm-qa": "Controllo della qualità di OpenStreetMap",
+    "category:internet": "Accesso a internet",
+    "category:kerbs": "Cordoli",
+    "category:law": "Legge",
+    "category:leisure": "Tempo libero",
+    "category:memorial": "Memoriali e monumenti",
+    "category:military": "Militare",
+    "category:mtb-routes": "Percorsi per mountain bike",
+    "category:natural": "Formazioni naturali",
+    "category:office": "Uffici",
+    "category:oil_gas": "Petrolio e gas naturale",
+    "category:organisations": "Organizzazioni",
+    "category:other": "Altro",
+    "category:outdoor": "Attività all'aperto",
+    "category:paddling": "Navigazione a remo",
+    "category:paddling_amenities": "Equipaggiamento per la navigazione a remo",
+    "category:paddling_hazards": "Pericoli per la navigazione a remo",
+    "category:paddling_routes": "Rotte per la navigazione a remo",
+    "category:phone": "Telefono",
+    "category:places": "Luoghi",
+    "category:places_geo": "Luoghi",
+    "category:playgrounds": "Parco giochi",
+    "category:post": "Posta",
+    "category:power_routes": "Linee energetiche",
+    "category:proposals": "Proposte",
+    "category:pt": "Mappa del trasporto pubblico",
+    "category:pt:stops": "Fermate e stazioni",
+    "category:pt:routes": "Percorsi",
+    "category:pt_amenities": "Servizi"
 }
diff --git a/lang/ja.json b/lang/ja.json
index 8c24b6f..7a74dcc 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -1,63 +1,7 @@
 {
-    "category:internet": "インターネット接続",
-    "category:leisure": "レジャー",
-    "category:memorial": "記念碑&記念建造物",
-    "category:military": "軍事",
-    "category:mtb-routes": "マウンテンバイクのルート",
-    "category:natural": "自然地層",
-    "category:office": "オフィス",
-    "category:oil_gas": "石油と天然ガス",
-    "category:organisations": "組織",
-    "category:other": "その他",
-    "category:outdoor": "アウトドア活動",
-    "category:phone": "電話",
-    "category:places": "場所",
-    "category:places_geo": "場所",
-    "category:playgrounds": "遊び場",
-    "category:post": "郵便",
-    "category:power_routes": "電線のルート",
-    "category:proposals": "提案",
-    "category:pt": "公共交通地図",
-    "category:pt:stops": "停留所と駅",
-    "category:pt:routes": "ルート",
-    "category:pt_amenities": "生活環境",
-    "category:public": "公共サービス",
-    "category:railway-electrification": "鉄道の電力",
-    "category:railway-gauge": "軌間",
-    "category:railway-infrastructure": "鉄道インフラ",
-    "category:railway-maxspeed": "鉄道の最高速度",
-    "category:railway-routes": "鉄道ルート",
-    "category:religion": "宗教",
-    "category:renewables": "再生可能エネルギー",
-    "category:residential": "住居エリア",
-    "category:resources": "資源採集",
-    "category:roads": "道路",
-    "category:shop": "ショッピング",
-    "category:sport": "スポーツ",
-    "category:swimming_bathing": "水泳と入浴",
-    "category:tourism_attractions": "観光",
-    "category:tourism_services": "観光",
-    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
-    "category:walk_amenities": "アメニティ",
-    "category:waste": "処理場",
-    "category:water": "水系",
     "category:wikipedia": "ウィキペディア",
     "category:works": "工場",
     "category:xmas": "クリスマス",
-    "category:index": "目次(カテゴリ)",
-    "category:leisure_sport_shopping": "レジャー",
-    "category:services": "サービス",
-    "category:transport": "輸送",
-    "category:transport_walk": "ウォーキング",
-    "category:transport_cycle": "サイクリング",
-    "category:transport_pt": "公共輸送",
-    "category:transport_car": "個人輸送機関",
-    "category:infrastructure": "インフラ",
-    "category:developments": "計画と建設",
-    "category:energy": "エネルギー",
-    "category:railway": "鉄道",
-    "category:special": "特別",
-    "category:law": "法律",
     "category:administrative": "行政界",
     "category:agriculture": "農業",
     "category:alternative_amenities": "生活環境",
@@ -78,6 +22,27 @@
     "category:communication": "情報通信",
     "category:construction": "工事中",
     "category:craft": "職人",
+    "category:public": "公共サービス",
+    "category:railway-maxspeed": "鉄道の最高速度",
+    "category:railway-routes": "鉄道ルート",
+    "category:religion": "宗教",
+    "category:renewables": "再生可能エネルギー",
+    "category:residential": "住居エリア",
+    "category:resources": "資源採集",
+    "category:roads": "道路",
+    "category:shop": "ショッピング",
+    "category:sport": "スポーツ",
+    "category:swimming_bathing": "水泳と入浴",
+    "category:tourism_attractions": "観光",
+    "category:tourism_services": "観光",
+    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
+    "category:walk_amenities": "アメニティ",
+    "category:waste": "処理場",
+    "category:water": "水系",
+    "category:gastro-smoking": "禁煙の飲食店",
+    "category:railway-gauge": "軌間",
+    "category:railway-electrification": "鉄道の電力",
+    "category:railway-infrastructure": "鉄道インフラ",
     "category:culture": "文化",
     "category:culture_religion": "文化と宗教",
     "category:cycle_amenities": "アメニティ",
@@ -87,11 +52,46 @@
     "category:electric_power": "電力",
     "category:emergency": "緊急サービス",
     "category:financial": "金融",
-    "category:gastro-smoking": "禁煙の飲食店",
     "category:gastro": "食べ物",
     "category:health": "健康",
     "category:hiking_routes": "ハイキングルート",
     "category:historic": "歴史",
+    "category:index": "目次(カテゴリ)",
+    "category:leisure_sport_shopping": "レジャー",
+    "category:services": "サービス",
+    "category:transport": "輸送",
+    "category:transport_walk": "ウォーキング",
+    "category:transport_cycle": "サイクリング",
+    "category:transport_pt": "公共輸送",
+    "category:transport_car": "個人輸送機関",
+    "category:infrastructure": "インフラ",
+    "category:developments": "計画と建設",
+    "category:energy": "エネルギー",
+    "category:railway": "鉄道",
+    "category:special": "特別",
+    "category:internet": "インターネット接続",
+    "category:law": "法律",
+    "category:leisure": "レジャー",
+    "category:memorial": "記念碑&記念建造物",
+    "category:military": "軍事",
+    "category:mtb-routes": "マウンテンバイクのルート",
+    "category:natural": "自然地層",
+    "category:office": "オフィス",
+    "category:oil_gas": "石油と天然ガス",
+    "category:organisations": "組織",
+    "category:other": "その他",
+    "category:outdoor": "アウトドア活動",
+    "category:phone": "電話",
+    "category:places": "場所",
+    "category:places_geo": "場所",
+    "category:playgrounds": "遊び場",
+    "category:post": "郵便",
+    "category:power_routes": "電線のルート",
+    "category:proposals": "提案",
+    "category:pt": "公共交通地図",
+    "category:pt:stops": "停留所と駅",
+    "category:pt:routes": "ルート",
+    "category:pt_amenities": "生活環境",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:fixme": "",
diff --git a/lang/nb.json b/lang/nb.json
index 1ae0d27..a4efd55 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -1,61 +1,7 @@
 {
-    "category:internet": "Internettilgang",
-    "category:leisure": "Fritid",
-    "category:memorial": "Minnesmerker og monumenter",
-    "category:military": "Militære",
-    "category:mtb-routes": "Terrengsykkelruter",
-    "category:natural": "Naturlige formasjoner",
-    "category:office": "Kontorer",
-    "category:oil_gas": "Bensin og naturlig gass",
-    "category:organisations": "Organisasjoner",
-    "category:other": "Andre",
-    "category:outdoor": "Utendørsaktiviteter",
-    "category:phone": "Telefon",
-    "category:places": "Steder",
-    "category:places_geo": "Steder",
-    "category:playgrounds": "Lekeplass",
-    "category:post": "Post",
-    "category:power_routes": "Strømruter",
-    "category:pt": "Offentlig-transport kart",
-    "category:pt:stops": "Stopp og stasjoner",
-    "category:pt:routes": "Ruter",
-    "category:pt_amenities": "Fasiliteter",
-    "category:public": "Offentlige tjenester",
-    "category:railway-electrification": "Jernbane-strømtilførsel",
-    "category:railway-gauge": "Sporvidde",
-    "category:railway-infrastructure": "Jernbane-infrastruktur",
-    "category:railway-maxspeed": "Jernbane-fartsgrense",
-    "category:railway-routes": "Jernbaneruter",
-    "category:religion": "Religion",
-    "category:renewables": "Fornybare",
-    "category:residential": "Boligområder",
-    "category:resources": "Ressursutvinning",
-    "category:roads": "Veier",
-    "category:shop": "Shopping",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Svømming og bading",
-    "category:tourism_attractions": "Turisme",
-    "category:tourism_services": "Turisme",
-    "category:transport_alternative": "Alternative transportmetoder",
-    "category:walk_amenities": "Fasiliteter",
-    "category:waste": "Avfall",
-    "category:water": "Vannflater",
     "category:wikipedia": "Wikipedia",
     "category:works": "Industrielt",
     "category:xmas": "Jul",
-    "category:index": "Indeks av kategorier",
-    "category:leisure_sport_shopping": "Fritid, sport og shopping",
-    "category:services": "Tjenester",
-    "category:transport": "Transport",
-    "category:transport_walk": "Gåing",
-    "category:transport_cycle": "Sykling",
-    "category:transport_pt": "Offentlig transport",
-    "category:transport_car": "Individuell trafikk",
-    "category:infrastructure": "Infrastruktur",
-    "category:energy": "Energi",
-    "category:railway": "Jernbane",
-    "category:special": "Spesielt",
-    "category:law": "Lov",
     "category:administrative": "Administrative områder",
     "category:agriculture": "Jordbruk",
     "category:alternative_amenities": "Fasiliteter",
@@ -76,6 +22,27 @@
     "category:communication": "Kommunikasjon",
     "category:construction": "Konstruksjonsområde",
     "category:craft": "Håndverk",
+    "category:public": "Offentlige tjenester",
+    "category:railway-maxspeed": "Jernbane-fartsgrense",
+    "category:railway-routes": "Jernbaneruter",
+    "category:religion": "Religion",
+    "category:renewables": "Fornybare",
+    "category:residential": "Boligområder",
+    "category:resources": "Ressursutvinning",
+    "category:roads": "Veier",
+    "category:shop": "Shopping",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Svømming og bading",
+    "category:tourism_attractions": "Turisme",
+    "category:tourism_services": "Turisme",
+    "category:transport_alternative": "Alternative transportmetoder",
+    "category:walk_amenities": "Fasiliteter",
+    "category:waste": "Avfall",
+    "category:water": "Vannflater",
+    "category:gastro-smoking": "Røykefritt Gastronomi",
+    "category:railway-gauge": "Sporvidde",
+    "category:railway-electrification": "Jernbane-strømtilførsel",
+    "category:railway-infrastructure": "Jernbane-infrastruktur",
     "category:culture": "Kultur",
     "category:culture_religion": "Kultur og religion",
     "category:cycle_amenities": "Fasiliteter",
@@ -84,11 +51,44 @@
     "category:electric_power": "Elektrisk strøm",
     "category:emergency": "Nødtjenester",
     "category:financial": "Finansiell",
-    "category:gastro-smoking": "Røykefritt Gastronomi",
     "category:gastro": "Gastronomi",
     "category:health": "Helse",
     "category:hiking_routes": "Gåruter",
     "category:historic": "Historisk",
+    "category:index": "Indeks av kategorier",
+    "category:leisure_sport_shopping": "Fritid, sport og shopping",
+    "category:services": "Tjenester",
+    "category:transport": "Transport",
+    "category:transport_walk": "Gåing",
+    "category:transport_cycle": "Sykling",
+    "category:transport_pt": "Offentlig transport",
+    "category:transport_car": "Individuell trafikk",
+    "category:infrastructure": "Infrastruktur",
+    "category:energy": "Energi",
+    "category:railway": "Jernbane",
+    "category:special": "Spesielt",
+    "category:internet": "Internettilgang",
+    "category:law": "Lov",
+    "category:leisure": "Fritid",
+    "category:memorial": "Minnesmerker og monumenter",
+    "category:military": "Militære",
+    "category:mtb-routes": "Terrengsykkelruter",
+    "category:natural": "Naturlige formasjoner",
+    "category:office": "Kontorer",
+    "category:oil_gas": "Bensin og naturlig gass",
+    "category:organisations": "Organisasjoner",
+    "category:other": "Andre",
+    "category:outdoor": "Utendørsaktiviteter",
+    "category:phone": "Telefon",
+    "category:places": "Steder",
+    "category:places_geo": "Steder",
+    "category:playgrounds": "Lekeplass",
+    "category:post": "Post",
+    "category:power_routes": "Strømruter",
+    "category:pt": "Offentlig-transport kart",
+    "category:pt:stops": "Stopp og stasjoner",
+    "category:pt:routes": "Ruter",
+    "category:pt_amenities": "Fasiliteter",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:developable_areas": "",
diff --git a/lang/nl.json b/lang/nl.json
index 3e444e4..03fd62b 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1,58 +1,7 @@
 {
-    "category:internet": "Internettoegang",
-    "category:leisure": "Vrije tijd",
-    "category:memorial": "Gedenktekens",
-    "category:military": "Militair",
-    "category:mtb-routes": "ATB routes",
-    "category:natural": "Natuurlijke Formaties",
-    "category:office": "Kantoren",
-    "category:oil_gas": "Petroleum en aardgas",
-    "category:organisations": "Organisaties",
-    "category:other": "Andere",
-    "category:outdoor": "Buitenactiviteiten",
-    "category:phone": "Telefonie",
-    "category:places": "Plaatsen",
-    "category:places_geo": "Plaatsen",
-    "category:playgrounds": "Speeltuin",
-    "category:post": "Post",
-    "category:power_routes": "Elektriciteitsleidingen",
-    "category:pt": "Openbaar vervoer kaart",
-    "category:pt:stops": "Haltes en Stations",
-    "category:pt:routes": "Routes",
-    "category:pt_amenities": "Voorzieningen",
-    "category:public": "Openbare diensten",
-    "category:railway-electrification": "Spoorwegelektrificatie",
-    "category:railway-infrastructure": "Spoorweginfrastructuur",
-    "category:railway-maxspeed": "Spoorweg snelheidslimiet",
-    "category:railway-routes": "Spoorwegroutes",
-    "category:religion": "Religie",
-    "category:renewables": "Hernieuwbare energie",
-    "category:residential": "Woongebieden",
-    "category:resources": "Grondstoffenwinning",
-    "category:shop": "Winkelen",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Zwemmen en baden",
-    "category:tourism_attractions": "Toerisme",
-    "category:tourism_services": "Toerisme",
-    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
-    "category:walk_amenities": "Voorzieningen",
-    "category:waste": "Afvalverwijdering",
-    "category:water": "Oppervlaktewater",
     "category:wikipedia": "Wikipedia",
     "category:works": "Fabrieken",
     "category:xmas": "Kerstmis",
-    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
-    "category:services": "Dienstverlening",
-    "category:transport": "Vervoer",
-    "category:transport_walk": "Wandelen",
-    "category:transport_cycle": "Fietsen",
-    "category:transport_pt": "Openbaar vervoer",
-    "category:transport_car": "Gemotoriseerd individueel verkeer",
-    "category:infrastructure": "Infrastructuur",
-    "category:energy": "Energie",
-    "category:railway": "Spoorwegen",
-    "category:special": "Speciaal",
-    "category:law": "Juridische diensten",
     "category:administrative": "Administratieve gebieden",
     "category:agriculture": "Landbouw",
     "category:alternative_amenities": "Voorzieningen",
@@ -72,6 +21,25 @@
     "category:communication": "Communicatie",
     "category:construction": "Bouwterrein",
     "category:craft": "Handwerk",
+    "category:public": "Openbare diensten",
+    "category:railway-maxspeed": "Spoorweg snelheidslimiet",
+    "category:railway-routes": "Spoorwegroutes",
+    "category:religion": "Religie",
+    "category:renewables": "Hernieuwbare energie",
+    "category:residential": "Woongebieden",
+    "category:resources": "Grondstoffenwinning",
+    "category:shop": "Winkelen",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Zwemmen en baden",
+    "category:tourism_attractions": "Toerisme",
+    "category:tourism_services": "Toerisme",
+    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
+    "category:walk_amenities": "Voorzieningen",
+    "category:waste": "Afvalverwijdering",
+    "category:water": "Oppervlaktewater",
+    "category:gastro-smoking": "Rookvrije gastronomie",
+    "category:railway-electrification": "Spoorwegelektrificatie",
+    "category:railway-infrastructure": "Spoorweginfrastructuur",
     "category:culture": "Cultuur",
     "category:culture_religion": "Cultuur",
     "category:cycle_amenities": "Voorzieningen",
@@ -80,11 +48,43 @@
     "category:electric_power": "Stroomvoorziening",
     "category:emergency": "Hulpdiensten",
     "category:financial": "Financieel",
-    "category:gastro-smoking": "Rookvrije gastronomie",
     "category:gastro": "Gastronomie",
     "category:health": "Gezondheid",
     "category:hiking_routes": "Wandelroutes",
     "category:historic": "Historisch",
+    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
+    "category:services": "Dienstverlening",
+    "category:transport": "Vervoer",
+    "category:transport_walk": "Wandelen",
+    "category:transport_cycle": "Fietsen",
+    "category:transport_pt": "Openbaar vervoer",
+    "category:transport_car": "Gemotoriseerd individueel verkeer",
+    "category:infrastructure": "Infrastructuur",
+    "category:energy": "Energie",
+    "category:railway": "Spoorwegen",
+    "category:special": "Speciaal",
+    "category:internet": "Internettoegang",
+    "category:law": "Juridische diensten",
+    "category:leisure": "Vrije tijd",
+    "category:memorial": "Gedenktekens",
+    "category:military": "Militair",
+    "category:mtb-routes": "ATB routes",
+    "category:natural": "Natuurlijke Formaties",
+    "category:office": "Kantoren",
+    "category:oil_gas": "Petroleum en aardgas",
+    "category:organisations": "Organisaties",
+    "category:other": "Andere",
+    "category:outdoor": "Buitenactiviteiten",
+    "category:phone": "Telefonie",
+    "category:places": "Plaatsen",
+    "category:places_geo": "Plaatsen",
+    "category:playgrounds": "Speeltuin",
+    "category:post": "Post",
+    "category:power_routes": "Elektriciteitsleidingen",
+    "category:pt": "Openbaar vervoer kaart",
+    "category:pt:stops": "Haltes en Stations",
+    "category:pt:routes": "Routes",
+    "category:pt_amenities": "Voorzieningen",
     "category:climbing": "",
     "category:culture-media": "",
     "category:cycle_directions": "",
diff --git a/lang/oc.json b/lang/oc.json
index aefa98c..6816c6f 100644
--- a/lang/oc.json
+++ b/lang/oc.json
@@ -1,63 +1,7 @@
 {
-    "category:internet": "Accès a Internet",
-    "category:leisure": "Lesers",
-    "category:memorial": "Monuments e Memoriaus",
-    "category:military": "Luòcs militaris",
-    "category:mtb-routes": "Itineraris de VTT",
-    "category:natural": "Elements naturaus",
-    "category:office": "Oficis/ Burèus",
-    "category:oil_gas": "Petròli e gas naturau",
-    "category:organisations": "Organizacions",
-    "category:other": "Autrei",
-    "category:outdoor": "Activitats de plen aire",
-    "category:phone": "Telefòne",
-    "category:places": "Luòcs",
-    "category:places_geo": "Luòcs",
-    "category:playgrounds": "Jòcs per leis enfants",
-    "category:post": "Pòsta",
-    "category:power_routes": "Linhas electricas",
-    "category:proposals": "Propositions",
-    "category:pt": "Transpòrts publics",
-    "category:pt:stops": "Arrèsts e Estations",
-    "category:pt:routes": "Linhas",
-    "category:pt_amenities": "Infrastructuras de transpòrt",
-    "category:public": "Servicis e equimaments publics",
-    "category:railway-electrification": "Electrificacion ferroviària",
-    "category:railway-gauge": "Ample dei vias",
-    "category:railway-infrastructure": "Infrastructura ferroviària",
-    "category:railway-maxspeed": "Limits de velocitat",
-    "category:railway-routes": "Linhas ferroviàrias",
-    "category:religion": "Religion",
-    "category:renewables": "Energias renovelablas",
-    "category:residential": "Quartiers residenciaus",
-    "category:resources": "Airau d'extraccion de ressorsas",
-    "category:roads": "Rotas",
-    "category:shop": "Botigas",
-    "category:sport": "Espòrt",
-    "category:swimming_bathing": "Natacion, banhada e banhèra",
-    "category:tourism_attractions": "Torisme",
-    "category:tourism_services": "Torisme",
-    "category:transport_alternative": "Transpòrt alternatiu (ciclisme, caminada, ...)",
-    "category:walk_amenities": "Equipaments pedoniers",
-    "category:waste": "Bordilhas e reciclatge",
-    "category:water": "Aigas e rius",
     "category:wikipedia": "Wikipèdia",
     "category:works": "Airaus industriaus",
     "category:xmas": "Calendas",
-    "category:index": "Indici dei categorias",
-    "category:leisure_sport_shopping": "Vida quotidiana, lesers e espòrts",
-    "category:services": "Servicis",
-    "category:transport": "Transpòrts",
-    "category:transport_walk": "Caminada",
-    "category:transport_cycle": "Ciclisme",
-    "category:transport_pt": "Transpòrts publics",
-    "category:transport_car": "Transpòrt automobil",
-    "category:infrastructure": "Infrastructuras",
-    "category:developments": "Planificacion e construccion",
-    "category:energy": "Energia",
-    "category:railway": "Camins de fer",
-    "category:special": "Categorias particularas",
-    "category:law": "Lèi",
     "category:administrative": "Divisions administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipament",
@@ -78,6 +22,27 @@
     "category:communication": "Communicacion",
     "category:construction": "Talhiers de construccion",
     "category:craft": "Artisanat",
+    "category:public": "Servicis e equimaments publics",
+    "category:railway-maxspeed": "Limits de velocitat",
+    "category:railway-routes": "Linhas ferroviàrias",
+    "category:religion": "Religion",
+    "category:renewables": "Energias renovelablas",
+    "category:residential": "Quartiers residenciaus",
+    "category:resources": "Airau d'extraccion de ressorsas",
+    "category:roads": "Rotas",
+    "category:shop": "Botigas",
+    "category:sport": "Espòrt",
+    "category:swimming_bathing": "Natacion, banhada e banhèra",
+    "category:tourism_attractions": "Torisme",
+    "category:tourism_services": "Torisme",
+    "category:transport_alternative": "Transpòrt alternatiu (ciclisme, caminada, ...)",
+    "category:walk_amenities": "Equipaments pedoniers",
+    "category:waste": "Bordilhas e reciclatge",
+    "category:water": "Aigas e rius",
+    "category:gastro-smoking": "Restauration sensa tabat",
+    "category:railway-gauge": "Ample dei vias",
+    "category:railway-electrification": "Electrificacion ferroviària",
+    "category:railway-infrastructure": "Infrastructura ferroviària",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura e religion",
     "category:cycle_amenities": "Equipaments per lei cicistas",
@@ -87,11 +52,46 @@
     "category:electric_power": "Produccion/ Transpòrt d'Energia",
     "category:emergency": "Servicis d'urgéncia",
     "category:financial": "Finança",
-    "category:gastro-smoking": "Restauration sensa tabat",
     "category:gastro": "Restauracion/ Gastronomia",
     "category:health": "Santat",
     "category:hiking_routes": "Itineraris per escorregudas",
     "category:historic": "Istòria",
+    "category:index": "Indici dei categorias",
+    "category:leisure_sport_shopping": "Vida quotidiana, lesers e espòrts",
+    "category:services": "Servicis",
+    "category:transport": "Transpòrts",
+    "category:transport_walk": "Caminada",
+    "category:transport_cycle": "Ciclisme",
+    "category:transport_pt": "Transpòrts publics",
+    "category:transport_car": "Transpòrt automobil",
+    "category:infrastructure": "Infrastructuras",
+    "category:developments": "Planificacion e construccion",
+    "category:energy": "Energia",
+    "category:railway": "Camins de fer",
+    "category:special": "Categorias particularas",
+    "category:internet": "Accès a Internet",
+    "category:law": "Lèi",
+    "category:leisure": "Lesers",
+    "category:memorial": "Monuments e Memoriaus",
+    "category:military": "Luòcs militaris",
+    "category:mtb-routes": "Itineraris de VTT",
+    "category:natural": "Elements naturaus",
+    "category:office": "Oficis/ Burèus",
+    "category:oil_gas": "Petròli e gas naturau",
+    "category:organisations": "Organizacions",
+    "category:other": "Autrei",
+    "category:outdoor": "Activitats de plen aire",
+    "category:phone": "Telefòne",
+    "category:places": "Luòcs",
+    "category:places_geo": "Luòcs",
+    "category:playgrounds": "Jòcs per leis enfants",
+    "category:post": "Pòsta",
+    "category:power_routes": "Linhas electricas",
+    "category:proposals": "Propositions",
+    "category:pt": "Transpòrts publics",
+    "category:pt:stops": "Arrèsts e Estations",
+    "category:pt:routes": "Linhas",
+    "category:pt_amenities": "Infrastructuras de transpòrt",
     "category:culture-media": "",
     "category:cycle_directions": "",
     "category:fixme": "",
diff --git a/lang/pl.json b/lang/pl.json
index 79ea5a7..a2725ed 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -1,70 +1,7 @@
 {
-    "category:internet": "Dostęp do Internetu",
-    "category:leisure": "Wypoczynek",
-    "category:memorial": "Miejsca pamięci i pomniki",
-    "category:military": "Wojskowe",
-    "category:mtb-routes": "Trasy dla rowerów górskich",
-    "category:natural": "Obiekty przyrodnicze",
-    "category:office": "Biura",
-    "category:oil_gas": "Ropa naftowa i gaz ziemny",
-    "category:organisations": "Organizacje",
-    "category:other": "Inne",
-    "category:outdoor": "Aktywność na powietrzu",
-    "category:paddling": "Wiosłowanie",
-    "category:paddling_amenities": "Udogodnienia związane z wiosłowaniem",
-    "category:paddling_hazards": "Zagrożenia związane z wiosłowaniem",
-    "category:paddling_routes": "Trasy wioślarskie",
-    "category:phone": "Telefon",
-    "category:places": "Miejsca",
-    "category:places_geo": "Miejsca",
-    "category:playgrounds": "Plac zabaw",
-    "category:post": "Poczta",
-    "category:power_routes": "Przebieg kabli energetycznych",
-    "category:proposals": "Propozycje",
-    "category:pt": "Mapa transportu publicznego",
-    "category:pt:stops": "Przystanki i stacje",
-    "category:pt:routes": "Trasy",
-    "category:pt_amenities": "Pożyteczne w transporcie publicznym",
-    "category:public": "Usługi publiczne",
-    "category:railway-electrification": "Elektryfikacja kolei",
-    "category:railway-gauge": "Rozstaw szyn",
-    "category:railway-infrastructure": "Infrastruktura kolejowa",
-    "category:railway-maxspeed": "Prędkość maksymalna kolei",
-    "category:railway-routes": "Trasy kolejowe",
-    "category:religion": "Religia",
-    "category:renewables": "Odnawialne",
-    "category:residential": "Obszary zamieszkania",
-    "category:resources": "Wydobycie zasobów naturalnych",
-    "category:roads": "Drogi",
-    "category:shop": "Zakupy",
-    "category:sport": "Sport",
-    "category:swimming_bathing": "Pływanie i kąpiele",
-    "category:tourism_attractions": "Turystyka",
-    "category:tourism_services": "Turystyka",
-    "category:transport_alternative": "Alternatywne metody transportu",
-    "category:walk_amenities": "Pożyteczne w transporcie pieszym",
-    "category:walk_amenities_qa": "Użyteczne w ruchu pieszym",
-    "category:waste": "Przetwarzanie odpadów",
-    "category:water": "Wodne",
     "category:wikipedia": "Wikipedia",
     "category:works": "Przemysł",
     "category:xmas": "Święta",
-    "category:index": "Spis kategorii",
-    "category:leisure_sport_shopping": "Wypoczynek, sport i zakupy",
-    "category:services": "Usługi",
-    "category:transport": "Transport",
-    "category:transport_walk": "Pieszy",
-    "category:transport_cycle": "Rowerowy",
-    "category:transport_pt": "Transport publiczny",
-    "category:transport_car": "Transport indywidualny",
-    "category:infrastructure": "Infrastruktura",
-    "category:developments": "Planowanie i budowanie",
-    "category:energy": "Energetyka",
-    "category:railway": "Kolej",
-    "category:special": "Specjalne",
-    "category:osm-qa": "Kontrola jakości OpenStreetMap",
-    "category:kerbs": "Krawężniki",
-    "category:law": "Prawo",
     "category:administrative": "Obszary administracyjne",
     "category:agriculture": "Rolnictwo",
     "category:alternative_amenities": "Pożyteczne miejsca",
@@ -86,6 +23,29 @@
     "category:construction": "Tereny budowy",
     "category:craft": "Rzemiosło",
     "category:culture-media": "Kultura - Media/Wikidane",
+    "category:public": "Usługi publiczne",
+    "category:railway-maxspeed": "Prędkość maksymalna kolei",
+    "category:railway-routes": "Trasy kolejowe",
+    "category:religion": "Religia",
+    "category:renewables": "Odnawialne",
+    "category:residential": "Obszary zamieszkania",
+    "category:resources": "Wydobycie zasobów naturalnych",
+    "category:roads": "Drogi",
+    "category:shop": "Zakupy",
+    "category:sport": "Sport",
+    "category:swimming_bathing": "Pływanie i kąpiele",
+    "category:tourism_attractions": "Turystyka",
+    "category:tourism_services": "Turystyka",
+    "category:transport_alternative": "Alternatywne metody transportu",
+    "category:walk_amenities": "Pożyteczne w transporcie pieszym",
+    "category:walk_amenities_qa": "Użyteczne w ruchu pieszym",
+    "category:waste": "Przetwarzanie odpadów",
+    "category:water": "Wodne",
+    "category:footways": "Chodniki",
+    "category:gastro-smoking": "Gastronomia wolna od papierosów",
+    "category:railway-gauge": "Rozstaw szyn",
+    "category:railway-electrification": "Elektryfikacja kolei",
+    "category:railway-infrastructure": "Infrastruktura kolejowa",
     "category:culture": "Kultura",
     "category:culture_religion": "Kultura i religia",
     "category:cycle_amenities": "Użyteczne w jeździe rowerem",
@@ -97,11 +57,51 @@
     "category:emergency": "Służby ratunkowe",
     "category:financial": "Finansowe",
     "category:fixme": "Popraw mnie",
-    "category:footways": "Chodniki",
-    "category:gastro-smoking": "Gastronomia wolna od papierosów",
     "category:gastro": "Gastronomia",
     "category:health": "Zdrowie",
     "category:heritage": "Ochrona dziedzictwa",
     "category:hiking_routes": "Trasy turystyczne",
-    "category:historic": "Miejsca historyczne"
+    "category:historic": "Miejsca historyczne",
+    "category:index": "Spis kategorii",
+    "category:leisure_sport_shopping": "Wypoczynek, sport i zakupy",
+    "category:services": "Usługi",
+    "category:transport": "Transport",
+    "category:transport_walk": "Pieszy",
+    "category:transport_cycle": "Rowerowy",
+    "category:transport_pt": "Transport publiczny",
+    "category:transport_car": "Transport indywidualny",
+    "category:infrastructure": "Infrastruktura",
+    "category:developments": "Planowanie i budowanie",
+    "category:energy": "Energetyka",
+    "category:railway": "Kolej",
+    "category:special": "Specjalne",
+    "category:osm-qa": "Kontrola jakości OpenStreetMap",
+    "category:internet": "Dostęp do Internetu",
+    "category:kerbs": "Krawężniki",
+    "category:law": "Prawo",
+    "category:leisure": "Wypoczynek",
+    "category:memorial": "Miejsca pamięci i pomniki",
+    "category:military": "Wojskowe",
+    "category:mtb-routes": "Trasy dla rowerów górskich",
+    "category:natural": "Obiekty przyrodnicze",
+    "category:office": "Biura",
+    "category:oil_gas": "Ropa naftowa i gaz ziemny",
+    "category:organisations": "Organizacje",
+    "category:other": "Inne",
+    "category:outdoor": "Aktywność na powietrzu",
+    "category:paddling": "Wiosłowanie",
+    "category:paddling_amenities": "Udogodnienia związane z wiosłowaniem",
+    "category:paddling_hazards": "Zagrożenia związane z wiosłowaniem",
+    "category:paddling_routes": "Trasy wioślarskie",
+    "category:phone": "Telefon",
+    "category:places": "Miejsca",
+    "category:places_geo": "Miejsca",
+    "category:playgrounds": "Plac zabaw",
+    "category:post": "Poczta",
+    "category:power_routes": "Przebieg kabli energetycznych",
+    "category:proposals": "Propozycje",
+    "category:pt": "Mapa transportu publicznego",
+    "category:pt:stops": "Przystanki i stacje",
+    "category:pt:routes": "Trasy",
+    "category:pt_amenities": "Pożyteczne w transporcie publicznym"
 }
diff --git a/lang/pt-br.json b/lang/pt-br.json
index b10e9e8..d7aaa9b 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -1,69 +1,7 @@
 {
-    "category:internet": "Acesso à Internet",
-    "category:leisure": "Lazer",
-    "category:memorial": "Memoriais e monumentos",
-    "category:military": "Militar",
-    "category:mtb-routes": "Rotas de mountain bike",
-    "category:natural": "Elementos naturais",
-    "category:office": "Escritórios e agências",
-    "category:oil_gas": "Petróleo e gás",
-    "category:organisations": "Organizações",
-    "category:other": "Outros",
-    "category:outdoor": "Atividades ao ar livre",
-    "category:paddling": "Navegação a remo",
-    "category:paddling_amenities": "Equipamentos",
-    "category:paddling_hazards": "Riscos",
-    "category:paddling_routes": "Rotas de navegação a remo",
-    "category:phone": "Telefone",
-    "category:places": "Lugares",
-    "category:places_geo": "Localidades",
-    "category:playgrounds": "Parquinhos",
-    "category:post": "Correios",
-    "category:power_routes": "Rotas de energia",
-    "category:proposals": "Planejados",
-    "category:pt": "Mapa de transporte público",
-    "category:pt:stops": "Paradas e estações",
-    "category:pt:routes": "Linhas",
-    "category:pt_amenities": "Equipamentos",
-    "category:public": "Utilidade pública",
-    "category:railway-electrification": "Eletrificação ferroviária",
-    "category:railway-gauge": "Bitola",
-    "category:railway-infrastructure": "Infraestrutura ferroviária",
-    "category:railway-maxspeed": "Velocidade máxima",
-    "category:railway-routes": "Rotas ferroviárias",
-    "category:religion": "Religião",
-    "category:renewables": "Renováveis",
-    "category:residential": "Áreas residenciais",
-    "category:resources": "Extração de recursos",
-    "category:roads": "Vias",
-    "category:shop": "Compras",
-    "category:sport": "Esportes",
-    "category:swimming_bathing": "Natação e banho",
-    "category:tourism_attractions": "Turismo",
-    "category:tourism_services": "Serviços turísticos",
-    "category:transport_alternative": "Modos de transporte alternativo",
-    "category:walk_amenities": "Equipamentos",
-    "category:waste": "Resíduos",
-    "category:water": "Hidrografia",
     "category:wikipedia": "Wikipédia",
     "category:works": "Produção",
     "category:xmas": "Natal",
-    "category:index": "Índice de Categorias",
-    "category:leisure_sport_shopping": "Lazer, esportes e compras",
-    "category:services": "Prestação de serviços",
-    "category:transport": "Mobilidade",
-    "category:transport_walk": "Pedestre",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transporte público",
-    "category:transport_car": "Transporte individual",
-    "category:infrastructure": "Infraestrutura",
-    "category:developments": "Planejamento e construção",
-    "category:energy": "Energia",
-    "category:railway": "Ferrovia",
-    "category:special": "Especial",
-    "category:osm-qa": "Controle de Qualidade OSM",
-    "category:kerbs": "Meios-fios",
-    "category:law": "Direito",
     "category:administrative": "Divisão político-administrativa",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipamentos",
@@ -85,6 +23,28 @@
     "category:construction": "Terrenos vazios e obras",
     "category:craft": "Ofícios",
     "category:culture-media": "Cultura - Imagem e Wikidata",
+    "category:public": "Utilidade pública",
+    "category:railway-maxspeed": "Velocidade máxima",
+    "category:railway-routes": "Rotas ferroviárias",
+    "category:religion": "Religião",
+    "category:renewables": "Renováveis",
+    "category:residential": "Áreas residenciais",
+    "category:resources": "Extração de recursos",
+    "category:roads": "Vias",
+    "category:shop": "Compras",
+    "category:sport": "Esportes",
+    "category:swimming_bathing": "Natação e banho",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Serviços turísticos",
+    "category:transport_alternative": "Modos de transporte alternativo",
+    "category:walk_amenities": "Equipamentos",
+    "category:waste": "Resíduos",
+    "category:water": "Hidrografia",
+    "category:footways": "Vias pedonais",
+    "category:gastro-smoking": "Gastronomia sem fumo",
+    "category:railway-gauge": "Bitola",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura e religião",
     "category:cycle_amenities": "Equipamentos",
@@ -95,13 +55,53 @@
     "category:emergency": "Emergência",
     "category:financial": "Finanças e seguros",
     "category:fixme": "Corrija-me",
-    "category:footways": "Vias pedonais",
-    "category:gastro-smoking": "Gastronomia sem fumo",
     "category:gastro": "Gastronomia",
     "category:health": "Saúde e assistência",
     "category:heritage": "Patrimônio histórico",
     "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
+    "category:index": "Índice de Categorias",
+    "category:leisure_sport_shopping": "Lazer, esportes e compras",
+    "category:services": "Prestação de serviços",
+    "category:transport": "Mobilidade",
+    "category:transport_walk": "Pedestre",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transporte público",
+    "category:transport_car": "Transporte individual",
+    "category:infrastructure": "Infraestrutura",
+    "category:developments": "Planejamento e construção",
+    "category:energy": "Energia",
+    "category:railway": "Ferrovia",
+    "category:special": "Especial",
+    "category:osm-qa": "Controle de Qualidade OSM",
+    "category:internet": "Acesso à Internet",
+    "category:kerbs": "Meios-fios",
+    "category:law": "Direito",
+    "category:leisure": "Lazer",
+    "category:memorial": "Memoriais e monumentos",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rotas de mountain bike",
+    "category:natural": "Elementos naturais",
+    "category:office": "Escritórios e agências",
+    "category:oil_gas": "Petróleo e gás",
+    "category:organisations": "Organizações",
+    "category:other": "Outros",
+    "category:outdoor": "Atividades ao ar livre",
+    "category:paddling": "Navegação a remo",
+    "category:paddling_amenities": "Equipamentos",
+    "category:paddling_hazards": "Riscos",
+    "category:paddling_routes": "Rotas de navegação a remo",
+    "category:phone": "Telefone",
+    "category:places": "Lugares",
+    "category:places_geo": "Localidades",
+    "category:playgrounds": "Parquinhos",
+    "category:post": "Correios",
+    "category:power_routes": "Rotas de energia",
+    "category:proposals": "Planejados",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:stops": "Paradas e estações",
+    "category:pt:routes": "Linhas",
+    "category:pt_amenities": "Equipamentos",
     "category:cycle_directions": "",
     "category:walk_amenities_qa": ""
 }
diff --git a/lang/pt.json b/lang/pt.json
index ae2569f..fdd50fd 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -1,64 +1,6 @@
 {
-    "category:internet": "Acesso à Internet",
-    "category:leisure": "Lazer",
-    "category:memorial": "Memoriais e monumentos",
-    "category:military": "Militar",
-    "category:mtb-routes": "Rotas de bicicleta de montanha",
-    "category:natural": "Formações naturais",
-    "category:office": "Escritórios",
-    "category:oil_gas": "Petróleo e gás natural",
-    "category:organisations": "Organizações",
-    "category:other": "Outros",
-    "category:outdoor": "Atividades ao ar livre",
-    "category:phone": "Telefone",
-    "category:places": "Lugares",
-    "category:places_geo": "Lugares",
-    "category:playgrounds": "Parques infantis",
-    "category:post": "Correios",
-    "category:power_routes": "Rotas energéticas",
-    "category:proposals": "Propostas",
-    "category:pt": "Mapa de transporte público",
-    "category:pt:stops": "Paragens e estações",
-    "category:pt:routes": "Rotas",
-    "category:pt_amenities": "Equipamentos",
-    "category:public": "Serviços públicos",
-    "category:railway-electrification": "Eletrificação ferroviária",
-    "category:railway-gauge": "Bitola",
-    "category:railway-infrastructure": "Infraestrutura ferroviária",
-    "category:railway-maxspeed": "Velocidade máxima",
-    "category:railway-routes": "Rotas ferroviárias",
-    "category:religion": "Religião",
-    "category:renewables": "Renováveis",
-    "category:residential": "Áreas residenciais",
-    "category:resources": "Extração de recursos",
-    "category:roads": "Vias",
-    "category:shop": "Compras",
-    "category:sport": "Desporto",
-    "category:swimming_bathing": "Natação e banho",
-    "category:tourism_attractions": "Turismo",
-    "category:tourism_services": "Turismo",
-    "category:transport_alternative": "Modais de transporte alternativo",
-    "category:walk_amenities": "Equipamentos",
-    "category:waste": "Lixo",
-    "category:water": "Massas de água",
     "category:wikipedia": "Wikipédia",
     "category:works": "Fábricas",
-    "category:index": "Índice de categorias",
-    "category:leisure_sport_shopping": "Lazer, desporto e compras",
-    "category:services": "Serviços",
-    "category:transport": "Transportes",
-    "category:transport_walk": "Pedestre",
-    "category:transport_cycle": "Ciclismo",
-    "category:transport_pt": "Transportes públicos",
-    "category:transport_car": "Transporte individual",
-    "category:infrastructure": "Infraestrutura",
-    "category:developments": "Planeamento e construção",
-    "category:energy": "Energia",
-    "category:railway": "Linhas ferroviárias",
-    "category:special": "Especial",
-    "category:osm-qa": "Controlo de Qualidade do OpenStreetMap",
-    "category:kerbs": "Lancis",
-    "category:law": "Direito",
     "category:administrative": "Regiões administrativas",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Equipamentos",
@@ -80,6 +22,28 @@
     "category:construction": "Locais de construção",
     "category:craft": "Artesanato",
     "category:culture-media": "Cultura - Media/Wikidata",
+    "category:public": "Serviços públicos",
+    "category:railway-maxspeed": "Velocidade máxima",
+    "category:railway-routes": "Rotas ferroviárias",
+    "category:religion": "Religião",
+    "category:renewables": "Renováveis",
+    "category:residential": "Áreas residenciais",
+    "category:resources": "Extração de recursos",
+    "category:roads": "Vias",
+    "category:shop": "Compras",
+    "category:sport": "Desporto",
+    "category:swimming_bathing": "Natação e banho",
+    "category:tourism_attractions": "Turismo",
+    "category:tourism_services": "Turismo",
+    "category:transport_alternative": "Modais de transporte alternativo",
+    "category:walk_amenities": "Equipamentos",
+    "category:waste": "Lixo",
+    "category:water": "Massas de água",
+    "category:footways": "Vias pedonais",
+    "category:gastro-smoking": "Restauração livre de tabaco",
+    "category:railway-gauge": "Bitola",
+    "category:railway-electrification": "Eletrificação ferroviária",
+    "category:railway-infrastructure": "Infraestrutura ferroviária",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura e religião",
     "category:cycle_amenities": "Equipamentos",
@@ -90,13 +54,49 @@
     "category:emergency": "Emergência",
     "category:financial": "Finanças",
     "category:fixme": "Corrige-me",
-    "category:footways": "Vias pedonais",
-    "category:gastro-smoking": "Restauração livre de tabaco",
     "category:gastro": "Restauração",
     "category:health": "Saúde",
     "category:heritage": "Património cultural",
     "category:hiking_routes": "Rotas de caminhada",
     "category:historic": "Histórico",
+    "category:index": "Índice de categorias",
+    "category:leisure_sport_shopping": "Lazer, desporto e compras",
+    "category:services": "Serviços",
+    "category:transport": "Transportes",
+    "category:transport_walk": "Pedestre",
+    "category:transport_cycle": "Ciclismo",
+    "category:transport_pt": "Transportes públicos",
+    "category:transport_car": "Transporte individual",
+    "category:infrastructure": "Infraestrutura",
+    "category:developments": "Planeamento e construção",
+    "category:energy": "Energia",
+    "category:railway": "Linhas ferroviárias",
+    "category:special": "Especial",
+    "category:osm-qa": "Controlo de Qualidade do OpenStreetMap",
+    "category:internet": "Acesso à Internet",
+    "category:kerbs": "Lancis",
+    "category:law": "Direito",
+    "category:leisure": "Lazer",
+    "category:memorial": "Memoriais e monumentos",
+    "category:military": "Militar",
+    "category:mtb-routes": "Rotas de bicicleta de montanha",
+    "category:natural": "Formações naturais",
+    "category:office": "Escritórios",
+    "category:oil_gas": "Petróleo e gás natural",
+    "category:organisations": "Organizações",
+    "category:other": "Outros",
+    "category:outdoor": "Atividades ao ar livre",
+    "category:phone": "Telefone",
+    "category:places": "Lugares",
+    "category:places_geo": "Lugares",
+    "category:playgrounds": "Parques infantis",
+    "category:post": "Correios",
+    "category:power_routes": "Rotas energéticas",
+    "category:proposals": "Propostas",
+    "category:pt": "Mapa de transporte público",
+    "category:pt:stops": "Paragens e estações",
+    "category:pt:routes": "Rotas",
+    "category:pt_amenities": "Equipamentos",
     "category:cycle_directions": "",
     "category:paddling": "",
     "category:paddling_amenities": "",
diff --git a/lang/ro.json b/lang/ro.json
index e7daeaf..fc4c7c6 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1,29 +1,5 @@
 {
-    "category:internet": "Acces internet",
-    "category:leisure": "Timp liber",
-    "category:military": "Militar",
-    "category:other": "Altele",
-    "category:phone": "Telefon",
-    "category:places": "Locuri",
-    "category:places_geo": "Locuri",
-    "category:playgrounds": "Loc de joacă",
-    "category:pt": "Hartă transport public",
-    "category:pt:routes": "Rute",
-    "category:public": "Servicii publice",
-    "category:religion": "Religie",
-    "category:residential": "Zona rezidentiala",
-    "category:shop": "Cumpărături",
-    "category:tourism_attractions": "Turism",
-    "category:tourism_services": "Turism",
-    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
     "category:xmas": "Crăciun",
-    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
-    "category:services": "Servicii",
-    "category:transport": "Transport",
-    "category:transport_pt": "Transport public",
-    "category:transport_car": "Trafic individual",
-    "category:infrastructure": "Infrastructură",
-    "category:energy": "Energie",
     "category:administrative": "Zona administrativă",
     "category:agriculture": "Agricultura",
     "category:alternative_amenities": "Facilități",
@@ -41,6 +17,13 @@
     "category:coal": "Cărbune",
     "category:communication": "Comunicatii",
     "category:construction": "Șantiere",
+    "category:public": "Servicii publice",
+    "category:religion": "Religie",
+    "category:residential": "Zona rezidentiala",
+    "category:shop": "Cumpărături",
+    "category:tourism_attractions": "Turism",
+    "category:tourism_services": "Turism",
+    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
     "category:culture": "Cultura",
     "category:culture_religion": "Cultura",
     "category:cycle_amenities": "Facilități",
@@ -53,6 +36,23 @@
     "category:health": "Sanatate",
     "category:hiking_routes": "Trasee de drumeție",
     "category:historic": "Istoric",
+    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
+    "category:services": "Servicii",
+    "category:transport": "Transport",
+    "category:transport_pt": "Transport public",
+    "category:transport_car": "Trafic individual",
+    "category:infrastructure": "Infrastructură",
+    "category:energy": "Energie",
+    "category:internet": "Acces internet",
+    "category:leisure": "Timp liber",
+    "category:military": "Militar",
+    "category:other": "Altele",
+    "category:phone": "Telefon",
+    "category:places": "Locuri",
+    "category:places_geo": "Locuri",
+    "category:playgrounds": "Loc de joacă",
+    "category:pt": "Hartă transport public",
+    "category:pt:routes": "Rute",
     "category:buildings-figure-ground": "",
     "category:climbing": "",
     "category:craft": "",
diff --git a/lang/ru.json b/lang/ru.json
index dce54b9..a545617 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1,59 +1,7 @@
 {
-    "category:internet": "Доступ в интернет",
-    "category:leisure": "Досуг",
-    "category:memorial": "Памятники и монументы",
-    "category:military": "Вооружённые силы",
-    "category:mtb-routes": "Маршруты для горных велосипедов",
-    "category:natural": "Природные образования",
-    "category:office": "Офисы",
-    "category:oil_gas": "Нефть и природный газ",
-    "category:organisations": "Организации",
-    "category:other": "Прочее",
-    "category:outdoor": "Мероприятия на природе",
-    "category:phone": "Телефон",
-    "category:places": "Места",
-    "category:places_geo": "Места",
-    "category:playgrounds": "Детская площадка",
-    "category:post": "Почта",
-    "category:power_routes": "Маршруты энергетики",
-    "category:pt": "Карта общественного транспорта",
-    "category:pt:stops": "Остановки и станции",
-    "category:pt:routes": "Маршруты",
-    "category:pt_amenities": "Транспортные принадлежности",
-    "category:public": "Общественные места",
-    "category:railway-electrification": "Электрификация железных дорог",
-    "category:railway-gauge": "Железнодорожная колея",
-    "category:railway-infrastructure": "Железнодорожная инфраструктура",
-    "category:railway-maxspeed": "Максимальная скорость",
-    "category:railway-routes": "Железнодорожные маршруты",
-    "category:religion": "Религия",
-    "category:renewables": "Возобновляемая",
-    "category:residential": "Жилые районы",
-    "category:resources": "Добыча ресурсов",
-    "category:shop": "Покупки",
-    "category:sport": "Спорт",
-    "category:swimming_bathing": "Бассейны и сауны",
-    "category:tourism_attractions": "Туризм",
-    "category:tourism_services": "Туризм",
-    "category:transport_alternative": "Альтернативное передвижение",
-    "category:waste": "Переработка отходов",
-    "category:water": "Водоемы",
     "category:wikipedia": "Википедия",
     "category:works": "Промышленность",
     "category:xmas": "Рождество",
-    "category:index": "Индекс категорий",
-    "category:leisure_sport_shopping": "Досуг, спорт и магазины",
-    "category:services": "Услуги",
-    "category:transport": "Транспорт",
-    "category:transport_walk": "Пешеходный",
-    "category:transport_cycle": "Велосипедный",
-    "category:transport_pt": "Общественный транспорт",
-    "category:transport_car": "Частный транспорт",
-    "category:infrastructure": "Инфраструктура",
-    "category:energy": "Энергетика",
-    "category:railway": "Железные дороги",
-    "category:special": "Специальное",
-    "category:law": "Юристы",
     "category:administrative": "Административные границы",
     "category:agriculture": "Сельское хозяйство",
     "category:alternative_amenities": "Полезные места",
@@ -71,6 +19,25 @@
     "category:communication": "Услуги связи",
     "category:construction": "Места строительства",
     "category:craft": "Мастерские",
+    "category:public": "Общественные места",
+    "category:railway-maxspeed": "Максимальная скорость",
+    "category:railway-routes": "Железнодорожные маршруты",
+    "category:religion": "Религия",
+    "category:renewables": "Возобновляемая",
+    "category:residential": "Жилые районы",
+    "category:resources": "Добыча ресурсов",
+    "category:shop": "Покупки",
+    "category:sport": "Спорт",
+    "category:swimming_bathing": "Бассейны и сауны",
+    "category:tourism_attractions": "Туризм",
+    "category:tourism_services": "Туризм",
+    "category:transport_alternative": "Альтернативное передвижение",
+    "category:waste": "Переработка отходов",
+    "category:water": "Водоемы",
+    "category:gastro-smoking": "Общественное питание без курения",
+    "category:railway-gauge": "Железнодорожная колея",
+    "category:railway-electrification": "Электрификация железных дорог",
+    "category:railway-infrastructure": "Железнодорожная инфраструктура",
     "category:culture": "Культура",
     "category:culture_religion": "Культура и религия",
     "category:cycle_routes": "Веломаршруты",
@@ -78,11 +45,44 @@
     "category:electric_power": "Электроэнергетика",
     "category:emergency": "Экстренные службы",
     "category:financial": "Финансы",
-    "category:gastro-smoking": "Общественное питание без курения",
     "category:gastro": "Общепит",
     "category:health": "Медицина",
     "category:hiking_routes": "Туристические маршруты",
     "category:historic": "Историческое",
+    "category:index": "Индекс категорий",
+    "category:leisure_sport_shopping": "Досуг, спорт и магазины",
+    "category:services": "Услуги",
+    "category:transport": "Транспорт",
+    "category:transport_walk": "Пешеходный",
+    "category:transport_cycle": "Велосипедный",
+    "category:transport_pt": "Общественный транспорт",
+    "category:transport_car": "Частный транспорт",
+    "category:infrastructure": "Инфраструктура",
+    "category:energy": "Энергетика",
+    "category:railway": "Железные дороги",
+    "category:special": "Специальное",
+    "category:internet": "Доступ в интернет",
+    "category:law": "Юристы",
+    "category:leisure": "Досуг",
+    "category:memorial": "Памятники и монументы",
+    "category:military": "Вооружённые силы",
+    "category:mtb-routes": "Маршруты для горных велосипедов",
+    "category:natural": "Природные образования",
+    "category:office": "Офисы",
+    "category:oil_gas": "Нефть и природный газ",
+    "category:organisations": "Организации",
+    "category:other": "Прочее",
+    "category:outdoor": "Мероприятия на природе",
+    "category:phone": "Телефон",
+    "category:places": "Места",
+    "category:places_geo": "Места",
+    "category:playgrounds": "Детская площадка",
+    "category:post": "Почта",
+    "category:power_routes": "Маршруты энергетики",
+    "category:pt": "Карта общественного транспорта",
+    "category:pt:stops": "Остановки и станции",
+    "category:pt:routes": "Маршруты",
+    "category:pt_amenities": "Транспортные принадлежности",
     "category:buildings-figure-ground": "",
     "category:children": "",
     "category:climbing": "",
diff --git a/lang/sr.json b/lang/sr.json
index e6dede5..40fd171 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -1,58 +1,7 @@
 {
-    "category:internet": "Приступ интернету",
-    "category:leisure": "Разонода",
-    "category:memorial": "Споменици",
-    "category:military": "Војска",
-    "category:mtb-routes": "Трасе за планинске бицикле",
-    "category:natural": "Природне појаве",
-    "category:office": "Канцеларије",
-    "category:oil_gas": "Нафта и природни гас",
-    "category:organisations": "Организације",
-    "category:other": "Остало",
-    "category:outdoor": "Активности на отвореном",
-    "category:phone": "Телефон",
-    "category:places": "Места",
-    "category:places_geo": "Места",
-    "category:playgrounds": "Игралиште",
-    "category:post": "Пошта",
-    "category:power_routes": "Далеководи",
-    "category:pt": "Мапа јавног превоза",
-    "category:pt:stops": "Стајалишта и станице",
-    "category:pt:routes": "Трасе",
-    "category:pt_amenities": "Додаци",
-    "category:public": "Јавне службе",
-    "category:railway-infrastructure": "Железничка инфраструктура",
-    "category:railway-routes": "Трасе железнице",
-    "category:religion": "Религија",
-    "category:renewables": "Обновљива енергија",
-    "category:residential": "Стамбена подручја",
-    "category:roads": "Путеви",
-    "category:shop": "Куповина",
-    "category:sport": "Спорт",
-    "category:swimming_bathing": "Пливање и купање",
-    "category:tourism_attractions": "Туризам",
-    "category:tourism_services": "Туризам",
-    "category:transport_alternative": "Други начини превоза",
-    "category:walk_amenities": "Додаци",
-    "category:waste": "Отпад",
-    "category:water": "Водене површине",
     "category:wikipedia": "Википедија",
     "category:works": "Радови",
     "category:xmas": "Божић",
-    "category:index": "Садржај категорија",
-    "category:leisure_sport_shopping": "Разонода, спорт и куповина",
-    "category:services": "Услуге",
-    "category:transport": "Превоз",
-    "category:transport_walk": "Ходање",
-    "category:transport_cycle": "Бициклизам",
-    "category:transport_pt": "Јавни превоз",
-    "category:transport_car": "Индивидуални саобраћај",
-    "category:infrastructure": "Инфраструктура",
-    "category:developments": "Планирање и изградња",
-    "category:energy": "Енергија",
-    "category:railway": "Пруга",
-    "category:special": "Посебно",
-    "category:law": "Закон",
     "category:administrative": "Административне зоне",
     "category:agriculture": "Пољопривреда",
     "category:alternative_amenities": "Додаци",
@@ -71,6 +20,22 @@
     "category:communication": "Комуникација",
     "category:construction": "Градилишта",
     "category:craft": "Занат",
+    "category:public": "Јавне службе",
+    "category:railway-routes": "Трасе железнице",
+    "category:religion": "Религија",
+    "category:renewables": "Обновљива енергија",
+    "category:residential": "Стамбена подручја",
+    "category:roads": "Путеви",
+    "category:shop": "Куповина",
+    "category:sport": "Спорт",
+    "category:swimming_bathing": "Пливање и купање",
+    "category:tourism_attractions": "Туризам",
+    "category:tourism_services": "Туризам",
+    "category:transport_alternative": "Други начини превоза",
+    "category:walk_amenities": "Додаци",
+    "category:waste": "Отпад",
+    "category:water": "Водене површине",
+    "category:railway-infrastructure": "Железничка инфраструктура",
     "category:culture": "Култура",
     "category:culture_religion": "Култура и религија",
     "category:cycle_amenities": "Додаци",
@@ -83,6 +48,41 @@
     "category:health": "Здравље",
     "category:hiking_routes": "Трасе за планинарење",
     "category:historic": "Историјско",
+    "category:index": "Садржај категорија",
+    "category:leisure_sport_shopping": "Разонода, спорт и куповина",
+    "category:services": "Услуге",
+    "category:transport": "Превоз",
+    "category:transport_walk": "Ходање",
+    "category:transport_cycle": "Бициклизам",
+    "category:transport_pt": "Јавни превоз",
+    "category:transport_car": "Индивидуални саобраћај",
+    "category:infrastructure": "Инфраструктура",
+    "category:developments": "Планирање и изградња",
+    "category:energy": "Енергија",
+    "category:railway": "Пруга",
+    "category:special": "Посебно",
+    "category:internet": "Приступ интернету",
+    "category:law": "Закон",
+    "category:leisure": "Разонода",
+    "category:memorial": "Споменици",
+    "category:military": "Војска",
+    "category:mtb-routes": "Трасе за планинске бицикле",
+    "category:natural": "Природне појаве",
+    "category:office": "Канцеларије",
+    "category:oil_gas": "Нафта и природни гас",
+    "category:organisations": "Организације",
+    "category:other": "Остало",
+    "category:outdoor": "Активности на отвореном",
+    "category:phone": "Телефон",
+    "category:places": "Места",
+    "category:places_geo": "Места",
+    "category:playgrounds": "Игралиште",
+    "category:post": "Пошта",
+    "category:power_routes": "Далеководи",
+    "category:pt": "Мапа јавног превоза",
+    "category:pt:stops": "Стајалишта и станице",
+    "category:pt:routes": "Трасе",
+    "category:pt_amenities": "Додаци",
     "category:buildings-figure-ground": "",
     "category:car_furniture": "",
     "category:culture-media": "",
diff --git a/lang/tr.json b/lang/tr.json
index ca920bf..fa43e3f 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -1,36 +1,51 @@
 {
+    "category:wikipedia": "Wikipedia",
+    "category:works": "Endüstri Bölgeleri",
+    "category:xmas": "Noel",
     "category:administrative": "İdari Alanlar",
+    "category:agriculture": "Tarım",
     "category:alternative_amenities": "Tesisler",
-    "category:buildings-entrances": "Girişler",
     "category:alternative_routes": "Rotalar",
-    "category:agriculture": "Tarım",
+    "category:buildings-entrances": "Girişler",
+    "category:buildings-figure-ground": "Figür-zemin diyagramı",
     "category:buildings-height": "Bina yüksekliği",
     "category:buildings-start_date": "Bina yaşı",
-    "category:buildings-figure-ground": "Figür-zemin diyagramı",
     "category:buildings-type": "Bina tipleri",
-    "category:car_amenities": "Tesisler",
     "category:buildings": "Binalar",
+    "category:car_amenities": "Tesisler",
     "category:car_furniture": "Sokak Mobilyaları",
     "category:car_maxspeed": "En yüksek hız",
     "category:car_routes": "Araba Rotaları",
     "category:children": "Çocuk Malzemeleri",
     "category:climbing": "Tırmanış",
-    "category:walk_amenities": "Olanaklar",
-    "category:transport_alternative": "Alternatif Ulaşım modları",
-    "category:water": "Su kütleleri",
-    "category:wikipedia": "Wikipedia",
-    "category:waste": "Atık ve Geri Dönüşüm",
-    "category:xmas": "Noel",
-    "category:works": "Endüstri Bölgeleri",
-    "category:walk_amenities_qa": "Yürüyüş Olanakları",
-    "category:tourism_services": "Turizm",
-    "category:swimming_bathing": "Yüzme ve banyo yapma",
     "category:coal": "Kömür",
-    "category:tourism_attractions": "Turizm",
     "category:communication": "İletişim",
     "category:construction": "İnşaat Sahaları",
     "category:craft": "El Sanatları",
     "category:culture-media": "Kültür - Medya/Wikidata",
+    "category:public": "Kamu Hizmetleri",
+    "category:railway-maxspeed": "Demiryolu Maksimum Hızı",
+    "category:railway-routes": "Demiryolu Güzergahları",
+    "category:religion": "Din",
+    "category:renewables": "Yenilenebilir kaynaklar",
+    "category:residential": "Yerleşim Alanları",
+    "category:resources": "Yeraltı Kaynağı Çıkarma",
+    "category:roads": "Yollar",
+    "category:shop": "Alışveriş",
+    "category:sport": "Spor",
+    "category:swimming_bathing": "Yüzme ve banyo yapma",
+    "category:tourism_attractions": "Turizm",
+    "category:tourism_services": "Turizm",
+    "category:transport_alternative": "Alternatif Ulaşım modları",
+    "category:walk_amenities": "Olanaklar",
+    "category:walk_amenities_qa": "Yürüyüş Olanakları",
+    "category:waste": "Atık ve Geri Dönüşüm",
+    "category:water": "Su kütleleri",
+    "category:footways": "Yaya Yolları",
+    "category:gastro-smoking": "Dumansız Gastronomi",
+    "category:railway-gauge": "Demiryolu hat açıklığı",
+    "category:railway-electrification": "Demiryolu elektrifikasyonu",
+    "category:railway-infrastructure": "Demiryolu altyapısı",
     "category:culture": "Kültür",
     "category:culture_religion": "Kültür ve Din",
     "category:cycle_amenities": "Tesisler",
@@ -42,8 +57,6 @@
     "category:emergency": "Acil Servisler",
     "category:financial": "Finansal",
     "category:fixme": "Beni Geliştirin",
-    "category:footways": "Yaya Yolları",
-    "category:gastro-smoking": "Dumansız Gastronomi",
     "category:gastro": "Gastronomi",
     "category:health": "Sağlık",
     "category:heritage": "Kültürel Miras",
@@ -90,18 +103,5 @@
     "category:pt": "Toplu taşıma haritası",
     "category:pt:stops": "Duraklar ve İstasyonlar",
     "category:pt:routes": "Rotalar",
-    "category:pt_amenities": "Tesisler",
-    "category:public": "Kamu Hizmetleri",
-    "category:railway-electrification": "Demiryolu elektrifikasyonu",
-    "category:railway-gauge": "Demiryolu hat açıklığı",
-    "category:railway-infrastructure": "Demiryolu altyapısı",
-    "category:railway-maxspeed": "Demiryolu Maksimum Hızı",
-    "category:railway-routes": "Demiryolu Güzergahları",
-    "category:religion": "Din",
-    "category:renewables": "Yenilenebilir kaynaklar",
-    "category:residential": "Yerleşim Alanları",
-    "category:resources": "Yeraltı Kaynağı Çıkarma",
-    "category:roads": "Yollar",
-    "category:shop": "Alışveriş",
-    "category:sport": "Spor"
+    "category:pt_amenities": "Tesisler"
 }