Merge branch 'master' into pt

6 years ago · 0e5fbf4606
22 changed files with 391 additions and 414 deletions
--- a/lang/ast.json
+++ b/lang/ast.json
@ -3,27 +3,27 @@
    "category:agriculture": "Agricultura",
    "category:alternative_amenities": "Infraestructures",
    "category:alternative_routes": "Rutes",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Infraestructures",
    "category:car_furniture": "Acondicionamientu urbanu",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Comunicaciones",
    "category:construction": "Sitios d'obres",
    "category:craft": "",
    "category:culture": "Cultura",
    "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Servicios educativos",
    "category:emergency": "Servicios d'emerxencia",
    "category:financial": "Dineru",
    "category:gastro-smoking": "",
    "category:gastro": "Gastronomía",
    "category:health": "Salú",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Hestoria",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Accesu a Internet",
    "category:leisure": "Recréu",
    "category:military": "Militar",
@ -36,11 +36,11 @@
    "category:post": "Corréu",
    "category:power": "Enerxía",
    "category:pt_amenities": "Infraestructures",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Paraes y estaciones",
    "category:public": "Serviciu Públicu",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Relixón",
    "category:residential": "Zones residenciales",
    "category:resources": "Estraición de recursos",
@ -49,12 +49,11 @@
    "category:tourism_attractions": "Turismu",
    "category:tourism_services": "Turismu",
    "category:transport_alternative": "Alternativu (Ciclismu, senderismu, ...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "Basures",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "Fábriques",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "Recréu, deportes y compres",
    "category:railway": "Ferrocarril",
    "category:services": "Servicios",
--- a/lang/ca.json
+++ b/lang/ca.json
@ -1,60 +1,59 @@
 {
-    "category:administrative": null,
-    "category:agriculture": null,
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:administrative": "",
+    "category:agriculture": "",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Comunicacions",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Cultura",
    "category:culture_religion": "Cultura i religió",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
-    "category:education": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
+    "category:education": "",
    "category:emergency": "Serveis d'emergència",
-    "category:financial": null,
+    "category:financial": "",
    "category:gastro-smoking": "",
-    "category:gastro": null,
-    "category:health": null,
-    "category:hiking_routes": null,
-    "category:historic": null,
-    "category:index": null,
+    "category:gastro": "",
+    "category:health": "",
+    "category:hiking_routes": "",
+    "category:historic": "",
+    "category:index": "",
    "category:internet": "Accés a Internet",
-    "category:leisure": null,
-    "category:military": null,
-    "category:natural": null,
-    "category:other": null,
-    "category:phone": null,
-    "category:places": null,
-    "category:places_geo": null,
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
-    "category:pt_stops": null,
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
-    "category:religion": null,
-    "category:residential": null,
-    "category:resources": null,
-    "category:shop": null,
-    "category:sport": null,
-    "category:tourism_attractions": null,
-    "category:tourism_services": null,
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:leisure": "",
+    "category:military": "",
+    "category:natural": "",
+    "category:other": "",
+    "category:phone": "",
+    "category:places": "",
+    "category:places_geo": "",
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power": "",
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
+    "category:pt_stops": "",
+    "category:public": "",
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
+    "category:religion": "",
+    "category:residential": "",
+    "category:resources": "",
+    "category:shop": "",
+    "category:sport": "",
+    "category:tourism_attractions": "",
+    "category:tourism_services": "",
+    "category:transport_alternative": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Oci, esport i compres",
    "category:services": "Serveis"
 }
--- a/lang/cs.json
+++ b/lang/cs.json
@ -3,27 +3,27 @@
    "category:agriculture": "Zemědělství",
    "category:alternative_amenities": "Občanská vybavenost",
    "category:alternative_routes": "Trasy cest",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Občasnká vybavenost",
    "category:car_furniture": "Pouliční přislušenství",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Komunikace",
    "category:construction": "Staveniště",
    "category:craft": "",
    "category:culture": "Kultura",
    "category:culture_religion": "Kultura",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Vzdělávací služby",
    "category:emergency": "Pohotovostní služby",
    "category:financial": "Finanční služby",
    "category:gastro-smoking": "",
    "category:gastro": "Stravování",
    "category:health": "Zdravotnictví",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Historické",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Přístup k internetu",
    "category:leisure": "Volný čas",
    "category:military": "Vojenské",
@ -36,11 +36,11 @@
    "category:post": "Poštovní služby",
    "category:power": "Elektřina",
    "category:pt_amenities": "Občanská vybavenost",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Zastávky & Stanice",
    "category:public": "Veřejné služby",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Religion",
    "category:residential": "Obytné oblasti",
    "category:resources": "Těžba surovin",
@ -49,12 +49,11 @@
    "category:tourism_attractions": "Turistika",
    "category:tourism_services": "Turistika",
    "category:transport_alternative": "Alternativní (Cyklistika, Pěší turistika, ...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "Nakládání s odpady",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "Továrny",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "Volný čas, sporty a nákupy",
    "category:railway": "Železnice",
    "category:services": "Služby",
--- a/lang/de.json
+++ b/lang/de.json
@ -23,7 +23,7 @@
    "category:health": "Gesundheitsdienste",
    "category:hiking_routes": "Wanderrouten",
    "category:historic": "Geschichte",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Internetzugang",
    "category:leisure": "Freizeit",
    "category:military": "Militär",
@ -48,13 +48,12 @@
    "category:sport": "Sport",
    "category:tourism_attractions": "Tourismus",
    "category:tourism_services": "Tourismus",
-    "category:transport_alternative": null,
+    "category:transport_alternative": "",
    "category:walk_amenities": "Einrichtungen",
    "category:waste": "Entsorgung",
    "category:water": "Gewässer",
    "category:wikipedia": "Wikipedia",
    "category:works": "Fabriken",
-    "category:cycle_infrastructure": "Radwege",
    "category:infrastructure": "Infrastruktur",
    "category:leisure_sport_shopping": "Freizeit, Sport und Einkauf",
    "category:railway": "Eisenbahn",
--- a/lang/el.json
+++ b/lang/el.json
@ -1,60 +1,59 @@
 {
    "category:administrative": "Διοικητικά Όρια",
    "category:agriculture": "Γεωργία",
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Επικοινωνίες",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Πολιτισμός",
    "category:culture_religion": "Πολιτισμός",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Υπηρεσίες Εκπαίδευσης",
    "category:emergency": "Υπηρεσίες Έκτακτης Ανάγκης",
    "category:financial": "Χρήμα",
    "category:gastro-smoking": "",
    "category:gastro": "Γαστρονομία",
    "category:health": "Υγεία",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Ιστορικά",
-    "category:index": null,
-    "category:internet": null,
+    "category:index": "",
+    "category:internet": "",
    "category:leisure": "Αναψυχή",
    "category:military": "Στρατιωτικό",
    "category:natural": "Φυσικοί Σχηματισμοί",
-    "category:other": null,
-    "category:phone": null,
+    "category:other": "",
+    "category:phone": "",
    "category:places": "Μέρη",
    "category:places_geo": "Μέρη",
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power": "",
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
    "category:pt_stops": "Στάσεις & Σταθμοί",
    "category:public": "Δημόσιες Υπηρεσίες",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Θρησκεία",
    "category:residential": "Περιοχές Κατοικίας",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "Αγορές",
    "category:sport": "Άθληση",
    "category:tourism_attractions": "Τουρισμός",
    "category:tourism_services": "Τουρισμός",
    "category:transport_alternative": "Εναλλακτικά (ποδηλασία, ορειβασία,...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Αναψυχή, Αθλητισμός και Αγορές",
    "category:services": "Υπηρεσίες",
    "category:transport": "Μεταφορές",
--- a/lang/en.json
+++ b/lang/en.json
@ -23,7 +23,7 @@
    "category:health": "Health",
    "category:hiking_routes": "Hiking routes",
    "category:historic": "Historic",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Internet access",
    "category:leisure": "Leisure",
    "category:military": "Military",
@ -48,13 +48,12 @@
    "category:sport": "Sport",
    "category:tourism_attractions": "Tourism",
    "category:tourism_services": "Tourism",
-    "category:transport_alternative": null,
+    "category:transport_alternative": "",
    "category:walk_amenities": "Amenities",
    "category:waste": "Disposal",
    "category:water": "Waterbodies",
    "category:wikipedia": "Wikipedia",
    "category:works": "Works",
-    "category:cycle_infrastructure": "Cycleways",
    "category:infrastructure": "Infrastructure",
    "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
    "category:railway": "Railway",
--- a/lang/es.json
+++ b/lang/es.json
@ -1,60 +1,59 @@
 {
-    "category:administrative": null,
-    "category:agriculture": null,
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
-    "category:communication": null,
-    "category:construction": null,
+    "category:administrative": "",
+    "category:agriculture": "",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
+    "category:communication": "",
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Cultura",
    "category:culture_religion": "Cultura y religión",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
-    "category:education": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
+    "category:education": "",
    "category:emergency": "Servicios de emergencia",
-    "category:financial": null,
+    "category:financial": "",
    "category:gastro-smoking": "",
-    "category:gastro": null,
-    "category:health": null,
-    "category:hiking_routes": null,
-    "category:historic": null,
-    "category:index": null,
+    "category:gastro": "",
+    "category:health": "",
+    "category:hiking_routes": "",
+    "category:historic": "",
+    "category:index": "",
    "category:internet": "Acceso a Internet",
-    "category:leisure": null,
-    "category:military": null,
-    "category:natural": null,
-    "category:other": null,
-    "category:phone": null,
-    "category:places": null,
-    "category:places_geo": null,
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
+    "category:leisure": "",
+    "category:military": "",
+    "category:natural": "",
+    "category:other": "",
+    "category:phone": "",
+    "category:places": "",
+    "category:places_geo": "",
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power": "",
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
    "category:pt_stops": "Paradas y estaciones",
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
-    "category:religion": null,
-    "category:residential": null,
-    "category:resources": null,
-    "category:shop": null,
-    "category:sport": null,
-    "category:tourism_attractions": null,
-    "category:tourism_services": null,
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:public": "",
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
+    "category:religion": "",
+    "category:residential": "",
+    "category:resources": "",
+    "category:shop": "",
+    "category:sport": "",
+    "category:tourism_attractions": "",
+    "category:tourism_services": "",
+    "category:transport_alternative": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Ocio, deporte y compras",
    "category:services": "Servicios"
 }
--- a/lang/et.json
+++ b/lang/et.json
@ -1,60 +1,59 @@
 {
    "category:administrative": "Administratiivalad",
    "category:agriculture": "Põllumajandus",
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Kommunikatsioon",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Kultuur",
    "category:culture_religion": "Kultuur ja religioon",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Haridusteenused",
    "category:emergency": "Hädaabi teenused",
-    "category:financial": null,
+    "category:financial": "",
    "category:gastro-smoking": "",
-    "category:gastro": null,
-    "category:health": null,
-    "category:hiking_routes": null,
+    "category:gastro": "",
+    "category:health": "",
+    "category:hiking_routes": "",
    "category:historic": "Ajalooline",
-    "category:index": null,
-    "category:internet": null,
-    "category:leisure": null,
-    "category:military": null,
-    "category:natural": null,
+    "category:index": "",
+    "category:internet": "",
+    "category:leisure": "",
+    "category:military": "",
+    "category:natural": "",
    "category:other": "Ülejäänud",
    "category:phone": "Telefon",
    "category:places": "Kohad",
    "category:places_geo": "Kohad",
    "category:playgrounds": "Mänguväljak",
-    "category:post": null,
+    "category:post": "",
    "category:power": "Elekter",
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
-    "category:pt_stops": null,
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
+    "category:pt_stops": "",
    "category:public": "Kommunaalteenused",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Religioon",
    "category:residential": "Elamupiirkonnad",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "Ostmine",
-    "category:sport": null,
+    "category:sport": "",
    "category:tourism_attractions": "Turism",
    "category:tourism_services": "Turism",
    "category:transport_alternative": "Alternatiivne (jalgrattasõit, matkamine, ...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Vaba aeg, sport ja ostmine",
    "category:railway": "Raudtee",
    "category:services": "Teenused",
--- a/lang/fr.json
+++ b/lang/fr.json
@ -23,7 +23,7 @@
    "category:health": "Santé",
    "category:hiking_routes": "Itinéraires pédestres",
    "category:historic": "Histoire",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Internet",
    "category:leisure": "Loisirs",
    "category:military": "Militaire",
@ -33,7 +33,7 @@
    "category:places": "Lieux",
    "category:places_geo": "Lieux",
    "category:playgrounds": "Jeux pour enfants",
-    "category:post": null,
+    "category:post": "",
    "category:power": "Énergie",
    "category:pt_amenities": "Équipements",
    "category:pt_routes": "Lignes",
@ -54,7 +54,6 @@
    "category:water": "Hydrographie",
    "category:wikipedia": "Wikipédia",
    "category:works": "Zones industrielles",
-    "category:cycle_infrastructure": "Infrastructures vélo",
    "category:infrastructure": "Infrastructures",
    "category:leisure_sport_shopping": "Loisirs",
    "category:railway": "Chemins de fer",
--- a/lang/hu.json
+++ b/lang/hu.json
@ -1,60 +1,59 @@
 {
    "category:administrative": "Adminisztratív határok",
    "category:agriculture": "Mezőgazdaság",
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Kommunikácó",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Kultúra",
    "category:culture_religion": "Kultúra",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
-    "category:education": null,
-    "category:emergency": null,
-    "category:financial": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
+    "category:education": "",
+    "category:emergency": "",
+    "category:financial": "",
    "category:gastro-smoking": "",
    "category:gastro": "Gasztronómia",
-    "category:health": null,
-    "category:hiking_routes": null,
+    "category:health": "",
+    "category:hiking_routes": "",
    "category:historic": "Historikus",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Internethozzáférés",
-    "category:leisure": null,
+    "category:leisure": "",
    "category:military": "Katonai",
    "category:natural": "Természeti képződmények",
    "category:other": "Egyéb",
    "category:phone": "Telefon",
    "category:places": "Helyek",
    "category:places_geo": "Helyek",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
    "category:post": "Posta",
    "category:power": "Áramellátás",
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
    "category:pt_stops": "Megállók és állomások",
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:public": "",
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Vallás",
    "category:residential": "Lakóövezetek",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "Vásárlás",
    "category:sport": "Sport",
    "category:tourism_attractions": "Túrizmus",
    "category:tourism_services": "Túrizmus",
    "category:transport_alternative": "Alternatív (Krékpár, Túra)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Szabadidő",
    "category:railway": "Vasút",
    "category:services": "Szolgáltatás",
--- a/lang/it.json
+++ b/lang/it.json
@ -3,44 +3,44 @@
    "category:agriculture": "Agricoltura",
    "category:alternative_amenities": "Infrastrutture",
    "category:alternative_routes": "Itinerari segnalati",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Infrastrutture",
    "category:car_furniture": "Dotazioni stradali",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Communicazioni",
    "category:construction": "Cantieri",
    "category:craft": "",
    "category:culture": "Cultura",
    "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Istruzione",
    "category:emergency": "Servizi d'emergenza",
    "category:financial": "Finanze",
    "category:gastro-smoking": "",
    "category:gastro": "Gastronomia",
    "category:health": "Sanità",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Storia",
-    "category:index": null,
-    "category:internet": null,
+    "category:index": "",
+    "category:internet": "",
    "category:leisure": "Tempo libero",
    "category:military": "Militare",
    "category:natural": "Natura",
    "category:other": "Altri",
-    "category:phone": null,
+    "category:phone": "",
    "category:places": "Luoghi",
    "category:places_geo": "Luoghi",
-    "category:playgrounds": null,
-    "category:post": null,
+    "category:playgrounds": "",
+    "category:post": "",
    "category:power": "Energia",
    "category:pt_amenities": "Infrastrutture",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Stazioni e fermate",
    "category:public": "Servizi pubblici",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Religione",
    "category:residential": "Aree residenziali",
    "category:resources": "Areee estrattive",
@ -49,12 +49,11 @@
    "category:tourism_attractions": "Turismo",
    "category:tourism_services": "Turismo",
    "category:transport_alternative": "Alternativi (bicicletta, camminate, ...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "Smaltimento",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "Fabbriche",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "Tempo libero, sport e shopping",
    "category:railway": "Ferrovie",
    "category:services": "Servizi",
--- a/lang/ja.json
+++ b/lang/ja.json
@ -1,29 +1,29 @@
 {
-    "category:administrative": null,
+    "category:administrative": "",
    "category:agriculture": "農業",
    "category:alternative_amenities": "生活環境",
    "category:alternative_routes": "ルート",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "生活環境",
    "category:car_furniture": "街路設置公共物",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "交流",
    "category:construction": "工事中",
    "category:craft": "",
    "category:culture": "文化",
    "category:culture_religion": "文化",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "教育サービス",
    "category:emergency": "緊急サービス",
    "category:financial": "金融",
    "category:gastro-smoking": "",
    "category:gastro": "食べ物",
    "category:health": "健康",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "記念",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "インターネット接続",
    "category:leisure": "レジャー",
    "category:military": "軍事",
@ -32,29 +32,28 @@
    "category:phone": "電話",
    "category:places": "場所",
    "category:places_geo": "場所",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
    "category:post": "郵便",
    "category:power": "電力",
    "category:pt_amenities": "生活環境",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "停留所と駅",
    "category:public": "公共サービス",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "宗教",
    "category:residential": "住居エリア",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "ショッピング",
    "category:sport": "スポーツ",
    "category:tourism_attractions": "観光",
    "category:tourism_services": "観光",
    "category:transport_alternative": "その他交通 (サイクリング、ハイキング、...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "処理場",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "工場",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "レジャー",
    "category:railway": "鉄道",
    "category:services": "サービス",
--- a/lang/nl.json
+++ b/lang/nl.json
@ -3,27 +3,27 @@
    "category:agriculture": "Landbouw",
    "category:alternative_amenities": "Voorzieningen",
    "category:alternative_routes": "Alternatieve routes",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Voorzieningen",
    "category:car_furniture": "Straatmeubilair",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Communicatie",
    "category:construction": "Bouwterrein",
    "category:craft": "",
    "category:culture": "Cultuur",
    "category:culture_religion": "Cultuur",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Onderwijs",
    "category:emergency": "Hulpdiensten",
    "category:financial": "Financieel",
    "category:gastro-smoking": "",
    "category:gastro": "Gastronomie",
    "category:health": "Gezondheid",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Historisch",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Internettoegang",
    "category:leisure": "Vrije tijd",
    "category:military": "Militair",
@ -32,15 +32,15 @@
    "category:phone": "Telefonie",
    "category:places": "Plaatsen",
    "category:places_geo": "Plaatsen",
-    "category:playgrounds": null,
+    "category:playgrounds": "",
    "category:post": "Post",
    "category:power": "Stroomvoorziening",
    "category:pt_amenities": "Voorzieningen",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Haltes en Stations",
    "category:public": "Openbare diensten",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Religie",
    "category:residential": "Woongebieden",
    "category:resources": "Grondstoffenwinning",
@ -49,12 +49,11 @@
    "category:tourism_attractions": "Toerisme",
    "category:tourism_services": "Toerisme",
    "category:transport_alternative": "Alternatief (Fiets, Wandel, ...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "Afvalverwijdering",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "Fabrieken",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "Vrije tijd, Sport en Winkelen",
    "category:railway": "Spoorwegen",
    "category:services": "Dienstverlening",
--- a/lang/pl.json
+++ b/lang/pl.json
@ -1,60 +1,59 @@
 {
-    "category:administrative": null,
-    "category:agriculture": null,
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
+    "category:administrative": "",
+    "category:agriculture": "",
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
    "category:car_furniture": "Elementy drogowe",
-    "category:car_maxspeed": null,
-    "category:children": null,
-    "category:communication": null,
-    "category:construction": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
+    "category:communication": "",
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Kultura",
    "category:culture_religion": "Kultura",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Edukacyjne",
-    "category:emergency": null,
+    "category:emergency": "",
    "category:financial": "Finasowe",
    "category:gastro-smoking": "",
    "category:gastro": "Gastronomia",
    "category:health": "Zdrowie",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Miejsca Historyczne",
-    "category:index": null,
-    "category:internet": null,
-    "category:leisure": null,
-    "category:military": null,
-    "category:natural": null,
-    "category:other": null,
-    "category:phone": null,
+    "category:index": "",
+    "category:internet": "",
+    "category:leisure": "",
+    "category:military": "",
+    "category:natural": "",
+    "category:other": "",
+    "category:phone": "",
    "category:places": "Miejsca",
    "category:places_geo": "Miejsca",
-    "category:playgrounds": null,
-    "category:post": null,
-    "category:power": null,
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
+    "category:playgrounds": "",
+    "category:post": "",
+    "category:power": "",
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
    "category:pt_stops": "Przystanki i Stacje",
-    "category:public": null,
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
-    "category:religion": null,
-    "category:residential": null,
-    "category:resources": null,
+    "category:public": "",
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
+    "category:religion": "",
+    "category:residential": "",
+    "category:resources": "",
    "category:shop": "Zakupy",
-    "category:sport": null,
+    "category:sport": "",
    "category:tourism_attractions": "Turystyka",
    "category:tourism_services": "Turystyka",
-    "category:transport_alternative": null,
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:transport_alternative": "",
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Wypoczynek, Sport i Zakupy",
    "category:services": "Usługi",
    "category:transport": "Transport",
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@ -23,7 +23,7 @@
    "category:health": "Saúde e Assistência",
    "category:hiking_routes": "Rotas de Caminhada",
    "category:historic": "Histórico",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Acesso à Internet",
    "category:leisure": "Lazer",
    "category:military": "Militar",
@ -48,13 +48,12 @@
    "category:sport": "Esportes",
    "category:tourism_attractions": "Turismo",
    "category:tourism_services": "Turismo",
-    "category:transport_alternative": null,
+    "category:transport_alternative": "",
    "category:walk_amenities": "Equipamentos",
    "category:waste": "Lixo",
    "category:water": "Hidrografia",
    "category:wikipedia": "Wikipédia",
    "category:works": "Fábricas",
-    "category:cycle_infrastructure": "Ciclovias",
    "category:infrastructure": "Infraestrutura",
    "category:leisure_sport_shopping": "Lazer, Esportes e Compras",
    "category:railway": "Ferrovia",
--- a/lang/pt.json
+++ b/lang/pt.json
@ -23,7 +23,7 @@
    "category:health": "Saúde",
    "category:hiking_routes": "Rotas de caminhada",
    "category:historic": "Histórico",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Acesso à Internet",
    "category:leisure": "Lazer",
    "category:military": "Militar",
@ -48,13 +48,12 @@
    "category:sport": "Desporto",
    "category:tourism_attractions": "Turismo",
    "category:tourism_services": "Turismo",
-    "category:transport_alternative": null,
+    "category:transport_alternative": "",
    "category:walk_amenities": "",
    "category:waste": "Lixo",
    "category:water": "Massas de água",
    "category:wikipedia": "Wikipédia",
    "category:works": "Fábricas",
-    "category:cycle_infrastructure": "Ciclovias",
    "category:infrastructure": "Infraestrutura",
    "category:leisure_sport_shopping": "Lazer, desporto e compras",
    "category:railway": "Linhas ferroviárias",
--- a/lang/ro.json
+++ b/lang/ro.json
@ -1,60 +1,59 @@
 {
    "category:administrative": "Zona administrativa",
    "category:agriculture": "Agricultura",
-    "category:alternative_amenities": null,
-    "category:alternative_routes": null,
-    "category:buildings": null,
-    "category:car_amenities": null,
-    "category:car_furniture": null,
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:alternative_amenities": "",
+    "category:alternative_routes": "",
+    "category:buildings": "",
+    "category:car_amenities": "",
+    "category:car_furniture": "",
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Comunicatii",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Cultura",
    "category:culture_religion": "Cultura",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Servicii educatie",
    "category:emergency": "Servicii urgenta",
    "category:financial": "Financiar",
    "category:gastro-smoking": "",
    "category:gastro": "Gastronomie",
    "category:health": "Sanatate",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Istoric",
-    "category:index": null,
+    "category:index": "",
    "category:internet": "Acces internet",
    "category:leisure": "Timp liber",
    "category:military": "Militar",
-    "category:natural": null,
+    "category:natural": "",
    "category:other": "Altele",
    "category:phone": "Telefon",
    "category:places": "Locuri",
    "category:places_geo": "Locuri",
    "category:playgrounds": "Loc de joaca",
-    "category:post": null,
+    "category:post": "",
    "category:power": "Energie",
-    "category:pt_amenities": null,
-    "category:pt_routes": null,
-    "category:pt_stops": null,
+    "category:pt_amenities": "",
+    "category:pt_routes": "",
+    "category:pt_stops": "",
    "category:public": "Servicii publice",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Religie",
    "category:residential": "Zona rezidentiala",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "Cumpărături",
-    "category:sport": null,
+    "category:sport": "",
    "category:tourism_attractions": "Turism",
    "category:tourism_services": "Turism",
    "category:transport_alternative": "Alternativ(Bicicleta,Drumetii)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Timp liber, Sport si Cumparaturi",
    "category:services": "Servicii",
    "category:transport": "Transport",
--- a/lang/ru.json
+++ b/lang/ru.json
@ -3,44 +3,44 @@
    "category:agriculture": "Сельское хозяйство",
    "category:alternative_amenities": "Полезные места",
    "category:alternative_routes": "Маршруты",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Обслуживание транспорта",
    "category:car_furniture": "Элементы дороги",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Услуги связи",
    "category:construction": "Места строительства",
    "category:craft": "",
    "category:culture": "Культура",
    "category:culture_religion": "Культура",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Образование",
    "category:emergency": "Экстренные службы",
    "category:financial": "Финансы",
    "category:gastro-smoking": "",
    "category:gastro": "Общепит",
    "category:health": "Медицина",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Историческое",
-    "category:index": null,
-    "category:internet": null,
+    "category:index": "",
+    "category:internet": "",
    "category:leisure": "Досуг",
    "category:military": "Вооружённые силы",
    "category:natural": "Природные образования",
    "category:other": "Прочее",
-    "category:phone": null,
+    "category:phone": "",
    "category:places": "Места",
    "category:places_geo": "Места",
-    "category:playgrounds": null,
-    "category:post": null,
+    "category:playgrounds": "",
+    "category:post": "",
    "category:power": "Энергетика",
    "category:pt_amenities": "Транспортные принадлежности",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Остановки и станции",
    "category:public": "Общественные места",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Религия",
    "category:residential": "Жилые районы",
    "category:resources": "Добыча ресурсов",
@ -49,12 +49,11 @@
    "category:tourism_attractions": "Туризм",
    "category:tourism_services": "Туризм",
    "category:transport_alternative": "Альтернативное передвижение (Велоспорт, Пешие прогулки, ...)",
-    "category:walk_amenities": null,
+    "category:walk_amenities": "",
    "category:waste": "Переработка отходов",
-    "category:water": null,
-    "category:wikipedia": null,
+    "category:water": "",
+    "category:wikipedia": "",
    "category:works": "Промышленность",
-    "category:cycle_infrastructure": null,
    "category:leisure_sport_shopping": "Досуг",
    "category:railway": "Железные дороги",
    "category:services": "Услуги",
--- a/lang/template.json
+++ b/lang/template.json
@ -53,16 +53,5 @@
    "category:waste": "",
    "category:water": "",
    "category:wikipedia": "",
-    "category:works": "",
-    "category:cycle_infrastructure": "",
-    "category:infrastructure": "",
-    "category:leisure_sport_shopping": "",
-    "category:railway": "",
-    "category:services": "",
-    "category:special": "",
-    "category:transport": "",
-    "category:transport_car": "",
-    "category:transport_cycle": "",
-    "category:transport_pt": "",
-    "category:transport_walk": ""
+    "category:works": ""
 }
--- a/lang/uk.json
+++ b/lang/uk.json
@ -1,60 +1,59 @@
 {
-    "category:administrative": null,
-    "category:agriculture": null,
+    "category:administrative": "",
+    "category:agriculture": "",
    "category:alternative_amenities": "Amenities",
    "category:alternative_routes": "Маршрути",
-    "category:buildings": null,
+    "category:buildings": "",
    "category:car_amenities": "Amenities",
    "category:car_furniture": "Street Furniture",
-    "category:car_maxspeed": null,
-    "category:children": null,
+    "category:car_maxspeed": "",
+    "category:children": "",
    "category:communication": "Телекомунікації",
-    "category:construction": null,
+    "category:construction": "",
    "category:craft": "",
    "category:culture": "Культура ",
    "category:culture_religion": "Культура ",
-    "category:cycle_amenities": null,
-    "category:cycle_routes": null,
+    "category:cycle_amenities": "",
+    "category:cycle_routes": "",
    "category:education": "Освіта",
    "category:emergency": "Швидка допомога",
    "category:financial": "Фінанси",
    "category:gastro-smoking": "",
    "category:gastro": "Гастрономія",
    "category:health": "Здоров'я",
-    "category:hiking_routes": null,
+    "category:hiking_routes": "",
    "category:historic": "Історія",
-    "category:index": null,
-    "category:internet": null,
+    "category:index": "",
+    "category:internet": "",
    "category:leisure": "Дозвілля",
-    "category:military": null,
+    "category:military": "",
    "category:natural": "Природне середовище",
    "category:other": "Інше",
-    "category:phone": null,
+    "category:phone": "",
    "category:places": "Місцевість",
    "category:places_geo": "Місцевість",
    "category:playgrounds": "Дитячий майданчик",
-    "category:post": null,
-    "category:power": null,
+    "category:post": "",
+    "category:power": "",
    "category:pt_amenities": "Amenities",
-    "category:pt_routes": null,
+    "category:pt_routes": "",
    "category:pt_stops": "Зупинки та станції",
    "category:public": "Громадські місця",
-    "category:railway-electrification": null,
-    "category:railway-infrastructure": null,
+    "category:railway-electrification": "",
+    "category:railway-infrastructure": "",
    "category:religion": "Релігія",
    "category:residential": "Житлова зона",
-    "category:resources": null,
+    "category:resources": "",
    "category:shop": "Торгівля",
    "category:sport": "Спорт. Інше.",
    "category:tourism_attractions": "Туризм",
    "category:tourism_services": "Туризм",
    "category:transport_alternative": "Інші (Велосипедні, піші, ...)",
-    "category:walk_amenities": null,
-    "category:waste": null,
-    "category:water": null,
-    "category:wikipedia": null,
-    "category:works": null,
-    "category:cycle_infrastructure": null,
+    "category:walk_amenities": "",
+    "category:waste": "",
+    "category:water": "",
+    "category:wikipedia": "",
+    "category:works": "",
    "category:leisure_sport_shopping": "Дозвілля",
    "category:services": "Послуги",
    "category:transport": "Транспорт",
--- a/railway-electrification.json
+++ b/railway-electrification.json
@ -39,12 +39,12 @@
        ],
        "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}",
        "description": [
-            "{{ tagTrans('railway', tags.railway) }} -",
+            "{{ tagTrans('railway', tags.railway) }}",
            "",
            "{% if tags.electrified == 'no' %}",
-            "  {{ trans('not electrified') }}",
+            "  - {{ tagTrans('electrified', 'no') }}",
            "{% elseif tags.electrified %}",
-            "  {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz",
+            "  - {{ tags.voltage|default(trans('unknown')) }}V, {{ tags.frequency|default(trans('unknown')) }}Hz",
            "{% endif %}"
        ],
        "body": [
--- a/railway-infrastructure.json
+++ b/railway-infrastructure.json
@ -14,14 +14,21 @@
    },
    "feature": {
        "title": "{% if tags.ref %}{{ localizedTag(tags, 'ref') }} - {% endif %}{{ localizedTag(tags, 'name')|default(localizedTag(tags, 'operator'))|default(trans('unnamed')) }}",
-        "description": "{{ tagTrans('railway', tags.railway) }}",
+        "description": [
+            "{{ tagTrans('railway', tags.railway) -}}",
+            "{%- if tags.usage %}",
+            ", {{ tagTrans('railway=rail usage', tags.usage) }}",
+            "{% endif -%}",
+            "{%- if tags.service %}",
+            ", {{ tagTrans('railway=rail service', tags.service) }}",
+            "{% endif -%}"
+        ],
        "body": [
            "{% if tags.operator %}{{ keyTrans('operator') }}: {{ localizedTag(tags, 'operator') }}<br>{% endif %}",
-            "{% if tags.usage %}{{ keyTrans('usage') }}: {{ tagTrans('usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}",
-            "{% if tags.service %}{{ keyTrans('service') }}: {{ tagTrans('service', tags.service ) }}<br/>{% endif %}",
+            "{% if tags.usage %}{{ keyTrans('railway=rail usage') }}: {{ tagTrans('railway=rail usage', tags.usage)|default(trans('unknown')) }}<br/>{% endif %}",
+            "{% if tags.service %}{{ keyTrans('railway=rail service') }}: {{ tagTrans('railway=rail service', tags.service ) }}<br/>{% endif %}",
            "{{ keyTrans('gauge') }}: {{ tags.gauge|default(trans('unknown')) }}<br/>",
-            "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}",
-            ""
+            "{% if tags.electrified == 'no' %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', 'no') }}{% elseif tags.electrified %}{{ keyTrans('electrified') }}: {{ tagTrans('electrified', tags.electrified) }}, {{ keyTrans('voltage') }}: {{ tags.voltage|default(trans('unknown')) }}, {{ keyTrans('frequency') }}: {{ tags.frequency|default(trans('unknown')) }}<br/>{% endif %}"
        ],
        "markerSign": "{% if tags.railway in [ 'halt', 'tram_stop', 'station', 'stop', 'subway_entrance' ] %}X{% endif %}",
        "markerSymbol": [
@ -145,4 +152,4 @@
        "{% endif %}",
        "</table>"
    ]
-}
+}