v6.0.0 release candidate 1

Signed-off-by: Martin Raifer <martin@raifer.tech>

CHANGELOG.md

@@ -7,6 +7,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 <!--
 # A.B.C
+##### YYYY-MMM-DD
+
 #### :mega: Release Highlights
 #### New Presets
 #### Changed Presets
@@ -17,6 +19,56 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 6.0.0-rc.1
+##### 2023-Jan-30
+
+#### Schema Changes
+* Upgrade to the schema-builder [version 6](https://github.com/ideditor/schema-builder/blob/main/CHANGELOG.md#600)
+  * :warning: Field type `cycleway` is replaced with new `directionalCombo` field
+  * :warning: Adds new `date` field type
+  * :warning: Introduces the use of icons from the [Röntgen icon set](https://github.com/enzet/map-machine#r%C3%B6ntgen-icon-set)
+  * Allows to specify icons for values of combo fields
+#### New Presets
+* Add most popular alternative medicine practitioners ([#731], thanks [@westnordost])
+#### Changed Presets
+* Make natural wood points unsearchable ([#755], thanks [@arch0345])
+* Rename `attraction=big_wheel` to Ferris Wheel
+* Use Rötgen icons for crane types
+* Allow to specify Therapist offices more precisely by adding `healthcare` fields
+* Add `crossing:markings=yes` as the default value to any newly created Marked Crossings (leave existing objects with `crossing=uncontrolled` as they are)
+#### New and Changed Fields
+* Switch type of various fields to `date`: `check_date`, `opening_date`, `start_date`, `survey:date`, `wreck:date_sunk`
+* Add translatable strings for the fields `substance` ([#737]), `material` ([#735]), `memorial` ([#734]), `barrier type` ([#709]), `archaeological_site` ([#707]), `bath:type` ([#742]), `sport` ([#747]), `attraction` ([#756]), `waste` ([#758]), `office` ([#761]), `resource` ([#760]) (thanks [@kjonosm])
+* Add fields for `parking:both|left|right` and `parking:both|left|right:orientation` ([#744])
+* Add more options to the `parking` field: `on_kerb`, `half_on_kerb` and `shoulder` ([#672])
+* Add field for `lift_gate:type` ([#711], thanks [@arch0345])
+* Add fields `tents`, `caravans`, `static_caravans`, `picnic_table`, and `nudism` to Camp Site preset ([#749], [#750], [#750], [#751], [#752], thanks [@kjonosm])
+* Use Rötgen icons for crane types
+* Specify icons for crossing markings
+
+[#672]: https://github.com/openstreetmap/id-tagging-schema/pull/672
+[#707]: https://github.com/openstreetmap/id-tagging-schema/pull/707
+[#709]: https://github.com/openstreetmap/id-tagging-schema/pull/709
+[#711]: https://github.com/openstreetmap/id-tagging-schema/pull/711
+[#731]: https://github.com/openstreetmap/id-tagging-schema/pull/731
+[#732]: https://github.com/openstreetmap/id-tagging-schema/pull/732
+[#734]: https://github.com/openstreetmap/id-tagging-schema/pull/734
+[#735]: https://github.com/openstreetmap/id-tagging-schema/pull/735
+[#737]: https://github.com/openstreetmap/id-tagging-schema/pull/737
+[#742]: https://github.com/openstreetmap/id-tagging-schema/pull/742
+[#744]: https://github.com/openstreetmap/id-tagging-schema/pull/744
+[#747]: https://github.com/openstreetmap/id-tagging-schema/pull/747
+[#749]: https://github.com/openstreetmap/id-tagging-schema/pull/749
+[#750]: https://github.com/openstreetmap/id-tagging-schema/pull/750
+[#751]: https://github.com/openstreetmap/id-tagging-schema/pull/751
+[#752]: https://github.com/openstreetmap/id-tagging-schema/pull/752
+[#755]: https://github.com/openstreetmap/id-tagging-schema/pull/755
+[#756]: https://github.com/openstreetmap/id-tagging-schema/pull/756
+[#758]: https://github.com/openstreetmap/id-tagging-schema/pull/758
+[#760]: https://github.com/openstreetmap/id-tagging-schema/pull/760
+[#761]: https://github.com/openstreetmap/id-tagging-schema/pull/761
+
+
 # 5.2.1
 
 #### Bugfixes
@@ -41,8 +93,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Add preset for residential gardens ([#714], thanks [@mikaeldui])
 * Add specialized presets for common physicians ([#718], thanks [@westnordost])
 #### Changed Presets
-* add seamark tags to marine fuel & sewerage presets ([#663], thanks [@k-yle])
-* add `direction` field to presets for `railway=derail` and `aeroway=holding_position` ([#665], thanks [@k-yle])
+* Add seamark tags to marine fuel & sewerage presets ([#663], thanks [@k-yle])
+* Add `direction` field to presets for `railway=derail` and `aeroway=holding_position` ([#665], thanks [@k-yle])
 * Restrict (most) Traffic Calming presets to vertices
 * Add oneway field to cycleway crossing presets ([#667], [#668], thanks [@kjonosm])
 * Add "GNIS Feature ID" field to waterway relation preset ([#687])
@@ -81,8 +133,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#669]: https://github.com/openstreetmap/id-tagging-schema/pull/669
 [#677]: https://github.com/openstreetmap/id-tagging-schema/issues/677
 [#679]: https://github.com/openstreetmap/id-tagging-schema/pull/679
-[#686]: https://github.com/openstreetmap/id-tagging-schema/issues/686
 [#684]: https://github.com/openstreetmap/id-tagging-schema/pull/684
+[#686]: https://github.com/openstreetmap/id-tagging-schema/issues/686
 [#687]: https://github.com/openstreetmap/id-tagging-schema/issues/687
 [#688]: https://github.com/openstreetmap/id-tagging-schema/issues/688
 [#689]: https://github.com/openstreetmap/id-tagging-schema/pull/689
@@ -179,7 +231,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 # 5.0.0
 
 #### Schema Changes
-* Upgrade to the schema-build version 5 ([#598])
+* Upgrade to the schema-builder version 5 ([#598])
   * :warning: Introduces a new `colour` field type
   * :warning: Allows to cross-reference strings in presets and fields
 #### New Presets

dist/fields.json

@@ -183,7 +183,22 @@
     },
     "archaeological_site": {
         "key": "archaeological_site",
-        "type": "combo"
+        "type": "combo",
+        "options": [
+            "baths",
+            "city",
+            "crannog",
+            "enclosure",
+            "fortification",
+            "hut_circle",
+            "megalith",
+            "necropolis",
+            "petroglyph",
+            "roman_circus",
+            "roman_villa",
+            "settlement",
+            "tumulus"
+        ]
     },
     "architect": {
         "key": "architect",
@@ -223,7 +238,28 @@
     },
     "attraction": {
         "key": "attraction",
-        "type": "typeCombo"
+        "type": "typeCombo",
+        "options": [
+            "animal",
+            "water_slide",
+            "amusement_ride",
+            "roller_coaster",
+            "carousel",
+            "maze",
+            "summer_toboggan",
+            "big_wheel",
+            "train",
+            "bumper_car",
+            "bungee_jumping",
+            "dark_ride",
+            "drop_tower",
+            "kiddie_ride",
+            "log_flume",
+            "pirate_ship",
+            "river_rafting",
+            "swing_carousel",
+            "alpine_coaster"
+        ]
     },
     "automated": {
         "key": "automated",
@@ -269,7 +305,32 @@
     },
     "barrier": {
         "key": "barrier",
-        "type": "typeCombo"
+        "type": "typeCombo",
+        "options": [
+            "fence",
+            "gate",
+            "wall",
+            "hedge",
+            "kerb",
+            "bollard",
+            "lift_gate",
+            "retaining_wall",
+            "block",
+            "guard_rail",
+            "cycle_barrier",
+            "stile",
+            "entrance",
+            "swing_gate",
+            "cattle_grid",
+            "ditch",
+            "toll_booth",
+            "city_wall",
+            "kissing_gate",
+            "chain",
+            "jersey_barrier",
+            "height_restrictor",
+            "turnstile"
+        ]
     },
     "basin": {
         "key": "basin",
@@ -291,7 +352,14 @@
     },
     "bath/type": {
         "key": "bath:type",
-        "type": "combo"
+        "type": "combo",
+        "options": [
+            "hammam",
+            "hot_spring",
+            "lake",
+            "onsen",
+            "thermal"
+        ]
     },
     "beauty": {
         "key": "beauty",
@@ -548,7 +616,11 @@
     "capacity/caravans": {
         "key": "capacity:caravans",
         "type": "number",
-        "minValue": 0
+        "minValue": 0,
+        "prerequisiteTag": {
+            "key": "caravans",
+            "valueNot": "no"
+        }
     },
     "capacity/disabled_parking": {
         "key": "capacity:disabled",
@@ -569,6 +641,10 @@
             "valueNot": "no"
         }
     },
+    "caravans": {
+        "key": "caravans",
+        "type": "check"
+    },
     "cash_in": {
         "key": "cash_in",
         "type": "check"
@@ -610,7 +686,8 @@
     },
     "check_date": {
         "key": "check_date",
-        "type": "text"
+        "type": "date",
+        "universal": true
     },
     "circumference": {
         "key": "circumference",
@@ -794,6 +871,12 @@
     "crane/type": {
         "key": "crane:type",
         "type": "combo",
+        "icons": {
+            "portal_crane": "roentgen-crane_portal",
+            "gantry_crane": "roentgen-crane_gantry",
+            "tower_crane": "roentgen-crane",
+            "travel_lift": "roentgen-crane_travel_lift"
+        },
         "autoSuggestions": false,
         "customValues": false,
         "options": [
@@ -878,9 +961,31 @@
         "key": "crossing:light",
         "type": "check"
     },
+    "crossing/markings_yes": {
+        "key": "crossing:markings",
+        "type": "combo",
+        "label": "{crossing/markings}",
+        "stringsCrossReference": "{crossing/markings}",
+        "iconsCrossReference": "{crossing/markings}",
+        "default": "yes"
+    },
     "crossing/markings": {
         "key": "crossing:markings",
         "type": "combo",
+        "icons": {
+            "zebra": "iD-crossing_markings-zebra",
+            "lines": "iD-crossing_markings-lines",
+            "ladder": "iD-crossing_markings-ladder",
+            "dots": "iD-crossing_markings-dots",
+            "dashes": "iD-crossing_markings-dashes",
+            "surface": "iD-crossing_markings-surface",
+            "ladder:skewed": "iD-crossing_markings-ladder_skewed",
+            "lines:paired": "iD-crossing_markings-lines_paired",
+            "zebra:double": "iD-crossing_markings-zebra_double",
+            "zebra:paired": "iD-crossing_markings-zebra_paired",
+            "zebra:bicolour": "iD-crossing_markings-zebra_bicolour",
+            "ladder:paired": "iD-crossing_markings-ladder_paired"
+        },
         "options": [
             "zebra",
             "lines",
@@ -966,15 +1071,15 @@
         "caseSensitive": true
     },
     "cycleway": {
+        "key": "cycleway",
         "keys": [
-            "cycleway",
             "cycleway:left",
             "cycleway:right"
         ],
         "reference": {
             "key": "cycleway"
         },
-        "type": "cycleway",
+        "type": "directionalCombo",
         "autoSuggestions": true,
         "options": [
             "no",
@@ -1737,6 +1842,18 @@
         "type": "semiCombo",
         "usage": "changeset"
     },
+    "healthcare_therapist": {
+        "key": "healthcare",
+        "type": "typeCombo",
+        "options": [
+            "physiotherapist",
+            "psychotherapist",
+            "occupational_therapist",
+            "speech_therapist"
+        ],
+        "autoSuggestions": false,
+        "label": "{healthcare}"
+    },
     "healthcare": {
         "key": "healthcare",
         "type": "typeCombo"
@@ -1886,7 +2003,7 @@
     },
     "historic/wreck/date_sunk": {
         "key": "wreck:date_sunk",
-        "type": "text"
+        "type": "date"
     },
     "historic/wreck/visible_at_high_tide": {
         "key": "wreck:visible_at_high_tide",
@@ -2220,6 +2337,18 @@
         "key": "lifeguard",
         "type": "check"
     },
+    "lift_gate/type": {
+        "key": "lift_gate:type",
+        "type": "combo",
+        "reference": {
+            "key": "barrier",
+            "value": "lift_gate"
+        },
+        "options": [
+            "single",
+            "double"
+        ]
+    },
     "line_attachment": {
         "key": "line_attachment",
         "type": "combo"
@@ -2295,7 +2424,31 @@
     },
     "material": {
         "key": "material",
-        "type": "combo"
+        "type": "combo",
+        "options": [
+            "adobe",
+            "aluminium",
+            "brass",
+            "brick",
+            "bronze",
+            "concrete",
+            "dry_stone",
+            "glass",
+            "granite",
+            "iron",
+            "limestone",
+            "marble",
+            "metal",
+            "plastic",
+            "reinforced_conrete",
+            "rock",
+            "sand",
+            "sandstone",
+            "soil",
+            "steel",
+            "stone",
+            "wood"
+        ]
     },
     "mattress": {
         "key": "mattress",
@@ -2364,7 +2517,20 @@
     },
     "memorial": {
         "key": "memorial",
-        "type": "combo"
+        "type": "combo",
+        "options": [
+            "blue_plaque",
+            "bust",
+            "cross",
+            "obelisk",
+            "plaque",
+            "sculpture",
+            "statue",
+            "stele",
+            "stolperstein",
+            "stone",
+            "war_memorial"
+        ]
     },
     "microbrewery": {
         "key": "microbrewery",
@@ -2523,9 +2689,72 @@
         "type": "textarea",
         "universal": true
     },
+    "nudism": {
+        "key": "nudism",
+        "type": "combo",
+        "autoSuggestions": false,
+        "customValues": false,
+        "options": [
+            "customary",
+            "designated",
+            "no",
+            "obligatory",
+            "permissive",
+            "yes"
+        ]
+    },
     "office": {
         "key": "office",
-        "type": "typeCombo"
+        "type": "typeCombo",
+        "options": [
+            "accountant",
+            "adoption_agency",
+            "advertising_agency",
+            "architect",
+            "association",
+            "charity",
+            "company",
+            "construction_company",
+            "consulting",
+            "courier",
+            "coworking",
+            "diplomatic",
+            "educational_institution",
+            "employment_agency",
+            "energy_supplier",
+            "engineer",
+            "estate_agent",
+            "financial",
+            "financial_advisor",
+            "forestry",
+            "foundation",
+            "government",
+            "graphic_design",
+            "guide",
+            "insurance",
+            "it",
+            "lawyer",
+            "logistics",
+            "moving_company",
+            "newspaper",
+            "ngo",
+            "notary",
+            "physician",
+            "political_party",
+            "private_investigator",
+            "property_management",
+            "quango",
+            "religion",
+            "research",
+            "security",
+            "surveyor",
+            "tax_advisor",
+            "telecommunication",
+            "therapist",
+            "travel_agent",
+            "union",
+            "water_utility"
+        ]
     },
     "oneway_yes": {
         "key": "oneway",
@@ -2563,7 +2792,7 @@
     },
     "opening_date": {
         "key": "opening_date",
-        "type": "text"
+        "type": "date"
     },
     "opening_hours": {
         "key": "opening_hours",
@@ -2656,7 +2885,10 @@
             "rooftop",
             "sheds",
             "street_side",
-            "layby"
+            "layby",
+            "on_kerb",
+            "half_on_kerb",
+            "shoulder"
         ]
     },
     "parking/orientation": {
@@ -2669,6 +2901,47 @@
             "perpendicular"
         ]
     },
+    "parking/side/orientation": {
+        "key": "parking:both:orientation",
+        "keys": [
+            "parking:left:orientation",
+            "parking:right:orientation"
+        ],
+        "reference": {
+            "key": "parking:orientation"
+        },
+        "type": "directionalCombo",
+        "autoSuggestions": false,
+        "customValues": false,
+        "options": [
+            "parallel",
+            "diagonal",
+            "perpendicular"
+        ]
+    },
+    "parking/side/parking": {
+        "key": "parking:both",
+        "keys": [
+            "parking:left",
+            "parking:right"
+        ],
+        "reference": {
+            "key": "parking"
+        },
+        "type": "directionalCombo",
+        "autoSuggestions": false,
+        "customValues": false,
+        "options": [
+            "lane",
+            "street_side",
+            "on_kerb",
+            "half_on_kerb",
+            "shoulder",
+            "no",
+            "separate",
+            "yes"
+        ]
+    },
     "payment_multi_fee": {
         "key": "payment:",
         "type": "multiCombo",
@@ -2734,6 +3007,10 @@
         "key": "phone",
         "type": "tel"
     },
+    "picnic_table": {
+        "key": "picnic_table",
+        "type": "check"
+    },
     "pipeline": {
         "key": "pipeline",
         "type": "typeCombo"
@@ -3309,7 +3586,18 @@
     },
     "resource": {
         "key": "resource",
-        "type": "semiCombo"
+        "type": "semiCombo",
+        "options": [
+            "aggregate",
+            "clay",
+            "coal",
+            "gold",
+            "gravel",
+            "iron_ore",
+            "limestone",
+            "peat",
+            "sand"
+        ]
     },
     "restriction": {
         "key": "restriction",
@@ -3778,7 +4066,44 @@
     },
     "sport": {
         "key": "sport",
-        "type": "semiCombo"
+        "type": "semiCombo",
+        "options": [
+            "american_football",
+            "athletics",
+            "badminton",
+            "baseball",
+            "basketball",
+            "beachvolleyball",
+            "boules",
+            "bowls",
+            "climbing",
+            "cricket",
+            "cycling",
+            "equestrian",
+            "fitness",
+            "free_flying",
+            "futsal",
+            "golf",
+            "gymnastics",
+            "handball",
+            "horse_racing",
+            "karting",
+            "motocross",
+            "motor",
+            "netball",
+            "padel",
+            "rugby_union",
+            "running",
+            "shooting",
+            "skateboard",
+            "skiing",
+            "soccer",
+            "softball",
+            "swimming",
+            "table_tennis",
+            "tennis",
+            "volleyball"
+        ]
     },
     "stars": {
         "key": "stars",
@@ -3786,9 +4111,13 @@
     },
     "start_date": {
         "key": "start_date",
-        "type": "text",
+        "type": "date",
         "universal": true
     },
+    "static_caravans": {
+        "key": "static_caravans",
+        "type": "check"
+    },
     "step_count": {
         "key": "step_count",
         "type": "number",
@@ -3876,7 +4205,16 @@
     },
     "substance": {
         "key": "substance",
-        "type": "combo"
+        "type": "combo",
+        "options": [
+            "fuel",
+            "gas",
+            "hot_water",
+            "oil",
+            "rainwater",
+            "sewage",
+            "water"
+        ]
     },
     "substation_pipeline": {
         "key": "substation",
@@ -3996,7 +4334,7 @@
     },
     "survey/date": {
         "key": "survey:date",
-        "type": "text"
+        "type": "date"
     },
     "swimming_pool": {
         "key": "swimming_pool",
@@ -4057,6 +4395,10 @@
         "key": "telecom:medium",
         "type": "combo"
     },
+    "tents": {
+        "key": "tents",
+        "type": "check"
+    },
     "tidal": {
         "key": "tidal",
         "type": "check"
@@ -4461,7 +4803,13 @@
     },
     "waste": {
         "key": "waste",
-        "type": "semiCombo"
+        "type": "semiCombo",
+        "options": [
+            "cigarettes",
+            "dog_excrement",
+            "organic",
+            "trash"
+        ]
     },
     "water_point": {
         "key": "water_point",

dist/presets.json

@@ -7946,6 +7946,7 @@
     "barrier/lift_gate": {
         "icon": "temaki-lift_gate",
         "fields": [
+            "lift_gate/type",
             "access",
             "locked",
             "opening_hours"
@@ -10525,7 +10526,7 @@
         "matchScore": 0.5
     },
     "healthcare/alternative": {
-        "icon": "maki-hospital",
+        "icon": "fas-spa",
         "geometry": [
             "point",
             "area"
@@ -10534,8 +10535,30 @@
             "healthcare": "alternative"
         }
     },
+    "healthcare/alternative/acupuncture": {
+        "icon": "fas-spa",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "acupuncture"
+        }
+    },
+    "healthcare/alternative/ayurveda": {
+        "icon": "temaki-hinduism",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "ayurveda"
+        }
+    },
     "healthcare/alternative/chiropractic": {
-        "icon": "maki-hospital",
+        "icon": "fas-spa",
         "geometry": [
             "point",
             "area"
@@ -10545,6 +10568,50 @@
             "healthcare:speciality": "chiropractic"
         }
     },
+    "healthcare/alternative/homeopathy": {
+        "icon": "fas-spa",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "homeopathy"
+        }
+    },
+    "healthcare/alternative/naturopathy": {
+        "icon": "fas-spa",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "naturopathy"
+        }
+    },
+    "healthcare/alternative/osteopathy": {
+        "icon": "fas-spa",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "osteopathy"
+        }
+    },
+    "healthcare/alternative/traditional_chinese_medicine": {
+        "icon": "fas-spa",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "healthcare": "alternative",
+            "healthcare:speciality": "traditional_chinese_medicine"
+        }
+    },
     "healthcare/audiologist": {
         "icon": "maki-hospital",
         "geometry": [
@@ -10922,10 +10989,16 @@
             "highway": "crossing",
             "crossing": "marked"
         },
+        "addTags": {
+            "highway": "crossing",
+            "crossing": "marked",
+            "crossing:markings": "yes"
+        },
         "reference": {
             "key": "crossing",
             "value": "marked"
         },
+        "name": "{highway/crossing/uncontrolled}",
         "searchable": false
     },
     "highway/crossing/zebra": {
@@ -10948,6 +11021,7 @@
             "key": "crossing",
             "value": "zebra"
         },
+        "name": "{highway/crossing/uncontrolled}",
         "searchable": false
     },
     "highway/crossing/traffic_signals": {
@@ -10985,7 +11059,7 @@
             "crossing",
             "tactile_paving",
             "crossing/island",
-            "crossing/markings",
+            "crossing/markings_yes",
             "crossing_raised"
         ],
         "geometry": [
@@ -11018,6 +11092,11 @@
             "highway": "crossing",
             "crossing": "unmarked"
         },
+        "addTags": {
+            "highway": "crossing",
+            "crossing": "unmarked",
+            "crossing:markings": "no"
+        },
         "reference": {
             "key": "crossing",
             "value": "unmarked"
@@ -11133,11 +11212,18 @@
             "cycleway": "crossing",
             "crossing": "marked"
         },
+        "addTags": {
+            "highway": "cycleway",
+            "cycleway": "crossing",
+            "crossing": "marked",
+            "crossing:markings": "yes"
+        },
         "reference": {
             "key": "crossing",
             "value": "marked"
         },
         "matchScore": 0.95,
+        "name": "{highway/cycleway/crossing/uncontrolled}",
         "searchable": false
     },
     "highway/cycleway/crossing/bicycle_foot": {
@@ -11215,7 +11301,7 @@
             "surface",
             "tactile_paving",
             "crossing/island",
-            "crossing/markings",
+            "crossing/markings_yes",
             "crossing_raised",
             "access"
         ],
@@ -11251,6 +11337,12 @@
             "cycleway": "crossing",
             "crossing": "unmarked"
         },
+        "addTags": {
+            "highway": "cycleway",
+            "cycleway": "crossing",
+            "crossing": "unmarked",
+            "crossing:markings": "no"
+        },
         "reference": {
             "key": "crossing",
             "value": "unmarked"
@@ -11525,10 +11617,17 @@
             "footway": "crossing",
             "crossing": "marked"
         },
+        "addTags": {
+            "highway": "footway",
+            "footway": "crossing",
+            "crossing": "marked",
+            "crossing:markings": "yes"
+        },
         "reference": {
             "key": "crossing",
             "value": "marked"
         },
+        "name": "{highway/footway/crossing/uncontrolled}",
         "searchable": false
     },
     "highway/footway/crossing/zebra": {
@@ -11554,6 +11653,7 @@
             "key": "crossing",
             "value": "zebra"
         },
+        "name": "{highway/footway/crossing/uncontrolled}",
         "searchable": false
     },
     "highway/footway/crossing/traffic_signals": {
@@ -11595,7 +11695,7 @@
             "surface",
             "tactile_paving",
             "crossing/island",
-            "crossing/markings",
+            "crossing/markings_yes",
             "crossing_raised",
             "access"
         ],
@@ -11636,6 +11736,12 @@
             "footway": "crossing",
             "crossing": "unmarked"
         },
+        "addTags": {
+            "highway": "footway",
+            "footway": "crossing",
+            "crossing": "unmarked",
+            "crossing:markings": "no"
+        },
         "reference": {
             "key": "crossing",
             "value": "unmarked"
@@ -11708,6 +11814,8 @@
             "maxweight_bridge",
             "maxwidth",
             "oneway/bicycle",
+            "parking/side/parking",
+            "parking/side/orientation",
             "smoothness",
             "trolley_wire",
             "width"
@@ -12098,6 +12206,8 @@
             "maxweight_bridge",
             "maxwidth",
             "oneway/bicycle",
+            "parking/side/parking",
+            "parking/side/orientation",
             "ref_road_number",
             "smoothness",
             "toll",
@@ -12146,9 +12256,10 @@
             "maxwidth",
             "not/name",
             "oneway/bicycle",
+            "parking/side/parking",
+            "parking/side/orientation",
             "smoothness",
             "toll",
-            "traffic_calming",
             "trolley_wire",
             "width"
         ],
@@ -12238,8 +12349,9 @@
             "maxwidth",
             "not/name",
             "oneway/bicycle",
+            "parking/side/parking",
+            "parking/side/orientation",
             "smoothness",
-            "traffic_calming",
             "trolley_wire",
             "width"
         ],
@@ -12393,8 +12505,9 @@
             "maxweight_bridge",
             "maxwidth",
             "oneway/bicycle",
+            "parking/side/parking",
+            "parking/side/orientation",
             "smoothness",
-            "traffic_calming",
             "trolley_wire",
             "width"
         ],
@@ -16711,7 +16824,7 @@
         }
     },
     "man_made/crane": {
-        "icon": "temaki-crane",
+        "icon": "roentgen-crane",
         "fields": [
             "operator",
             "manufacturer",
@@ -16729,7 +16842,7 @@
         }
     },
     "man_made/crane/gantry_crane": {
-        "icon": "temaki-crane",
+        "icon": "roentgen-crane_gantry",
         "geometry": [
             "point",
             "vertex",
@@ -16745,7 +16858,7 @@
         }
     },
     "man_made/crane/portal_crane": {
-        "icon": "temaki-crane",
+        "icon": "roentgen-crane_portal",
         "geometry": [
             "point",
             "vertex",
@@ -18152,6 +18265,23 @@
             "military": "trench"
         }
     },
+    "natural/wood": {
+        "icon": "maki-park-alt1",
+        "fields": [
+            "name",
+            "leaf_type",
+            "leaf_cycle"
+        ],
+        "moreFields": [
+            "species/wikidata"
+        ],
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "natural": "wood"
+        }
+    },
     "natural/bare_rock": {
         "icon": "temaki-boulder3",
         "geometry": [
@@ -18938,24 +19068,6 @@
             "value": "wet_meadow"
         }
     },
-    "natural/wood": {
-        "icon": "maki-park-alt1",
-        "fields": [
-            "name",
-            "leaf_type",
-            "leaf_cycle"
-        ],
-        "moreFields": [
-            "species/wikidata"
-        ],
-        "geometry": [
-            "area",
-            "point"
-        ],
-        "tags": {
-            "natural": "wood"
-        }
-    },
     "network/type/node_network-DE-NL-BE-LU": {
         "fields": [
             "name",
@@ -19673,7 +19785,13 @@
         ],
         "tags": {
             "office": "therapist"
-        }
+        },
+        "fields": [
+            "healthcare_therapist",
+            "healthcare/speciality",
+            "{office}"
+        ],
+        "matchScore": 0.9
     },
     "office/union": {
         "icon": "maki-suitcase",
@@ -25267,9 +25385,12 @@
             "operator",
             "address",
             "access_simple",
-            "capacity/caravans",
             "capacity/persons",
+            "tents",
             "capacity/tents",
+            "caravans",
+            "capacity/caravans",
+            "static_caravans",
             "fee",
             "payment_multi_fee",
             "charge_fee"
@@ -25285,10 +25406,12 @@
             "internet_access",
             "internet_access/fee",
             "internet_access/ssid",
+            "nudism",
             "openfire",
             "opening_hours",
             "opening_hours/covid19",
             "phone",
+            "picnic_table",
             "power_supply",
             "ref/vatin",
             "reservation",
@@ -26003,7 +26126,9 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line",
+            "area"
         ],
         "tags": {
             "traffic_calming": "*"
@@ -26017,7 +26142,9 @@
             "{traffic_calming}"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line",
+            "area"
         ],
         "tags": {
             "traffic_calming": "yes"
@@ -26032,7 +26159,8 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "tags": {
             "traffic_calming": "bump"
@@ -26045,7 +26173,9 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line",
+            "area"
         ],
         "tags": {
             "traffic_calming": "chicane"
@@ -26058,7 +26188,9 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line",
+            "area"
         ],
         "tags": {
             "traffic_calming": "choker"
@@ -26071,7 +26203,8 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "tags": {
             "traffic_calming": "cushion"
@@ -26084,7 +26217,8 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "tags": {
             "traffic_calming": "dip"
@@ -26097,7 +26231,8 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "tags": {
             "traffic_calming": "hump"
@@ -26110,6 +26245,7 @@
         ],
         "geometry": [
             "vertex",
+            "line",
             "area"
         ],
         "tags": {
@@ -26122,7 +26258,8 @@
             "traffic_calming": "mini_bumps"
         },
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "fields": [
             "surface",
@@ -26135,7 +26272,8 @@
             "direction_vertex"
         ],
         "geometry": [
-            "vertex"
+            "vertex",
+            "line"
         ],
         "tags": {
             "traffic_calming": "rumble_strip"

dist/translations/af.json

@@ -1539,9 +1539,6 @@
                 "building/stable": {
                     "name": "Stalle"
                 },
-                "building/static_caravan": {
-                    "name": "Karavaan"
-                },
                 "building/temple": {
                     "name": "Tempelgebou"
                 },

dist/translations/ar.json

@@ -496,7 +496,6 @@
                     "terms": "السعة,القدرة الاستيعابية"
                 },
                 "capacity/caravans": {
-                    "label": "السعة (للكرفانات)",
                     "placeholder": "10، 20، 50..."
                 },
                 "capacity/disabled_parking": {
@@ -2896,8 +2895,7 @@
                     "label": "النوع"
                 },
                 "traffic_calming": {
-                    "label": "النوع",
-                    "terms": "نوع,صنف,نمط"
+                    "label": "النوع"
                 },
                 "traffic_sign": {
                     "label": "علامة مرورية"
@@ -4294,10 +4292,6 @@
                     "name": "حظيرة حيوانات",
                     "terms": "حظيرة حيوانات،محجر حيوانات،حوش حيوانات،حوز حيوانات،ضميمة حيوانات"
                 },
-                "attraction/big_wheel": {
-                    "name": "دولاب هواء",
-                    "terms": "دولاب هواء; العجلة الكبيرة"
-                },
                 "attraction/bumper_car": {
                     "name": "Bumper Cars"
                 },
@@ -4464,10 +4458,6 @@
                     "name": "بوابة لا تسمح بعبور الماشية",
                     "terms": "بوابة منع الماشية"
                 },
-                "barrier/lift_gate": {
-                    "name": "حاجز عمودي يرتفع وينخفض",
-                    "terms": "بوابة الرافعة,حاجز عمودي,حاجز عمودي يرتفع وينخفض,بوابة عامودية,بوابة مواقف عامودية"
-                },
                 "barrier/log": {
                     "name": "شجرة ساقطة",
                     "aliases": "شجرة واقعة"
@@ -4738,10 +4728,6 @@
                     "name": "مبنى الملعب",
                     "terms": "مبنى الملعب"
                 },
-                "building/static_caravan": {
-                    "name": "منزل متحرك موجود في مكانه لفترة",
-                    "terms": "مقطورة متحركة ثابتة في مكانها لفترة"
-                },
                 "building/sty": {
                     "name": "Pigsty"
                 },
@@ -5298,23 +5284,14 @@
                 "highway/crossing": {
                     "name": "معبر/خط مشاة"
                 },
-                "highway/crossing/marked": {
-                    "name": "معبر مشاة بعلامات مرورية"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "معبر مشاة بإشارات",
                     "terms": "معبر مشاة بإشارات"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "معبر مشاة بعلامات مرورية"
-                },
                 "highway/crossing/unmarked": {
                     "name": "معبر مشاة بدون علامات أو إشارة مرورية",
                     "terms": "معبر مشاة بدون علامات مرورية أو إشارة مرورية"
                 },
-                "highway/crossing/zebra": {
-                    "name": "معبر مشاة بعلامات مرورية"
-                },
                 "highway/cycleway": {
                     "name": "مسار دراجات",
                     "terms": "طريق دراجات; مسار دراجات"
@@ -5330,9 +5307,6 @@
                     "name": "معبر مشاة ودراجات هوائية",
                     "terms": "معبر مشاة ودراجات هوائية"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "معبر دراجات هوائية بعلامات مرورية"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "معبر دراجات هوائية بدون علامات مرورية",
                     "terms": "معبر دراجات هوائية بدون علامات مرورية"

dist/translations/ast.json

@@ -1563,10 +1563,6 @@
                 "area": {
                     "name": "Área"
                 },
-                "attraction/big_wheel": {
-                    "name": "Noria",
-                    "terms": "rueda,atracciones"
-                },
                 "attraction/carousel": {
                     "name": "Caballinos",
                     "terms": "carrusel,atracciones,feria"
@@ -1615,9 +1611,6 @@
                 "barrier/kissing_gate": {
                     "name": "Puerta ganadera"
                 },
-                "barrier/lift_gate": {
-                    "name": "Barrera"
-                },
                 "barrier/retaining_wall": {
                     "name": "Muru de contención"
                 },
@@ -1730,9 +1723,6 @@
                     "name": "Establu",
                     "terms": "corte,cuadra"
                 },
-                "building/static_caravan": {
-                    "name": "Casa portátil"
-                },
                 "building/terrace": {
                     "name": "Filera de cases"
                 },

dist/translations/bg.json

@@ -308,9 +308,6 @@
                     "label": "Капацитет",
                     "placeholder": "50, 100, 200..."
                 },
-                "capacity/caravans": {
-                    "label": "Капацитет (каравани)"
-                },
                 "capacity/persons": {
                     "label": "Капацитет (души)"
                 },
@@ -1557,9 +1554,6 @@
                 "barrier/kissing_gate": {
                     "name": "Препятствие за животни"
                 },
-                "barrier/lift_gate": {
-                    "name": "Бариера"
-                },
                 "barrier/retaining_wall": {
                     "name": "Подпорна стена"
                 },
@@ -1797,22 +1791,12 @@
                 "highway/crossing": {
                     "name": "Пешеходна пътека"
                 },
-                "highway/crossing/marked": {
-                    "name": "Пешеходна пътека"
-                },
-                "highway/crossing/uncontrolled": {
-                    "name": "Маркирана пешеходна пътека",
-                    "terms": "зебра"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Немаркирана пешеходна пътека"
                 },
                 "highway/cycleway": {
                     "name": "Велоалея"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Маркирана велосипедна пътека"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Немаркирана велосипедна пътека"
                 },

dist/translations/bs.json

@@ -550,10 +550,6 @@
                     "name": "Kapija (sa dvoje vrata)",
                     "terms": "kapija sa dvoje vrata"
                 },
-                "barrier/lift_gate": {
-                    "name": "Kapija (koja se podiže)",
-                    "terms": "kapija koja se podiže,podižuća kapija"
-                },
                 "barrier/retaining_wall": {
                     "name": "Potporni zid",
                     "terms": "potporni zid,zid za zadržavanje"

dist/translations/ca.json

@@ -244,7 +244,21 @@
                     "label": "Per a animals"
                 },
                 "archaeological_site": {
-                    "label": "Tipus"
+                    "label": "Tipus",
+                    "options": {
+                        "baths": "Banys",
+                        "city": "Ciutat Històrica",
+                        "crannog": "Crannog",
+                        "fortification": "Fortificació",
+                        "hut_circle": "Cabana circular",
+                        "megalith": "Megàlit",
+                        "necropolis": "Necròpoli",
+                        "petroglyph": "Petròglif",
+                        "roman_circus": "Circ romà",
+                        "roman_villa": "Vila romana",
+                        "settlement": "Assentament històric",
+                        "tumulus": "Túmul"
+                    }
                 },
                 "architect": {
                     "label": "Arquitecte",
@@ -307,7 +321,26 @@
                     "terms": "bar,barra"
                 },
                 "barrier": {
-                    "label": "Tipus"
+                    "label": "Tipus",
+                    "options": {
+                        "bollard": "Piló",
+                        "cattle_grid": "Reixat ",
+                        "chain": "Cadena",
+                        "city_wall": "Muralla",
+                        "cycle_barrier": "Barrera per a ciclistes",
+                        "ditch": "Séquia",
+                        "entrance": "Entrada",
+                        "fence": "Tanca",
+                        "gate": "Porta",
+                        "hedge": "Tanca de bardissa",
+                        "height_restrictor": "Restrictor de gàlib",
+                        "kerb": "Gual",
+                        "kissing_gate": "Porta giratòria",
+                        "retaining_wall": "Mur de contenció",
+                        "stile": "Esgraons",
+                        "toll_booth": "Peatge",
+                        "wall": "Mur"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barrera",
@@ -518,7 +551,6 @@
                     "terms": "capacitat"
                 },
                 "capacity/caravans": {
-                    "label": "Capacitat (Caravanes)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -761,7 +793,7 @@
                 "crossing": {
                     "label": "Tipus",
                     "options": {
-                        "traffic_signals": "Creumaent controlat per semàfors",
+                        "traffic_signals": "Pas de vianants controlat per semàfors",
                         "uncontrolled": "Només senyalització horitzontal",
                         "unmarked": "Sense senyalització horitzontal o semàfors"
                     }
@@ -786,7 +818,7 @@
                     "label": "Llums"
                 },
                 "crossing/markings": {
-                    "label": "Senyalització del creuament",
+                    "label": "Senyalització del pas de vianants",
                     "options": {
                         "dashes": "Línies transversals discontínues",
                         "dots": "Línies transversals puntejades",
@@ -804,7 +836,7 @@
                         "zebra:double": "Barres longitudinals dobles",
                         "zebra:paired": "Barres longitudinals emparellades"
                     },
-                    "terms": "pas de vianants,creuament,pas de peatons,pas de zebra"
+                    "terms": "pas de vianants,creuament,pas de peatons,pas de zebra,marques horitzontals"
                 },
                 "crossing_raised": {
                     "label": "Elevat",
@@ -1467,11 +1499,11 @@
                         "dermatovenereology": "Dermatovenereologia",
                         "diabetology": "Diabetologia",
                         "diagnostic_radiology": "Diagnòstic Radiològic",
-                        "emergency": "Emergències",
+                        "emergency": "Emergències\nUrgències",
                         "endocrinology": "Endocrinologia",
                         "fertility": "Fertilitat",
                         "gastroenterology": "Gastroenterologia",
-                        "general": "Medicina Familiar i Comunitaria",
+                        "general": "Medicina Familiar i Comunitaria\nMedicina General",
                         "geriatrics": "Medicina Geriàtrica",
                         "gynaecology": "Obestricia i Ginecologia",
                         "haematology": "Hematologia",
@@ -1503,7 +1535,7 @@
                         "palliative": "Cures Paliatives",
                         "pathology": "Anatomia Patològica",
                         "physiatry": "Medicinia Física i Rehabilitació",
-                        "plastic_surgery": "Cirurgia Plàstica",
+                        "plastic_surgery": "Medicina Estètica",
                         "podiatry": "Podologia",
                         "proctology": "Cirugia Colorectal",
                         "psychiatry": "Psiquiatria",
@@ -1519,7 +1551,7 @@
                         "systemic": "Terapia sistèmica",
                         "traditional_chinese_medicine": "Medicina Tradicional Xinesa",
                         "transplant": "Trasplantament",
-                        "trauma": "Ortopèdia",
+                        "trauma": "Traumatologia\nOrtopèdia",
                         "tropical": "Medicina Tropical",
                         "tuina": "Tui Na",
                         "unani": "Medicina Unani",
@@ -1858,7 +1890,31 @@
                     "label": "Tipus"
                 },
                 "material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "options": {
+                        "adobe": "Tova",
+                        "aluminium": "Alumini",
+                        "brass": "Llautó",
+                        "brick": "Maó",
+                        "bronze": "Bronze",
+                        "concrete": "Ciment",
+                        "dry_stone": "Pedra seca",
+                        "glass": "Vidre",
+                        "granite": "Granit",
+                        "iron": "Ferro",
+                        "limestone": "Pedra calcària",
+                        "marble": "Marbre",
+                        "metal": "Metall",
+                        "plastic": "Plàstic",
+                        "reinforced_conrete": "Ciment Reforçat",
+                        "rock": "Roca",
+                        "sand": "Sorra",
+                        "sandstone": "Gres",
+                        "soil": "Terra",
+                        "steel": "Acer",
+                        "stone": "Pedra",
+                        "wood": "Fusta"
+                    }
                 },
                 "mattress": {
                     "label": "Matalassos disponibles"
@@ -1895,7 +1951,20 @@
                     "label": "Amplada màxima"
                 },
                 "memorial": {
-                    "label": "Tipus"
+                    "label": "Tipus",
+                    "options": {
+                        "blue_plaque": "Placa blava",
+                        "bust": "Bust",
+                        "cross": "Creu memorial",
+                        "obelisk": "Obelisc",
+                        "plaque": "Placa commemorativa",
+                        "sculpture": "Esculptura",
+                        "statue": "Estatua",
+                        "stele": "Estela",
+                        "stolperstein": "Llamborda de topada",
+                        "stone": "Pedra",
+                        "war_memorial": "Memorial de guerra"
+                    }
                 },
                 "microbrewery": {
                     "label": "Microcerveseria"
@@ -3550,6 +3619,9 @@
                 "amenity/community_centre/lgbtq": {
                     "name": "Centre comunitari LGBTQ+"
                 },
+                "amenity/community_centre/youth_centre": {
+                    "name": "Centre Juvenil"
+                },
                 "amenity/compressed_air": {
                     "name": "Aire comprimit",
                     "terms": "aire comprimit,compressor d'aire,unflador de rodes"
@@ -3569,7 +3641,8 @@
                     "name": "Crematori"
                 },
                 "amenity/dentist": {
-                    "name": "Dentista"
+                    "name": "Dentista",
+                    "terms": "dentista,dents,dent,pròtesi"
                 },
                 "amenity/dive_centre": {
                     "name": "Centre de submarinisme",
@@ -3591,8 +3664,97 @@
                     "name": "Dermatòleg",
                     "terms": "dermatologia,pell,ungles,monyo,cabells"
                 },
+                "amenity/doctors/gastroenterology": {
+                    "name": "gastroenteròleg",
+                    "terms": "gastroenteròlega,budells,sistema digestiu,esòfag,gastrointestinal,tracte gastrointestinal,intestins,estómac"
+                },
+                "amenity/doctors/general": {
+                    "name": "Metge d'atenció primària",
+                    "terms": "metge de família,metge,atenció primària,cap"
+                },
                 "amenity/doctors/gynaecology": {
-                    "name": "Ginecòleg"
+                    "name": "Ginecòleg",
+                    "terms": "ginecòloga,ou,ginecologia,obstetrícia,obstètric,òvul,ovulació,reproducció,embaràs"
+                },
+                "amenity/doctors/haematology": {
+                    "name": "Hematòleg",
+                    "terms": "hematòloga,anèmia,sang,òs,os,òssos,ossos,hematologia,leucèmia,linfoma"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Internista",
+                    "terms": "medicina interna"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Nefròleg",
+                    "terms": "nefròloga,ronyó,renal,ronyons"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Neuròleg",
+                    "terms": "cervell,nervis,sistema nerviós,neurologia,neurocirugia"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "neurocirurgià",
+                    "terms": "cervell,cirugia neurològica"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Oncòleg",
+                    "terms": "càncer,quimioteràpia,oncologia,tumor,radio teràpia,medicina nuclear"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Oftalmòleg",
+                    "terms": "oftamòloga,ull,ulls,ulleres,lents,ocular,oftamologia,vista,òptica"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Cirugià ortopèdic",
+                    "terms": "ortopèdia,cirguia ortopèdica"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Otorrinolaringòleg",
+                    "terms": "otorrinolaringòloga,orella,audició,cap,coll,bescoll,nas,crani"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Pediatra",
+                    "terms": "pedriatre,adolescents,xiquets,xiquetes,nois,noies,al·lots,al·lotes,infantil,pediatria"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Patòleg",
+                    "terms": "autòpsia,anatomia,anatomia patológica,patologia anatòmica,patologia"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Cirugià plàstic",
+                    "terms": "cirugia estètica,cirugia cosmètica,cirugia cranifacial,cirugia craneofacial,cirugia plàstica,cirugia reconstructiva"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Podòleg",
+                    "terms": "peu,peus,cama,cames,podologia,taló,turmell"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Cirugià Colorectal",
+                    "terms": "cul,coló,cólon,colorectal,recte,cirugia rectal"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Pneumòleg",
+                    "terms": "asma,pit,pulmó,pneumologia,pneumonia,neumonia,neumologia,pneumoleg,neumoleg,respieació,respiratiu,respirologia,respiratòri,medicin respiratòria,pulmòleg"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Radiòleg",
+                    "terms": "radiologia,tomografia,tac,resonància magnètica,ultrasons,ecografia,sonografia,ultrasonografia"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Reumatòleg",
+                    "terms": "reuma,lupus,osteoporosis,reumatologia"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Cirugià general",
+                    "terms": "cirugia"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Cirugià de trauma",
+                    "terms": "trauma,cirugia,fractura"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Uròleg",
+                    "terms": "urologia,penis,próstata,reproducció,escrot,bebé"
                 },
                 "amenity/dojo": {
                     "name": "Dojo / Acadèmia d'arts marcials"
@@ -3622,6 +3784,10 @@
                     "name": "Local de menjar ràpid",
                     "terms": "menjar ràpid,servei de menjar ràpid,restaurant de menjar ràpid,local de menjar ràpid"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "Hamburgueseria de menjar ràpid",
+                    "terms": "hamburguesa com a menjar ràpid,desdejuni,dinar,sopar,asmorzar,autoservei,autorestaurant,menjar,parrilla,taula"
+                },
                 "amenity/fast_food/cafeteria": {
                     "name": "Cantina",
                     "terms": "cantina,refector,menjador escolar"
@@ -3725,7 +3891,7 @@
                 },
                 "amenity/motorcycle_parking": {
                     "name": "Aparcament per a motocicletes",
-                    "terms": "estacionament de motos,parking de motos,aparcament de motos,estacionament per a motocicletes,parking de motocicletes"
+                    "terms": "estacionament de motos,parking de motos,aparcament de motos,estacionament per a motocicletes,parking de motocicletes,motos"
                 },
                 "amenity/motorcycle_rental": {
                     "name": "Lloguer de motocicletes",
@@ -3833,7 +3999,8 @@
                     "terms": "bústia,bústia pública,correus,carta,servei de correus,enviament"
                 },
                 "amenity/post_depot": {
-                    "name": "Oficina de classificació"
+                    "name": "Oficina de classificació",
+                    "terms": "correus,procesament del correu postal,postal"
                 },
                 "amenity/post_office": {
                     "name": "Oficina de correus",
@@ -3852,6 +4019,14 @@
                 "amenity/pub/irish": {
                     "name": "Pub Irlandés"
                 },
+                "amenity/pub/lgbtq": {
+                    "name": "Bar LGTBQ+",
+                    "terms": "bar gay,bar lèsbic,lgtb,lgbtq bar,alterne"
+                },
+                "amenity/pub/microbrewery": {
+                    "name": "Bar amb cervesa",
+                    "terms": "alcohol,beguda,cervesa,birra,cerveseria"
+                },
                 "amenity/public_bath": {
                     "name": "Banys públic",
                     "terms": "banys públic,bany públic,banys,bany"
@@ -3960,6 +4135,9 @@
                 "amenity/shelter/lean_to": {
                     "name": "Alpendre"
                 },
+                "amenity/shelter/public_transport": {
+                    "name": "Marquesina"
+                },
                 "amenity/shower": {
                     "name": "Dutxa"
                 },
@@ -3995,8 +4173,13 @@
                 "amenity/studio/audio": {
                     "name": "Estudi de gravació"
                 },
+                "amenity/studio/radio": {
+                    "name": "Estació de ràdio",
+                    "terms": "ràdio am,ràdio fm,ràdio,emissió de ràdio,estúdio de ràdio,estació radiofònica"
+                },
                 "amenity/studio/television": {
-                    "name": "Estudis de Televisió"
+                    "name": "Estudis de Televisió",
+                    "terms": "televisió,emissió televisiva,estació de televisió,tv,estudi de televisió"
                 },
                 "amenity/studio/video": {
                     "name": "Estudis Cinematogràfics"
@@ -4044,6 +4227,14 @@
                     "terms": "màquina expenedora,màquina de vènding",
                     "aliases": "Màquina de vènding\nMàquina de venda"
                 },
+                "amenity/vending_machine/bottle_return": {
+                    "name": "Màquina de retorn d'ampolles",
+                    "terms": "retorn d'ampolles,retorn de botelles,ampolles,botelles,reciclos,reciclatge"
+                },
+                "amenity/vending_machine/bread": {
+                    "name": "Màquina expenedora de pà",
+                    "terms": "pà,baguette,baguet"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Màquina de tabac",
                     "terms": "cigarretes,tabac",
@@ -4099,7 +4290,8 @@
                     "name": "Màquina de venda de títols de transport públic"
                 },
                 "amenity/vending_machine/stamps": {
-                    "name": "Expenedora de segells"
+                    "name": "Màquina expenedora de segells",
+                    "terms": "segell,correu,postal,correu postal"
                 },
                 "amenity/vending_machine/sweets": {
                     "name": "Màquina de vènding de comestibles"
@@ -4137,6 +4329,14 @@
                 "attraction/amusement_ride": {
                     "name": "Atracció de fira"
                 },
+                "attraction/animal": {
+                    "name": "Recinte animal",
+                    "terms": "anfibi,parc animal,aquarium,os,pardal,ocell,oroneta,peix,insecte,lleó,mamífer,mico,mono,pingüí,reptil,parc,tigre,zoo"
+                },
+                "attraction/bumper_car": {
+                    "name": "Autos de xoc",
+                    "terms": "cotxes de xoc"
+                },
                 "attraction/maze": {
                     "name": "Laberint"
                 },
@@ -4198,6 +4398,12 @@
                     "name": "Porta",
                     "terms": "porta d'embarcament d'avions,porta d'aeroport,porta"
                 },
+                "barrier/guard_rail": {
+                    "name": "Guarda rail"
+                },
+                "barrier/handrail": {
+                    "name": "Barana"
+                },
                 "barrier/hedge": {
                     "name": "Tanca de bardissa",
                     "terms": "seto,tanca de bardissa,valla de seto,valla verda,valla de plantes,tanca de plantes"
@@ -4213,10 +4419,6 @@
                     "name": "Porta giratòria",
                     "terms": "porta giratòria,porta sense retorn,accés giratori,porta de no retorn"
                 },
-                "barrier/lift_gate": {
-                    "name": "Barrera per a vehicles",
-                    "terms": "porta d'ascensor"
-                },
                 "barrier/log": {
                     "name": "Arbre caigut"
                 },
@@ -4398,10 +4600,6 @@
                 "building/stadium": {
                     "name": "Edifici d'un estadi"
                 },
-                "building/static_caravan": {
-                    "name": "Caravana fixa",
-                    "terms": "casa prefabricada,trailer casa,cosa mòbil,caravana residencial,caravana estàtica"
-                },
                 "building/temple": {
                     "name": "Edifici d'un temple"
                 },
@@ -4495,7 +4693,7 @@
                 },
                 "craft/electronics_repair": {
                     "name": "Botiga de reparacions electròniques",
-                    "terms": "tenda de reparacions electròniques"
+                    "terms": "tenda de reparacions electròniques,telèfon,reparació de mòbils,mòbil"
                 },
                 "craft/gardener": {
                     "name": "Jardiner"
@@ -4622,7 +4820,8 @@
                     "terms": "estació d'ambulàncies"
                 },
                 "emergency/assembly_point": {
-                    "name": "Punt de trobada d'emergència"
+                    "name": "Punt de trobada d'emergència",
+                    "terms": "emergencia,punt de trobada,punt d'emergències,trobada d'emergència"
                 },
                 "emergency/defibrillator": {
                     "name": "Desfibril·lador"
@@ -4641,7 +4840,7 @@
                 },
                 "emergency/fire_hydrant": {
                     "name": "Boca d'incendis",
-                    "terms": "boca d'incendis,presa d'aigua per a bombers,incendi,bombers,sortida d'aigua,aigua"
+                    "terms": "boca d'incendis,presa d'aigua per a bombers,incendi,bombers,sortida d'aigua,aigua,hidrant"
                 },
                 "emergency/first_aid_kit": {
                     "name": "Equip de primers auxilis"
@@ -4741,6 +4940,10 @@
                 "healthcare/blood_donation": {
                     "name": "Centre de donació de sang"
                 },
+                "healthcare/dentist/orthodontics": {
+                    "name": "Ortodontista",
+                    "terms": "ortodòncia,braquets,aparato,dents,alineament dental,dent,bucal,boca"
+                },
                 "healthcare/hospice": {
                     "name": "Hospici"
                 },
@@ -4780,27 +4983,24 @@
                     "name": "Parada d'autobús",
                     "aliases": "Parada de bus"
                 },
+                "highway/construction": {
+                    "name": "Carretera en construcció"
+                },
                 "highway/corridor": {
                     "name": "Corredor interior"
                 },
                 "highway/crossing": {
                     "name": "Pas de vianants"
                 },
-                "highway/crossing/marked": {
-                    "name": "Pas de vianants amb senyalització horitzontal"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Pas de vianants controlat per semàfors"
                 },
                 "highway/crossing/uncontrolled": {
-                    "terms": "pas de vianants,pas de peatons"
+                    "name": "Pas de vianants senyalitzat"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Creuament sense senyalització horitzontal"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Pas de zebra"
-                },
                 "highway/cycleway": {
                     "name": "Carril Bici",
                     "terms": "carril bici,via verda,via ciclista"
@@ -4814,8 +5014,9 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Pas per a vianants i bicicletes"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Pas de bicicletes senyalitzat hortizontalment"
+                "highway/cycleway/crossing/traffic_signals": {
+                    "name": "Creuament ciclista amb semàfor",
+                    "terms": "semàfor,bici,bicicleta,pista ciclista,creuament ciclista"
                 },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Pas de bicicletes sense senyalització horitzontal"
@@ -4828,19 +5029,28 @@
                     "name": "Camí per a vianants",
                     "terms": "camí per a vianants,carrer peatonal,camí per a peatons,a peu,camí per caminar,vianant,vianants,peató,peatons,transeünt,transeünts,peatonal"
                 },
+                "highway/footway/access_aisle": {
+                    "name": "Corredor d'accés"
+                },
                 "highway/footway/crossing": {
                     "name": "Pas de vianants"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Pas de vianants amb senyalització horitzontal"
+                "highway/footway/crossing/uncontrolled": {
+                    "name": "Pas de vianants uncontrolat"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Pas de zebra"
+                "highway/footway/crossing/unmarked": {
+                    "name": "Creuament sense senyalització horitzontal"
+                },
+                "highway/footway/informal": {
+                    "name": "Camí de vianants informal"
                 },
                 "highway/footway/sidewalk": {
                     "name": "Vorera",
                     "terms": "vorera,voravia"
                 },
+                "highway/footway/traffic_island": {
+                    "name": "Illa de refugi"
+                },
                 "highway/give_way": {
                     "name": "Senyal de cediu el pas"
                 },
@@ -6416,7 +6626,7 @@
                 },
                 "shop/agrarian": {
                     "name": "Agrobotiga",
-                    "terms": "botiga de suministres agrícoles,tenda de suministres agrícoles",
+                    "terms": "botiga de suministres agrícoles,tenda de suministres agrícoles,agrotenda,cooperativa agrícola",
                     "aliases": "Cooperativa agrícola"
                 },
                 "shop/alcohol": {
@@ -6431,16 +6641,21 @@
                     "name": "Botiga d'antiguitats",
                     "terms": "tenda d'antiguitats,antiquari,vintage,història,vell,antic"
                 },
+                "shop/appliance": {
+                    "name": "Botiga d'electrodomèstics",
+                    "terms": "tenda d'electrodomèstics,electrodomèstic,aire condicionat,secadora,rentadora,llavadora,congelador,nevera,forn,estufa,refrigerador,cafetera,televisió"
+                },
                 "shop/art": {
                     "name": "Botiga d'art",
                     "terms": "art,exhibit,galeria,galeria d'art,exhibició"
                 },
                 "shop/baby_goods": {
                     "name": "Botiga per a nadons",
-                    "terms": "botiga per a bebès,tenda per a bebès,tenda per a nadons,bebè,nadó,bebé"
+                    "terms": "botiga per a bebès,tenda per a bebès,tenda per a nadons,bebè,nadó,bebé,puericultura"
                 },
                 "shop/bag": {
-                    "name": "Botiga d'equipatges o bosses"
+                    "name": "Botiga d'equipatges o bosses",
+                    "terms": "bolso,maleta,bossa,complements,cartera,equipatge,moneder,tenda d'equipatges o bosses"
                 },
                 "shop/bakery": {
                     "name": "Fleca",
@@ -6517,7 +6732,8 @@
                     "name": "Botiga de formatge"
                 },
                 "shop/chemist": {
-                    "name": "Farmàcia"
+                    "name": "Drogueria",
+                    "terms": "perfumeria,bellesa,cosmètics,monyo,pèl,farmàcia,dents,higiene"
                 },
                 "shop/chocolate": {
                     "name": "Botiga de xocolata"
@@ -6668,7 +6884,7 @@
                 },
                 "shop/gift": {
                     "name": "Botiga de regals",
-                    "terms": "botiga de regals,botiga d'objectes de regal,tenda de regals,tenda d'objectes de regal"
+                    "terms": "botiga d'objectes de regal,tenda de regals,tenda d'objectes de regal"
                 },
                 "shop/greengrocer": {
                     "name": "Fruiteria"
@@ -6688,8 +6904,13 @@
                 "shop/hifi": {
                     "name": "Botiga d'alta fidelitat"
                 },
+                "shop/household_linen": {
+                    "name": "Botiga de roba per a la llar",
+                    "terms": "tenda de roba per a la llar,llar,casa,hogar,llençols,llançols,pijama,coixins,torcamans"
+                },
                 "shop/houseware": {
-                    "name": "Botiga de la llar"
+                    "name": "Botiga d'articles per a la llar",
+                    "terms": "tenda d'articles per a la llar,hogar,llar,casa,cuina"
                 },
                 "shop/hunting": {
                     "name": "Botiga de caça",
@@ -6716,7 +6937,8 @@
                     "name": "Bugaderia d'autoservei"
                 },
                 "shop/leather": {
-                    "name": "Botiga de cuirs"
+                    "name": "Botiga de cuirs",
+                    "terms": "tenda de cuirs,cuir,cuero,pell,pelleteria"
                 },
                 "shop/locksmith": {
                     "name": "Copisteria de claus"
@@ -6797,6 +7019,10 @@
                 "shop/religion": {
                     "name": "Botiga d'articles religiosos"
                 },
+                "shop/rental": {
+                    "name": "Botiga de lloguers",
+                    "terms": "tenda de lloguers,lloguer"
+                },
                 "shop/scuba_diving": {
                     "name": "Botiga de submarinisme",
                     "terms": "tenda de submarinisme,mar,aigua,snorkel,buceig,submarinisme"
@@ -6809,7 +7035,8 @@
                     "name": "Botiga de segona mà"
                 },
                 "shop/sewing": {
-                    "name": "Merceria"
+                    "name": "Merceria",
+                    "terms": "cinteria,llenceria,fils,cusir,cosir"
                 },
                 "shop/shoe_repair": {
                     "name": "Sabater",
@@ -6817,15 +7044,15 @@
                 },
                 "shop/shoes": {
                     "name": "Sabateria",
-                    "terms": "sabateria,botiga de sabates,sabater"
+                    "terms": "sabateria,botiga de sabates,sabater,calçat,sabata,bamba,tacons,sandàlies,botes"
                 },
                 "shop/spices": {
                     "name": "Botiga d'espècies",
-                    "terms": "tenda d'especies,curry,xili,canella,herba,pebrera,pimienta,sal,especie,condiments,wasabi,condiment"
+                    "terms": "tenda d'espècies,curry,xili,canella,herba,pebrera,pimienta,sal,especie,condiments,wasabi,condiment,pebre,safrà"
                 },
                 "shop/sports": {
                     "name": "Botiga d'esports",
-                    "terms": "esport,deport"
+                    "terms": "esport,deport,esports,tenda d'esports"
                 },
                 "shop/stationery": {
                     "name": "Papereria"
@@ -6854,7 +7081,7 @@
                 },
                 "shop/tiles": {
                     "name": "Botiga de rajoles",
-                    "terms": "tenda de rajoles,manises,ceràmica,paret"
+                    "terms": "tenda de rajoles,manises,ceràmica,paret,taulell"
                 },
                 "shop/tobacco": {
                     "name": "Estanc",
@@ -6896,7 +7123,7 @@
                 },
                 "shop/watches": {
                     "name": "Botiga de rellotges",
-                    "terms": "botiga d'ulleres,tenda d'ulleres,optometrista"
+                    "terms": "tenda de rellotges,botiga de relonges,tenda de relonges"
                 },
                 "shop/water": {
                     "name": "Botiga d'aigua potable",
@@ -6910,6 +7137,10 @@
                     "name": "Armeria",
                     "terms": "botiga d'armes,tenda d'armes,gavinets,ganivets,pistola,munició,armes"
                 },
+                "shop/wigs": {
+                    "name": "Botiga de perruqes",
+                    "terms": "tenda de perruques,extensions de monyo,extensions de pèl,monyo,pèl,calb,calva"
+                },
                 "shop/window_blind": {
                     "name": "Botiga de persianes"
                 },

dist/translations/da.json

@@ -467,9 +467,6 @@
                     "placeholder": "50, 100, 200...",
                     "terms": "rumlighed"
                 },
-                "capacity/caravans": {
-                    "label": "Kapacitet (campingvogne)"
-                },
                 "capacity/disabled_parking": {
                     "label": "Handikappladser",
                     "placeholder": "1, 2, 3..."
@@ -1650,11 +1647,16 @@
                 "parking/orientation": {
                     "label": "Orientering",
                     "options": {
-                        "diagonal": "På skråt med vejen",
+                        "diagonal": "Diagonal i forhold til vejen",
                         "parallel": "Parallelt med vejen",
                         "perpendicular": "Vinkelret på vejen"
                     }
                 },
+                "parking/side/orientation": {
+                    "options": {
+                        "diagonal": "Diagonal i forhold til vejen (~45°)"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Type"
                 },
@@ -3318,10 +3320,6 @@
                     "name": "Dyreanlæg",
                     "terms": "dyreindhegning,dyrepark"
                 },
-                "attraction/big_wheel": {
-                    "name": "Pariserhjul",
-                    "terms": "ferris"
-                },
                 "attraction/bumper_car": {
                     "name": "Radiobiler"
                 },
@@ -3425,10 +3423,6 @@
                     "name": "Dyrefoldslåge",
                     "terms": "dyrefoldsport,låge,dyr,fold,dyrefold"
                 },
-                "barrier/lift_gate": {
-                    "name": "Løftebom",
-                    "terms": "bom,port,løfte,hæve"
-                },
                 "barrier/retaining_wall": {
                     "name": "Støttemur",
                     "terms": "støttemur"
@@ -3625,10 +3619,6 @@
                     "name": "Stadionbygning",
                     "terms": "stadion,sport,hal"
                 },
-                "building/static_caravan": {
-                    "name": "Fast mobilt hus",
-                    "terms": "fast mobilt hus,fast campingvogn"
-                },
                 "building/temple": {
                     "name": "Tempelbygning",
                     "terms": "tempel,bygning"
@@ -4055,9 +4045,6 @@
                 "highway/crossing": {
                     "name": "Fodgængerfelt"
                 },
-                "highway/crossing/marked": {
-                    "name": "Markeret fodgængerfelt"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Fodgængerovergang med lyssignal"
                 },
@@ -4065,9 +4052,6 @@
                     "name": "Umarkeret fodgængerfelt",
                     "terms": "overgang,felt,fodgænger,fodgængerovergang"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Markeret fodgængerfelt"
-                },
                 "highway/cycleway": {
                     "name": "Cykelsti",
                     "terms": "cykelsti"
@@ -4083,9 +4067,6 @@
                     "name": "Cykel & fodgængerfelt",
                     "terms": "cykel,fodgænger,felt,cykel og fodgænger,cyklist,cyklist og fodgænger,cykling"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Markeret cykelfelt"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Umarkeret cykelfelt",
                     "terms": "felt,overgang,cykel,cyklist,passage,umarkeret"

dist/translations/de.json

@@ -244,7 +244,22 @@
                     "label": "Tierheim"
                 },
                 "archaeological_site": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "baths": "Badeanlage (Therme)",
+                        "city": "Historische Stadt",
+                        "crannog": "Crannóg (Insel)",
+                        "enclosure": "Umgrenzung",
+                        "fortification": "Befestigung",
+                        "hut_circle": "Hüttenkreis (kreisförmige Vertiefung)",
+                        "megalith": "Megalith (Steinblock)",
+                        "necropolis": "Nekropole (Totenstadt)",
+                        "petroglyph": "Petroglyph (Felsbild)",
+                        "roman_circus": "Römischer Circus",
+                        "roman_villa": "Römische Villa",
+                        "settlement": "Historische Siedlung",
+                        "tumulus": "Tumulus (Hügelgrab)"
+                    }
                 },
                 "architect": {
                     "label": "Architekt",
@@ -278,7 +293,28 @@
                     "label": "Geldautomat"
                 },
                 "attraction": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "alpine_coaster": "Alpine-Coaster",
+                        "amusement_ride": "Fahrgeschäft",
+                        "animal": "Tiergehege",
+                        "big_wheel": "Riesenrad",
+                        "bumper_car": "Autoscooter",
+                        "bungee_jumping": "Bungee Jumping",
+                        "carousel": "Karussell",
+                        "dark_ride": "Themenfahrt (Dark Ride)",
+                        "drop_tower": "Freifallturm",
+                        "kiddie_ride": "Kinder-Fahrautomat",
+                        "log_flume": "Wildwasserbahn im Baumstamm",
+                        "maze": "Labyrinth",
+                        "pirate_ship": "Schiffsschaukel",
+                        "river_rafting": "Stromschnellenbahn (Rapid River)",
+                        "roller_coaster": "Achterbahn",
+                        "summer_toboggan": "Sommerrodelbahn",
+                        "swing_carousel": "Kettenkarussell",
+                        "train": "Bimmelbahn für Touristen",
+                        "water_slide": "Wasserrutsche"
+                    }
                 },
                 "automated": {
                     "label": "Automatisch"
@@ -307,7 +343,32 @@
                     "terms": "bar"
                 },
                 "barrier": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "block": "Großer Block",
+                        "bollard": "Poller",
+                        "cattle_grid": "Viehgitter",
+                        "chain": "Kette",
+                        "city_wall": "Stadtmauer",
+                        "cycle_barrier": "Umlaufgitter",
+                        "ditch": "Senke",
+                        "entrance": "Durchgang",
+                        "fence": "Zaun",
+                        "gate": "Tor",
+                        "guard_rail": "Leitplanke",
+                        "hedge": "Hecke",
+                        "height_restrictor": "Durchfahrtshöhenbegrenzer",
+                        "jersey_barrier": "Jersey-Barriere (Betonschutzwand)",
+                        "kerb": "Bordstein",
+                        "kissing_gate": "Kissing Gate (eine Art von Viehgatter)",
+                        "lift_gate": "Schranke (Schlagbaum)",
+                        "retaining_wall": "Stützmauer",
+                        "stile": "Zaunübertritt",
+                        "swing_gate": "Drehschranke",
+                        "toll_booth": "Mautstation",
+                        "turnstile": "Drehkreuz (halbe Höhe)",
+                        "wall": "Mauer"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Hindernis",
@@ -332,7 +393,14 @@
                     "label": "Sandbad"
                 },
                 "bath/type": {
-                    "label": "Art der Badeanstalt"
+                    "label": "Art der Badeanstalt",
+                    "options": {
+                        "hammam": "Hammam",
+                        "hot_spring": "Thermalquelle",
+                        "lake": "Seebad",
+                        "onsen": "Onsen",
+                        "thermal": "Thermalbad"
+                    }
                 },
                 "beauty": {
                     "label": "Schönheitssalon",
@@ -518,7 +586,7 @@
                     "terms": "kapazität,fassungsvermögen"
                 },
                 "capacity/caravans": {
-                    "label": "Kapazität (Wohnwagen)",
+                    "label": "Kapazität (Wohnmobile / Wohnwagen)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -541,6 +609,9 @@
                     "label": "Volumen (Kubikmeter)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Wohnmobile / Wohnwagen"
+                },
                 "cash_in": {
                     "label": "Einzahlmöglichkeit"
                 },
@@ -573,7 +644,8 @@
                 },
                 "check_date": {
                     "label": "Datum der letzten Überprüfung",
-                    "placeholder": "JJJJ-MM-TT"
+                    "placeholder": "JJJJ-MM-TT",
+                    "terms": "datum,prüfung,letzte prüfung,überprüfung,check,erhebung,vorortüberprüfung"
                 },
                 "circumference": {
                     "label": "Stammumfang (auf Brusthöhe)",
@@ -1798,12 +1870,19 @@
                     "label": "Typ"
                 },
                 "license_classes": {
-                    "label": "Führerscheimklassen",
-                    "terms": "führerscheimklassen,führerscheinkategorien"
+                    "label": "Führerscheinklassen",
+                    "terms": "führerscheinklassen,führerscheinkategorien"
                 },
                 "lifeguard": {
                     "label": "Rettungsschwimmer"
                 },
+                "lift_gate/type": {
+                    "label": "Typ",
+                    "options": {
+                        "double": "Gegenüberliegende Schrankenbäume",
+                        "single": "Ein Schrankenbaum"
+                    }
+                },
                 "line_attachment": {
                     "label": "Leitungsbefestigung",
                     "terms": "leitungsanbringung,leitungsaufhängung,leitungsmontage,kabelbefestigung,kabelanbringung,kabelaufhängung,kabelmontage"
@@ -1862,6 +1941,30 @@
                 },
                 "material": {
                     "label": "Material",
+                    "options": {
+                        "adobe": "Lehm",
+                        "aluminium": "Aluminium",
+                        "brass": "Blech",
+                        "brick": "Backstein",
+                        "bronze": "Bronze",
+                        "concrete": "Beton",
+                        "dry_stone": "Trockenmauerwerk ",
+                        "glass": "Glas",
+                        "granite": "Granit",
+                        "iron": "Eisen",
+                        "limestone": "Kalkstein",
+                        "marble": "Marmor",
+                        "metal": "Metall",
+                        "plastic": "Kunststoff",
+                        "reinforced_conrete": "Stahlbeton",
+                        "rock": "Fels",
+                        "sand": "Sand",
+                        "sandstone": "Sandstein",
+                        "soil": "Erdreich",
+                        "steel": "Stahl",
+                        "stone": "Stein",
+                        "wood": "Holz"
+                    },
                     "terms": "material"
                 },
                 "mattress": {
@@ -1904,7 +2007,20 @@
                     "terms": "lichte,breite,weite,lichte breite,lichte weite,durchgangslichte,durchgangsbreite,durchgangsweite,durchfahrlichte,durchfahrbreite,durchfahrweite,maximale lichte,maximale breite,maximale weite"
                 },
                 "memorial": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "blue_plaque": "Blue Plaque",
+                        "bust": "Büste",
+                        "cross": "Gedenkkreuz",
+                        "obelisk": "Obelisk",
+                        "plaque": "Gedenktafel",
+                        "sculpture": "Skulptur",
+                        "statue": "Statue",
+                        "stele": "Stele",
+                        "stolperstein": "Stolperstein",
+                        "stone": "Gedenkstein",
+                        "war_memorial": "Kriegsmahnmal"
+                    }
                 },
                 "microbrewery": {
                     "label": "Hausbrauerei",
@@ -2034,8 +2150,69 @@
                     "label": "Notiz",
                     "terms": "kommentar,anmerkung"
                 },
+                "nudism": {
+                    "label": "FKK",
+                    "options": {
+                        "customary": "Üblich",
+                        "designated": "Vorgesehen",
+                        "no": "Verboten",
+                        "obligatory": "Verpflichtend",
+                        "permissive": "Geduldet",
+                        "yes": "Erlaubt"
+                    },
+                    "terms": "nudismus,freikörperkultur,nackt,nacktbaden,naturalismus"
+                },
                 "office": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "accountant": "Buchhaltungsbüro",
+                        "adoption_agency": "Adoptionsagentur",
+                        "advertising_agency": "Werbeagentur",
+                        "architect": "Architekturbüro",
+                        "association": "Büro eines Berufs- oder Interessenverbands",
+                        "charity": "Wohlfahrtseinrichtung",
+                        "company": "Firmenbüro",
+                        "construction_company": "Büro eines Bauunternehmens",
+                        "consulting": "Consulting/Beratungs-Büro",
+                        "courier": "Kurierdienst",
+                        "coworking": "Coworking-Büro",
+                        "diplomatic": "Diplomatische und konsularische Vertretung",
+                        "educational_institution": "Bildungseinrichtung",
+                        "employment_agency": "Arbeitsvermittlung",
+                        "energy_supplier": "Energieversorgungsunternehmen",
+                        "engineer": "Ingenieurbüro",
+                        "estate_agent": "Immobilienmakler",
+                        "financial": "Finanzvermittlung",
+                        "financial_advisor": "Finanzberatung",
+                        "forestry": "Forstverwaltung",
+                        "foundation": "Stiftung",
+                        "government": "Behörde",
+                        "graphic_design": "Grafikdesign",
+                        "guide": "Fremdenführer",
+                        "insurance": "Versicherungsbüro",
+                        "it": "IT-Unternehmen",
+                        "lawyer": "Anwaltskanzlei",
+                        "logistics": "Spedition",
+                        "moving_company": "Umzugsfirma",
+                        "newspaper": "Zeitungsredaktion",
+                        "ngo": "NGO-Büro – Nichtregierungsorganisation",
+                        "notary": "Notariat",
+                        "physician": "Arztpraxis",
+                        "political_party": "Parteibüro",
+                        "private_investigator": "Privatdetektiv",
+                        "property_management": "Hausverwaltung",
+                        "quango": "Mittlerorganisation",
+                        "religion": "Büro einer Glaubensgemeinschaft",
+                        "research": "Forschungseinrichtung",
+                        "security": "Sicherheitsdienstleister",
+                        "surveyor": "Sachverständigenbüro",
+                        "tax_advisor": "Steuerberatungskanzlei",
+                        "telecommunication": "Telekommunikationsunternehmen",
+                        "therapist": "Therapeut",
+                        "travel_agent": "Reisebüro",
+                        "union": "Gewerkschaftsbüro",
+                        "water_utility": "Wasserversorgungsunternehmen"
+                    }
                 },
                 "oneway": {
                     "label": "Einbahnstraße",
@@ -2122,11 +2299,14 @@
                     "options": {
                         "carports": "Carports",
                         "garage_boxes": "Garagenboxen",
+                        "half_on_kerb": "Halb auf Gehweg",
                         "lane": "Parkstreifen am Straßenrand",
                         "layby": "Rastplatz",
                         "multi-storey": "Parkhaus",
+                        "on_kerb": "Auf Gehweg",
                         "rooftop": "Dachfläche",
                         "sheds": "Schuppen",
+                        "shoulder": "Auf Seitenstreifen",
                         "street_side": "Straßenrand",
                         "surface": "Ebenerdig",
                         "underground": "Tiefgarage"
@@ -2140,6 +2320,37 @@
                         "perpendicular": "Quer zur Straße"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Parkplatzausrichtung",
+                    "options": {
+                        "diagonal": "Schräg zur Straße (~45°)",
+                        "parallel": "Parallel zur Straße",
+                        "perpendicular": "Rechtwinklig zur Straße (~90°)"
+                    },
+                    "terms": "ausrichtung,richtung,orientierung,stellplatzausrichtung,stellplatzrichtung,stellplatzorientierung,parkplatzausrichtung,parkplatzrichtung,parkplatzorientierung",
+                    "types": {
+                        "parking:left:orientation": "Linke Seite",
+                        "parking:right:orientation": "Rechte Seite"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Parken",
+                    "options": {
+                        "half_on_kerb": "Halb auf Gehweg",
+                        "lane": "Parkstreifen am Straßenrand",
+                        "no": "Nein",
+                        "on_kerb": "Auf Gehweg",
+                        "separate": "Parken separat kartiert",
+                        "shoulder": "Seitenstreifen",
+                        "street_side": "Straßenrand",
+                        "yes": "Ja (unspezifiziert)"
+                    },
+                    "terms": "parken,parkplatz,parkplätze,stellplatz,stellplätze",
+                    "types": {
+                        "parking:left": "Linke Seite",
+                        "parking:right": "Rechte Seite"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Typ"
                 },
@@ -2201,6 +2412,10 @@
                     "placeholder": "+49 123 4567",
                     "terms": "telefonnummer,rufnummer"
                 },
+                "picnic_table": {
+                    "label": "Picknicktisch",
+                    "terms": "jausentisch,picknicktisch,tischgruppe,außentisch"
+                },
                 "pipeline": {
                     "label": "Typ"
                 },
@@ -2547,7 +2762,18 @@
                     "label": "Typ"
                 },
                 "resource": {
-                    "label": "Rohstoffe"
+                    "label": "Rohstoffe",
+                    "options": {
+                        "aggregate": "Gesteinskörnung",
+                        "clay": "Tonerde",
+                        "coal": "Kohle",
+                        "gold": "Gold",
+                        "gravel": "Kies",
+                        "iron_ore": "Eisenerz",
+                        "limestone": "Kalkstein",
+                        "peat": "Torf",
+                        "sand": "Sand"
+                    }
                 },
                 "restriction": {
                     "label": "Typ"
@@ -2872,7 +3098,44 @@
                     "terms": "spezies wikidata"
                 },
                 "sport": {
-                    "label": "Sport"
+                    "label": "Sport",
+                    "options": {
+                        "american_football": "American Football",
+                        "athletics": "Leichtathletik",
+                        "badminton": "Badminton",
+                        "baseball": "Baseball",
+                        "basketball": "Basketball",
+                        "beachvolleyball": "Beachvolleyball",
+                        "boules": "Boule/Boccia",
+                        "bowls": "Bowls",
+                        "climbing": "Klettern",
+                        "cricket": "Cricket",
+                        "cycling": "Radfahren",
+                        "equestrian": "Pferdesport",
+                        "fitness": "Fitness Training",
+                        "free_flying": "Paragliding / Gleitschirmfliegen",
+                        "futsal": "Futsal",
+                        "golf": "Golf",
+                        "gymnastics": "Turnen / Gymnastik",
+                        "handball": "Handball",
+                        "horse_racing": "Pferderennen",
+                        "karting": "Kartsport",
+                        "motocross": "Motocross",
+                        "motor": "Motorsport",
+                        "netball": "Netball",
+                        "padel": "Padel",
+                        "rugby_union": "Rugby Union",
+                        "running": "Laufsport",
+                        "shooting": "Schießsport",
+                        "skateboard": "Skateboard",
+                        "skiing": "Skisport",
+                        "soccer": "Fussball",
+                        "softball": "Softball",
+                        "swimming": "Schwimmsport",
+                        "table_tennis": "Tischtennis",
+                        "tennis": "Tennis",
+                        "volleyball": "Volleyball"
+                    }
                 },
                 "sport_ice": {
                     "label": "Sportarten",
@@ -2921,6 +3184,9 @@
                     "placeholder": "JJJJ-MM-TT",
                     "terms": "anfangsdatum,startdatum"
                 },
+                "static_caravans": {
+                    "label": "Dauercamper"
+                },
                 "step_count": {
                     "label": "Anzahl der Stufen",
                     "terms": "stufenanzahl,stufen,schrittanzahl,schritte,stufenzahl,steigungen"
@@ -2986,7 +3252,16 @@
                     "terms": "thema wikidata"
                 },
                 "substance": {
-                    "label": "Substanz"
+                    "label": "Substanz",
+                    "options": {
+                        "fuel": "Kraftstoff",
+                        "gas": "Erdgas",
+                        "hot_water": "Heißes Wasser",
+                        "oil": "Erdöl",
+                        "rainwater": "Regenwasser",
+                        "sewage": "Abwasser",
+                        "water": "Trinkwasser"
+                    }
                 },
                 "substation": {
                     "label": "Typ",
@@ -3140,6 +3415,9 @@
                 "telecom/medium": {
                     "label": "Medium"
                 },
+                "tents": {
+                    "label": "Zelte"
+                },
                 "tidal": {
                     "label": "Gezeitenabhängig",
                     "terms": "gezeiten,tidenhub,flut,ebbe"
@@ -3230,8 +3508,7 @@
                         "mini_bumps": "Kleine Teller",
                         "rumble_strip": "Rüttelstreifen",
                         "table": "Lange Bodenwelle (Plateau)"
-                    },
-                    "terms": "typ"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Verkehrsschild"
@@ -3456,7 +3733,13 @@
                     "label": "Typ"
                 },
                 "waste": {
-                    "label": "Abfall"
+                    "label": "Abfall",
+                    "options": {
+                        "cigarettes": "Zigaretten",
+                        "dog_excrement": "Hundekot",
+                        "organic": "Biomüll",
+                        "trash": "Restmüll"
+                    }
                 },
                 "water": {
                     "label": "Typ"
@@ -4790,7 +5073,7 @@
                 },
                 "attraction/big_wheel": {
                     "name": "Riesenrad",
-                    "terms": "riesenrad"
+                    "terms": "fahrgeschäft,riesenrad"
                 },
                 "attraction/bumper_car": {
                     "name": "Autoscooter",
@@ -4973,7 +5256,8 @@
                 },
                 "barrier/lift_gate": {
                     "name": "Schranke",
-                    "terms": "schranke,schlagbaum,schranken"
+                    "terms": "schranke,schlagbaum,wegeschranke,schlag",
+                    "aliases": "Schlagbaum"
                 },
                 "barrier/log": {
                     "name": "Baumstamm",
@@ -5253,8 +5537,8 @@
                     "terms": "stadiongebäude"
                 },
                 "building/static_caravan": {
-                    "name": "Feststehender Wohnwagen",
-                    "terms": "abgestellter wohnwagen,dauercamper"
+                    "name": "Dauercamper",
+                    "terms": "wohnwagen,wohnmobil,saisoncamping,wohnwagensiedlung,mobilheim,mobile home"
                 },
                 "building/sty": {
                     "name": "Schweinestall",
@@ -5727,10 +6011,34 @@
                     "terms": "akupunktur,anthroposophisch,aromatherapie,ayurveda,heilkunde,homöopathie,hydrotherapie,hypnose,kräutermedizin,naturheilkunde,osteopathie,pflanzenheilkunde,physiatrie,reiki,spagyrika,tcm,unani,wasserheilkunde",
                     "aliases": "Heilpraktiker\nHeilpraktikerin"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Praxis für Akupunktur",
+                    "terms": "akupunktur,nadel,nadelstimulation,nadelstiche,akkupunktur"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Praxis für Ayurveda",
+                    "terms": "ayurveda,ayurweda,indische medizin"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Chiropraktiker/in",
                     "terms": "chiropraktiker,manualtherapeut"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Praxis für Homöopathie",
+                    "terms": "homöopathie,globuli"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Praxis für Naturheilkunde",
+                    "terms": "naturheilkunde,naturopathie,physiatrie,naturheilverfahren,heilpflanzen,phytotherapie,hydrotherapie,balneotherapie,wärmetherapie,kältetherapie,wasserkur,bewegungstherapie,ernährungstherapie,ordnungstherapie"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Praxis für Osteopathie",
+                    "terms": "manuelle medizin,manualtherapie,chirotherapie,chiropraktik"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Praxis für Traditionelle Chinesische Medizin",
+                    "terms": "tcm"
+                },
                 "healthcare/audiologist": {
                     "name": "Hörakustiker/in",
                     "terms": "hörakustiker/in"
@@ -5828,24 +6136,19 @@
                 "highway/crossing": {
                     "name": "Übergang"
                 },
-                "highway/crossing/marked": {
-                    "name": "markierter / gekennzeichneter Übergang"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Kreuzung mit Fußgängerampel",
                     "terms": "fußgängerampel,fußgängerübergang,radübergang"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "markierter / gekennzeichneter Übergang",
-                    "terms": "zebrastreifen,gekennzeichneter übergang,markierter übergang,querung,übergang,überweg,fußgängerüberweg,markierung"
+                    "name": "Gehweg-Querung mit Fahrbahnmarkierung",
+                    "terms": "markierter fußgängerüberweg,markierter zebrastreifen,zebrastreifen,fußgängerüberweg",
+                    "aliases": "Gekennzeichneter Übergang\nMarkierter Übergang"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Nicht gekennzeichneter Übergang",
                     "terms": "nicht gekennzeichneter übergang,nicht markierte kreuzung,nicht gekennzeichnete kreuzung"
                 },
-                "highway/crossing/zebra": {
-                    "name": "markierter / gekennzeichneter Übergang"
-                },
                 "highway/cycleway": {
                     "name": "Radweg",
                     "terms": "radweg,radfahrweg,radfahrerweg,fahrradweg"
@@ -5861,9 +6164,6 @@
                     "name": "Rad- und Fußübergang",
                     "terms": "rad- und fußübergang,fahrradübergang und fußgängerübergang"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Gekennzeichneter Fahrrad-Übergang"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Radweg-Querung mit Ampel",
                     "terms": "fahrradquerung,fahrradüberweg,radquerung,radüberweg,radfahrerquerung,radfahrerüberweg,fahrradweg,radweg,fahrradstreifen,radstreifen,ampel,ampelgeregelt,lichtzeichen"
@@ -5915,10 +6215,6 @@
                 "highway/footway/crossing": {
                     "name": "Fußgängerüberweg (eigener Weg)"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Gehweg-Querung mit Fahrbahnmarkierung",
-                    "aliases": "Gekennzeichneter Übergang\nMarkierter Übergang"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Gehweg-Querung mit Ampel",
                     "terms": "fußgängerampel,fußgängergang,fußgängerüberweg (ampel),fahrradüberweg (ampel),zebrastreifen (ampel)"
@@ -5932,9 +6228,6 @@
                     "name": "Querung ohne Markierungen",
                     "terms": "nicht gekennzeichneter übergang,nicht markierte kreuzung,nicht gekennzeichnete kreuzung"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Gehweg-Querung mit Zebrastreifen"
-                },
                 "highway/footway/informal": {
                     "name": "Trampelpfad"
                 },

dist/translations/el.json

@@ -243,6 +243,14 @@
                 "animal_shelter": {
                     "label": "Για Ζώα"
                 },
+                "archaeological_site": {
+                    "options": {
+                        "city": "Ιστορική Πόλη",
+                        "fortification": "Οχύρωση",
+                        "necropolis": "Νεκρόπολη",
+                        "roman_villa": "Ρωμαϊκή Βίλα"
+                    }
+                },
                 "architect": {
                     "label": "Αρχιτέκτονας",
                     "terms": "αρχιτέκτονας"
@@ -254,7 +262,15 @@
                     "label": "Καλλιτέχνης"
                 },
                 "artwork_type": {
-                    "label": "Τύπος"
+                    "label": "Τύπος",
+                    "options": {
+                        "graffiti": "Γραφίτι",
+                        "mosaic": "Μωσαϊκό",
+                        "mural": "Τοιχογραφία",
+                        "painting": "Πίνακας",
+                        "sculpture": "Γλυπτό",
+                        "statue": "Άγαλμα"
+                    }
                 },
                 "ascent": {
                     "label": "Συνολική Άνοδος"
@@ -290,7 +306,19 @@
                     "terms": "μπάρα,πάγκος"
                 },
                 "barrier": {
-                    "label": "Είδος"
+                    "label": "Είδος",
+                    "options": {
+                        "bollard": "Κολονάκι",
+                        "chain": "Αλυσίδα",
+                        "city_wall": "Τείχη Πόλης",
+                        "entrance": "Είσοδος",
+                        "fence": "Φράκτης",
+                        "gate": "Πύλη",
+                        "guard_rail": "Προστατευτικό Κιγκλίδωμα",
+                        "hedge": "Θαμνώδης Περίφραξη",
+                        "height_restrictor": "Περιοριστής Ύψους",
+                        "kerb": "Κράσπεδο"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Εμπόδιο",
@@ -309,7 +337,11 @@
                     "label": "Αμμόλουτρο"
                 },
                 "bath/type": {
-                    "label": "Ειδικότητα"
+                    "label": "Ειδικότητα",
+                    "options": {
+                        "lake": "Λίμνη",
+                        "thermal": "Θερμά Λουτρά"
+                    }
                 },
                 "beauty": {
                     "label": "Υπηρεσίες",
@@ -355,7 +387,17 @@
                     }
                 },
                 "board_type": {
-                    "label": "Τύπος"
+                    "label": "Τύπος",
+                    "options": {
+                        "art": "Τέχνη",
+                        "astronomy": "Αστρονομία",
+                        "geology": "Γεωλογία",
+                        "history": "Ιστορία",
+                        "nature": "Φύση",
+                        "notice": "Σημειωματάριο",
+                        "plants": "Βλάστηση",
+                        "welcome_sign": "Πινακίδα Καλώς Ορίσματος"
+                    }
                 },
                 "bollard": {
                     "label": "Τύπος"
@@ -417,6 +459,9 @@
                 "building/part": {
                     "label": "Τμήμα Κτίρίου\nΜέρος Κτιρίου\nΚτίριο"
                 },
+                "building/prefabricated": {
+                    "label": "Προκατασκευασμένος"
+                },
                 "bunker_type": {
                     "label": "Τύπος"
                 },
@@ -459,7 +504,6 @@
                     "terms": "χωρητικότητα"
                 },
                 "capacity/caravans": {
-                    "label": "Χωρητικότητα (Τροχόσπιτων)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -596,7 +640,39 @@
                     }
                 },
                 "craft": {
-                    "label": "Τύπος"
+                    "label": "Τύπος",
+                    "options": {
+                        "agricultural_engines": "Μηχανικός Αγροτικών Μηχανημάτων",
+                        "basket_maker": "Καλαθοποιός",
+                        "beekeeper": "Μελισσοκόμος",
+                        "blacksmith": "Σιδεράς",
+                        "boatbuilder": "Ναυπηγός",
+                        "bookbinder": "Βιβλιοδέτης",
+                        "brewery": "Ζυθοποιός",
+                        "builder": "Οικοδόμος",
+                        "carpenter": "Ξυλουργός",
+                        "caterer": "Προμηθευτής",
+                        "chimney_sweeper": "Καπνοδοχοκαθαριστής",
+                        "cleaning": "Υπηρεσία Καθαριότητας",
+                        "clockmaker": "Ωρολογοποιός",
+                        "confectionery": "Ζαχαροπλάστης",
+                        "distillery": "Οινοπνευματοποιείο",
+                        "dressmaker": "Μοδίστρα",
+                        "electrician": "Ηλεκτρονικός",
+                        "electronics_repair": "Τεχνικός Ηλεκτρονικών",
+                        "floorer": "Πατωματζής",
+                        "gardener": "Κηπουρός",
+                        "glaziery": "Υαλουργείο",
+                        "grinding_mill": "Μύλος Άλεσης",
+                        "handicraft": "Χειροτεχνία",
+                        "jeweller": "Κοσμηματοποιός",
+                        "painter": "Βαφέας",
+                        "photographer": "Φωτογράφος",
+                        "plumber": "Υδραυλικός",
+                        "sculptor": "Γλύπτης",
+                        "shoemaker": "Υποδηματοποιός",
+                        "tailor": "Ράπτης"
+                    }
                 },
                 "crane/type": {
                     "label": "Τύπος γερανού",
@@ -1665,6 +1741,23 @@
                 },
                 "material": {
                     "label": "Υλικό",
+                    "options": {
+                        "aluminium": "Αλουμίνιο",
+                        "brick": "Τούβλο",
+                        "bronze": "Μπρούτζος",
+                        "concrete": "Τσιμέντο",
+                        "glass": "Γυαλί",
+                        "granite": "Γρανίτης",
+                        "iron": "Σίδερο",
+                        "marble": "Μάρμαρο",
+                        "metal": "Μέταλλο",
+                        "plastic": "Πλαστικό",
+                        "rock": "Βράχος",
+                        "sand": "Άμμος",
+                        "steel": "Ατσάλι",
+                        "stone": "Πέτρα",
+                        "wood": "Ξύλο"
+                    },
                     "terms": "υλικό"
                 },
                 "mattress": {
@@ -1705,7 +1798,14 @@
                     "terms": "πλάτος,μέγιστο εύρος,εύρος,μέγιστο άνοιγμα,άνοιγμα"
                 },
                 "memorial": {
-                    "label": "Είδος"
+                    "label": "Είδος",
+                    "options": {
+                        "obelisk": "Οβελίσκος",
+                        "plaque": "Αναμνηστική Πλακέτα",
+                        "sculpture": "Γλυπτό",
+                        "statue": "Άγαλμα",
+                        "war_memorial": "Μνημείο Πολέμου"
+                    }
                 },
                 "microbrewery": {
                     "label": "Μικροζυθοποιία",
@@ -2101,6 +2201,16 @@
                 "plant/method": {
                     "label": "Μέθοδος Παραγωγής"
                 },
+                "plant/output": {
+                    "options": {
+                        "compressed_air": "Συμπιεσμένος Αέρας",
+                        "electricity": "Ηλεκτρισμός",
+                        "hot_air": "Καυτός Αέρας",
+                        "hot_water": "Καυτό Νερό",
+                        "steam": "Ατμός",
+                        "vacuum": "Κενό"
+                    }
+                },
                 "plant/output/electricity": {
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
@@ -2327,6 +2437,9 @@
                 "rooms": {
                     "label": "Δωμάτια"
                 },
+                "rotor/diameter": {
+                    "label": "Διάμετρος Ρότορα (Μέτρα)"
+                },
                 "roundtrip": {
                     "label": "Φόρμα Βρόχου"
                 },
@@ -2525,6 +2638,9 @@
                 "shelter_type": {
                     "label": "Τύπος"
                 },
+                "shoes": {
+                    "label": "Υποδήματα"
+                },
                 "shop": {
                     "label": "Είδος"
                 },
@@ -2575,7 +2691,13 @@
                     "label": "SMS"
                 },
                 "social_facility": {
-                    "label": "Τύπος"
+                    "label": "Τύπος",
+                    "options": {
+                        "day_care": "Ημερήσια Φροντίδα",
+                        "food_bank": "Τράπεζα Τροφίμων",
+                        "nursing_home": "Γηροκομείο",
+                        "workshop": "Εργαστήριο"
+                    }
                 },
                 "social_facility_for": {
                     "label": "Εξυπηρετημένος Κόσμος"
@@ -2657,7 +2779,7 @@
                     "label": "Είδος Στάσης",
                     "options": {
                         "all": "'Ολες οι Κατευθύνσεις",
-                        "minor": "Τοπικός Δρόμος"
+                        "minor": "Δρόμος Τοπικός"
                     }
                 },
                 "street_cabinet": {
@@ -2684,7 +2806,9 @@
                 "structure_power": {
                     "label": "Κατασκευή",
                     "options": {
-                        "lattice": "Δικτυωτό"
+                        "lattice": "Δικτυωτό",
+                        "solid": "Συμπαγές",
+                        "tubular": "Σωληνοειδής"
                     }
                 },
                 "structure_waterway": {
@@ -2706,11 +2830,25 @@
                     "terms": "wikidata αντικειμένου"
                 },
                 "substance": {
-                    "label": "Ουσία"
+                    "label": "Ουσία",
+                    "options": {
+                        "fuel": "Καύσιμα",
+                        "gas": "Φυσικό Αέριο",
+                        "oil": "Μαζούτ",
+                        "rainwater": "Βρόχινα Νερά",
+                        "sewage": "Απόβλητα",
+                        "water": "Πόσιμο Νερό"
+                    }
                 },
                 "substation": {
                     "label": "Είδος",
                     "options": {
+                        "compensation": "Αντιστάθμιση Άεργου Ισχύος",
+                        "converter": "Μετασχηματιστής Υψηλής Τάσης AC/DC",
+                        "distribution": "Περιφερειακή Διανομή",
+                        "generation": "Γενιά",
+                        "industrial": "Βιομηχανικός",
+                        "minor_distribution": "Τοπική Διανομή",
                         "traction": "Σύστημα Τροφοδοσίας Μεταφοράς"
                     }
                 },
@@ -3022,7 +3160,10 @@
                     }
                 },
                 "utility": {
-                    "label": "Εργαλείο"
+                    "label": "Εργαλείο",
+                    "options": {
+                        "street_lighting": "Φωτισμός Δρόμου"
+                    }
                 },
                 "utility_semi": {
                     "label": "Εργαλεία"
@@ -3104,7 +3245,10 @@
                     "label": "Σημείο με Νερό"
                 },
                 "water_source": {
-                    "label": "Πηγή Νερού"
+                    "label": "Πηγή Νερού",
+                    "options": {
+                        "main": "Σωλήνας Διανομής Νερού"
+                    }
                 },
                 "water_tank/volume": {
                     "label": "Όγκος (Λίτρα)",
@@ -3447,9 +3591,78 @@
                     "name": "Ιατρός",
                     "terms": "ιατρός,ιατρείο,ιατρικό κέντρο"
                 },
+                "amenity/doctors/allergology": {
+                    "name": "Αλλεργιολόγος"
+                },
+                "amenity/doctors/cardiology": {
+                    "name": "Καρδιολόγος"
+                },
+                "amenity/doctors/dermatology": {
+                    "name": "Δερματολόγος"
+                },
+                "amenity/doctors/gastroenterology": {
+                    "name": "Γαστρεντερολόγος"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Γυναικολόγος"
                 },
+                "amenity/doctors/haematology": {
+                    "name": "Αιματολόγος"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Παθολόγος"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Νεφρολόγος"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Νευρολόγος"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "Νευροχειρουργός"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Ογκολόγος"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Οφθαλμολόγος"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Ορθοπεδικός Χειρουργός"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Ωτορινολαρυγγολόγος"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Παιδίατρος"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Παθολόγος"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Πλαστικός Χειρουργός"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Ποδίατρος"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Γαστρεντερολόγος"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Πνευμονολόγος"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Ακτινολόγος"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Ρευματολόγος"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Γενικός Χειρουργός"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Ουρολόγος"
+                },
                 "amenity/dojo": {
                     "name": "Ντότζο/ Σχολή Πολεμικών Τεχνών",
                     "terms": "ντότζο/ κέντρο πολεμικών τεχνών,ντότζο,σχολή πολεμικών τεχνών,ακαδημία/σχολείο πολεμικών τεχνών"
@@ -4068,9 +4281,6 @@
                     "name": "Εγκλεισμός ζώων",
                     "terms": "περίφραξη ζώων"
                 },
-                "attraction/big_wheel": {
-                    "name": "Μεγάλη Ρόδα"
-                },
                 "attraction/bumper_car": {
                     "name": "Συγκρουόμενα Αυτοκίνητα"
                 },
@@ -4209,10 +4419,6 @@
                 "barrier/kissing_gate": {
                     "name": "Πόρτα Παγίδευσης"
                 },
-                "barrier/lift_gate": {
-                    "name": "Ανυψούμενη Μπάρα",
-                    "terms": "μπάρα,αναρτούμενη πύλη"
-                },
                 "barrier/log": {
                     "name": "Πεσμένο Δέντρο"
                 },
@@ -4451,9 +4657,6 @@
                 "building/stadium": {
                     "name": "Στάδιο"
                 },
-                "building/static_caravan": {
-                    "name": "Λυόμενο"
-                },
                 "building/sty": {
                     "name": "Χοιροστάσιο"
                 },
@@ -4833,6 +5036,15 @@
                 "healthcare/alternative/chiropractic": {
                     "name": "Χειροπράκτορας"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Ομοιοπαθητικός"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Φυσικοπαθητικός"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Χειροπράκτωρ"
+                },
                 "healthcare/audiologist": {
                     "name": "Ωτορινολαρυγγολόγος"
                 },
@@ -4909,21 +5121,12 @@
                 "highway/crossing": {
                     "name": "Διασταύρωση"
                 },
-                "highway/crossing/marked": {
-                    "name": "Διάβαση Πεζών / Ζέβρα"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Διάβαση Με Φανάρια Πεζών"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Διαγραμμισμένη Διάβαση Πεζών"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Διάβαση Χωρίς Διαγράμμιση"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Διάβαση Πεζών / Ζέβρα"
-                },
                 "highway/cycleway": {
                     "name": "Ποδηλατόδρομος",
                     "terms": "διαδρομή ποδηλάτων,δρόμος ποδηλάτων,ποδηλατολωρίδα"
@@ -4937,9 +5140,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Διαστάυρωση Ποδηλατόδρομου με Πεζόδρομου"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Διαγραμμισμένη Διάβαση Δίκυκλων"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Διάβαση Δίκυκλων Με Φανάρια"
                 },
@@ -4963,7 +5163,7 @@
                     "name": "Χώρος Στάθμευσης Εκτάκτου Ανάγκης"
                 },
                 "highway/footway": {
-                    "name": "Μονοπάτι Πεζών",
+                    "name": "Πεζόδρομος",
                     "terms": "μονοπάτι,διαδρομή πεζού,πεζοδρόμιο,πεζόδρομος,βόλτα"
                 },
                 "highway/footway/access_aisle": {
@@ -4975,9 +5175,6 @@
                 "highway/footway/crossing": {
                     "name": "Διάβαση Πεζών"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Διαγραμμισμένη Διάβαση"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Διάβαση Με Φανάρια Πεζών"
                 },
@@ -4987,9 +5184,6 @@
                 "highway/footway/crossing/unmarked": {
                     "name": "Διάβαση Χωρίς Διαγράμμιση"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Διάβαση Με Διαγράμμιση"
-                },
                 "highway/footway/informal": {
                     "name": "Ανεπίσημο Μονοπάτι Πεζοπορίας",
                     "aliases": "Άτυπο μονοπάτι πεζών\nΑνεπίσημο μονοπάτι πεζών"
@@ -5004,7 +5198,7 @@
                     "name": "Σήμανση Παραχώρησης Προτεραιότητας"
                 },
                 "highway/living_street": {
-                    "name": "Δρόμος Ήπιας Κυκλοφορίας"
+                    "name": "Οδός Ήπιας Κυκλοφορίας"
                 },
                 "highway/milestone": {
                     "name": "Χιλιομετρικό Σημείο Αυτοκινητόδρομου"
@@ -5026,7 +5220,7 @@
                     "name": "Πέρασμα"
                 },
                 "highway/path": {
-                    "name": "Μονοπάτι (χρήση εκτός μηχανοκίνητων οχημάτων)",
+                    "name": "Στενό Μονοπάτι",
                     "terms": "διαδρομή,μονοπάτι"
                 },
                 "highway/path/boardwalk": {
@@ -5039,8 +5233,8 @@
                     "name": "Πεζοδρομημένη Περιοχή"
                 },
                 "highway/pedestrian_line": {
-                    "name": "Πεζοδρομημένος Δρόμος",
-                    "terms": "πεζοδρομημένη οδός\nπεζόδρομος"
+                    "name": "Πεζοδρομημένη Οδός",
+                    "terms": "πεζοδρομημένος δρόμος\nπεζόδρομος"
                 },
                 "highway/primary": {
                     "name": "Δευτερεύον Δίκτυο / Εθνική Οδός"
@@ -5059,18 +5253,17 @@
                     "name": "Πίστα Motocross"
                 },
                 "highway/residential": {
-                    "name": "Οικιστικός Δρόμος",
-                    "terms": "αστική οδός,τοπική οδός,οδός εντός αστικού ιστού",
-                    "aliases": "Δημοτική Οδός"
+                    "name": "Δρόμος Οικιστικός",
+                    "terms": "αστική οδός,τοπική οδός,οδός εντός αστικού ιστού"
                 },
                 "highway/rest_area": {
                     "name": "Χώρος Στάθμευσης και Αναψυχής - Χ.Σ.Α."
                 },
                 "highway/road": {
-                    "name": "Απροσδιόριστη Οδός"
+                    "name": "Δρόμος Απροσδιόριστος"
                 },
                 "highway/road/bridge": {
-                    "name": "Γέφυρα Απροσδιόριστης Οδού"
+                    "name": "Γέφυρα Απροσδιόριστου Δρόμου"
                 },
                 "highway/secondary": {
                     "name": "Τριτεύον Δίκτυο / Επαρχιακή Οδός"
@@ -5079,7 +5272,7 @@
                     "name": "Σύνδεση Τριτεύοντος Δικτύου / Επαρχιακής Οδού"
                 },
                 "highway/service": {
-                    "name": "Δρόμος εξυπηρέτησης",
+                    "name": "Δρόμος Εξυπηρέτησης",
                     "terms": "δρόμος εξυπηρέτησης,βοηθητικός δρόμος,βοηθητική οδός,συμπληρωματικός δρόμος"
                 },
                 "highway/service/alley": {
@@ -5137,8 +5330,8 @@
                     "name": "Αυτόματο Σύστημα Διοδίων (Χωρίς Καμπίνες)"
                 },
                 "highway/track": {
-                    "name": "Αγροτικός δρόμος / Δρόμος πρόσβασης γης",
-                    "terms": "δασικός δρόμος,χωματόδρομος,καρόδρομος"
+                    "name": "Δρόμος Αγροτικός / Πρόσβασης Γης",
+                    "terms": "δασικός δρόμος,καρόδρομος"
                 },
                 "highway/traffic_mirror": {
                     "name": "Κυρτοί Καθρέπτες Δρόμου"
@@ -5164,9 +5357,8 @@
                     "name": "Νησίδα Αναστροφής"
                 },
                 "highway/unclassified": {
-                    "name": "Δευτερεύων δρόμος/Εκτός Οικιστικών Περιοχών",
-                    "terms": "τοπικός δρόμος\nαταξινόμητος δρόμος\nάγνωστη κατηγορία δρόμου\nδρόμος χωρίς κατηγορία\nοδός χωρίς κατηγορία",
-                    "aliases": "Εκτός Οικιστικών Περιοχών\nΤοπικός δρόμος"
+                    "name": "Δρόμος Μη Οικιστικός / Δευτερεύων",
+                    "terms": "τοπικός δρόμος\nαταξινόμητος δρόμος\nάγνωστη κατηγορία δρόμου\nδρόμος χωρίς κατηγορία\nοδός χωρίς κατηγορία"
                 },
                 "historic": {
                     "name": "Ιστορική τοποθεσία",

dist/translations/en-AU.json

@@ -9,6 +9,9 @@
                 "brewery": {
                     "label": "Draught Beers"
                 },
+                "building/flats": {
+                    "label": "Unit Count"
+                },
                 "capacity_volume": {
                     "label": "Capacity (Cubic Metres)"
                 },
@@ -238,15 +241,6 @@
                 "healthcare/counselling": {
                     "name": "Counselling Centre"
                 },
-                "highway/crossing/marked": {
-                    "name": "Marked Crossing"
-                },
-                "highway/crossing/uncontrolled": {
-                    "name": "Marked Crossing"
-                },
-                "highway/crossing/zebra": {
-                    "name": "Marked Crossing"
-                },
                 "highway/cycleway/bicycle_foot": {
                     "name": "Shared Path"
                 },

dist/translations/en-GB.json

@@ -1922,9 +1922,6 @@
                 "attraction/amusement_ride": {
                     "name": "Amusement Ride"
                 },
-                "attraction/big_wheel": {
-                    "name": "Big Wheel"
-                },
                 "attraction/bungee_jumping": {
                     "name": "Bungee Jumping"
                 },
@@ -2000,9 +1997,6 @@
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate"
                 },
-                "barrier/lift_gate": {
-                    "name": "Lift Gate"
-                },
                 "barrier/retaining_wall": {
                     "name": "Retaining Wall"
                 },
@@ -2142,9 +2136,6 @@
                 "building/stadium": {
                     "name": "Stadium Building"
                 },
-                "building/static_caravan": {
-                    "name": "Static Caravan"
-                },
                 "building/temple": {
                     "name": "Temple Building"
                 },
@@ -2416,12 +2407,6 @@
                 "highway/corridor": {
                     "name": "Indoor Corridor"
                 },
-                "highway/crossing/marked": {
-                    "name": "Marked Crossing"
-                },
-                "highway/crossing/zebra": {
-                    "name": "Marked Crossing"
-                },
                 "highway/cycleway": {
                     "name": "Cycle Path"
                 },

dist/translations/en.json

@@ -243,7 +243,22 @@
                     "label": "For Animals"
                 },
                 "archaeological_site": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "baths": "Baths",
+                        "city": "Historic City",
+                        "crannog": "Crannog",
+                        "enclosure": "Enclosure",
+                        "fortification": "Fortification",
+                        "hut_circle": "Hut Circle",
+                        "megalith": "Megalith",
+                        "necropolis": "Necropolis",
+                        "petroglyph": "Rock Carving",
+                        "roman_circus": "Roman Circus",
+                        "roman_villa": "Roman Villa",
+                        "settlement": "Historic Settlement",
+                        "tumulus": "Tumulus"
+                    }
                 },
                 "architect": {
                     "label": "Architect",
@@ -277,7 +292,28 @@
                     "label": "ATM"
                 },
                 "attraction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "animal": "Animal Enclosure",
+                        "water_slide": "Water Slide",
+                        "amusement_ride": "Amusement Ride",
+                        "roller_coaster": "Roller Coaster",
+                        "carousel": "Carousel",
+                        "maze": "Maze",
+                        "summer_toboggan": "Summer Toboggan",
+                        "big_wheel": "Ferris Wheel",
+                        "train": "Tourist Train",
+                        "bumper_car": "Bumper Cars",
+                        "bungee_jumping": "Bungee Jumping",
+                        "dark_ride": "Dark Ride",
+                        "drop_tower": "Drop Tower Ride",
+                        "kiddie_ride": "Kiddie Ride",
+                        "log_flume": "Log Flume",
+                        "pirate_ship": "Pirate Ship Ride",
+                        "river_rafting": "River Rapids Ride",
+                        "swing_carousel": "Swing Carousel",
+                        "alpine_coaster": "Alpine Coaster"
+                    }
                 },
                 "automated": {
                     "label": "Automated"
@@ -311,7 +347,32 @@
                     }
                 },
                 "barrier": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "fence": "Fence",
+                        "gate": "Gate",
+                        "wall": "Wall",
+                        "hedge": "Hedge",
+                        "kerb": "Curb",
+                        "bollard": "Bollard",
+                        "lift_gate": "Boom Gate",
+                        "retaining_wall": "Retaining Wall",
+                        "block": "Large Block",
+                        "guard_rail": "Guard Rail",
+                        "cycle_barrier": "Cycle Barrier",
+                        "stile": "Stile",
+                        "entrance": "Entrance",
+                        "swing_gate": "Swing Gate",
+                        "cattle_grid": "Cattle Grid",
+                        "ditch": "Ditch",
+                        "toll_booth": "Toll Booth",
+                        "city_wall": "City Wall",
+                        "kissing_gate": "Kissing Gate",
+                        "chain": "Chain",
+                        "jersey_barrier": "Jersey Barrier",
+                        "height_restrictor": "Height Restrictor",
+                        "turnstile": "Turnstile"
+                    }
                 },
                 "basin": {
                     "label": "Type",
@@ -329,7 +390,14 @@
                     "label": "Sand Bath"
                 },
                 "bath/type": {
-                    "label": "Specialty"
+                    "label": "Specialty",
+                    "options": {
+                        "hammam": "Hammam",
+                        "hot_spring": "Hot Spring",
+                        "lake": "Lake",
+                        "onsen": "Onsen",
+                        "thermal": "Thermal Bath"
+                    }
                 },
                 "beauty": {
                     "label": "Services",
@@ -518,7 +586,7 @@
                     "placeholder": "50, 100, 200..."
                 },
                 "capacity/caravans": {
-                    "label": "Capacity (Caravans)",
+                    "label": "Capacity (Campervan / Camping Trailer)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -533,6 +601,9 @@
                     "label": "Capacity (Tents)",
                     "placeholder": "10, 20, 50..."
                 },
+                "caravans": {
+                    "label": "Campervan / Camping Trailer"
+                },
                 "cash_in": {
                     "label": "Deposits"
                 },
@@ -563,6 +634,7 @@
                 },
                 "check_date": {
                     "label": "Last Checked Date",
+                    "terms": "survey date,last survey date",
                     "placeholder": "YYYY-MM-DD"
                 },
                 "circumference": {
@@ -778,6 +850,7 @@
                 "crossing/light": {
                     "label": "Lights"
                 },
+                "crossing/markings_yes": {},
                 "crossing/markings": {
                     "label": "Crossing Markings",
                     "options": {
@@ -1403,6 +1476,7 @@
                     "label": "Hashtags",
                     "placeholder": "#example"
                 },
+                "healthcare_therapist": {},
                 "healthcare": {
                     "label": "Type"
                 },
@@ -1753,6 +1827,13 @@
                 "lifeguard": {
                     "label": "Lifeguard"
                 },
+                "lift_gate/type": {
+                    "label": "Type",
+                    "options": {
+                        "single": "Single Bar",
+                        "double": "Opposing Bars"
+                    }
+                },
                 "line_attachment": {
                     "label": "Line Attachment"
                 },
@@ -1805,7 +1886,31 @@
                     "label": "Type"
                 },
                 "material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "options": {
+                        "adobe": "Adobe",
+                        "aluminium": "Aluminum",
+                        "brass": "Brass",
+                        "brick": "Brick",
+                        "bronze": "Bronze",
+                        "concrete": "Concrete",
+                        "dry_stone": "Dry Stone",
+                        "glass": "Glass",
+                        "granite": "Granite",
+                        "iron": "Iron",
+                        "limestone": "Limestone",
+                        "marble": "Marble",
+                        "metal": "Metal",
+                        "plastic": "Plastic",
+                        "reinforced_conrete": "Reinforced Concrete",
+                        "rock": "Rock",
+                        "sand": "Sand",
+                        "sandstone": "Sandstone",
+                        "soil": "Soil, Earth",
+                        "steel": "Steel",
+                        "stone": "Stone",
+                        "wood": "Wood"
+                    }
                 },
                 "mattress": {
                     "label": "Mattresses Available"
@@ -1840,7 +1945,20 @@
                     "label": "Max Width"
                 },
                 "memorial": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "blue_plaque": "Blue Plaque",
+                        "bust": "Bust",
+                        "cross": "Memorial Cross",
+                        "obelisk": "Obelisk",
+                        "plaque": "Commemorative Plaque",
+                        "sculpture": "Sculpture",
+                        "statue": "Statue",
+                        "stele": "Stele",
+                        "stolperstein": "Stolperstein",
+                        "stone": "Stone",
+                        "war_memorial": "War Memorial"
+                    }
                 },
                 "microbrewery": {
                     "label": "Microbrewery",
@@ -1964,8 +2082,69 @@
                     "label": "Note",
                     "terms": "comment"
                 },
+                "nudism": {
+                    "label": "Nudism",
+                    "terms": "naturism,naturist,nude recreation,nudist",
+                    "options": {
+                        "customary": "Customary",
+                        "designated": "Designated",
+                        "no": "Prohibited",
+                        "obligatory": "Obligatory",
+                        "permissive": "Permissive",
+                        "yes": "Allowed"
+                    }
+                },
                 "office": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "accountant": "Accountant Office",
+                        "adoption_agency": "Adoption Agency",
+                        "advertising_agency": "Advertising Agency",
+                        "architect": "Architect Office",
+                        "association": "Nonprofit Organization Office",
+                        "charity": "Charity Office",
+                        "company": "Corporate Office",
+                        "construction_company": "Construction Company Office",
+                        "consulting": "Consultancy Office",
+                        "courier": "Courier Office",
+                        "coworking": "Coworking Space",
+                        "diplomatic": "Diplomatic Office",
+                        "educational_institution": "Educational Institution",
+                        "employment_agency": "Employment Agency",
+                        "energy_supplier": "Energy Supplier Office",
+                        "engineer": "Engineering Office",
+                        "estate_agent": "Real Estate Office",
+                        "financial": "Financial Office",
+                        "financial_advisor": "Financial Advisor",
+                        "forestry": "Forestry Office",
+                        "foundation": "Foundation Office",
+                        "government": "Government Office",
+                        "graphic_design": "Graphic Design Office",
+                        "guide": "Tour Guide Office",
+                        "insurance": "Insurance Office",
+                        "it": "Information Technology Office",
+                        "lawyer": "Law Office",
+                        "logistics": "Forwarding Agency",
+                        "moving_company": "Moving Company Office",
+                        "newspaper": "Newspaper Office",
+                        "ngo": "NGO Office",
+                        "notary": "Notary Office",
+                        "physician": "Physician",
+                        "political_party": "Political Party Office",
+                        "private_investigator": "Private Investigator Office",
+                        "property_management": "Property Management Office",
+                        "quango": "Quasi-NGO Office",
+                        "religion": "Religious Office",
+                        "research": "Research Office",
+                        "security": "Security Office",
+                        "surveyor": "Surveyor Office",
+                        "tax_advisor": "Tax Advisor Office",
+                        "telecommunication": "Telecom Office",
+                        "therapist": "Therapist Office",
+                        "travel_agent": "Travel Agency",
+                        "union": "Labor Union Office",
+                        "water_utility": "Water Utility Office"
+                    }
                 },
                 "oneway_yes": {
                     "options": {
@@ -2059,7 +2238,10 @@
                         "rooftop": "Rooftop",
                         "sheds": "Sheds",
                         "street_side": "Street-Side",
-                        "layby": "Turnout / Lay-By"
+                        "layby": "Turnout / Lay-By",
+                        "on_kerb": "On Kerb",
+                        "half_on_kerb": "Half On Kerb",
+                        "shoulder": "Shoulder"
                     }
                 },
                 "parking/orientation": {
@@ -2070,6 +2252,35 @@
                         "perpendicular": "Meets the Street at a Straight Angle"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Parking orientation",
+                    "types": {
+                        "parking:left:orientation": "Left side",
+                        "parking:right:orientation": "Right side"
+                    },
+                    "options": {
+                        "parallel": "Parallel to the Street",
+                        "diagonal": "Diagonal in Relation to the Street (~45°)",
+                        "perpendicular": "Meets the Street at a Straight Angle (~90°)"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Parking",
+                    "types": {
+                        "parking:left": "Left side",
+                        "parking:right": "Right side"
+                    },
+                    "options": {
+                        "lane": "Roadside Lane",
+                        "street_side": "Street-Side",
+                        "on_kerb": "On Kerb",
+                        "half_on_kerb": "Half On Kerb",
+                        "shoulder": "Shoulder",
+                        "no": "No",
+                        "separate": "Parking mapped separately",
+                        "yes": "Yes (unspecified)"
+                    }
+                },
                 "payment_multi_fee": {},
                 "payment_multi": {
                     "label": "Payment Types",
@@ -2125,6 +2336,10 @@
                     "terms": "phone number",
                     "placeholder": "+31 42 123 4567"
                 },
+                "picnic_table": {
+                    "label": "Picnic Table",
+                    "terms": "outdoor table,bench"
+                },
                 "pipeline": {
                     "label": "Type"
                 },
@@ -2467,7 +2682,18 @@
                     "label": "Type"
                 },
                 "resource": {
-                    "label": "Resources"
+                    "label": "Resources",
+                    "options": {
+                        "aggregate": "Aggregate",
+                        "clay": "Clay",
+                        "coal": "Coal",
+                        "gold": "Gold",
+                        "gravel": "Gravel",
+                        "iron_ore": "Iron Ore",
+                        "limestone": "Limestone",
+                        "peat": "Peat",
+                        "sand": "Sand"
+                    }
                 },
                 "restriction": {
                     "label": "Type"
@@ -2816,7 +3042,44 @@
                     }
                 },
                 "sport": {
-                    "label": "Sports"
+                    "label": "Sports",
+                    "options": {
+                        "american_football": "American Football",
+                        "athletics": "Athletics",
+                        "badminton": "Badminton",
+                        "baseball": "Baseball",
+                        "basketball": "Basketball",
+                        "beachvolleyball": "Beach Volleyball",
+                        "boules": "Boules",
+                        "bowls": "Bowls",
+                        "climbing": "Climbing",
+                        "cricket": "Cricket",
+                        "cycling": "Cycling",
+                        "equestrian": "Equestrian",
+                        "fitness": "Fitness Training",
+                        "free_flying": "Paragliding / Hang Gliding",
+                        "futsal": "Futsal",
+                        "golf": "Golf",
+                        "gymnastics": "Gymnastics",
+                        "handball": "Team Handball",
+                        "horse_racing": "Horse Racing",
+                        "karting": "Kart Racing",
+                        "motocross": "Motocross",
+                        "motor": "Motorsports",
+                        "netball": "Netball",
+                        "padel": "Padel",
+                        "rugby_union": "Rugby Union",
+                        "running": "Running",
+                        "shooting": "Shooting",
+                        "skateboard": "Skateboard",
+                        "skiing": "Skiing",
+                        "soccer": "Soccer",
+                        "softball": "Softball",
+                        "swimming": "Swimming",
+                        "table_tennis": "Table Tennis",
+                        "tennis": "Tennis",
+                        "volleyball": "Volleyball"
+                    }
                 },
                 "stars": {
                     "label": "Stars",
@@ -2827,6 +3090,9 @@
                     "terms": "inception",
                     "placeholder": "YYYY-MM-DD"
                 },
+                "static_caravans": {
+                    "label": "Mobile Homes"
+                },
                 "step_count": {
                     "label": "Number of Steps"
                 },
@@ -2888,7 +3154,16 @@
                     "label": "Subject Wikidata"
                 },
                 "substance": {
-                    "label": "Substance"
+                    "label": "Substance",
+                    "options": {
+                        "fuel": "Fuel",
+                        "gas": "Natural Gas",
+                        "hot_water": "Hot Water",
+                        "oil": "Crude Oil",
+                        "rainwater": "Rainwater",
+                        "sewage": "Sewage",
+                        "water": "Drinking Water"
+                    }
                 },
                 "substation_pipeline": {
                     "label": "Type",
@@ -3036,6 +3311,9 @@
                 "telecom/medium": {
                     "label": "Medium"
                 },
+                "tents": {
+                    "label": "Tents"
+                },
                 "tidal": {
                     "label": "Tidal"
                 },
@@ -3107,7 +3385,6 @@
                 },
                 "traffic_calming": {
                     "label": "Type",
-                    "terms": "flat top,hump,speed,slow",
                     "options": {
                         "bump": "Speed Bump",
                         "chicane": "Traffic Chicane",
@@ -3336,7 +3613,13 @@
                     "label": "Type"
                 },
                 "waste": {
-                    "label": "Waste"
+                    "label": "Waste",
+                    "options": {
+                        "cigarettes": "Cigarettes",
+                        "dog_excrement": "Dog Excrement",
+                        "organic": "Organic Waste",
+                        "trash": "Trash"
+                    }
                 },
                 "water_point": {
                     "label": "Water Point"
@@ -4713,8 +4996,8 @@
                     "terms": "amphibian,animal park,aquarium,bear,bird,fish,insect,lion,mammal,monkey,penguin,reptile,safari,theme park,tiger,zoo"
                 },
                 "attraction/big_wheel": {
-                    "name": "Big Wheel",
-                    "terms": "ferris wheel,theme park,amusement ride"
+                    "name": "Ferris Wheel",
+                    "terms": "theme park,amusement ride"
                 },
                 "attraction/bumper_car": {
                     "name": "Bumper Cars",
@@ -4891,8 +5174,8 @@
                     "name": "Kissing Gate"
                 },
                 "barrier/lift_gate": {
-                    "name": "Lift Gate",
-                    "terms": "boom barrier,boom gate,boom lift,hinged bar,pivoted pole"
+                    "name": "Boom Barrier",
+                    "terms": "boom gate,boom lift,hinged bar,lift gate,pivoted pole"
                 },
                 "barrier/motorcycle_barrier": {
                     "name": "Motorcycle Barrier"
@@ -5126,8 +5409,8 @@
                     "name": "Stadium Building"
                 },
                 "building/static_caravan": {
-                    "name": "Static Mobile Home",
-                    "terms": "house trailer,manufactured home,mobile home,prefabricated home,residential caravan,static caravan,trailer home"
+                    "name": "Mobile Home",
+                    "terms": "house trailer,manufactured home,prefabricated home,residential caravan,static caravan,static mobile home,trailer home"
                 },
                 "building/sty": {
                     "name": "Pigsty",
@@ -5534,12 +5817,36 @@
                 },
                 "healthcare/alternative": {
                     "name": "Alternative Medicine",
-                    "terms": "acupuncture,anthroposophical,applied kinesiology,aromatherapy,ayurveda,herbalism,homeopathy,hydrotherapy,hypnosis,naturopathy,osteopathy,reflexology,reiki,shiatsu,traditional,tuina,unani"
+                    "terms": "anthroposophical,applied kinesiology,aromatherapy,herbalism,hydrotherapy,hypnosis,reflexology,traditional,unani"
+                },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Acupuncture Practitioner",
+                    "aliases": "Acupuncturist"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Ayurveda Practitioner",
+                    "terms": "traditional indian medicine"
                 },
                 "healthcare/alternative/chiropractic": {
                     "name": "Chiropractor",
                     "terms": "back,pain,spine"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Homeopath",
+                    "aliases": "Homeopathy Practitioner"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturopath",
+                    "aliases": "Naturopathy Practitioner"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Osteopath",
+                    "aliases": "Osteopathy Practitioner"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Traditional Chinese Medicine Practitioner",
+                    "terms": "die da,dit da,reiki,tcm,tui na,shiatsu"
+                },
                 "healthcare/audiologist": {
                     "name": "Audiologist",
                     "terms": "ear,hearing,sound"
@@ -5630,22 +5937,19 @@
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                 },
-                "highway/crossing/marked": {
-                    "name": "Marked Crosswalk"
-                },
-                "highway/crossing/zebra": {
-                    "name": "Marked Crosswalk"
-                },
+                "highway/crossing/marked": {},
+                "highway/crossing/zebra": {},
                 "highway/crossing/traffic_signals": {
                     "name": "Crossing With Pedestrian Signals",
-                    "terms": "pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)"
+                    "terms": "bicycle crossing (lights),crosswalk (lights),pedestrian crossing (lights),pedestrian traffic lights,pedestrian traffic signals"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "Marked Crosswalk"
+                    "name": "Marked Crossing",
+                    "terms": "marked foot path crossing,marked crosswalk,marked pedestrian crosswalk,zebra crossing,crosswalk"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Unmarked Crossing",
-                    "terms": "unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing"
+                    "terms": "unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing"
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
@@ -5658,16 +5962,14 @@
                     "name": "Cycle & Foot Path",
                     "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,shared path,shared use path,rail trail"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Marked Cycle Crossing"
-                },
+                "highway/cycleway/crossing/marked": {},
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Cycle & Foot Crossing",
                     "terms": "bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist"
                 },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Cycle Crossing With Traffic Signals",
-                    "terms": "cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"
+                    "terms": "bicycle crossing,bike crossing,cycle path crossing,cycleway crossing"
                 },
                 "highway/cycleway/crossing/uncontrolled": {
                     "name": "Marked Cycle Crossing",
@@ -5675,7 +5977,7 @@
                 },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Unmarked Cycle Crossing",
-                    "terms": "cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"
+                    "terms": "bike crossing,bicycle crossing,cycle path crossing,cycleway crossing"
                 },
                 "highway/cycleway/moped_link-NL": {
                     "name": "Moped Link"
@@ -5720,15 +6022,11 @@
                     "name": "Moving Walkway",
                     "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Marked Crossing"
-                },
-                "highway/footway/crossing/zebra": {
-                    "name": "Marked Crossing"
-                },
+                "highway/footway/crossing/marked": {},
+                "highway/footway/crossing/zebra": {},
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Crossing With Pedestrian Signals",
-                    "terms": "pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)"
+                    "terms": "crosswalk (lights),pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights)"
                 },
                 "highway/footway/crossing/uncontrolled": {
                     "name": "Marked Crossing",
@@ -5736,7 +6034,7 @@
                 },
                 "highway/footway/crossing/unmarked": {
                     "name": "Unmarked Crossing",
-                    "terms": "unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing"
+                    "terms": "unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing"
                 },
                 "highway/footway/sidewalk": {
                     "name": "Sidewalk",
@@ -7002,6 +7300,10 @@
                     "name": "Military Trench",
                     "terms": "dugout,firestep,fox hole,infantry trench,war trench"
                 },
+                "natural/wood": {
+                    "name": "Natural Wood",
+                    "terms": "boreal,forest,forrest,taiga,tree,trees,woodlands,woods"
+                },
                 "natural/bare_rock": {
                     "name": "Bare Rock",
                     "terms": "rock"
@@ -7213,10 +7515,6 @@
                 "natural/wetland/wet_meadow": {
                     "name": "Wet Meadow"
                 },
-                "natural/wood": {
-                    "name": "Natural Wood",
-                    "terms": "boreal,forest,forrest,taiga,tree,trees,woodlands,woods"
-                },
                 "network/type/node_network-DE-NL-BE-LU": {
                     "name": "Recreational Network Node",
                     "terms": "node network,rcn,rwn"
@@ -7430,7 +7728,7 @@
                 },
                 "office/union": {
                     "name": "Labor Union Office",
-                    "terms": "trade union"
+                    "terms": "trade union,union office"
                 },
                 "office/water_utility": {
                     "name": "Water Utility Office",
@@ -8175,7 +8473,7 @@
                 },
                 "shop/cannabis": {
                     "name": "Cannabis Shop",
-                    "terms": "420,marijuana,pot,reefer,weed"
+                    "terms": "420,cannabis dispensary,marijuana,pot,reefer,weed"
                 },
                 "shop/car_parts": {
                     "name": "Car Parts Store",
@@ -8957,7 +9255,7 @@
                 },
                 "traffic_calming/island": {
                     "name": "Traffic Island",
-                    "terms": "circle,roundabout,slow,traffic calming"
+                    "terms": "circle,roundabout,slow"
                 },
                 "traffic_calming/mini_bumps": {
                     "name": "Mini Speed Bumps",

dist/translations/eo.json

@@ -463,7 +463,6 @@
                     "terms": "nombro da ejoj"
                 },
                 "capacity/caravans": {
-                    "label": "Enhaveco (kampad-veturiloj)",
                     "placeholder": "10, 20, 50…"
                 },
                 "capacity/disabled_parking": {
@@ -3956,10 +3955,6 @@
                     "name": "Besto (nelibera)",
                     "terms": "bestoĝardeno,kaĝo,leono,tigro,elefanto,zoologia ĝardeno,zoo"
                 },
-                "attraction/big_wheel": {
-                    "name": "Spektoradego",
-                    "terms": "giganta radego,radego de ferris,granda radego"
-                },
                 "attraction/bumper_car": {
                     "name": "Karambolaj aŭtetoj (allogaĵo)",
                     "terms": "koliziaj aŭtetoj,aŭtetoj,dodgem"
@@ -4111,10 +4106,6 @@
                     "name": "Nurhoma pordego",
                     "terms": "kontraŭbruta,kontraubruta,kontrauxbruta"
                 },
-                "barrier/lift_gate": {
-                    "name": "Bariero levebla",
-                    "terms": "vojbarilo,movebla barilo"
-                },
                 "barrier/retaining_wall": {
                     "name": "Apogmuro",
                     "terms": "apoga muro,kontraŭglito,klifo artefarita,terglito,kontraŭterglito"
@@ -4352,10 +4343,6 @@
                     "name": "Konstruaĵo de stadiono",
                     "terms": "stadiono,sportejo"
                 },
-                "building/static_caravan": {
-                    "name": "Movdomo (nemovata)",
-                    "terms": "movebla domo,kampadveturilo statika,kampveturilo statika"
-                },
                 "building/sty": {
                     "name": "Pork-stalo",
                     "terms": "porkstalo,stalo,porkostalo,porkejo"
@@ -4900,19 +4887,10 @@
                 "highway/crossing": {
                     "name": "Stratpasejo"
                 },
-                "highway/crossing/marked": {
-                    "name": "Stratpasejo zebrostria"
-                },
-                "highway/crossing/uncontrolled": {
-                    "name": "Stratpasejo zebrostria"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Stratpasejo nemarkita",
                     "terms": "pasejo,trairejo,transpasejo,piedira transirejo"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Stratpasejo zebrostria"
-                },
                 "highway/cycleway": {
                     "name": "Bicikl-vojo",
                     "terms": "biciklo,biciklovojo"
@@ -4928,9 +4906,6 @@
                     "name": "Stratpasejo por biciklistoj k piedirantoj",
                     "terms": "biciklvojo,biciklovojo,pasejo,zebro,transirejo"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Stratpasejo bicikla (markita)"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Stratpasejo bicikla (nemarkita)",
                     "terms": "biciklvojo,biciklovojo,pasejo"

dist/translations/es.json

@@ -244,7 +244,22 @@
                     "label": "Para animales"
                 },
                 "archaeological_site": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "baths": "Baños",
+                        "city": "Ciudad histórica",
+                        "crannog": "Crannog",
+                        "enclosure": "Recinto",
+                        "fortification": "Fortificación",
+                        "hut_circle": "Círculo de cabaña",
+                        "megalith": "Megalito",
+                        "necropolis": "Necrópolis",
+                        "petroglyph": "Tallado en roca",
+                        "roman_circus": "Circo romano",
+                        "roman_villa": "Villa romana",
+                        "settlement": "Asentamiento histórico",
+                        "tumulus": "Túmulo"
+                    }
                 },
                 "architect": {
                     "label": "Arquitecto, ta",
@@ -278,7 +293,28 @@
                     "label": "Cajero automático"
                 },
                 "attraction": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "alpine_coaster": "Montaña rusa alpina",
+                        "amusement_ride": "Atracción de feria",
+                        "animal": "Recinto para animales",
+                        "big_wheel": "Noria",
+                        "bumper_car": "Autitos chocadores",
+                        "bungee_jumping": "Salto en bungee / Puenting",
+                        "carousel": "Carrusel",
+                        "dark_ride": "Tren fantasma",
+                        "drop_tower": "Torre de caída",
+                        "kiddie_ride": "Paseo infantil",
+                        "log_flume": "Canal de troncos",
+                        "maze": "Laberinto",
+                        "pirate_ship": "Paseo en barco pirata",
+                        "river_rafting": "Paseo por los rápidos del río",
+                        "roller_coaster": "Montaña rusa",
+                        "summer_toboggan": "Tobogán de verano",
+                        "swing_carousel": "Carrusel oscilante",
+                        "train": "Tren turístico",
+                        "water_slide": "Tobogán acuático"
+                    }
                 },
                 "automated": {
                     "label": "Automático"
@@ -307,7 +343,32 @@
                     "terms": "bar,barra,copas,tapas,café,cafetería,pub,cantina,taberna"
                 },
                 "barrier": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "block": "Bloque grande",
+                        "bollard": "Bolardo",
+                        "cattle_grid": "Guardaganado",
+                        "chain": "Cadena",
+                        "city_wall": "Muralla",
+                        "cycle_barrier": "Barrera para bicicletas",
+                        "ditch": "Zanja",
+                        "entrance": "Entrada",
+                        "fence": "Valla",
+                        "gate": "Puerta",
+                        "guard_rail": "Guardarraíl",
+                        "hedge": "Seto",
+                        "height_restrictor": "Restrictor de altura",
+                        "jersey_barrier": "Barrera Jersey",
+                        "kerb": "Bordillo",
+                        "kissing_gate": "Pasamano / Tranquera",
+                        "lift_gate": "Barrera levadiza",
+                        "retaining_wall": "Muro de contención",
+                        "stile": "Escalones",
+                        "swing_gate": "Puerta batiente",
+                        "toll_booth": "Cabina de peaje",
+                        "turnstile": "Torniquete",
+                        "wall": "Pared"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barrera",
@@ -317,7 +378,13 @@
                     }
                 },
                 "basin": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "detention": "Detención",
+                        "evaporation": "Evaporación",
+                        "infiltration": "Infiltración",
+                        "retention": "Retención"
+                    }
                 },
                 "bath/open_air": {
                     "label": "Aire libre"
@@ -326,7 +393,14 @@
                     "label": "Baño de arena"
                 },
                 "bath/type": {
-                    "label": "Especialidad"
+                    "label": "Especialidad",
+                    "options": {
+                        "hammam": "Haman",
+                        "hot_spring": "Aguas termales",
+                        "lake": "Lago",
+                        "onsen": "Onsen",
+                        "thermal": "Baño termal"
+                    }
                 },
                 "beauty": {
                     "label": "Servicios",
@@ -512,7 +586,7 @@
                     "terms": "capacidad,aforo,cabida,aptitud"
                 },
                 "capacity/caravans": {
-                    "label": "Capacidad (Caravanas)",
+                    "label": "Capacidad (Autocaravana / Remolque de camping)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -535,6 +609,9 @@
                     "label": "Capacidad (metros cúbicos)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Autocaravana / Remolque de camping"
+                },
                 "cash_in": {
                     "label": "Depósitos"
                 },
@@ -567,7 +644,8 @@
                 },
                 "check_date": {
                     "label": "Fecha de última revisión",
-                    "placeholder": "AAAA-MM-DD"
+                    "placeholder": "AAAA-MM-DD",
+                    "terms": "relevamiento,reconocimiento,fecha del último relevamiento"
                 },
                 "circumference": {
                     "label": "Circunferencia (a la altura del pecho)",
@@ -963,7 +1041,7 @@
                     "label": "Destinos"
                 },
                 "destination/ref": {
-                    "label": "Referència de la carretera de destí"
+                    "label": "Referencia de la carretera de destino"
                 },
                 "destination/symbol": {
                     "label": "Símbolos de destino"
@@ -1538,7 +1616,7 @@
                     "terms": "altura del edificio,metros,pies"
                 },
                 "highchair": {
-                    "label": "Trona",
+                    "label": "Trona / Sillita alta",
                     "terms": "silla alta,sillita alta para niños,trona"
                 },
                 "highspeed": {
@@ -1798,6 +1876,13 @@
                 "lifeguard": {
                     "label": "Socorrista acuático"
                 },
+                "lift_gate/type": {
+                    "label": "Tipo",
+                    "options": {
+                        "double": "Barras opuestas",
+                        "single": "Barra única"
+                    }
+                },
                 "line_attachment": {
                     "label": "Fijación de la línea",
                     "terms": "fijación de la línea,enganche de la línea,soporte de la línea"
@@ -1855,6 +1940,30 @@
                 },
                 "material": {
                     "label": "Material",
+                    "options": {
+                        "adobe": "Adobe",
+                        "aluminium": "Aluminio",
+                        "brass": "Latón",
+                        "brick": "Ladrillo",
+                        "bronze": "Bronce",
+                        "concrete": "Hormigón / Concreto",
+                        "dry_stone": "Piedra seca",
+                        "glass": "Vidrio",
+                        "granite": "Granito",
+                        "iron": "Hierro",
+                        "limestone": "Caliza",
+                        "marble": "Mármol",
+                        "metal": "Metal",
+                        "plastic": "Plástico",
+                        "reinforced_conrete": "Hormigón armado",
+                        "rock": "Roca",
+                        "sand": "Arena",
+                        "sandstone": "Arenisca",
+                        "soil": "Suelo, tierra",
+                        "steel": "Acero",
+                        "stone": "Piedra",
+                        "wood": "Madera"
+                    },
                     "terms": "material,fibra,sustrato,sustancia,elemento"
                 },
                 "mattress": {
@@ -1897,7 +2006,20 @@
                     "terms": "ancho máximo,anchura máxima,máximo,ancho límite,anchura límite"
                 },
                 "memorial": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "blue_plaque": "Placa azul",
+                        "bust": "Busto",
+                        "cross": "Cruz conmemorativa",
+                        "obelisk": "Obelisco",
+                        "plaque": "Placa conmemorativa",
+                        "sculpture": "Escultura",
+                        "statue": "Estatua",
+                        "stele": "Estela",
+                        "stolperstein": "Stolperstein",
+                        "stone": "Piedra",
+                        "war_memorial": "Monumento al soldado caído"
+                    }
                 },
                 "microbrewery": {
                     "label": "Microcervecería",
@@ -2027,8 +2149,69 @@
                     "label": "Nota",
                     "terms": "comentario,observación,nota"
                 },
+                "nudism": {
+                    "label": "Nudismo",
+                    "options": {
+                        "customary": "Costumbre",
+                        "designated": "Designado",
+                        "no": "Prohibido",
+                        "obligatory": "Obligatorio",
+                        "permissive": "Permisivo",
+                        "yes": "Permitido"
+                    },
+                    "terms": "naturismo,naturista,recreación al desnudo,nudista"
+                },
                 "office": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "accountant": "Estudio contable",
+                        "adoption_agency": "Agencia de adopción",
+                        "advertising_agency": "Agencia de publicidad",
+                        "architect": "Estudio de arquitectura",
+                        "association": "Oficina de organización sin fines de lucro",
+                        "charity": "Oficina de caridad",
+                        "company": "Oficina corporativa",
+                        "construction_company": "Oficina de empresa constructora",
+                        "consulting": "Oficina de consultoría",
+                        "courier": "Oficina de mensajería",
+                        "coworking": "Espacio de coworking",
+                        "diplomatic": "Oficina diplomática",
+                        "educational_institution": "Institución educativa",
+                        "employment_agency": "Agencia de empleo",
+                        "energy_supplier": "Oficina de proveedor de energía",
+                        "engineer": "Oficina de ingeniería",
+                        "estate_agent": "Oficina inmobiliaria",
+                        "financial": "Oficina financiera",
+                        "financial_advisor": "Asesor financiero",
+                        "forestry": "Oficina forestal",
+                        "foundation": "Oficina de la fundación",
+                        "government": "Oficina gubernamental",
+                        "graphic_design": "Oficina de diseño gráfico",
+                        "guide": "Oficina del guía turístico",
+                        "insurance": "Oficina de seguros",
+                        "it": "Oficina de Tecnología de la Información",
+                        "lawyer": "Despacho de abogados",
+                        "logistics": "Agencia de transportes",
+                        "moving_company": "Oficina de empresa de mudanzas",
+                        "newspaper": "Oficina del periódico",
+                        "ngo": "Oficina de ONG",
+                        "notary": "Notaría",
+                        "physician": "Médico",
+                        "political_party": "Oficina del partido político",
+                        "private_investigator": "Oficina del detective privado",
+                        "property_management": "Oficina de administración de propiedades",
+                        "quango": "Oficina de cuasi-ONG",
+                        "religion": "Oficina religiosa",
+                        "research": "Oficina de investigación",
+                        "security": "Oficina de seguridad",
+                        "surveyor": "Oficina del perito",
+                        "tax_advisor": "Oficina de asesoría fiscal",
+                        "telecommunication": "Oficina de telecomunicaciones",
+                        "therapist": "Oficina del terapeuta",
+                        "travel_agent": "Agencia de viajes",
+                        "union": "Oficina sindical",
+                        "water_utility": "Oficina de suministro de agua"
+                    }
                 },
                 "oneway": {
                     "label": "Sentido único",
@@ -2115,11 +2298,14 @@
                     "options": {
                         "carports": "Cocheras",
                         "garage_boxes": "Garaje en cubículos",
+                        "half_on_kerb": "La mitad en la acera",
                         "lane": "Carril al borde de la calzada",
                         "layby": "Área de descanso",
                         "multi-storey": "Multinivel",
+                        "on_kerb": "En la acera",
                         "rooftop": "Techo",
                         "sheds": "Galpones",
+                        "shoulder": "Arcén / banquina",
                         "street_side": "Adyacente a la calzada",
                         "surface": "Superficie",
                         "underground": "Subterráneo"
@@ -2128,9 +2314,40 @@
                 "parking/orientation": {
                     "label": "Orientación",
                     "options": {
-                        "diagonal": "Diagonal a la calle",
-                        "parallel": "Paralelo a la calle",
-                        "perpendicular": "En ángulo recto a la calle"
+                        "diagonal": "Diagonal a la calzada",
+                        "parallel": "Paralelo a la calzada",
+                        "perpendicular": "En ángulo recto a la calzada"
+                    }
+                },
+                "parking/side/orientation": {
+                    "label": "Orientación del estacionamiento",
+                    "options": {
+                        "diagonal": "Diagonal con respecto a la calzada (~45°)",
+                        "parallel": "Paralelo a la calzada",
+                        "perpendicular": "Se encuentra con la calzada en ángulo recto (~90°)"
+                    },
+                    "terms": "orientación de estacionamiento,orientación de aparcamiento",
+                    "types": {
+                        "parking:left:orientation": "Lado izquierdo",
+                        "parking:right:orientation": "Lado derecho"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Estacionamiento",
+                    "options": {
+                        "half_on_kerb": "La mitad en la acera",
+                        "lane": "Carril al borde de la calzada",
+                        "no": "No",
+                        "on_kerb": "En la acera",
+                        "separate": "Estacionamiento mapeado por separado",
+                        "shoulder": "Arcén / banquina",
+                        "street_side": "Adyacente a la calzada",
+                        "yes": "Sí (sin especificar)"
+                    },
+                    "terms": "aparcamiento,estacionamiento,parking",
+                    "types": {
+                        "parking:left": "Lado izquierdo",
+                        "parking:right": "Lado derecho"
                     }
                 },
                 "parking_entrance": {
@@ -2194,6 +2411,10 @@
                     "placeholder": "+31 42 123 4567",
                     "terms": "teléfono,número de teléfono,número de línea,móvil,celular"
                 },
+                "picnic_table": {
+                    "label": "Mesa de picnic",
+                    "terms": "mesa de exterior,banco"
+                },
                 "pipeline": {
                     "label": "Tipo"
                 },
@@ -2418,7 +2639,7 @@
                         "engine_oil": "Aceite de motor",
                         "glass": "Cualquier vidrio (vidrio templado, ventanas, espejos, etc.)",
                         "glass_bottles": "Botellas y frascos de vidrio",
-                        "green_waste": "Residuos verdes",
+                        "green_waste": "Residuos orgánicos",
                         "paper": "Papel",
                         "plastic": "Plástico",
                         "plastic_bottles": "Botellas de plástico",
@@ -2468,7 +2689,7 @@
                     "label": "Número de plataforma"
                 },
                 "ref_road_number": {
-                    "label": "Referència de la carretera",
+                    "label": "Referencia de la carretera",
                     "terms": "número de camino,número de ruta,número de calle,número de vía"
                 },
                 "ref_room_number": {
@@ -2540,7 +2761,18 @@
                     "label": "Tipo"
                 },
                 "resource": {
-                    "label": "Recursos"
+                    "label": "Recursos",
+                    "options": {
+                        "aggregate": "Agregado",
+                        "clay": "Arcilla",
+                        "coal": "Carbón",
+                        "gold": "Oro",
+                        "gravel": "Grava",
+                        "iron_ore": "Mineral de hierro",
+                        "limestone": "Caliza",
+                        "peat": "Turba",
+                        "sand": "Arena"
+                    }
                 },
                 "restriction": {
                     "label": "Tipo"
@@ -2824,7 +3056,18 @@
                     "terms": "sms,mensaje,celular,teléfono,móvil,texto"
                 },
                 "social_facility": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "ambulatory_care": "Atención ambulatoria",
+                        "assisted_living": "Hogar para indigentes",
+                        "day_care": "Guardería",
+                        "food_bank": "Banco de alimentos",
+                        "group_home": "Hogar grupal / Asilo",
+                        "nursing_home": "Residencia de ancianos",
+                        "outreach": "Divulgación social",
+                        "shelter": "Albergue",
+                        "workshop": "Taller"
+                    }
                 },
                 "social_facility_for": {
                     "label": "Personas atendidas"
@@ -2854,7 +3097,44 @@
                     "terms": "especies,wikidata,datos,metadatos,información,etiquetas,base"
                 },
                 "sport": {
-                    "label": "Deportes"
+                    "label": "Deportes",
+                    "options": {
+                        "american_football": "Fútbol americano",
+                        "athletics": "Atletismo",
+                        "badminton": "Bádminton",
+                        "baseball": "Béisbol",
+                        "basketball": "Baloncesto / Básquetbol",
+                        "beachvolleyball": "Voleibol de playa",
+                        "boules": "Bolos",
+                        "bowls": "Bolo césped / Bochas",
+                        "climbing": "Escalada",
+                        "cricket": "Críquet",
+                        "cycling": "Ciclismo",
+                        "equestrian": "Ecuestre",
+                        "fitness": "Entrenamiento físico",
+                        "free_flying": "Parapente / Ala Delta",
+                        "futsal": "Futsal / Fútbol sala",
+                        "golf": "Golf",
+                        "gymnastics": "Gimnasia",
+                        "handball": "Handball / Balonmano por equipos",
+                        "horse_racing": "Carreras de caballos",
+                        "karting": "Carreras de karts / Karting",
+                        "motocross": "Motocross",
+                        "motor": "Deportes de motor (Motorsports)",
+                        "netball": "Balonred / Netball",
+                        "padel": "Pádel",
+                        "rugby_union": "Rugby union",
+                        "running": "Running",
+                        "shooting": "Tiro deportivo",
+                        "skateboard": "Skateboard / Monopatinaje",
+                        "skiing": "Esquí",
+                        "soccer": "Fútbol",
+                        "softball": "Sóftbol",
+                        "swimming": "Natación",
+                        "table_tennis": "Tenis de mesa",
+                        "tennis": "Tenis",
+                        "volleyball": "Voleibol"
+                    }
                 },
                 "sport_ice": {
                     "label": "Deportes",
@@ -2878,9 +3158,9 @@
                 "sport_racing_motor": {
                     "label": "Deportes",
                     "options": {
-                        "karting": "Karting",
+                        "karting": "Carreras de karts / karting",
                         "motocross": "Motocross",
-                        "motor": "Automovilismo",
+                        "motor": "Deportes de motor (Motorsports)",
                         "speedway": "Pista de carreras de motos"
                     }
                 },
@@ -2891,7 +3171,7 @@
                         "cycling": "Ciclismo",
                         "dog_racing": "Carreras de perros",
                         "horse_racing": "Carreras de caballos",
-                        "running": "Running (Carrera a pie)"
+                        "running": "Running"
                     }
                 },
                 "stars": {
@@ -2903,6 +3183,9 @@
                     "placeholder": "AAAA-MM-DD",
                     "terms": "fecha de inicio,comienzo,inauguración,empezar,término,final"
                 },
+                "static_caravans": {
+                    "label": "Casas móviles"
+                },
                 "step_count": {
                     "label": "Número de escalones",
                     "terms": "número de escalones,numero de escalones,escalones,pasos,intervalos"
@@ -2968,7 +3251,16 @@
                     "terms": "wikidata,wikipedia,sujeto,tema,asunto"
                 },
                 "substance": {
-                    "label": "Sustancia"
+                    "label": "Sustancia",
+                    "options": {
+                        "fuel": "Combustible",
+                        "gas": "Gas natural",
+                        "hot_water": "Agua caliente",
+                        "oil": "Petróleo crudo",
+                        "rainwater": "Agua de lluvia",
+                        "sewage": "Aguas residuales",
+                        "water": "Agua potable"
+                    }
                 },
                 "substation": {
                     "label": "Tipo",
@@ -3122,6 +3414,9 @@
                 "telecom/medium": {
                     "label": "Medio"
                 },
+                "tents": {
+                    "label": "Carpas"
+                },
                 "tidal": {
                     "label": "De marea",
                     "terms": "marea"
@@ -3212,8 +3507,7 @@
                         "mini_bumps": "Reductor de velocidad lenticular",
                         "rumble_strip": "Banda sonora reductora de velocidad",
                         "table": "Reductor de velocidad trapezoidal"
-                    },
-                    "terms": "moderador de tráfico,apaciguador de tráfico,calmado de tráfico,reductor de velocidad,tráfico,tránsito,circulación,chichón,joroba,velocidad,guardias tumbados,policías acostados,badén"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Señal de tránsito"
@@ -3350,7 +3644,16 @@
                     }
                 },
                 "utility": {
-                    "label": "Servicio público"
+                    "label": "Servicio público",
+                    "options": {
+                        "gas": "Gas",
+                        "oil": "Petróleo",
+                        "power": "Energía eléctrica",
+                        "sewerage": "Aguas residuales",
+                        "street_lighting": "Alumbrado público",
+                        "telecom": "Telecomunicaciones",
+                        "water": "Agua"
+                    }
                 },
                 "utility_semi": {
                     "label": "Servicios públicos"
@@ -3429,7 +3732,13 @@
                     "label": "Tipo"
                 },
                 "waste": {
-                    "label": "Residuos"
+                    "label": "Residuos",
+                    "options": {
+                        "cigarettes": "Cigarrillos",
+                        "dog_excrement": "Excremento de perro",
+                        "organic": "Residuos orgánicos",
+                        "trash": "Basura"
+                    }
                 },
                 "water": {
                     "label": "Tipo"
@@ -3875,10 +4184,110 @@
                     "name": "Médico",
                     "terms": "médico,medico,médica,medica,galeno,consultorio médico,ambulatorio médico,consulta médica,enfermería,doctor,doctora"
                 },
+                "amenity/doctors/allergology": {
+                    "name": "Alergólogo / Alergista",
+                    "terms": "alergólogo,alergista,alergia,asma"
+                },
+                "amenity/doctors/cardiology": {
+                    "name": "Cardiólogo",
+                    "terms": "cirujano cardíaco,cardiología,sistema cardiovascular,arteria coronaria,corazón"
+                },
+                "amenity/doctors/dermatology": {
+                    "name": "Dermatólogo",
+                    "terms": "dermatología,cabello,uñas,piel"
+                },
+                "amenity/doctors/gastroenterology": {
+                    "name": "Gastroenterólogo",
+                    "terms": "intestinos,sistema digestivo,digestión,esófago,tubo digestivo,cálculos biliares,tracto gastrointestinal,gastroenterología,intestino grueso,hígado,intestino delgado,estómago"
+                },
+                "amenity/doctors/general": {
+                    "name": "Médico de atención primaria",
+                    "terms": "médico de atención primaria,médico de familia,médico de cabecera,médico primario"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Ginecólogo",
                     "terms": "óvulo,ginecólogo,ginecologo,ginecóloga,ginecologa ginecología,ginecologia,obstetricia,ovulación,ovulacion,reproductiva,médico de la mujer,medicina de la mujer"
                 },
+                "amenity/doctors/haematology": {
+                    "name": "Hematólogo",
+                    "terms": "anemia,sangre,médula ósea,hematología,leucemia,linfoma"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Internista",
+                    "terms": "médico general interno,medicina interna,especialista en medicina interna"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Nefrólogo",
+                    "terms": "riñón,riñones,medicina renal,nefrología,renal"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Neurólogo",
+                    "terms": "cerebro,nervios,sistema nervioso,neurología,neurocirugía"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "Neurocirujano",
+                    "terms": "cerebro,cirugía neurológica,neurocirugía"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Oncólogo",
+                    "terms": "cáncer,quimioterapia,oncología,tumor"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Oftalmólogo",
+                    "terms": "ojo,ojos,anteojos,ocular,oftalmología"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Cirujano ortopédico",
+                    "terms": "cirugía ortopédica"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Otorrinolaringólogo",
+                    "terms": "oído,otorrinolaringología,cirugía de cabeza y cuello,nariz,orl,cráneo,garganta"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Pediatra",
+                    "terms": "adolescentes,niños,bebés,pediatría"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Patólogo",
+                    "terms": "autopsia,patología anatómica,patología"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Cirujano plástico",
+                    "terms": "cirugía estética,cirugía cosmética,cirugía craneofacial,cirugía reconstructiva,cirugía plástica"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Podólogo",
+                    "terms": "tobillo,pies,pie,pierna,piernas,podología"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Cirujano colorrectal",
+                    "terms": "cirugía colorrectal,proctología,colon,ano,coloproctología"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Neumólogo",
+                    "terms": "asma,medicina torácica,pulmón,neumología,neumonología,neumonía,vías respiratorias,respirología,medicina respiratoria"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Radiólogo",
+                    "terms": "radiología,tomografía computarizada,imágenes por resonancia magnética,resonancia,ultrasonido médico,ultrasonografía médica,resonancia magnética,ecografía,ultrasonografía"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Reumatólogo",
+                    "terms": "lupus,osteoporosis,reuma,reumatología"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Cirujano general",
+                    "terms": "cirugía"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Cirujano traumatológico",
+                    "terms": "cirugía,cirugía de trauma,cirujano traumatólogo,traumatólogo"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Urólogo",
+                    "terms": "glándulas suprarrenales,vejiga,epidídimo,riñón,pene,próstata,reproductor,escroto,testículos,uretra,uréteres,urología,urinario"
+                },
                 "amenity/dojo": {
                     "name": "Academia de artes marciales",
                     "terms": "dojo,academia,artes marciales,karate,judo,taekwondo,kendo,ninjutsu,kung fu"
@@ -4368,11 +4777,11 @@
                 },
                 "amenity/shelter": {
                     "name": "Refugio",
-                    "terms": "albergue,abrigo,amparo,asilo,cobertizo,garita,refugio"
+                    "terms": "albergue,abrigo,amparo,asilo,cobertizo,garita,refugio,templete,pabellón,gazebo,picnic"
                 },
                 "amenity/shelter/gazebo": {
-                    "name": "Gazebo",
-                    "terms": "gazebo,glorieta"
+                    "name": "Gazebo / Glorieta",
+                    "terms": "gazebo,glorieta,mirador,kiosco,quiosco,templete,tienda,pabellón"
                 },
                 "amenity/shelter/lean_to": {
                     "name": "Cobertizo",
@@ -4655,15 +5064,15 @@
                 },
                 "attraction/big_wheel": {
                     "name": "Noria",
-                    "terms": "rueda de la fortuna,vuelta al mundo,viaje a la luna,rueda moscovita,rueda de chicago,rueda chicagua,rueda gigante,rueda feria,juego mecánico,juego de feria"
+                    "terms": "parque temático,atracciones,noria de feria,rueda de chicago,rueda de la fortuna,rueda ferris,rueda gigante,rueda moscovita,viaje a la luna,vuelta al mundo,estrella,atracción de feria,parque de atracciones,parque de diversiones"
                 },
                 "attraction/bumper_car": {
-                    "name": "Autos de choque",
-                    "terms": "atracción,atraccion,coche de choque,autos chocadores,autitos chocadores,carros chocones,parque de atracciones,coches chocantes,coches locos,coches de tope,carritos chocones"
+                    "name": "Autitos chocadores",
+                    "terms": "atracción,atraccion,coche de choque,autos chocadores,autitos chocadores,carros chocones,parque de atracciones,coches chocantes,coches locos,coches de tope,carritos chocones,autitos chocones,caritos chocadores,autos de choque,coches de choque,carros chocadores"
                 },
                 "attraction/bungee_jumping": {
-                    "name": "Saldo de bungee",
-                    "terms": "salto,saltar,bungee,puenting,puente,benji,cuerda elástica,salto al vacío"
+                    "name": "Salto en bungee / Puenting",
+                    "terms": "salto,saltar,bungee,puenting,puente,benji,cuerda elástica,salto al vacío,bungee jumping"
                 },
                 "attraction/carousel": {
                     "name": "Carrusel",
@@ -4674,7 +5083,7 @@
                     "terms": "paseo oscuro,viaje oscuro,tren fantasma,paseo guiado,juego de feria"
                 },
                 "attraction/drop_tower": {
-                    "name": "Paseo en torre de caída",
+                    "name": "Torre de caída",
                     "terms": "parque temático,atracción de feria,góndola,torre,gran caída"
                 },
                 "attraction/kiddie_ride": {
@@ -4694,7 +5103,7 @@
                     "terms": "parque temático,paseo de carnaval,paseo de atracciones"
                 },
                 "attraction/river_rafting": {
-                    "name": "Paseo en rápidos por el río",
+                    "name": "Paseo por los rápidos del río",
                     "terms": "parque temático,parque acuático,simulador de rafting,paseo en balsa por el río,paseo en rápidos por el río"
                 },
                 "attraction/roller_coaster": {
@@ -4702,12 +5111,12 @@
                     "terms": "montaña rusa,juego mecánico,juego de feria"
                 },
                 "attraction/summer_toboggan": {
-                    "name": "Pista de tobogán de verano",
+                    "name": "Tobogán de verano",
                     "terms": "tobogán alpino,montaña rusa,pista de tobogán de verano,montaña rusa alpina,sommerrodelbahn"
                 },
                 "attraction/swing_carousel": {
-                    "name": "Paseo del columpio",
-                    "terms": "parque temático,atracción de feria,carrusel,torre,torre de carrusel,columpio"
+                    "name": "Carrusel oscilante",
+                    "terms": "parque temático,atracción de feria,carrusel,torre,torre de carrusel,columpio,carrusel oscilante"
                 },
                 "attraction/train": {
                     "name": "Tren turístico",
@@ -4750,7 +5159,7 @@
                     "terms": "barrera de cable,barrera de seguridad de cable metálico"
                 },
                 "barrier/cattle_grid": {
-                    "name": "Paso canadiense",
+                    "name": "Guardaganado",
                     "terms": "paso con rejas para animales,paso canadiense,barrera canadiense,guardaganados,guarda ganados,rejilla de retención,paso de vehículo"
                 },
                 "barrier/chain": {
@@ -4837,7 +5246,7 @@
                 },
                 "barrier/lift_gate": {
                     "name": "Barrera levadiza",
-                    "terms": "entrada,salida,paso,puerta,barrera,levadiza,pivote,acceso,control"
+                    "terms": "barrera levadiza,pluma"
                 },
                 "barrier/log": {
                     "name": "Árbol caído"
@@ -4866,7 +5275,7 @@
                     "terms": "tira de pinchos,pinchos,tira de púas,puas,tira de espigas,espigas,tura de clavos,clavos,barra de pinchos,barra de púas,barra de espigas,barra de clavos"
                 },
                 "barrier/stile": {
-                    "name": "Escalera de paso",
+                    "name": "Escalones de paso",
                     "terms": "peldaños en una valla,escalones de cerca,escalera de paso"
                 },
                 "barrier/swing_gate": {
@@ -5115,8 +5524,8 @@
                     "terms": "edificio del estadio,estadio"
                 },
                 "building/static_caravan": {
-                    "name": "Caravana estática",
-                    "terms": "caravana,remolque,autocaravana,trailer,roulotte,casa rodante,mobile homes,house trailers,caravanas estáticas"
+                    "name": "Casa móvil",
+                    "terms": "casa remolque,casa prefabricada,caravana residencial,caravana estática,casa móvil estática,trailer,casa rodante"
                 },
                 "building/sty": {
                     "name": "Pocilga",
@@ -5585,10 +5994,34 @@
                     "name": "Medicina alternativa",
                     "terms": "medicina alternativa,acupuntura,antroposófico,kinesiología aplicada,aromaterapia,ayurveda,herbolario,homeopatía,hidroterapia,hipnosis,naturopatía,osteopatía,reflexología,reiki,shiatsu,tradicional,tuina,unani,medicina alterna"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Practicante de acupuntura",
+                    "terms": "acupuntura"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Practicante de Ayurveda",
+                    "terms": "medicina tradicional india,ayurveda"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Quiropráctico",
                     "terms": "quiropráctico,dolor de espalda,espalda,columna"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Homeópata",
+                    "terms": "homeópata,homeopatía"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturópata",
+                    "terms": "naturópata,naturopatía,medicina naturopática"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Osteópata",
+                    "terms": "osteópata,osteopatía,huesos"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Practicante de medicina tradicional china",
+                    "terms": "die da,dit da,reiki,tui na,tuina,shiatsu"
+                },
                 "healthcare/audiologist": {
                     "name": "Audiólogo",
                     "terms": "audiólogo,oído,audición,sonido"
@@ -5685,24 +6118,18 @@
                 "highway/crossing": {
                     "name": "Cruce"
                 },
-                "highway/crossing/marked": {
-                    "name": "Cruce peatonal marcado"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Cruce con señales para peatones",
                     "terms": "semáforo para peatones,señal para peatones,cruce de peatones,paso de peatones,paso de bicicletas"
                 },
                 "highway/crossing/uncontrolled": {
                     "name": "Cruce peatonal marcado",
-                    "terms": "cebra,paso de cebra,cruce marcado,paso de peatones,cruce de peatones"
+                    "terms": "paso de peatones marcado,paso de peatones señalizado,cruce de peatones señalizado,paso de cebra,cruce de cebra,cebra"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Cruce peatonal sin marcar",
                     "terms": "cruce,crucero,paso a nivel,sin marcar"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Cruce peatonal marcado"
-                },
                 "highway/cycleway": {
                     "name": "Ciclovía",
                     "terms": "camino,senda,sendero,carril bici,bicisenda,ciclovía,ciclorruta,pista,ciclista,ciclismo,bicicleta,bici"
@@ -5718,9 +6145,6 @@
                     "name": "Cruce de bicicleta y peatonal",
                     "terms": "bicicleta,paso peatonal,paso de peatones,ciclovía,ciclismo,ciclista"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Cruce de ciclovía marcado"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Cruce de ciclovía con señales de tránsito",
                     "terms": "cruce de bicisenda,cruce de ciclovía,cruce de carril bici,cruce de bicicletas"
@@ -5772,9 +6196,6 @@
                 "highway/footway/crossing": {
                     "name": "Cruce peatonal"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Cruce peatonal marcado"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Cruce con señales para peatones",
                     "terms": "semáforo para peatones,señal para peatones,cruce de peatones,paso de peatones,paso de bicicletas"
@@ -5787,9 +6208,6 @@
                     "name": "Cruce peatonal sin marcar",
                     "terms": "cruce peatonal,paso peatonal,sin marcar,sin señalar"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Cruce peatonal marcado"
-                },
                 "highway/footway/informal": {
                     "name": "Camino peatonal informal"
                 },
@@ -6443,6 +6861,10 @@
                     "name": "Jardín comunitario",
                     "terms": "jardín cooperativo,jardín colectivo,jardín comunitario"
                 },
+                "leisure/garden/residential": {
+                    "name": "Jardín residencial",
+                    "terms": "jardín trasero,patio trasero,jardín doméstico,jardín delantero,patio delantero"
+                },
                 "leisure/golf_course": {
                     "name": "Campo de golf",
                     "terms": "campo de golf,cancha de golf"
@@ -6521,7 +6943,7 @@
                     "terms": "campo,cancha,béisbol,baseball"
                 },
                 "leisure/pitch/basketball": {
-                    "name": "Cancha de baloncesto",
+                    "name": "Cancha de baloncesto / básquetbol",
                     "terms": "cancha de baloncesto,baloncesto,basketball,básquetbol"
                 },
                 "leisure/pitch/beachvolleyball": {
@@ -6598,8 +7020,8 @@
                     "terms": "cancha,campo,liga,rugby,rugbi,fútbol rugby,rugby a 13,rugby league"
                 },
                 "leisure/pitch/rugby_union": {
-                    "name": "Campo de rugby unión",
-                    "terms": "cancha,campo,unión,rugby,rugbi,fútbol rugby,rugby a 15,rugby union"
+                    "name": "Campo de rugby union",
+                    "terms": "cancha,campo,unión,union,rugby,rugbi,fútbol rugby,rugby a 15,rugby-15,rugby union"
                 },
                 "leisure/pitch/shooting": {
                     "name": "Campo de tiro",
@@ -7150,8 +7572,8 @@
                     "terms": "brezal,landa,jaral,matorral,llanura,páramo,meseta,arenal,estepa,planicie,descampado,escajo,tojo"
                 },
                 "natural/hot_spring": {
-                    "name": "Fuente termal",
-                    "terms": "manantial geotermal,piscina termal,aguas termales"
+                    "name": "Aguas termales",
+                    "terms": "manantial geotermal,piscina termal,aguas termales,fuente termal"
                 },
                 "natural/mud": {
                     "name": "Lodo",
@@ -8292,7 +8714,7 @@
                 },
                 "shop/bookmaker": {
                     "name": "Corredor de apuestas",
-                    "terms": "apuesta,dinero,apostador"
+                    "terms": "apuesta,dinero,apostador,juego,casa de apuestas,corredor de apuestas"
                 },
                 "shop/books": {
                     "name": "Librería",
@@ -8602,7 +9024,7 @@
                 },
                 "shop/kiosk": {
                     "name": "Quiosco",
-                    "terms": "kiosko,kiosco,puesto,negocio,periódico,revista,encendedor,mapas,cigarrillo,dulces,golosinas,refrescos,jugos,flores"
+                    "terms": "kiosko,kiosco,kiosquero,puesto,caseta,negocio,periódico,revista,encendedor,mapas,cigarrillo,dulces,golosinas,refrescos,jugos,flores,glorieta"
                 },
                 "shop/kitchen": {
                     "name": "Tienda de diseño de cocinas",

dist/translations/et.json

@@ -1886,9 +1886,6 @@
                 "attraction/amusement_ride": {
                     "name": "Lõbuatraktsioon"
                 },
-                "attraction/big_wheel": {
-                    "name": "Vaateratas"
-                },
                 "barrier": {
                     "name": "Barjäär",
                     "terms": "tõke,takistus,blokeering,läbisõidupiirang"
@@ -1933,9 +1930,6 @@
                 "barrier/kissing_gate": {
                     "name": "Karjavärav"
                 },
-                "barrier/lift_gate": {
-                    "name": "Tõkkepuu"
-                },
                 "barrier/retaining_wall": {
                     "name": "Tugisein",
                     "terms": "kaitsemüür"
@@ -2112,10 +2106,6 @@
                 "building/stadium": {
                     "name": "Staadionihoone"
                 },
-                "building/static_caravan": {
-                    "name": "Paikne haagismaja",
-                    "terms": "haagiselamu,haagismaja,teisaldatav maja"
-                },
                 "building/sty": {
                     "name": "Sigala"
                 },
@@ -2351,9 +2341,6 @@
                 "highway/cycleway/crossing": {
                     "name": "Lõikumine (jalg- ja) jalgrattateega"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Märgistatud lõikumine (jalg- ja) jalgrattateega"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Märgistamata lõikumine (jalg- ja) jalgrattateega",
                     "terms": "ratta,jalgratta,ülekäigu,ülekäik"

dist/translations/fa.json

@@ -444,7 +444,6 @@
                     "placeholder": "۵۰, ۱۰۰, ۲۰۰..."
                 },
                 "capacity/caravans": {
-                    "label": "ظرفیت (کاروان)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -3706,9 +3705,6 @@
                     "name": "محوطه حیوانات",
                     "terms": "پارک حیوانات، باغ وحش، خرس، پرنده، پرندگان، ماهی، حشره، حشرات، میمون، پنگوئن، پارک تفریحی، ببر، شیر، آکواریوم، لاکپشت، خزندگان"
                 },
-                "attraction/big_wheel": {
-                    "name": "چرخ و فلک"
-                },
                 "attraction/bumper_car": {
                     "name": "ماشین‌های کوبنده",
                     "terms": "پارک تفریحی، اتومبیل‌های برقی ، اتومبیل رانی"
@@ -3859,10 +3855,6 @@
                     "name": "ورودی مخصوص انسان",
                     "terms": "دروازه مخصوص انسان,کیسینگ گیت"
                 },
-                "barrier/lift_gate": {
-                    "name": "راهبند بازویی",
-                    "terms": "گیت بالارونده"
-                },
                 "barrier/retaining_wall": {
                     "name": "دیوار نگه دارنده",
                     "terms": "دیوار محافظ ، دیوار حایل ، دیوار مقابل خاکریز ، دیوار جلوگیری از ریزش سنگ و خاک"
@@ -4098,10 +4090,6 @@
                 "building/stadium": {
                     "name": "ساختمان استادیوم"
                 },
-                "building/static_caravan": {
-                    "name": "خانه از پیش ساخته متحرک",
-                    "terms": "تریلر خانه ، خانه تولیدی ، خانه موبایل ، خانه پیش ساخته ، کاروان مسکونی ، کاروان استاتیک ، خانه تریلر ، خانه سیار"
-                },
                 "building/sty": {
                     "name": "آغل خوک",
                     "terms": "سالن گراز ، قلاب خوک ، گوسفند خوک ، انبار خوک ، تالار خوک ، اغل خوک ، ریخته گوسفند ، پناهگاه خوک ، گوسفند ، خوک ، پیگمنت ، خوک ، جای خوک ، طویله خوک ، خوک دانی ، جای کثیف"
@@ -4604,19 +4592,10 @@
                 "highway/crossing": {
                     "name": "گذرگاه پیاده"
                 },
-                "highway/crossing/marked": {
-                    "name": "تقاطع گذرگاه پیاده با نشانه‌گذاری"
-                },
-                "highway/crossing/uncontrolled": {
-                    "name": "خط عابرپیاده علامت‌گذاری شده"
-                },
                 "highway/crossing/unmarked": {
                     "name": "تقاطع گذرگاه پیاده بدون نشانه‌گذاری",
                     "terms": "گذرگاه عابر پیاده، محل عبور عابر پیاده"
                 },
-                "highway/crossing/zebra": {
-                    "name": "تقاطع گذرگاه پیاده با خط‌کشی راه‌راه"
-                },
                 "highway/cycleway": {
                     "name": "راه دوچرخه‌سواری",
                     "terms": "دوچرخه,مسیر دوچرخه"
@@ -4632,9 +4611,6 @@
                     "name": "گذرگاه دوچرخه و پیاده",
                     "terms": "عبور دوچرخه و پیاده ، عبور دوچرخه و عابر پیاده ، راه دوچرخه ، دوچرخه سواری ، دوچرخه سوار، تقاطع"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "گذرگاه دوچرخه با نشانه‌گذاری"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "گذرگاه دوچرخه بدون نشانه‌گذاری",
                     "terms": "عبور دوچرخه بدون علامت، تقاطع"

dist/translations/fi.json

@@ -235,6 +235,11 @@
                 "animal_shelter": {
                     "label": "Eläimille"
                 },
+                "archaeological_site": {
+                    "options": {
+                        "city": "Historiallinen kaupunki"
+                    }
+                },
                 "architect": {
                     "label": "Arkkitehti"
                 },
@@ -245,7 +250,12 @@
                     "label": "Taiteilija"
                 },
                 "artwork_type": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "bust": "Rintakuva",
+                        "sculpture": "Veistos",
+                        "statue": "Patsas"
+                    }
                 },
                 "ascent": {
                     "label": "Nousu yhteensä"
@@ -254,7 +264,12 @@
                     "label": "Pankkiautomaatti"
                 },
                 "attraction": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "big_wheel": "Maailmanpyörä",
+                        "bumper_car": "Törmäilyautot",
+                        "carousel": "Karuselli"
+                    }
                 },
                 "automated": {
                     "label": "Automatisoitu"
@@ -277,7 +292,12 @@
                     "label": "Baari"
                 },
                 "barrier": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "city_wall": "Kaupunginmuuri",
+                        "fence": "Aita",
+                        "wall": "Seinä"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Este",
@@ -296,7 +316,12 @@
                     "label": "Hiekkakylpy"
                 },
                 "bath/type": {
-                    "label": "Erikoisuus"
+                    "label": "Erikoisuus",
+                    "options": {
+                        "hot_spring": "Kuuma lähde",
+                        "lake": "Järvi",
+                        "onsen": "Onsen-kylpylä"
+                    }
                 },
                 "beauty": {
                     "label": "Palvelut",
@@ -343,7 +368,16 @@
                     }
                 },
                 "board_type": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "art": "Taide",
+                        "astronomy": "Tähtitiede",
+                        "geology": "Geologia",
+                        "history": "Historia",
+                        "nature": "Luonto",
+                        "notice": "Ilmoitustaulu",
+                        "plants": "Kasvit"
+                    }
                 },
                 "bollard": {
                     "label": "Tyyppi"
@@ -404,7 +438,7 @@
                     "label": "Tyyppi"
                 },
                 "button_operated": {
-                    "label": "Nappi"
+                    "label": "Kutsunappi"
                 },
                 "cables": {
                     "label": "Kaapelit",
@@ -439,7 +473,6 @@
                     "terms": "kapasiteetti"
                 },
                 "capacity/caravans": {
-                    "label": "Karavaanikapasiteetti",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -570,7 +603,15 @@
                     }
                 },
                 "craft": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "blacksmith": "Rautaseppä",
+                        "bookbinder": "Kirjasitomo",
+                        "brewery": "Olutpanimo",
+                        "caterer": "Pitopalvelu",
+                        "chimney_sweeper": "Nuohooja",
+                        "cleaning": "Siivouspalvelu"
+                    }
                 },
                 "crane/type": {
                     "label": "Nosturityyppi",
@@ -3572,10 +3613,6 @@
                 "attraction/animal": {
                     "name": "Eläinhäkki"
                 },
-                "attraction/big_wheel": {
-                    "name": "Maailmanpyörä",
-                    "terms": "huvipuisto,elämyspuisto,laite,härveli,vimpain,vitkutin,huvilaite,pyörä"
-                },
                 "attraction/bumper_car": {
                     "name": "Törmäilyautot"
                 },
@@ -3690,10 +3727,6 @@
                 "barrier/kissing_gate": {
                     "name": "Karjarajoitin"
                 },
-                "barrier/lift_gate": {
-                    "name": "Nostopuomi",
-                    "terms": "puomi,portti,nosto,nousu,nouseva,ylösnouseva"
-                },
                 "barrier/log": {
                     "name": "Kaatunut puu"
                 },
@@ -3889,9 +3922,6 @@
                 "building/stadium": {
                     "name": "Stadionrakennus"
                 },
-                "building/static_caravan": {
-                    "name": "Paikallaan pysyvä siirrettävä talo"
-                },
                 "building/sty": {
                     "name": "Sikala"
                 },
@@ -4299,21 +4329,12 @@
                 "highway/crossing": {
                     "name": "Suojatie"
                 },
-                "highway/crossing/marked": {
-                    "name": "Merkitty suojatie"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Valo-ohjattu suojatie"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Merkitty suojatie"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Merkitsemätön suojatie"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Merkitty suojatie"
-                },
                 "highway/cycleway": {
                     "name": "Pyörätie"
                 },
@@ -4327,9 +4348,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Pyörätien jatke ja suojatie"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Merkitty pyörätien jatke"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Merkitsemätön pyörätien jatke"
                 },

dist/translations/fr.json

@@ -244,7 +244,22 @@
                     "label": "Pour animaux"
                 },
                 "archaeological_site": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "baths": "Bains",
+                        "city": "Cité historique",
+                        "crannog": "Crannog",
+                        "enclosure": "Enclos",
+                        "fortification": "Fortification",
+                        "hut_circle": "Cercle de cabanes",
+                        "megalith": "Mégalithe",
+                        "necropolis": "Nécropole",
+                        "petroglyph": "Pétroglyphe",
+                        "roman_circus": "Cirque romain",
+                        "roman_villa": "Villa romaine",
+                        "settlement": "Site historique",
+                        "tumulus": "Tumulus"
+                    }
                 },
                 "architect": {
                     "label": "Architecte",
@@ -278,7 +293,28 @@
                     "label": "Distributeur de billets"
                 },
                 "attraction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "alpine_coaster": "Alpine coaster",
+                        "amusement_ride": "Manège",
+                        "animal": "Enclos à animaux",
+                        "big_wheel": "Grande roue",
+                        "bumper_car": "Auto tamponneuses",
+                        "bungee_jumping": "Saut à l'élastique",
+                        "carousel": "Carrousel",
+                        "dark_ride": "Train fantôme",
+                        "drop_tower": "Tour de chute",
+                        "kiddie_ride": "Manège pour enfants",
+                        "log_flume": "Manège aquatique",
+                        "maze": "Labyrinthe",
+                        "pirate_ship": "Bateau pirate",
+                        "river_rafting": "Bouées",
+                        "roller_coaster": "Montagnes russes",
+                        "summer_toboggan": "Luge d'été",
+                        "swing_carousel": "Chaises volantes",
+                        "train": "Train touristique",
+                        "water_slide": "Toboggan aquatique"
+                    }
                 },
                 "automated": {
                     "label": "Automatisé"
@@ -307,7 +343,32 @@
                     "terms": "bar,brasserie,café,pub"
                 },
                 "barrier": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "block": "Gros bloc",
+                        "bollard": "Bollard",
+                        "cattle_grid": "Barrière à bétail",
+                        "chain": "Chaîne",
+                        "city_wall": "Mur d'enceinte",
+                        "cycle_barrier": "Barrière à vélo",
+                        "ditch": "Fossé",
+                        "entrance": "Entrée",
+                        "fence": "Clôture",
+                        "gate": "Porte",
+                        "guard_rail": "Barrière de sécurité",
+                        "hedge": "Haie",
+                        "height_restrictor": "Limite de hauteur",
+                        "jersey_barrier": "Mur Jersey",
+                        "kerb": "Bordure de trottoir",
+                        "kissing_gate": "Portillon à chicane mobile",
+                        "lift_gate": "Barrière levante",
+                        "retaining_wall": "Mur de soutènement",
+                        "stile": "Échalier",
+                        "swing_gate": "Barrière pivotante",
+                        "toll_booth": "Péage",
+                        "turnstile": "Tourniquet",
+                        "wall": "Mur"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barrière",
@@ -317,7 +378,13 @@
                     }
                 },
                 "basin": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "detention": "Bassin d'orage",
+                        "evaporation": "Bassin d'évaporation",
+                        "infiltration": "Bassin d'infiltration",
+                        "retention": "Bassin de rétention"
+                    }
                 },
                 "bath/open_air": {
                     "label": "Plein air"
@@ -326,7 +393,14 @@
                     "label": "Bain de sable"
                 },
                 "bath/type": {
-                    "label": "Spécialité"
+                    "label": "Spécialité",
+                    "options": {
+                        "hammam": "Hammam",
+                        "hot_spring": "Source chaude",
+                        "lake": "Lac",
+                        "onsen": "Onsen",
+                        "thermal": "Thermes"
+                    }
                 },
                 "beauty": {
                     "label": "Services",
@@ -510,7 +584,7 @@
                     "terms": "capacité,quantité,nombre"
                 },
                 "capacity/caravans": {
-                    "label": "Capacité (caravanes)",
+                    "label": "Capacité (camping-car / caravane)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -533,6 +607,9 @@
                     "label": "Capacité (mètres cubes)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Camping-car / caravane"
+                },
                 "cash_in": {
                     "label": "Versements"
                 },
@@ -1513,6 +1590,9 @@
                     "label": " Hauteur (Mètres)",
                     "terms": "hauteur"
                 },
+                "height/hub": {
+                    "label": "Hauteur (mètres)"
+                },
                 "height_building": {
                     "label": "Hauteur du bâtiment (mètres)",
                     "terms": "hauteur"
@@ -1775,6 +1855,13 @@
                 "lifeguard": {
                     "label": "Sauveteur"
                 },
+                "lift_gate/type": {
+                    "label": "Type",
+                    "options": {
+                        "double": "Double",
+                        "single": "Simple"
+                    }
+                },
                 "line_attachment": {
                     "label": "Armement aérien"
                 },
@@ -1832,6 +1919,30 @@
                 },
                 "material": {
                     "label": "Matériau",
+                    "options": {
+                        "adobe": "Adobe",
+                        "aluminium": "Aluminium",
+                        "brass": "Laiton",
+                        "brick": "Brique",
+                        "bronze": "Bronze",
+                        "concrete": "Béton",
+                        "dry_stone": "Pierre sèche",
+                        "glass": "Verre",
+                        "granite": "Granit",
+                        "iron": "Fer",
+                        "limestone": "Calcaire",
+                        "marble": "Marbre",
+                        "metal": "Métal",
+                        "plastic": "Plastique",
+                        "reinforced_conrete": "Béton armé",
+                        "rock": "Roche",
+                        "sand": "Sable",
+                        "sandstone": "Grès",
+                        "soil": "Terre",
+                        "steel": "Acier",
+                        "stone": "Pierre",
+                        "wood": "Bois"
+                    },
                     "terms": "matériau,matière,substance"
                 },
                 "mattress": {
@@ -1873,7 +1984,20 @@
                     "terms": "largeur maximale,envergure"
                 },
                 "memorial": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "blue_plaque": "Plaque bleue",
+                        "bust": "Buste",
+                        "cross": "Croix",
+                        "obelisk": "Obélisque",
+                        "plaque": "Plaque commémorative",
+                        "sculpture": "Sculpture",
+                        "statue": "Statue",
+                        "stele": "Stèle",
+                        "stolperstein": "Stolpersteine",
+                        "stone": "Pierre",
+                        "war_memorial": "Mémorial de guerre"
+                    }
                 },
                 "microbrewery": {
                     "label": "Micro-brasserie",
@@ -2003,8 +2127,68 @@
                     "label": "Note",
                     "terms": "note,commentaire"
                 },
+                "nudism": {
+                    "label": "Nudisme",
+                    "options": {
+                        "customary": "Habituel",
+                        "designated": "Signalé",
+                        "no": "Interdit",
+                        "obligatory": "Obligatoire",
+                        "permissive": "Toléré",
+                        "yes": "Autorisé"
+                    }
+                },
                 "office": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "accountant": "Comptable",
+                        "adoption_agency": "Agence d'adoption",
+                        "advertising_agency": "Agence de publicité",
+                        "architect": "Architecte",
+                        "association": "Bureau d'association",
+                        "charity": "Organisation de bienfaisance/charité",
+                        "company": "Bureau d'entreprise",
+                        "construction_company": "Entreprise de construction",
+                        "consulting": "Bureau de consultant",
+                        "courier": "Livreurs",
+                        "coworking": "Espace de bureaux partagés",
+                        "diplomatic": "Bâtiment diplomatique",
+                        "educational_institution": "Centre de formation",
+                        "employment_agency": "Agence pour l'emploi",
+                        "energy_supplier": "Fournisseur d'énergie",
+                        "engineer": "Bureau d'études et d'ingénierie",
+                        "estate_agent": "Agence immobilière",
+                        "financial": "Bureau d'entreprise financière",
+                        "financial_advisor": "Conseiller financier",
+                        "forestry": "Administration forestière",
+                        "foundation": "Fondation",
+                        "government": "Administration publique",
+                        "graphic_design": "Designer",
+                        "guide": "Bureau des guides",
+                        "insurance": "Agence d'assurance",
+                        "it": "Spécialiste en informatique",
+                        "lawyer": "Cabinet d'avocats",
+                        "logistics": "Entreprise de transport",
+                        "moving_company": "Entreprise de déménagement",
+                        "newspaper": "Journal",
+                        "ngo": "Organisation non gouvernementale",
+                        "notary": "Notaire",
+                        "physician": "Médecin",
+                        "political_party": "Bureau de parti politique",
+                        "private_investigator": "Enquêteur privé/détective",
+                        "property_management": "Entreprise de gestion immobilière",
+                        "quango": "Autorité administrative indépendante ",
+                        "religion": "Bureau religieux",
+                        "research": "Organisme de recherche",
+                        "security": "Agence de sécurité privée",
+                        "surveyor": "Géomètre",
+                        "tax_advisor": "Conseiller fiscal",
+                        "telecommunication": "Entreprise de télécommunications",
+                        "therapist": "Thérapeute",
+                        "travel_agent": "Agence de voyages",
+                        "union": "Bureau de syndicat",
+                        "water_utility": "Compagnie des eaux"
+                    }
                 },
                 "oneway": {
                     "label": "Sens unique",
@@ -2091,11 +2275,14 @@
                     "options": {
                         "carports": "Auvent",
                         "garage_boxes": "Box",
+                        "half_on_kerb": "Chevauchement du trottoir",
                         "lane": "Bordure de voie",
                         "layby": "Bas-côté",
                         "multi-storey": "Sur plusieurs niveaux",
+                        "on_kerb": "Sur le trottoir",
                         "rooftop": "Toiture",
                         "sheds": "Abri privé",
+                        "shoulder": "Bas-côté",
                         "street_side": "Stationnement de rue",
                         "surface": "En surface",
                         "underground": "Souterrain"
@@ -2109,6 +2296,35 @@
                         "perpendicular": "En bataille par rapport à la chaussée"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Orientation du stationnement",
+                    "options": {
+                        "diagonal": "En épi par rapport à la chaussée (~45°)",
+                        "parallel": "En créneau par rapport à la chaussée",
+                        "perpendicular": "En bataille par rapport à la chaussée (~90°)"
+                    },
+                    "types": {
+                        "parking:left:orientation": "Côté gauche",
+                        "parking:right:orientation": "Côté droit"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Stationnement",
+                    "options": {
+                        "half_on_kerb": "Chevauchement du trottoir",
+                        "lane": "Bordure de voie",
+                        "no": "Non",
+                        "on_kerb": "Sur le trottoir",
+                        "separate": "Stationnement cartographié séparément",
+                        "shoulder": "Bas-côté",
+                        "street_side": "Stationnement de rue",
+                        "yes": "Oui (non spécifié)"
+                    },
+                    "types": {
+                        "parking:left": "Côté gauche",
+                        "parking:right": "Côté droit"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Type"
                 },
@@ -2170,6 +2386,9 @@
                     "placeholder": "+33 1 23 45 67 89",
                     "terms": "téléphone,numéro de téléphone"
                 },
+                "picnic_table": {
+                    "label": "Table de pique-nique"
+                },
                 "pipeline": {
                     "label": "Type"
                 },
@@ -2516,7 +2735,18 @@
                     "label": "Type"
                 },
                 "resource": {
-                    "label": "Ressources"
+                    "label": "Ressources",
+                    "options": {
+                        "aggregate": "Agrégat",
+                        "clay": "Argile",
+                        "coal": "Charbon",
+                        "gold": "Or",
+                        "gravel": "Graviers",
+                        "iron_ore": "Minerai de fer",
+                        "limestone": "Calcaire",
+                        "peat": "Tourbe",
+                        "sand": "Sable"
+                    }
                 },
                 "restriction": {
                     "label": "Type"
@@ -2799,7 +3029,18 @@
                     "terms": "sms,texto"
                 },
                 "social_facility": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "ambulatory_care": "Soins ambulatoires",
+                        "assisted_living": "Aide à domicile",
+                        "day_care": "Soins de jour",
+                        "food_bank": "Banque alimentaire",
+                        "group_home": "Résidence collective",
+                        "nursing_home": "Maison de repos",
+                        "outreach": "Service de conseil",
+                        "shelter": "Abri",
+                        "workshop": "Entreprise de travail adapté"
+                    }
                 },
                 "social_facility_for": {
                     "label": "Personnes aidées"
@@ -2829,7 +3070,44 @@
                     "terms": "wikidata,espèce"
                 },
                 "sport": {
-                    "label": "Sport"
+                    "label": "Sport",
+                    "options": {
+                        "american_football": "Football américain",
+                        "athletics": "Athlétisme",
+                        "badminton": "Badminton",
+                        "baseball": "Baseball",
+                        "basketball": "Basket-ball",
+                        "beachvolleyball": "Beach volley",
+                        "boules": "Boules",
+                        "bowls": "Bowling",
+                        "climbing": "Escalade",
+                        "cricket": "Cricket",
+                        "cycling": "Cyclisme",
+                        "equestrian": "Équestre",
+                        "fitness": "Fitness",
+                        "free_flying": "Parapente",
+                        "futsal": "Futsal",
+                        "golf": "Golf",
+                        "gymnastics": "Gymnastique",
+                        "handball": "Handball",
+                        "horse_racing": "Course hippique",
+                        "karting": "Karting",
+                        "motocross": "Motocross",
+                        "motor": "Sports automobiles et mécaniques",
+                        "netball": "Netball",
+                        "padel": "Padel",
+                        "rugby_union": "Rugby à XV",
+                        "running": "Course à pied",
+                        "shooting": "Tir",
+                        "skateboard": "Skateboard",
+                        "skiing": "Ski",
+                        "soccer": "Football",
+                        "softball": "Softball",
+                        "swimming": "Natation",
+                        "table_tennis": "Tennis de table",
+                        "tennis": "Tennis",
+                        "volleyball": "Volley-ball"
+                    }
                 },
                 "sport_ice": {
                     "label": "Sports",
@@ -2878,6 +3156,9 @@
                     "placeholder": "AAAA-MM-JJ",
                     "terms": "date de début,début"
                 },
+                "static_caravans": {
+                    "label": "Caravanes"
+                },
                 "step_count": {
                     "label": "Nombre de marches",
                     "terms": "marches,nombre de marches,escalier"
@@ -2943,7 +3224,16 @@
                     "terms": "wikidata,sujet"
                 },
                 "substance": {
-                    "label": "Substance"
+                    "label": "Substance",
+                    "options": {
+                        "fuel": "Essence",
+                        "gas": "Gaz naturel",
+                        "hot_water": "Eau chaude",
+                        "oil": "Pétrole",
+                        "rainwater": "Eau de pluie",
+                        "sewage": "Eaux usées",
+                        "water": "Eau potable"
+                    }
                 },
                 "substation": {
                     "label": "Type",
@@ -3095,6 +3385,9 @@
                 "telecom/medium": {
                     "label": "Moyenne"
                 },
+                "tents": {
+                    "label": "Tentes"
+                },
                 "tidal": {
                     "label": "Sous l'influence de la marée",
                     "terms": "marée,influence maritime"
@@ -3175,6 +3468,12 @@
                     "options": {
                         "bump": "Chaussée surélevée",
                         "chicane": "Chicane",
+                        "choked_table": "Dos d'âne trapézoïdal avec écluse",
+                        "choker": "Écluse (ralentisseur)",
+                        "cushion": "Coussin berlinois",
+                        "dip": "Creux",
+                        "double_dip": "Double creux",
+                        "hump": "Ralentisseur dos d’âne",
                         "island": "Ilôt",
                         "mini_bumps": "Mini ralentisseurs",
                         "rumble_strip": "Bande rugueuse",
@@ -3315,7 +3614,16 @@
                     }
                 },
                 "utility": {
-                    "label": "Utilitaire"
+                    "label": "Utilitaire",
+                    "options": {
+                        "gas": "Gaz",
+                        "oil": "Pétrole",
+                        "power": "Énergie",
+                        "sewerage": "Eaux usées",
+                        "street_lighting": "Éclairage public",
+                        "telecom": "Télécommunications",
+                        "water": "Eau"
+                    }
                 },
                 "utility_semi": {
                     "label": "Infrastructures"
@@ -3394,7 +3702,13 @@
                     "label": "Type"
                 },
                 "waste": {
-                    "label": "Déchets"
+                    "label": "Déchets",
+                    "options": {
+                        "cigarettes": "Cigarettes",
+                        "dog_excrement": "Excrément canin",
+                        "organic": "Déchets verts",
+                        "trash": "Déchets"
+                    }
                 },
                 "water": {
                     "label": "Type"
@@ -3405,6 +3719,7 @@
                 "water_source": {
                     "label": "Source d'eau",
                     "options": {
+                        "main": "Conduite hydraulique",
                         "pond": "Étang",
                         "river": "Rivière",
                         "stream": "Fleuve",
@@ -3764,7 +4079,7 @@
                     "terms": "station de recharge,borne de recharge,recharge électrique,recharge,batterie,charging station,chargeur"
                 },
                 "amenity/childcare": {
-                    "name": "Nursery/Childcare",
+                    "name": "Garderie",
                     "terms": "crèche,garderie"
                 },
                 "amenity/cinema": {
@@ -3838,10 +4153,85 @@
                     "name": "Médecin",
                     "terms": "docteur,médecin,medecin,cabinet médical,médecine générale,dermatologue,cardiologue,gynécologue,spécialiste,doctors,doctor"
                 },
+                "amenity/doctors/allergology": {
+                    "name": "Allergologue"
+                },
+                "amenity/doctors/cardiology": {
+                    "name": "Cardiologue"
+                },
+                "amenity/doctors/dermatology": {
+                    "name": "Dermatologue"
+                },
+                "amenity/doctors/gastroenterology": {
+                    "name": "Gastroentérologue"
+                },
+                "amenity/doctors/general": {
+                    "name": "Médecin généraliste"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Gynécologue",
                     "terms": "gynécologue,santé,femme,reproduction,ovulation,génital"
                 },
+                "amenity/doctors/haematology": {
+                    "name": "Hématologue"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Interniste"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Néphrologue"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Neurologue"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "Neurochirurgien"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Oncologue"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Ophtalmologue"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Chirurgien orthopédique"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Otorhinolaryngologiste"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Pédiatre"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Anatomopathologiste"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Chirurgien plastique"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Podologue"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Proctologue"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Pneumologue"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Radiologue"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Rhumatologue"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Chirurgien généraliste"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Chirurgien traumatologue"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Urologue"
+                },
                 "amenity/dojo": {
                     "name": "Dojo",
                     "terms": "dojo,arts martiaux,art martial,tatami,judo,karate,aikido,aïkido,kendo,jujitsu,jujutsu,ju-jitsu,ju-jutsu,jūjutsu,jiu-jitsu,akhara,dojang,gelanggang,silat melayu,heya,sumo,kalari,kalaripayat,sasaran,pencak silat,wuguan,wushu,shorinji kempo,yoseikan budo,budo,aïkibudo,kenjutsu,bujutsu,katana,wakizashi,bokken,kobudo,bo-jutsu,bojustu,kendō,bō-jutsu,taijitsu,taijutsu"
@@ -4088,7 +4478,7 @@
                 },
                 "amenity/parking_space/disabled": {
                     "name": "Place de parking accessible PMR",
-                    "terms": "parking handicapé,pmr"
+                    "terms": "parking handicapé,pmr,place handicapé,mobilité réduite"
                 },
                 "amenity/payment_centre": {
                     "name": "Centre de paiement",
@@ -4616,8 +5006,7 @@
                     "terms": "enclos,animal,animaux,cage,lion,tigre,ours,zoo,parc zoologique,parc animalier,safari"
                 },
                 "attraction/big_wheel": {
-                    "name": "Grande Roue",
-                    "terms": "grande roue,roue,attraction,parc d'attraction"
+                    "name": "Grande roue"
                 },
                 "attraction/bumper_car": {
                     "name": "Auto tamponneuse",
@@ -4751,6 +5140,9 @@
                     "name": "barrière de sécurité",
                     "terms": "barrière de sécurité,barre de sécurité,garde-fou,garde-corps,rampe"
                 },
+                "barrier/hampshire_gate": {
+                    "name": "Barrière à fils"
+                },
                 "barrier/handrail": {
                     "name": "Rampe"
                 },
@@ -4790,8 +5182,7 @@
                     "terms": "portillon à chicanes,chicane battante,portail à bétail,portail à sas,portillon,passage,bétail,piétons,randonneurs,animaux,animal,vache,cheval,enclos,barrier kissing gate,kissing gate"
                 },
                 "barrier/lift_gate": {
-                    "name": "Barrière levante",
-                    "terms": "barrière relevable,barrière levante,barrière automatique,barrière de péage,lift gate"
+                    "name": "Barrière levante"
                 },
                 "barrier/log": {
                     "name": "Arbre Tombé"
@@ -5067,8 +5458,7 @@
                     "terms": "stade,tribune."
                 },
                 "building/static_caravan": {
-                    "name": "Mobil home fixe",
-                    "terms": "mobil home statique"
+                    "name": "Caravane"
                 },
                 "building/sty": {
                     "name": "Porcherie",
@@ -5537,10 +5927,28 @@
                     "name": "Médecine alternative",
                     "terms": "techniques de bien-être alternatives"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Acupuncteur"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Praticien ayurvédique"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Chiropraticien",
                     "terms": "chiropraticien,chiropracteur"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Homéopathe"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturopathe"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Ostéopathe"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Médecine traditionnelle chinoise"
+                },
                 "healthcare/audiologist": {
                     "name": "Audiologiste",
                     "terms": "audiologiste,audiologue"
@@ -5637,23 +6045,18 @@
                 "highway/crossing": {
                     "name": "Passage piéton"
                 },
-                "highway/crossing/marked": {
-                    "name": "Passage piéton marqué"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Passage piéton avec feux de signalisation",
                     "terms": "feux piétons,passage piéton avec feux"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "Traversée non protégée"
+                    "name": "Passage piéton non protégé",
+                    "terms": "passage piéton marqué"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Passage piéton non marqué",
                     "terms": "passage piéton non marqué"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Passage piéton marqué"
-                },
                 "highway/cycleway": {
                     "name": "Voie cyclable",
                     "terms": "piste cyclable"
@@ -5669,14 +6072,12 @@
                     "name": "Passage cycliste et piéton",
                     "terms": "passage cycliste,passage piéton,passage clouté"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Passage cycliste marqué"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Passage cycliste avec feux de signalisation"
                 },
                 "highway/cycleway/crossing/uncontrolled": {
-                    "name": "Passage cycliste marqué"
+                    "name": "Passage cycliste marqué",
+                    "terms": "passage cycliste,passage piéton,passage clouté"
                 },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Passage cycliste non marqué",
@@ -5719,9 +6120,6 @@
                 "highway/footway/crossing": {
                     "name": "Passage piéton"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Passage piéton marqué"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Passage piéton avec feu de signalisation"
                 },
@@ -5730,10 +6128,8 @@
                     "terms": "passage piéton marqué"
                 },
                 "highway/footway/crossing/unmarked": {
-                    "name": "Passage piéton non marqué"
-                },
-                "highway/footway/crossing/zebra": {
-                    "name": "Passage piéton marqué"
+                    "name": "Passage piéton non marqué",
+                    "terms": "passage piéton non marqué"
                 },
                 "highway/footway/informal": {
                     "name": "Chemin piéton informel"
@@ -6386,6 +6782,9 @@
                     "name": "Jardin partagé",
                     "terms": "jardin,communautaire,familial,partagé,associatif,collectif"
                 },
+                "leisure/garden/residential": {
+                    "name": "Jardin résidentiel"
+                },
                 "leisure/golf_course": {
                     "name": "Parcours de golf",
                     "terms": "golf,terrain de golf,parcours de golf"
@@ -7465,6 +7864,9 @@
                 "office/yes": {
                     "name": "Bureau (non précisé)"
                 },
+                "pipeline": {
+                    "name": "Équipement de pipeline"
+                },
                 "pipeline/substation": {
                     "name": "Sous-station pour canalisations"
                 },
@@ -7572,6 +7974,9 @@
                 "playground": {
                     "name": "Jeux"
                 },
+                "playground/activitypanel": {
+                    "name": "Panneau d'activités"
+                },
                 "playground/aerialrotator": {
                     "name": "Aéro-rotateur"
                 },

dist/translations/gl.json

@@ -3191,10 +3191,6 @@
                 "attraction/animal": {
                     "name": "Recinto de animais"
                 },
-                "attraction/big_wheel": {
-                    "name": "Noria",
-                    "terms": "noria,nora,atracción"
-                },
                 "attraction/bumper_car": {
                     "name": "Coches de choque"
                 },
@@ -3328,9 +3324,6 @@
                 "barrier/kissing_gate": {
                     "name": "Porta Kissing"
                 },
-                "barrier/lift_gate": {
-                    "name": "Barreira levadiza"
-                },
                 "barrier/retaining_wall": {
                     "name": "Muro de contención"
                 },
@@ -3534,9 +3527,6 @@
                 "building/stadium": {
                     "name": "Edificio do estadio"
                 },
-                "building/static_caravan": {
-                    "name": "Autocaravana estática"
-                },
                 "building/temple": {
                     "name": "Edificio do templo"
                 },
@@ -3946,16 +3936,10 @@
                 "highway/crossing": {
                     "name": "Paso de peóns"
                 },
-                "highway/crossing/marked": {
-                    "name": "Paso de peóns marcado"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Paso de peóns sen marcar",
                     "terms": "paso de peóns sen marcar,peonil,peonal"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Paso de peóns marcado"
-                },
                 "highway/cycleway": {
                     "name": "Senda ciclista",
                     "terms": "carreiro,senda,sendeiro,vieiro,camiño,carril bici,bicisenda,ciclovía,ciclorruta,pista,ciclista,ciclismo,bicicleta,bici,ruta ciclista"
@@ -3970,9 +3954,6 @@
                     "name": "Paso de peóns e de pista de ciclismo",
                     "terms": "peonil,peonal,ciclista,ciclismo,bicicleta"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Paso de bicicletas marcado"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Paso de bicicletas sen marcar",
                     "terms": "cruzamento de carril bici,cruzamento de ciclovía,cruzamento de bicicleta,cruzamento de bici,cruzamento de senda ciclista"

dist/translations/he.json

@@ -121,7 +121,10 @@
                     "terms": "היתר גישה,מותר לגשת,הכניסה מותרת,כניסה מאופשרת,כניסה חופשית,גישה חופשית"
                 },
                 "activity": {
-                    "label": "פעילות"
+                    "label": "פעילות",
+                    "options": {
+                        "horse": "רכיבה על סוסים"
+                    }
                 },
                 "addr/interpolation": {
                     "label": "סוג",
@@ -234,6 +237,20 @@
                 "animal_shelter": {
                     "label": "לחיות"
                 },
+                "archaeological_site": {
+                    "label": "סוג",
+                    "options": {
+                        "baths": "מרחצאות",
+                        "city": "עיר היסטורית",
+                        "crannog": "קראנוג",
+                        "fortification": "ביצורים",
+                        "megalith": "מגלית",
+                        "necropolis": "נקרופוליס",
+                        "roman_circus": "קרקס רומי",
+                        "roman_villa": "וילה רומית",
+                        "tumulus": "תל"
+                    }
+                },
                 "architect": {
                     "label": "ארכיטקטורה",
                     "terms": "ארכיטקט,אדריכלות,בנייה,בניין,ארדיכל,עיצוב"
@@ -308,6 +325,7 @@
                     "options": {
                         "cosmetics": "טיפוח",
                         "nails": "מניקור / פדיקור",
+                        "skin_care": "טיפוח העור",
                         "tanning": "שיזוף"
                     }
                 },
@@ -341,7 +359,15 @@
                     }
                 },
                 "board_type": {
-                    "label": "סוג"
+                    "label": "סוג",
+                    "options": {
+                        "art": "אומנות",
+                        "astronomy": "אסטרונומיה",
+                        "geology": "גאולוגיה",
+                        "history": "היסטוריה",
+                        "nature": "טבע",
+                        "notice": "לוח מידע"
+                    }
                 },
                 "bollard": {
                     "label": "סוג"
@@ -429,7 +455,6 @@
                     "terms": "נפח,כמות,קיבולת,יכולת"
                 },
                 "capacity/caravans": {
-                    "label": "קיבולת (קרוואנים)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -3701,10 +3726,6 @@
                     "name": "בעלי חיים בכלוב",
                     "terms": "פארק מים,זואופארק,גן חיות,כלוב,שבי"
                 },
-                "attraction/big_wheel": {
-                    "name": "גלגל ענק",
-                    "terms": "גלגל ענק"
-                },
                 "attraction/bumper_car": {
                     "name": "מכוניות מתנגשות",
                     "terms": "מתנגשות,מכוניות צעצוע"
@@ -3862,10 +3883,6 @@
                     "name": "מחסום חיות",
                     "terms": "מחסום חיות"
                 },
-                "barrier/lift_gate": {
-                    "name": "שער זרוע",
-                    "terms": "שער הרמה,שער מתרומם"
-                },
                 "barrier/log": {
                     "name": "עץ שנפל"
                 },
@@ -4112,10 +4129,6 @@
                     "name": "אצטדיון",
                     "terms": "אצטדיון"
                 },
-                "building/static_caravan": {
-                    "name": "קרוון נייח",
-                    "terms": "קרוון סטטי"
-                },
                 "building/sty": {
                     "name": "דיר חזירים",
                     "terms": "חזיריה,חזירים,רפת חזירים"
@@ -4628,9 +4641,6 @@
                 "highway/crossing": {
                     "name": "מעבר"
                 },
-                "highway/crossing/marked": {
-                    "name": "מעבר חצייה מסומן"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "מעבר עם סימנים להולכי רגל"
                 },
@@ -4638,9 +4648,6 @@
                     "name": "מעבר חצייה בלתי מסומן",
                     "terms": "מעבר חציה לא מסומן,מעבר חצייה לא מסומן"
                 },
-                "highway/crossing/zebra": {
-                    "name": "מעבר חצייה מסומן"
-                },
                 "highway/cycleway": {
                     "name": "מסלול אופניים",
                     "terms": "מסלול אופניים"
@@ -4656,9 +4663,6 @@
                     "name": "מעבר אופניים והולכי רגל",
                     "terms": "מעבר לאופניים ולהולכי רגל,חצייה להולכי רגל ולאופניים,מעבר אופניים,שביל אופניים,חצייה,רכיבת אופניים,הולך רגל"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "מעבר דו־גלגליים מסומן"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "מעבר דו־גלגליים בלתי מסומן",
                     "terms": "מעבר לאופניים,מעבר לאופנועים,מעבר לקורקינט"
@@ -5931,8 +5935,8 @@
                     "terms": "עשביה"
                 },
                 "natural/shingle": {
-                    "name": "ריצוף",
-                    "terms": "גג ריצוף"
+                    "name": "רעף",
+                    "terms": "גג ריצוף,רעפים,גג רעפים"
                 },
                 "natural/shrub": {
                     "name": "שיח",
@@ -6039,7 +6043,7 @@
                 },
                 "office/association": {
                     "name": "ארגון ללא מטרת רווח",
-                    "terms": "ארגון ללא מטרת רווח"
+                    "terms": "ארגון ללא מטרת רווח,מלכר,מלכ״ר,מלכ\"ר"
                 },
                 "office/charity": {
                     "name": "משרד צדקה",

dist/translations/hr.json

@@ -55,6 +55,10 @@
                 "access": {
                     "label": "Dopušten pristup",
                     "options": {
+                        "customers": {
+                            "description": "Ograničeno na kupce na odredištu",
+                            "title": "Kupci"
+                        },
                         "designated": {
                             "description": "Pristup dopuštaju znakovi ili lokalni zakoni",
                             "title": "Označeno"
@@ -83,6 +87,10 @@
                             "description": "Pristup je dopušten samo uz izričitu dozvolu vlasnika",
                             "title": "Privatno"
                         },
+                        "unknown": {
+                            "description": "Uvjeti za pristup su nepoznati ili nejasni",
+                            "title": "Nepoznato"
+                        },
                         "yes": {
                             "description": "Pristup je dopušten zakonom; pravo prolaza",
                             "title": "Dopušteno"
@@ -110,6 +118,11 @@
                     },
                     "terms": "dopušten pristup,dopuštenje,pristup"
                 },
+                "activity": {
+                    "options": {
+                        "ski": "Skijanje"
+                    }
+                },
                 "addr/interpolation": {
                     "label": "Vrsta",
                     "options": {
@@ -406,7 +419,35 @@
                     "label": "Usjev"
                 },
                 "crossing": {
-                    "label": "Vrsta"
+                    "label": "Vrsta",
+                    "options": {
+                        "traffic_signals": "Pješački prijelaz sa semaforom",
+                        "uncontrolled": "Samo oznake na cesti",
+                        "unmarked": "Prijelaz bez oznaka ili semafora"
+                    }
+                },
+                "crossing/island": {
+                    "label": "Pješački otok"
+                },
+                "crossing/markings": {
+                    "label": "Oznake na cesti",
+                    "options": {
+                        "no": "Neoznačeno",
+                        "surface": "Drugačija površina",
+                        "yes": "Nekakve oznake",
+                        "zebra": "Zebra",
+                        "zebra:bicolour": "Zebra u dvije boje",
+                        "zebra:double": "Dvostruka zebra",
+                        "zebra:paired": "Zebra u parovima"
+                    },
+                    "terms": "zebra,horizontalna signalizacija"
+                },
+                "crossing_raised": {
+                    "label": "Dignuta",
+                    "options": {
+                        "table": "Da",
+                        "undefined": "Ne"
+                    }
                 },
                 "cuisine": {
                     "label": "Kuhinja",
@@ -697,6 +738,9 @@
                 "horse_scale": {
                     "terms": "razina jahanja"
                 },
+                "hot_water": {
+                    "label": "Topla voda"
+                },
                 "iata": {
                     "label": "IATA kôd za zračnu luku"
                 },
@@ -718,6 +762,7 @@
                     }
                 },
                 "indoor": {
+                    "label": "U zatvorenom prostoru",
                     "terms": "u zatvorenom prostoru"
                 },
                 "informal": {
@@ -761,6 +806,9 @@
                     },
                     "terms": "raskršće"
                 },
+                "kitchen": {
+                    "label": "Kuhinja"
+                },
                 "lamp_type": {
                     "label": "Vrsta"
                 },
@@ -774,6 +822,7 @@
                 },
                 "layer": {
                     "label": "Sloj",
+                    "placeholder": "0",
                     "terms": "sloj"
                 },
                 "leaf_cycle": {
@@ -811,6 +860,9 @@
                 "level_semi": {
                     "terms": "razine,katovi"
                 },
+                "lifeguard": {
+                    "label": "Spasilac"
+                },
                 "line_management": {
                     "terms": "odvajanje,topološka crta,terminacija"
                 },
@@ -844,6 +896,30 @@
                 },
                 "material": {
                     "label": "Materijal",
+                    "options": {
+                        "adobe": "Nepečena opeka (ćerpič)",
+                        "aluminium": "Aluminij",
+                        "brass": "Mjed",
+                        "brick": "Cigle",
+                        "bronze": "Bronca",
+                        "concrete": "Beton",
+                        "dry_stone": "Suhozid",
+                        "glass": "Staklo",
+                        "granite": "Granit",
+                        "iron": "Željezo",
+                        "limestone": "Vapnenac",
+                        "marble": "Mramor",
+                        "metal": "Metal",
+                        "plastic": "Plastika",
+                        "reinforced_conrete": "Ojačani beton",
+                        "rock": "Stijena",
+                        "sand": "Pjesak",
+                        "sandstone": "Stijena pješčenjak",
+                        "soil": "Zemlja, tlo",
+                        "steel": "Čelik",
+                        "stone": "Kamen",
+                        "wood": "Drvo"
+                    },
                     "terms": "materijal"
                 },
                 "max_age": {
@@ -869,6 +945,15 @@
                     "label": "Najveća dopuštena težina",
                     "terms": "maksimalna težina"
                 },
+                "memorial": {
+                    "options": {
+                        "bust": "Poprsje",
+                        "obelisk": "Obelisk",
+                        "plaque": "Spomen ploča",
+                        "sculpture": "Skulptura",
+                        "statue": "Kip"
+                    }
+                },
                 "microbrewery": {
                     "label": "Mikro pivovara",
                     "terms": "privatna pivara"
@@ -1024,13 +1109,29 @@
                     "options": {
                         "carports": "Nastrešnica",
                         "garage_boxes": "Boks garaža",
+                        "half_on_kerb": "Dijelom na rubniku",
                         "lane": "Parking uz prometnicu",
+                        "layby": "Na odmorištu",
                         "multi-storey": "Višerazinski",
+                        "on_kerb": "Na rubnik",
+                        "rooftop": "Na krovu",
                         "sheds": "Šupe",
+                        "street_side": "Uz kolnik",
                         "surface": "Površinski",
                         "underground": "Podzemni"
                     }
                 },
+                "parking/orientation": {
+                    "label": "Orijentacija",
+                    "options": {
+                        "diagonal": "Dijagonalno na ulicu",
+                        "parallel": "Paralelno sa ulicom",
+                        "perpendicular": "Okomito na ulicu"
+                    }
+                },
+                "parking/side/orientation": {
+                    "label": "Orijentacija parkiranja"
+                },
                 "payment_multi": {
                     "label": "Načini plaćanja",
                     "terms": "način plaćanja"
@@ -1083,9 +1184,20 @@
                 "plant": {
                     "label": "Elektrana"
                 },
+                "plant/output": {
+                    "options": {
+                        "compressed_air": "Komprimirani zrak",
+                        "electricity": "Električna struja",
+                        "hot_water": "Vrela voda",
+                        "steam": "Vodena para"
+                    }
+                },
                 "plant/output/electricity": {
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "plant/source": {
+                    "label": "Izvor energije"
+                },
                 "polling_station": {
                     "terms": "biračko mjesto"
                 },
@@ -1111,16 +1223,38 @@
                 "ramp": {
                     "terms": "ugrađen prilaz"
                 },
+                "recycling_accepts": {
+                    "label": "Prima",
+                    "options": {
+                        "batteries": "Baterije",
+                        "cans": "Limenke",
+                        "cardboard": "Karton",
+                        "clothes": "Odjeća",
+                        "cooking_oil": "Ulje za kuhanje",
+                        "engine_oil": "Motorno ulje",
+                        "glass": "Svakakvo staklo (kaljeno staklo, prozori, ogledala, itd.)",
+                        "glass_bottles": "Staklene boce i staklenke",
+                        "green_waste": "Biootpad",
+                        "paper": "Papir",
+                        "plastic": "Plastika",
+                        "plastic_bottles": "Plastične boce",
+                        "plastic_packaging": "Plastično pakiranje"
+                    }
+                },
                 "ref": {
                     "terms": "referenti kod"
                 },
                 "ref/vatin": {
                     "terms": "porezni broj,oib"
                 },
+                "ref_golf_hole": {
+                    "label": "Broj rupe"
+                },
                 "ref_road_number": {
                     "terms": "broj ceste"
                 },
                 "ref_route": {
+                    "label": "Broj rute",
                     "terms": "broj rute"
                 },
                 "ref_runway": {
@@ -1131,6 +1265,16 @@
                 },
                 "religion": {
                     "label": "Religija",
+                    "options": {
+                        "buddhist": "Budizam",
+                        "christian": "Kršćanska",
+                        "hindu": "Hinduizam",
+                        "jewish": "Judaizam",
+                        "muslim": "Muslimanska",
+                        "shinto": "Šintoizam",
+                        "sikh": "Sikhizam",
+                        "taoist": "Taoizam"
+                    },
                     "terms": "vjera,vjeroispovijed"
                 },
                 "reservation": {
@@ -1198,6 +1342,7 @@
                     "label": "Oblik"
                 },
                 "seamark/buoy_lateral/colour": {
+                    "label": "Boja",
                     "options": {
                         "green": "Zelena"
                     }
@@ -1278,7 +1423,10 @@
                     "terms": "izvori,reference"
                 },
                 "sport": {
-                    "label": "Sportovi"
+                    "label": "Sportovi",
+                    "options": {
+                        "handball": "Rukomet"
+                    }
                 },
                 "sport_ice": {
                     "label": "Sportovi"
@@ -1333,6 +1481,9 @@
                 },
                 "surface": {
                     "label": "Površina",
+                    "options": {
+                        "asphalt": "Asfalt"
+                    },
                     "terms": "površina"
                 },
                 "survey/date": {
@@ -1410,6 +1561,11 @@
                 "trolley_wire": {
                     "terms": "žice trolejbusa"
                 },
+                "tunnel_combo": {
+                    "options": {
+                        "culvert": "Propust"
+                    }
+                },
                 "usage_rail": {
                     "options": {
                         "tourism": "Turizam"
@@ -1956,9 +2112,6 @@
                 "barrier/kissing_gate": {
                     "name": "Rotirajući prolaz za ljude"
                 },
-                "barrier/lift_gate": {
-                    "name": "Rampa"
-                },
                 "barrier/retaining_wall": {
                     "name": "Potporni zid"
                 },
@@ -1977,6 +2130,9 @@
                 "boundary/administrative": {
                     "name": "Administrativna granica"
                 },
+                "bridge/support/pier": {
+                    "name": "Stup mosta"
+                },
                 "building": {
                     "name": "Građevina",
                     "terms": "zgrada,kuća,građevina,neboder"
@@ -2078,9 +2234,6 @@
                 "building/stadium": {
                     "name": "Zgrada stadiona"
                 },
-                "building/static_caravan": {
-                    "name": "Statičan mobilan dom"
-                },
                 "building/terrace": {
                     "name": "Kuće u nizu"
                 },
@@ -2232,6 +2385,13 @@
                     "name": "Garaža hitne pomoći",
                     "terms": "garaža hitne pomoći,stanica hitne pomoći,stanica za hitnu pomoć,hitna pomoć"
                 },
+                "emergency/fire_extinguisher": {
+                    "name": "Aparat za gašenje požara",
+                    "terms": "vatrogasni aparat"
+                },
+                "emergency/fire_hose": {
+                    "name": "Vatrogasno crijevo"
+                },
                 "emergency/fire_hydrant": {
                     "name": "Požarni hidrant",
                     "terms": "hidrant"
@@ -2240,6 +2400,10 @@
                     "name": "Spasilac",
                     "terms": "plaži,spasioc"
                 },
+                "emergency/mountain_rescue": {
+                    "name": "Gorska služba spašavanja",
+                    "terms": "hgss"
+                },
                 "emergency/phone": {
                     "name": "Telefon za nuždu"
                 },
@@ -2288,15 +2452,9 @@
                 "highway/corridor": {
                     "name": "Hodnik"
                 },
-                "highway/crossing/marked": {
-                    "name": "Označeni pješački prijelaz"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Neoznačeni pješački prijelaz"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Označeni pješački prijelaz"
-                },
                 "highway/cycleway": {
                     "name": "Biciklistička staza"
                 },
@@ -2306,9 +2464,6 @@
                 "highway/cycleway/crossing": {
                     "name": "Biciklistički prijelaz"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Označeni biciklistički prijelaz"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Neoznačeni biciklistički prijelaz"
                 },
@@ -2413,6 +2568,9 @@
                 "highway/tertiary_link": {
                     "name": "Pristupna cesta lokalne ceste"
                 },
+                "highway/track": {
+                    "name": "Poljski ili šumski put"
+                },
                 "highway/traffic_mirror": {
                     "name": "Prometno ogledalo"
                 },
@@ -2660,6 +2818,9 @@
                 "leisure/pitch/chess": {
                     "name": "Golema šahovska ploča"
                 },
+                "leisure/pitch/handball": {
+                    "name": "Teren za rukomet"
+                },
                 "leisure/pitch/skateboard": {
                     "name": "Skate park",
                     "terms": "skate park,skejt park,skejt,skate,park za ekstremne sportove"
@@ -2768,7 +2929,11 @@
                 },
                 "man_made/pier": {
                     "name": "Mol",
-                    "terms": "pristanište,mol,lukobran,molo,mul,gat"
+                    "terms": "pristanište,mol,lukobran,molo,mul,gat,dok"
+                },
+                "man_made/pier/floating": {
+                    "name": "Plutajući mol",
+                    "terms": "plutajući ponton,plutajući dok"
                 },
                 "man_made/pipeline": {
                     "name": "Cjevovod",
@@ -2858,6 +3023,9 @@
                 "man_made/windmill": {
                     "name": "Vetrenjača"
                 },
+                "man_made/windpump": {
+                    "name": "Pumpa za vodu na vjetar"
+                },
                 "man_made/works": {
                     "name": "Tvornica"
                 },
@@ -3095,6 +3263,15 @@
                 "power/minor_line": {
                     "name": "Mali dalekovod"
                 },
+                "power/plant/source/coal": {
+                    "name": "Termoelektrana na ugljen"
+                },
+                "power/plant/source/gas": {
+                    "name": "Termoelektrana na plin"
+                },
+                "power/plant/source/oil": {
+                    "name": "Termoelektrana na loživo ulje"
+                },
                 "power/pole": {
                     "name": "Električni stup",
                     "terms": "stup dalekovoda"

dist/translations/hu.json

@@ -502,7 +502,6 @@
                     "terms": "kapacitás,képesség,méret,befogadóképesség"
                 },
                 "capacity/caravans": {
-                    "label": "Kapacitás (lakókocsi)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -1686,6 +1685,24 @@
                 },
                 "material": {
                     "label": "Anyag",
+                    "options": {
+                        "adobe": "Vályog",
+                        "aluminium": "Alumínium",
+                        "brass": "Sárgaréz",
+                        "brick": "Tégla",
+                        "bronze": "Bronz",
+                        "concrete": "Beton",
+                        "glass": "Üveg",
+                        "granite": "Gránit",
+                        "iron": "Vas",
+                        "limestone": "Mészkő",
+                        "marble": "Márvány",
+                        "metal": "Fém",
+                        "plastic": "Műanyag",
+                        "reinforced_conrete": "Vasbeton",
+                        "rock": "Szikla",
+                        "sand": "Homok"
+                    },
                     "terms": "anyag,építőanyag,alapanyag,összetevő,alkotóelem,matéria"
                 },
                 "max_age": {
@@ -2670,7 +2687,16 @@
                     "label": "Típus"
                 },
                 "substance": {
-                    "label": "Szállított anyag"
+                    "label": "Szállított anyag",
+                    "options": {
+                        "fuel": "Üzemanyag",
+                        "gas": "Földgáz",
+                        "hot_water": "Forró víz",
+                        "oil": "Nyersolaj",
+                        "rainwater": "Esővíz",
+                        "sewage": "Szennyvíz",
+                        "water": "Ivóvíz"
+                    }
                 },
                 "substation": {
                     "label": "Típus",
@@ -2705,6 +2731,7 @@
                         "grass": "Fű",
                         "gravel": "Zúzottkő",
                         "ground": "Föld",
+                        "metal": "Fém",
                         "paved": "Burkolt",
                         "paving_stones": "Térkő",
                         "sand": "Homok",
@@ -2861,7 +2888,10 @@
                     "label": "Típus"
                 },
                 "traffic_calming": {
-                    "label": "Típus"
+                    "label": "Típus",
+                    "options": {
+                        "bump": "Fekvőrendőr"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Jelzőtábla"
@@ -2953,7 +2983,10 @@
                     "placeholder": "Alapértelmezett"
                 },
                 "tunnel_combo": {
-                    "label": "Típus"
+                    "label": "Típus",
+                    "options": {
+                        "culvert": "Áteresz"
+                    }
                 },
                 "turning_circle": {
                     "label": "Alak"
@@ -2984,7 +3017,13 @@
                 "utility": {
                     "label": "Közmű",
                     "options": {
-                        "street_lighting": "Közvilágítás"
+                        "gas": "Gáz",
+                        "oil": "Olaj",
+                        "power": "Energia",
+                        "sewerage": "Szennyvíz",
+                        "street_lighting": "Közvilágítás",
+                        "telecom": "Távközlés",
+                        "water": "Víz"
                     }
                 },
                 "utility_semi": {
@@ -4248,10 +4287,6 @@
                     "name": "Állatkifutó",
                     "terms": "kétéltű,állatpark,akvárium,medve,madár,hal,rovar,oroszlán,emlős,majom,pingvin,hüllő,szafari,tematikus park,tigris,állatkert"
                 },
-                "attraction/big_wheel": {
-                    "name": "Óriáskerék",
-                    "terms": "nagy kerék,óriáskerék"
-                },
                 "attraction/bumper_car": {
                     "name": "Dodzsem",
                     "terms": "dodgem"
@@ -4411,10 +4446,6 @@
                     "name": "Lengőkapu",
                     "terms": "ütközős csapóajtó"
                 },
-                "barrier/lift_gate": {
-                    "name": "Emelkedő sorompó",
-                    "terms": "sorompó"
-                },
                 "barrier/log": {
                     "name": "Kidőlt fa"
                 },
@@ -4672,10 +4703,6 @@
                     "name": "Stadionépület",
                     "terms": "labdarúgópálya"
                 },
-                "building/static_caravan": {
-                    "name": "Telepített lakókocsi",
-                    "terms": "rögzített lakókocsi,telepített lakókocsi"
-                },
                 "building/sty": {
                     "name": "Disznóól",
                     "terms": "ól"
@@ -5193,21 +5220,12 @@
                 "highway/crossing": {
                     "name": "Gyalogosátkelő"
                 },
-                "highway/crossing/marked": {
-                    "name": "Jelölt gyalogátkelő"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Jelzőlámpás gyalogátkelőhely"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Kijelölt gyalogátkelőhely"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Jelöletlen gyalogosátkelő"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Jelölt gyalogátkelő"
-                },
                 "highway/cycleway": {
                     "name": "Kijelölt kerékpárút",
                     "terms": "bicikliút,bringaút"
@@ -5221,9 +5239,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Gyalogos- és kerékpárosátkelő"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Jelölt kerékpárosátkelő"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Nem jelölt kerékpárosátkelő"
                 },
@@ -6309,6 +6324,9 @@
                     "name": "Megerősített torony",
                     "terms": "erőd,erődítmény,vár"
                 },
+                "man_made/tower/diving": {
+                    "name": "Műugrótorony"
+                },
                 "man_made/tower/minaret": {
                     "name": "Minaret",
                     "terms": "iszlám,mecset,müezzin,muszlim"
@@ -6434,7 +6452,7 @@
                 },
                 "natural/glacier": {
                     "name": "Gleccser",
-                    "terms": "jégfolyó"
+                    "terms": "jégfolyó,jégár"
                 },
                 "natural/grassland": {
                     "name": "Füves puszta",
@@ -6525,6 +6543,10 @@
                 "natural/water/moat": {
                     "name": "Várárok"
                 },
+                "natural/water/oxbow": {
+                    "name": "Morotva",
+                    "terms": "holtág"
+                },
                 "natural/water/pond": {
                     "name": "Kis tó",
                     "terms": "tavacska,pocsolya"
@@ -6685,6 +6707,10 @@
                     "name": "Adóhivatal",
                     "terms": "adóhatóság,adóhivatal"
                 },
+                "office/graphic_design": {
+                    "name": "Grafikai stúdió",
+                    "terms": "grafikus,tervező,reklámgrafikus"
+                },
                 "office/guide": {
                     "name": "Idegenvezetői iroda",
                     "terms": "búvárvezető,hegyi vezető,túravezető"
@@ -6743,7 +6769,8 @@
                     "name": "Biztonsági iroda"
                 },
                 "office/surveyor": {
-                    "name": "Földmérő"
+                    "name": "Földmérő",
+                    "terms": "őrző-védő"
                 },
                 "office/tax_advisor": {
                     "name": "Adótanácsadó",
@@ -6849,7 +6876,8 @@
                     "name": "Városrész"
                 },
                 "place/town": {
-                    "name": "Kisváros"
+                    "name": "Kisváros",
+                    "terms": "városka"
                 },
                 "place/village": {
                     "name": "Falu",
@@ -6944,6 +6972,9 @@
                     "name": "Föld alatti elektromos kábel",
                     "terms": "földkábel"
                 },
+                "power/catenary_mast": {
+                    "name": "Felsővezeték-tartó oszlop"
+                },
                 "power/generator": {
                     "name": "Áramfejlesztő",
                     "terms": "generátor,erőmű,villamos energia,áram"
@@ -8307,6 +8338,9 @@
                     "name": "Távvezeték nyomvonala",
                     "terms": "elektromos vezeték útvonala,távvezeték,nagyfeszültségű vezeték"
                 },
+                "type/route/railway": {
+                    "name": "Vasútvonal"
+                },
                 "type/route/road": {
                     "name": "Közút vonala",
                     "terms": "út,főút,közút,autóút,autópálya"

dist/translations/id.json

@@ -1516,9 +1516,6 @@
                 "barrier/kissing_gate": {
                     "name": "Gerbang pertemuan"
                 },
-                "barrier/lift_gate": {
-                    "name": "Gerbang lif"
-                },
                 "barrier/retaining_wall": {
                     "name": "Dinding penahan"
                 },

dist/translations/index.json

@@ -1 +1 @@
-{"af":{"pct":0.21},"ak":{"pct":0},"am":{"pct":0.02},"ar":{"pct":0.91},"ar-AA":{"pct":0},"as":{"pct":0},"ast":{"pct":0.26},"ay":{"pct":0},"az":{"pct":0},"ba":{"pct":0},"be":{"pct":0},"bg":{"pct":0.23},"bn":{"pct":0.05},"bo":{"pct":0},"br":{"pct":0.35},"bs":{"pct":0.14},"ca":{"pct":0.69},"ckb":{"pct":0.04},"cs":{"pct":0.97},"cv":{"pct":0},"cy":{"pct":0.01},"da":{"pct":0.62},"de":{"pct":1},"de-AT":{"pct":0},"de-CH":{"pct":0},"dv":{"pct":0.02},"ee":{"pct":0},"el":{"pct":0.71},"en":{"pct":1},"en-AU":{"pct":0.02},"en-CA":{"pct":0.04},"en-GB":{"pct":0.3},"en-IE":{"pct":0},"en-IN":{"pct":0},"en-NZ":{"pct":0.02},"en-US":{"pct":0},"eo":{"pct":0.83},"es":{"pct":0.98},"et":{"pct":0.35},"eu":{"pct":0.16},"fa":{"pct":0.71},"fa-IR":{"pct":0},"ff":{"pct":0},"fi":{"pct":0.59},"fil":{"pct":0},"fr":{"pct":0.96},"fr-FR":{"pct":0},"fy":{"pct":0.01},"ga":{"pct":0},"gan":{"pct":0},"gl":{"pct":0.58},"grt":{"pct":0},"gu":{"pct":0},"ha":{"pct":0},"he":{"pct":0.78},"he-IL":{"pct":0},"hi":{"pct":0.02},"hr":{"pct":0.32},"hu":{"pct":0.82},"hy":{"pct":0.02},"ia":{"pct":0},"id":{"pct":0.22},"ig":{"pct":0},"is":{"pct":0.33},"it":{"pct":0.79},"ja":{"pct":0.97},"jam":{"pct":0},"jv":{"pct":0},"ka":{"pct":0},"kbd":{"pct":0},"kha":{"pct":0},"ki":{"pct":0},"kk":{"pct":0},"km":{"pct":0},"kn":{"pct":0.07},"ko":{"pct":0.63},"ks":{"pct":0},"ku":{"pct":0.01},"ky":{"pct":0},"lb":{"pct":0},"lg":{"pct":0},"lij":{"pct":0},"ln":{"pct":0},"lo":{"pct":0},"lt":{"pct":0.28},"lus":{"pct":0},"lv":{"pct":0.21},"mg":{"pct":0},"mi":{"pct":0},"mk":{"pct":1},"ml":{"pct":0},"mn":{"pct":0},"mr":{"pct":0},"ms":{"pct":0.13},"my":{"pct":0},"nb":{"pct":0},"nd":{"pct":0},"ne":{"pct":0.02},"nl":{"pct":0.89},"nl-BE":{"pct":0},"nl-NL":{"pct":0},"nn":{"pct":0.05},"no":{"pct":0.68},"nr":{"pct":0},"nso":{"pct":0},"nv":{"pct":0},"ny":{"pct":0},"oc":{"pct":0},"om":{"pct":0},"or":{"pct":0},"pa":{"pct":0},"pa-PK":{"pct":0.11},"pap":{"pct":0},"pl":{"pct":0.84},"ps":{"pct":0},"pt":{"pct":0.97},"pt-BR":{"pct":0.92},"qu":{"pct":0},"rm":{"pct":0},"ro":{"pct":0.27},"ru":{"pct":0.59},"rw":{"pct":0},"sat":{"pct":0},"sc":{"pct":0},"sd":{"pct":0},"sg":{"pct":0},"si":{"pct":0},"sk":{"pct":0.68},"sl":{"pct":0.33},"sm":{"pct":0},"sn":{"pct":0},"so":{"pct":0.04},"sq":{"pct":0.02},"sr":{"pct":0.37},"ss":{"pct":0},"st":{"pct":0},"su":{"pct":0},"sv":{"pct":0.99},"sw":{"pct":0},"ta":{"pct":0.23},"te":{"pct":0.02},"tg":{"pct":0},"th":{"pct":0.21},"ti":{"pct":0},"tk":{"pct":0},"tl":{"pct":0.04},"tn":{"pct":0},"tr":{"pct":0.76},"ts":{"pct":0},"tt":{"pct":0},"tum":{"pct":0},"ug":{"pct":0},"uk":{"pct":0.98},"ur":{"pct":0},"uz":{"pct":0},"ve":{"pct":0},"vi":{"pct":0.82},"wo":{"pct":0},"xh":{"pct":0},"yo":{"pct":0},"yue":{"pct":0.26},"zh":{"pct":0.06},"zh-CN":{"pct":0.86},"zh-HK":{"pct":0.54},"zh-TW":{"pct":1},"zu":{"pct":0}}
+{"af":{"pct":0.2},"ak":{"pct":0},"am":{"pct":0.02},"ar":{"pct":0.86},"ar-AA":{"pct":0},"as":{"pct":0},"ast":{"pct":0.25},"ay":{"pct":0},"az":{"pct":0},"ba":{"pct":0},"be":{"pct":0},"bg":{"pct":0.22},"bn":{"pct":0.05},"bo":{"pct":0},"br":{"pct":0.37},"bs":{"pct":0.13},"ca":{"pct":0.69},"ckb":{"pct":0.04},"cs":{"pct":0.98},"cv":{"pct":0},"cy":{"pct":0.01},"da":{"pct":0.59},"de":{"pct":1},"de-AT":{"pct":0},"de-CH":{"pct":0},"dv":{"pct":0.02},"ee":{"pct":0},"el":{"pct":0.7},"en":{"pct":1},"en-AU":{"pct":0.02},"en-CA":{"pct":0.04},"en-GB":{"pct":0.28},"en-IE":{"pct":0},"en-IN":{"pct":0},"en-NZ":{"pct":0.02},"en-US":{"pct":0},"eo":{"pct":0.79},"es":{"pct":1},"et":{"pct":0.33},"eu":{"pct":0.15},"fa":{"pct":0.67},"fa-IR":{"pct":0},"ff":{"pct":0},"fi":{"pct":0.56},"fil":{"pct":0},"fr":{"pct":0.97},"fr-FR":{"pct":0},"fy":{"pct":0.01},"ga":{"pct":0},"gan":{"pct":0},"gl":{"pct":0.55},"grt":{"pct":0},"gu":{"pct":0},"ha":{"pct":0},"he":{"pct":0.74},"he-IL":{"pct":0},"hi":{"pct":0.01},"hr":{"pct":0.33},"hu":{"pct":0.78},"hy":{"pct":0.02},"ia":{"pct":0},"id":{"pct":0.21},"ig":{"pct":0},"is":{"pct":0.31},"it":{"pct":0.75},"ja":{"pct":0.99},"jam":{"pct":0},"jv":{"pct":0},"ka":{"pct":0},"kbd":{"pct":0},"kha":{"pct":0},"ki":{"pct":0},"kk":{"pct":0},"km":{"pct":0},"kn":{"pct":0.07},"ko":{"pct":0.6},"ks":{"pct":0},"ku":{"pct":0.01},"ky":{"pct":0},"lb":{"pct":0},"lg":{"pct":0},"lij":{"pct":0},"ln":{"pct":0},"lo":{"pct":0},"lt":{"pct":0.27},"lus":{"pct":0},"lv":{"pct":0.2},"mg":{"pct":0},"mi":{"pct":0},"mk":{"pct":1},"ml":{"pct":0},"mn":{"pct":0},"mr":{"pct":0},"ms":{"pct":0.12},"my":{"pct":0},"nb":{"pct":0},"nd":{"pct":0},"ne":{"pct":0.02},"nl":{"pct":0.88},"nl-BE":{"pct":0},"nl-NL":{"pct":0},"nn":{"pct":0.05},"no":{"pct":0.65},"nr":{"pct":0},"nso":{"pct":0},"nv":{"pct":0},"ny":{"pct":0},"oc":{"pct":0},"om":{"pct":0},"or":{"pct":0},"pa":{"pct":0},"pa-PK":{"pct":0.1},"pap":{"pct":0},"pl":{"pct":0.81},"ps":{"pct":0},"pt":{"pct":0.98},"pt-BR":{"pct":0.87},"qu":{"pct":0},"rm":{"pct":0},"ro":{"pct":0.25},"ru":{"pct":0.56},"rw":{"pct":0},"sat":{"pct":0},"sc":{"pct":0},"sd":{"pct":0},"sg":{"pct":0},"si":{"pct":0},"sk":{"pct":0.66},"sl":{"pct":0.31},"sm":{"pct":0},"sn":{"pct":0},"so":{"pct":0.03},"sq":{"pct":0.02},"sr":{"pct":0.35},"ss":{"pct":0},"st":{"pct":0},"su":{"pct":0},"sv":{"pct":1},"sw":{"pct":0},"ta":{"pct":0.22},"te":{"pct":0.02},"tg":{"pct":0},"th":{"pct":0.2},"ti":{"pct":0},"tk":{"pct":0},"tl":{"pct":0.03},"tn":{"pct":0},"tr":{"pct":0.73},"ts":{"pct":0},"tt":{"pct":0},"tum":{"pct":0},"ug":{"pct":0},"uk":{"pct":0.99},"ur":{"pct":0},"uz":{"pct":0},"ve":{"pct":0},"vi":{"pct":0.78},"wo":{"pct":0},"xh":{"pct":0},"yo":{"pct":0},"yue":{"pct":0.25},"zh":{"pct":0.06},"zh-CN":{"pct":0.82},"zh-HK":{"pct":0.52},"zh-TW":{"pct":1},"zu":{"pct":0}}

dist/translations/index.min.json

@@ -1,6 +1,6 @@
 {
     "af": {
-        "pct": 0.21
+        "pct": 0.2
     },
     "ak": {
         "pct": 0
@@ -9,7 +9,7 @@
         "pct": 0.02
     },
     "ar": {
-        "pct": 0.91
+        "pct": 0.86
     },
     "ar-AA": {
         "pct": 0
@@ -18,7 +18,7 @@
         "pct": 0
     },
     "ast": {
-        "pct": 0.26
+        "pct": 0.25
     },
     "ay": {
         "pct": 0
@@ -33,7 +33,7 @@
         "pct": 0
     },
     "bg": {
-        "pct": 0.23
+        "pct": 0.22
     },
     "bn": {
         "pct": 0.05
@@ -42,10 +42,10 @@
         "pct": 0
     },
     "br": {
-        "pct": 0.35
+        "pct": 0.37
     },
     "bs": {
-        "pct": 0.14
+        "pct": 0.13
     },
     "ca": {
         "pct": 0.69
@@ -54,7 +54,7 @@
         "pct": 0.04
     },
     "cs": {
-        "pct": 0.97
+        "pct": 0.98
     },
     "cv": {
         "pct": 0
@@ -63,7 +63,7 @@
         "pct": 0.01
     },
     "da": {
-        "pct": 0.62
+        "pct": 0.59
     },
     "de": {
         "pct": 1
@@ -81,7 +81,7 @@
         "pct": 0
     },
     "el": {
-        "pct": 0.71
+        "pct": 0.7
     },
     "en": {
         "pct": 1
@@ -93,7 +93,7 @@
         "pct": 0.04
     },
     "en-GB": {
-        "pct": 0.3
+        "pct": 0.28
     },
     "en-IE": {
         "pct": 0
@@ -108,19 +108,19 @@
         "pct": 0
     },
     "eo": {
-        "pct": 0.83
+        "pct": 0.79
     },
     "es": {
-        "pct": 0.98
+        "pct": 1
     },
     "et": {
-        "pct": 0.35
+        "pct": 0.33
     },
     "eu": {
-        "pct": 0.16
+        "pct": 0.15
     },
     "fa": {
-        "pct": 0.71
+        "pct": 0.67
     },
     "fa-IR": {
         "pct": 0
@@ -129,13 +129,13 @@
         "pct": 0
     },
     "fi": {
-        "pct": 0.59
+        "pct": 0.56
     },
     "fil": {
         "pct": 0
     },
     "fr": {
-        "pct": 0.96
+        "pct": 0.97
     },
     "fr-FR": {
         "pct": 0
@@ -150,7 +150,7 @@
         "pct": 0
     },
     "gl": {
-        "pct": 0.58
+        "pct": 0.55
     },
     "grt": {
         "pct": 0
@@ -162,19 +162,19 @@
         "pct": 0
     },
     "he": {
-        "pct": 0.78
+        "pct": 0.74
     },
     "he-IL": {
         "pct": 0
     },
     "hi": {
-        "pct": 0.02
+        "pct": 0.01
     },
     "hr": {
-        "pct": 0.32
+        "pct": 0.33
     },
     "hu": {
-        "pct": 0.82
+        "pct": 0.78
     },
     "hy": {
         "pct": 0.02
@@ -183,19 +183,19 @@
         "pct": 0
     },
     "id": {
-        "pct": 0.22
+        "pct": 0.21
     },
     "ig": {
         "pct": 0
     },
     "is": {
-        "pct": 0.33
+        "pct": 0.31
     },
     "it": {
-        "pct": 0.79
+        "pct": 0.75
     },
     "ja": {
-        "pct": 0.97
+        "pct": 0.99
     },
     "jam": {
         "pct": 0
@@ -225,7 +225,7 @@
         "pct": 0.07
     },
     "ko": {
-        "pct": 0.63
+        "pct": 0.6
     },
     "ks": {
         "pct": 0
@@ -252,13 +252,13 @@
         "pct": 0
     },
     "lt": {
-        "pct": 0.28
+        "pct": 0.27
     },
     "lus": {
         "pct": 0
     },
     "lv": {
-        "pct": 0.21
+        "pct": 0.2
     },
     "mg": {
         "pct": 0
@@ -279,7 +279,7 @@
         "pct": 0
     },
     "ms": {
-        "pct": 0.13
+        "pct": 0.12
     },
     "my": {
         "pct": 0
@@ -294,7 +294,7 @@
         "pct": 0.02
     },
     "nl": {
-        "pct": 0.89
+        "pct": 0.88
     },
     "nl-BE": {
         "pct": 0
@@ -306,7 +306,7 @@
         "pct": 0.05
     },
     "no": {
-        "pct": 0.68
+        "pct": 0.65
     },
     "nr": {
         "pct": 0
@@ -333,22 +333,22 @@
         "pct": 0
     },
     "pa-PK": {
-        "pct": 0.11
+        "pct": 0.1
     },
     "pap": {
         "pct": 0
     },
     "pl": {
-        "pct": 0.84
+        "pct": 0.81
     },
     "ps": {
         "pct": 0
     },
     "pt": {
-        "pct": 0.97
+        "pct": 0.98
     },
     "pt-BR": {
-        "pct": 0.92
+        "pct": 0.87
     },
     "qu": {
         "pct": 0
@@ -357,10 +357,10 @@
         "pct": 0
     },
     "ro": {
-        "pct": 0.27
+        "pct": 0.25
     },
     "ru": {
-        "pct": 0.59
+        "pct": 0.56
     },
     "rw": {
         "pct": 0
@@ -381,10 +381,10 @@
         "pct": 0
     },
     "sk": {
-        "pct": 0.68
+        "pct": 0.66
     },
     "sl": {
-        "pct": 0.33
+        "pct": 0.31
     },
     "sm": {
         "pct": 0
@@ -393,13 +393,13 @@
         "pct": 0
     },
     "so": {
-        "pct": 0.04
+        "pct": 0.03
     },
     "sq": {
         "pct": 0.02
     },
     "sr": {
-        "pct": 0.37
+        "pct": 0.35
     },
     "ss": {
         "pct": 0
@@ -411,13 +411,13 @@
         "pct": 0
     },
     "sv": {
-        "pct": 0.99
+        "pct": 1
     },
     "sw": {
         "pct": 0
     },
     "ta": {
-        "pct": 0.23
+        "pct": 0.22
     },
     "te": {
         "pct": 0.02
@@ -426,7 +426,7 @@
         "pct": 0
     },
     "th": {
-        "pct": 0.21
+        "pct": 0.2
     },
     "ti": {
         "pct": 0
@@ -435,13 +435,13 @@
         "pct": 0
     },
     "tl": {
-        "pct": 0.04
+        "pct": 0.03
     },
     "tn": {
         "pct": 0
     },
     "tr": {
-        "pct": 0.76
+        "pct": 0.73
     },
     "ts": {
         "pct": 0
@@ -456,7 +456,7 @@
         "pct": 0
     },
     "uk": {
-        "pct": 0.98
+        "pct": 0.99
     },
     "ur": {
         "pct": 0
@@ -468,7 +468,7 @@
         "pct": 0
     },
     "vi": {
-        "pct": 0.82
+        "pct": 0.78
     },
     "wo": {
         "pct": 0
@@ -480,16 +480,16 @@
         "pct": 0
     },
     "yue": {
-        "pct": 0.26
+        "pct": 0.25
     },
     "zh": {
         "pct": 0.06
     },
     "zh-CN": {
-        "pct": 0.86
+        "pct": 0.82
     },
     "zh-HK": {
-        "pct": 0.54
+        "pct": 0.52
     },
     "zh-TW": {
         "pct": 1

dist/translations/is.json

@@ -2180,9 +2180,6 @@
                 "attraction/amusement_ride": {
                     "name": "Skemmtitæki"
                 },
-                "attraction/big_wheel": {
-                    "name": "Parísarhjól"
-                },
                 "attraction/bungee_jumping": {
                     "name": "Teygjustökk"
                 },
@@ -2249,9 +2246,6 @@
                 "barrier/kissing_gate": {
                     "name": "Sjálflokandi hlið"
                 },
-                "barrier/lift_gate": {
-                    "name": "Lyftuhlið"
-                },
                 "barrier/retaining_wall": {
                     "name": "Hallaveggur"
                 },
@@ -2392,9 +2386,6 @@
                 "building/stadium": {
                     "name": "Íþróttaleikvangur"
                 },
-                "building/static_caravan": {
-                    "name": "Staðfast hjólhýsi"
-                },
                 "building/temple": {
                     "name": "Musterisbygging"
                 },
@@ -2671,15 +2662,9 @@
                 "highway/corridor": {
                     "name": "Gangur innanhúss"
                 },
-                "highway/crossing/marked": {
-                    "name": "Merkt gangbraut"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Ómerkt gangbraut"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Merkt gangbraut"
-                },
                 "highway/cycleway": {
                     "name": "Hjólastígur"
                 },

dist/translations/it.json

@@ -306,7 +306,10 @@
                     "terms": "bar"
                 },
                 "barrier": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "wall": "Muro"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barriera",
@@ -325,7 +328,10 @@
                     "label": "Sabbiatura"
                 },
                 "bath/type": {
-                    "label": "Specialità"
+                    "label": "Specialità",
+                    "options": {
+                        "lake": "Lago"
+                    }
                 },
                 "beauty": {
                     "label": "Servizi",
@@ -375,7 +381,11 @@
                     }
                 },
                 "board_type": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "art": "Arte",
+                        "nature": "Natura"
+                    }
                 },
                 "bollard": {
                     "label": "Tipo"
@@ -486,7 +496,6 @@
                     "terms": "capacità,capienza"
                 },
                 "capacity/caravans": {
-                    "label": "Capacità (caravan)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -4034,10 +4043,6 @@
                     "name": "Recinto animali",
                     "terms": "zoo,zoo safari,safari,parco animali,gabbia,gabbie,leone,leoni,tigre,tigri,orso,orsi,giraffa,giraffe,elefante,elefanti,zebra,zebre"
                 },
-                "attraction/big_wheel": {
-                    "name": "Ruota panoramica",
-                    "terms": "grande ruota,ruota,panoramica,parco a tema,attrazioni,divertimento,divertimenti,giostra,luna park"
-                },
                 "attraction/bumper_car": {
                     "name": "Autoscontro"
                 },
@@ -4184,10 +4189,6 @@
                     "name": "Cancello che non fa passare il bestiame",
                     "terms": "kissing gate"
                 },
-                "barrier/lift_gate": {
-                    "name": "Sbarra",
-                    "terms": "barriera a sollevamento"
-                },
                 "barrier/retaining_wall": {
                     "name": "Muro di contenimento",
                     "terms": "muro di contenimento"
@@ -4418,10 +4419,6 @@
                     "name": "Stadio",
                     "terms": "stadio,stadio olimpico,olimpico,stadio di calcio,stadio del ghiaccio,stadio sportivo,sport,sportivo,arena,palazzetto"
                 },
-                "building/static_caravan": {
-                    "name": "Roulotte stazionaria",
-                    "terms": "casa mobile,container,casa prefabbricata"
-                },
                 "building/sty": {
                     "name": "Porcile"
                 },
@@ -4936,10 +4933,6 @@
                 "highway/crossing": {
                     "name": "Attraversamento"
                 },
-                "highway/crossing/marked": {
-                    "name": "Strisce pedonali",
-                    "aliases": "Attraversamento pedonale"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Attraversamento pedonale semaforizzato",
                     "terms": "semaforo,piedi,pedonale,strisce pedonali,attraversamento,bici,ciclabile,marciapiede"
@@ -4948,10 +4941,6 @@
                     "name": "Attraversamento pedonale non segnalato",
                     "terms": "pedone,pedoni,pedonale,attraversamento,punto,senza strisce,informale"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Strisce pedonali",
-                    "aliases": "Attraversamento pedonale"
-                },
                 "highway/cycleway": {
                     "name": "Percorso ciclabile",
                     "terms": "percorso ciclabile"
@@ -4967,9 +4956,6 @@
                     "name": "Attraversamento ciclabile e pedonale",
                     "terms": "attraversamento bici e pedoni,bici e pedoni,ciclabile e pedonale"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Strisce per biciclette"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Attraversamento ciclabile semaforico",
                     "terms": "attraversamento ciclabile con semaforo"
@@ -5010,9 +4996,6 @@
                 "highway/footway/crossing": {
                     "name": "Attraversamento pedonale"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Attraversamento pedonale segnalato"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Attraversamento pedonale semaforico",
                     "terms": "attraversamento pedonale con semaforo"
@@ -5024,9 +5007,6 @@
                 "highway/footway/crossing/unmarked": {
                     "name": "Attraversamento pedonale non segnalato"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Strisce pedonali"
-                },
                 "highway/footway/sidewalk": {
                     "name": "Marciapiede",
                     "terms": "marciapiedi"

dist/translations/ko.json

@@ -3184,10 +3184,6 @@
                 "attraction/animal": {
                     "name": "동물 우리"
                 },
-                "attraction/big_wheel": {
-                    "name": "대관람차",
-                    "terms": "대관람차"
-                },
                 "attraction/bumper_car": {
                     "name": "범퍼카"
                 },
@@ -3307,10 +3303,6 @@
                     "name": "목장 문",
                     "terms": "좁게 열리는 문"
                 },
-                "barrier/lift_gate": {
-                    "name": "리프트 문",
-                    "terms": "내리닫이 문"
-                },
                 "barrier/retaining_wall": {
                     "name": "옹벽",
                     "terms": "옹벽"
@@ -3515,10 +3507,6 @@
                 "building/stadium": {
                     "name": "경기장 건물"
                 },
-                "building/static_caravan": {
-                    "name": "고정형 이동식 주택",
-                    "terms": "이동 주택"
-                },
                 "building/sty": {
                     "name": "돈사",
                     "terms": "돼지우리"
@@ -3998,28 +3986,16 @@
                 "highway/crossing": {
                     "name": "횡단보도"
                 },
-                "highway/crossing/marked": {
-                    "name": "횡단보도"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "보행자 신호등이 있는 횡단보도"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "표시가 있는 횡단보도"
-                },
                 "highway/crossing/unmarked": {
                     "name": "표시되지 않은 횡단보도"
                 },
-                "highway/crossing/zebra": {
-                    "name": "횡단보도"
-                },
                 "highway/cycleway": {
                     "name": "자전거 도로",
                     "terms": "자전거 도로"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "표시된 자전거 횡단로"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "표시되지 않은 자전거 횡단로"
                 },
@@ -4041,9 +4017,6 @@
                 "highway/footway/crossing": {
                     "name": "횡단보도"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "표시된 횡단보도"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "보행자 신호등이 있는 횡단보도"
                 },

dist/translations/lt.json

@@ -1828,9 +1828,6 @@
                     "name": "Plotas",
                     "terms": "plotas"
                 },
-                "attraction/big_wheel": {
-                    "name": "Didelis ratas"
-                },
                 "attraction/carousel": {
                     "name": "Karuselė"
                 },
@@ -1889,10 +1886,6 @@
                 "barrier/kissing_gate": {
                     "name": "Atsidarantys varteliai"
                 },
-                "barrier/lift_gate": {
-                    "name": "Pakeliami vartai",
-                    "terms": "pakeliami vartai"
-                },
                 "barrier/retaining_wall": {
                     "name": "Laikančioji siena"
                 },
@@ -2042,9 +2035,6 @@
                 "building/stadium": {
                     "name": "Stadiono pastatas"
                 },
-                "building/static_caravan": {
-                    "name": "Statiški mobilūs namai"
-                },
                 "building/temple": {
                     "name": "Šventyklos pastatas"
                 },

dist/translations/lv.json

@@ -1497,10 +1497,6 @@
                 "area": {
                     "name": "Apgabals"
                 },
-                "attraction/big_wheel": {
-                    "name": "Panorāmas rats",
-                    "terms": "rats,atrakcija,bruciens,lielais rats"
-                },
                 "attraction/bungee_jumping": {
                     "name": "Gumijlēkšana",
                     "terms": "gumija,augstums,lekšana,lekšanas platforma"
@@ -1566,10 +1562,6 @@
                     "name": "Dubultveramie vārti",
                     "terms": "dubultie,abpusējie,dubultvārti"
                 },
-                "barrier/lift_gate": {
-                    "name": "Lifta ieeja",
-                    "terms": "paceļamie,bomja,bomis"
-                },
                 "barrier/retaining_wall": {
                     "name": "Stiprinājuma siena"
                 },

dist/translations/mk.json

@@ -240,7 +240,22 @@
                     "label": "За животни"
                 },
                 "archaeological_site": {
-                    "label": "Вид"
+                    "label": "Вид",
+                    "options": {
+                        "baths": "Бања",
+                        "city": "Стар град",
+                        "crannog": "Краног",
+                        "enclosure": "Обор",
+                        "fortification": "Утврдување",
+                        "hut_circle": "Темел на кружна куќа",
+                        "megalith": "Мегалит",
+                        "necropolis": "Некропола",
+                        "petroglyph": "Петроглиф",
+                        "roman_circus": "Римски циркус",
+                        "roman_villa": "Римска вила",
+                        "settlement": "Стара населба",
+                        "tumulus": "Могила"
+                    }
                 },
                 "architect": {
                     "label": "Архитект"
@@ -273,7 +288,28 @@
                     "label": "Банкомат"
                 },
                 "attraction": {
-                    "label": "Вид"
+                    "label": "Вид",
+                    "options": {
+                        "alpine_coaster": "Планинска спушталница",
+                        "amusement_ride": "Забавна постројка",
+                        "animal": "Живеалиште за животни",
+                        "big_wheel": "Панорамско тркало",
+                        "bumper_car": "Автодром",
+                        "bungee_jumping": "Скокање со јаже — банџи",
+                        "carousel": "Рингишпил",
+                        "dark_ride": "Возење низ куќа на стравот",
+                        "drop_tower": "Слободен пад",
+                        "kiddie_ride": "Детска возилка",
+                        "log_flume": "Трупна спушталка",
+                        "maze": "Лавиринт",
+                        "pirate_ship": "Пловење на пиратски брод",
+                        "river_rafting": "Пловење по речни брзаци",
+                        "roller_coaster": "Луда железница",
+                        "summer_toboggan": "Летен тобоган",
+                        "swing_carousel": "Вртелешка со лулашки",
+                        "train": "Туристички воз",
+                        "water_slide": "Водена лизгалка"
+                    }
                 },
                 "automated": {
                     "label": "Автоматски"
@@ -300,7 +336,32 @@
                     "label": "Бар"
                 },
                 "barrier": {
-                    "label": "Вид"
+                    "label": "Вид",
+                    "options": {
+                        "block": "Голем блок",
+                        "bollard": "Дирек",
+                        "cattle_grid": "Решетка за добиток",
+                        "chain": "Ланец",
+                        "city_wall": "Градски ѕид",
+                        "cycle_barrier": "Велосипедска препрека",
+                        "ditch": "Ров",
+                        "entrance": "Влез",
+                        "fence": "Ограда",
+                        "gate": "Порта",
+                        "guard_rail": "Заштитна ограда",
+                        "hedge": "Жива ограда",
+                        "height_restrictor": "Висински ограничувач",
+                        "jersey_barrier": "Бетонска препрека",
+                        "kerb": "Рабник",
+                        "kissing_gate": "Стоконепропусна порта",
+                        "lift_gate": "Порта на поттурнување",
+                        "retaining_wall": "Потпорен ѕид",
+                        "stile": "Оградни скалила",
+                        "swing_gate": "Крилна порта",
+                        "toll_booth": "Патарина",
+                        "turnstile": "Турникет",
+                        "wall": "Ѕид"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Препрека",
@@ -325,7 +386,14 @@
                     "label": "Песочна бања"
                 },
                 "bath/type": {
-                    "label": "Намена"
+                    "label": "Намена",
+                    "options": {
+                        "hammam": "Амам",
+                        "hot_spring": "Топол извор",
+                        "lake": "Езеро",
+                        "onsen": "Онсен",
+                        "thermal": "Бања"
+                    }
                 },
                 "beauty": {
                     "label": "Услуги",
@@ -496,7 +564,7 @@
                     "placeholder": "50, 100, 200..."
                 },
                 "capacity/caravans": {
-                    "label": "Сместивост (приколки)",
+                    "label": "Сместивост (трајлер / приколка)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -519,6 +587,9 @@
                     "label": "Зафатнина  (кубици)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Трајлер / приколка"
+                },
                 "cash_in": {
                     "label": "Влогови"
                 },
@@ -1716,6 +1787,13 @@
                 "lifeguard": {
                     "label": "Спасител"
                 },
+                "lift_gate/type": {
+                    "label": "Вид",
+                    "options": {
+                        "double": "Двојна рампа",
+                        "single": "Единечна рампа"
+                    }
+                },
                 "line_attachment": {
                     "label": "Кабелска приврска",
                     "terms": "<преведете со истозначници или сродни поими на „кабелска приврска“,одделени со запирки>"
@@ -1769,7 +1847,31 @@
                     "label": "Вид"
                 },
                 "material": {
-                    "label": "Материјал"
+                    "label": "Материјал",
+                    "options": {
+                        "adobe": "Ќерпич",
+                        "aluminium": "Алуминиум",
+                        "brass": "Месинг",
+                        "brick": "Цигла",
+                        "bronze": "Бронза",
+                        "concrete": "Бетон",
+                        "dry_stone": "Сувоѕидица",
+                        "glass": "Стакло",
+                        "granite": "Гранит",
+                        "iron": "Железо",
+                        "limestone": "Варовник",
+                        "marble": "Мермер",
+                        "metal": "Метал",
+                        "plastic": "Пластика",
+                        "reinforced_conrete": "Армиран бетон",
+                        "rock": "Карпа",
+                        "sand": "Песок",
+                        "sandstone": "Песочник",
+                        "soil": "Земја",
+                        "steel": "Челик",
+                        "stone": "Камен",
+                        "wood": "Дрво"
+                    }
                 },
                 "mattress": {
                     "label": "Достапни душеци"
@@ -1803,7 +1905,20 @@
                     "label": "Најг. ширина"
                 },
                 "memorial": {
-                    "label": "Вид"
+                    "label": "Вид",
+                    "options": {
+                        "blue_plaque": "Сина спомен-плоча",
+                        "bust": "Биста",
+                        "cross": "Спомен-крст",
+                        "obelisk": "Обелиск",
+                        "plaque": "Спомен-плоча",
+                        "sculpture": "Скулптура",
+                        "statue": "Статуа",
+                        "stele": "Стела",
+                        "stolperstein": "Камен на сопнување",
+                        "stone": "Камен",
+                        "war_memorial": "Воен паметник"
+                    }
                 },
                 "microbrewery": {
                     "label": "Микропиварница"
@@ -1923,8 +2038,69 @@
                 "note": {
                     "label": "Напомена"
                 },
+                "nudism": {
+                    "label": "Нудизам",
+                    "options": {
+                        "customary": "Вообичаен",
+                        "designated": "Очекуван",
+                        "no": "Забранет",
+                        "obligatory": "Задолжителен",
+                        "permissive": "Се допушта",
+                        "yes": "Дозволен"
+                    },
+                    "terms": "<преведете со истозначници или сродни поими на „нудизам“,одделени со запирки>"
+                },
                 "office": {
-                    "label": "Вид"
+                    "label": "Вид",
+                    "options": {
+                        "accountant": "Сметководствено биро",
+                        "adoption_agency": "Агенција за посвојување",
+                        "advertising_agency": "Рекламна агенција",
+                        "architect": "Архитектонско биро",
+                        "association": "Непрофитна организација",
+                        "charity": "Добротворна организација",
+                        "company": "Деловни простории",
+                        "construction_company": "Градежно претпријатие",
+                        "consulting": "Советодавно биро",
+                        "courier": "Брза пошта",
+                        "coworking": "Споделена канцеларија",
+                        "diplomatic": "Дипломатска служба",
+                        "educational_institution": "Образовна установа",
+                        "employment_agency": "Агенција за вработување",
+                        "energy_supplier": "Енергостопанска служба",
+                        "engineer": "Инженерско биро",
+                        "estate_agent": "Агенција за недвижности",
+                        "financial": "Финансиска служба",
+                        "financial_advisor": "Финансов советник",
+                        "forestry": "Шумарска служба",
+                        "foundation": "Задолжбина",
+                        "government": "Управна служба",
+                        "graphic_design": "Графичко ателје",
+                        "guide": "Туристички водич",
+                        "insurance": "Осигурително друштво",
+                        "it": "Информатичка служба",
+                        "lawyer": "Правник",
+                        "logistics": "Шпедитер",
+                        "moving_company": "Преселувач",
+                        "newspaper": "Новинарска служба",
+                        "ngo": "НВО",
+                        "notary": "Нотар",
+                        "physician": "Лекар",
+                        "political_party": "Партиски штаб",
+                        "private_investigator": "Приватен иследувач",
+                        "property_management": "Домарска служба",
+                        "quango": "Квази-НВО",
+                        "religion": "Верска служба",
+                        "research": "Истражувачка служба",
+                        "security": "Обезбедување",
+                        "surveyor": "Земјомерна служба",
+                        "tax_advisor": "Даночен советник",
+                        "telecommunication": "Телекомуникациска служба",
+                        "therapist": "Терапевт",
+                        "travel_agent": "Туристичка агенција",
+                        "union": "Синдикална канцеларија",
+                        "water_utility": "Водоводна служба"
+                    }
                 },
                 "oneway": {
                     "label": "Еднонасочно",
@@ -2002,11 +2178,14 @@
                     "options": {
                         "carports": "Автомобилски стреи",
                         "garage_boxes": "Гаражи",
+                        "half_on_kerb": "Половина на тротоар",
                         "lane": "Крајпатна лента",
                         "layby": "Одмориште",
                         "multi-storey": "Катно",
+                        "on_kerb": "На тротоар",
                         "rooftop": "Покрив",
                         "sheds": "Шупи",
+                        "shoulder": "Принудна лента",
                         "street_side": "Крајулично",
                         "surface": "Надземно",
                         "underground": "Подземно"
@@ -2020,6 +2199,35 @@
                         "perpendicular": "Под прав агол на улицата"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Насока на паркирање",
+                    "options": {
+                        "diagonal": "Дијагонално на улицата (~45°)",
+                        "parallel": "Напоредно на улицата",
+                        "perpendicular": "Под прав агол на улицата (~90°)"
+                    },
+                    "types": {
+                        "parking:left:orientation": "Лево",
+                        "parking:right:orientation": "Десно"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Паркирање",
+                    "options": {
+                        "half_on_kerb": "Половина на тротоар",
+                        "lane": "Крајпатна лента",
+                        "no": "Не",
+                        "on_kerb": "На тротоар",
+                        "separate": "Паркирање исцртано посебно",
+                        "shoulder": "Принудна лента",
+                        "street_side": "Крајулично",
+                        "yes": "Да (неукажано)"
+                    },
+                    "types": {
+                        "parking:left": "Лево",
+                        "parking:right": "Десно"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Вид"
                 },
@@ -2079,6 +2287,10 @@
                     "label": "Телефон",
                     "placeholder": "+31 42 123 4567"
                 },
+                "picnic_table": {
+                    "label": "Излетничка маса",
+                    "terms": "<преведете со истозначници или сродни поими на „излетничка маса“,одделени со запирки>"
+                },
                 "pipeline": {
                     "label": "Вид"
                 },
@@ -2414,7 +2626,18 @@
                     "label": "Вид"
                 },
                 "resource": {
-                    "label": "Ресурси"
+                    "label": "Ресурси",
+                    "options": {
+                        "aggregate": "Агрегат",
+                        "clay": "Глина",
+                        "coal": "Јаглен",
+                        "gold": "Злато",
+                        "gravel": "Чакал",
+                        "iron_ore": "Железна руда",
+                        "limestone": "Варовни",
+                        "peat": "Тресет",
+                        "sand": "Песок"
+                    }
                 },
                 "restriction": {
                     "label": "Вид"
@@ -2725,7 +2948,44 @@
                     "label": "Вид на Википодатоците"
                 },
                 "sport": {
-                    "label": "Спортови"
+                    "label": "Спортови",
+                    "options": {
+                        "american_football": "Американски фудбал",
+                        "athletics": "Атлетика",
+                        "badminton": "Бадминтон",
+                        "baseball": "Бејзбол",
+                        "basketball": "Кошарка",
+                        "beachvolleyball": "Одбојка на плажа",
+                        "boules": "Боќање",
+                        "bowls": "Боулс",
+                        "climbing": "Искачување",
+                        "cricket": "Крикет",
+                        "cycling": "Велосипедизам",
+                        "equestrian": "Коњички спорт",
+                        "fitness": "Физички вежби",
+                        "free_flying": "Параглајдерство / змејарство",
+                        "futsal": "Футсал",
+                        "golf": "Голф",
+                        "gymnastics": "Гимнастика",
+                        "handball": "Ракомет",
+                        "horse_racing": "Коњски трки",
+                        "karting": "Картинг",
+                        "motocross": "Мотокрос",
+                        "motor": "Мототрки",
+                        "netball": "Нетбол",
+                        "padel": "Падел",
+                        "rugby_union": "Рагби (сојузно)",
+                        "running": "Трчање",
+                        "shooting": "Стрелаштво",
+                        "skateboard": "Скејтбординг",
+                        "skiing": "Сијање",
+                        "soccer": "Фудбал",
+                        "softball": "Софтбол",
+                        "swimming": "Пливање",
+                        "table_tennis": "Пинг-понг",
+                        "tennis": "Тенис",
+                        "volleyball": "Одбојка"
+                    }
                 },
                 "sport_ice": {
                     "label": "Спортови",
@@ -2771,6 +3031,9 @@
                     "label": "Почетен датум",
                     "placeholder": "ГГГГ-ММ-ДД"
                 },
+                "static_caravans": {
+                    "label": "Подвижни домови"
+                },
                 "step_count": {
                     "label": "Бр. на чекори"
                 },
@@ -2832,7 +3095,16 @@
                     "label": "Википодатоци за предметот"
                 },
                 "substance": {
-                    "label": "Супстанција"
+                    "label": "Супстанција",
+                    "options": {
+                        "fuel": "Гориво",
+                        "gas": "Природно дрво",
+                        "hot_water": "Топла вода",
+                        "oil": "Сирова нафта",
+                        "rainwater": "Дождовница",
+                        "sewage": "Отпадна вода",
+                        "water": "Пивка вода"
+                    }
                 },
                 "substation": {
                     "label": "Вид",
@@ -2981,6 +3253,9 @@
                 "telecom/medium": {
                     "label": "Медиум"
                 },
+                "tents": {
+                    "label": "Шатори"
+                },
                 "tidal": {
                     "label": "Приливен"
                 },
@@ -3281,7 +3556,13 @@
                     "label": "Вид"
                 },
                 "waste": {
-                    "label": "Отпадоци"
+                    "label": "Отпадоци",
+                    "options": {
+                        "cigarettes": "Отпушоци",
+                        "dog_excrement": "Кучешки измет",
+                        "organic": "Органски отпад",
+                        "trash": "Ѓубре"
+                    }
                 },
                 "water": {
                     "label": "Вид"
@@ -4302,7 +4583,7 @@
                     "name": "Живеалиште за животни"
                 },
                 "attraction/big_wheel": {
-                    "name": "Големо тркало"
+                    "name": "Панорамско тркало"
                 },
                 "attraction/bumper_car": {
                     "name": "Автодром"
@@ -4440,7 +4721,7 @@
                     "name": "Стоконепропусна порта"
                 },
                 "barrier/lift_gate": {
-                    "name": "Порта со дигалка"
+                    "name": "Рампа"
                 },
                 "barrier/log": {
                     "name": "Паднато дрво"
@@ -4656,7 +4937,7 @@
                     "name": "Стадионска градба"
                 },
                 "building/static_caravan": {
-                    "name": "Недвижечки подвижен дом"
+                    "name": "Подвижен дом"
                 },
                 "building/sty": {
                     "name": "Кочина"
@@ -5021,9 +5302,27 @@
                 "healthcare/alternative": {
                     "name": "Алтернативна медицина"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Акупунтурист"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Ајурведичар"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Хиропрактичар"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Хомеопат"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Натуропат"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Остеопат"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Традиционален кинески ликар"
+                },
                 "healthcare/audiologist": {
                     "name": "Слушен лекар"
                 },
@@ -5099,22 +5398,15 @@
                 "highway/crossing": {
                     "name": "Премин"
                 },
-                "highway/crossing/marked": {
-                    "name": "Обележан пешачки премин"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Премин со пешачки сигнали"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "Обележан пешачки премин",
-                    "terms": "[преведете со истозначници и сродни поими на „обележан пешачки премин“,одделени со запирки]"
+                    "name": "Обележан премин"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Необележан премин"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Обележан пешачки премин"
-                },
                 "highway/cycleway": {
                     "name": "Велосипедска патека"
                 },
@@ -5127,9 +5419,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Велосипедско-пешачки премин"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Обележан велосипедски премин"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Велосипедски премин со семафор"
                 },
@@ -5170,9 +5459,6 @@
                 "highway/footway/crossing": {
                     "name": "Пешачки премин"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Обележан премин"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Премин со пешачки семафор"
                 },
@@ -5182,9 +5468,6 @@
                 "highway/footway/crossing/unmarked": {
                     "name": "Необележан премин"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Обележан премин"
-                },
                 "highway/footway/informal": {
                     "name": "Неформална пешачка патека"
                 },

dist/translations/nl.json

@@ -243,6 +243,24 @@
                 "animal_shelter": {
                     "label": "Voor dieren"
                 },
+                "archaeological_site": {
+                    "label": "Type",
+                    "options": {
+                        "baths": "Baden",
+                        "city": "Historische stad",
+                        "crannog": "Crannog",
+                        "enclosure": "Omheining",
+                        "fortification": "Vestingwerken",
+                        "hut_circle": "Huttencirkel",
+                        "megalith": "Megaliet",
+                        "necropolis": "Necropolis",
+                        "petroglyph": "Rotstekening",
+                        "roman_circus": "Romeins circus",
+                        "roman_villa": "Romeinse villa",
+                        "settlement": "Historische nederzetting",
+                        "tumulus": "Grafheuvel"
+                    }
+                },
                 "architect": {
                     "label": "Architect",
                     "terms": "gebouwontwerper,architect,ontwerper"
@@ -254,7 +272,18 @@
                     "label": "Kunstenaar"
                 },
                 "artwork_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "bust": "Buste",
+                        "graffiti": "Graffiti",
+                        "installation": "Kunstinstallatie",
+                        "mosaic": "Mozaïek",
+                        "mural": "Muurschildering",
+                        "painting": "Schilderij",
+                        "relief": "Reliëf",
+                        "sculpture": "Sculptuur",
+                        "statue": "Standbeeld"
+                    }
                 },
                 "ascent": {
                     "label": "Totale afdaling",
@@ -264,7 +293,28 @@
                     "label": "Geldautomaat"
                 },
                 "attraction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "alpine_coaster": "Alpine Coaster",
+                        "amusement_ride": "Pretparkattractie",
+                        "animal": "Dierenverblijf",
+                        "big_wheel": "Reuzenrad",
+                        "bumper_car": "Botsautootjes",
+                        "bungee_jumping": "Bungeejumpen",
+                        "carousel": "Draaimolen",
+                        "dark_ride": "Darkride",
+                        "drop_tower": "Vrijevaltoren ",
+                        "kiddie_ride": "Kinderattractie",
+                        "log_flume": "Boomstamattractie",
+                        "maze": "Doolhof",
+                        "pirate_ship": "Piratenschipattractie",
+                        "river_rafting": "Wildwaterbaan",
+                        "roller_coaster": "Achtbaan",
+                        "summer_toboggan": "Zomerrodelbaan",
+                        "swing_carousel": "Zweefmolen",
+                        "train": "Toeristentrein",
+                        "water_slide": "Waterglijbaan"
+                    }
                 },
                 "automated": {
                     "label": "Geautomatiseerd"
@@ -293,7 +343,32 @@
                     "terms": "bar,café"
                 },
                 "barrier": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "block": "Groot blok",
+                        "bollard": "Paaltje",
+                        "cattle_grid": "Wildrooster",
+                        "chain": "Ketting",
+                        "city_wall": "Stadsmuur",
+                        "cycle_barrier": "Fietshek",
+                        "ditch": "Sloot",
+                        "entrance": "Ingang",
+                        "fence": "Hek\nOmheining",
+                        "gate": "Poort",
+                        "guard_rail": "Vangrail",
+                        "hedge": "Haag",
+                        "height_restrictor": "Hoogtebeperker",
+                        "jersey_barrier": "Jersey barrier",
+                        "kerb": "Stoeprand",
+                        "kissing_gate": "Kissing gate",
+                        "lift_gate": "Slagboom",
+                        "retaining_wall": "Keermuur",
+                        "stile": "Overstaphek",
+                        "swing_gate": "Draaipoort",
+                        "toll_booth": "Tolhuisje",
+                        "turnstile": "Draaihek voor voetgangers",
+                        "wall": "Muur"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barrière",
@@ -303,7 +378,13 @@
                     }
                 },
                 "basin": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "detention": "Detentie",
+                        "evaporation": "Verdamping",
+                        "infiltration": "Infiltratie",
+                        "retention": "Retentie"
+                    }
                 },
                 "bath/open_air": {
                     "label": "Openlucht"
@@ -312,7 +393,14 @@
                     "label": "Japans zandbad"
                 },
                 "bath/type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "hammam": "Hamam",
+                        "hot_spring": "Warmwaterbron",
+                        "lake": "Meer",
+                        "onsen": "Onsen",
+                        "thermal": "Thermaalbad"
+                    }
                 },
                 "beauty": {
                     "label": "Diensten",
@@ -367,10 +455,28 @@
                     }
                 },
                 "board_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "art": "Kunst",
+                        "astronomy": "Astronomie",
+                        "geology": "Geologie",
+                        "history": "Geschiedenis",
+                        "nature": "Natuur",
+                        "notice": "Publicatiebord",
+                        "plants": "Planten",
+                        "welcome_sign": "Welkomstbord",
+                        "wildlife": "Wilde dieren"
+                    }
                 },
                 "bollard": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "fixed": "Vast paaltje",
+                        "flexible": "Flexibel paaltje",
+                        "foldable": "Vouwbaar paaltje",
+                        "removable": "Verwijderbaar paaltje",
+                        "rising": "Poller\nInzinkbaar paaltje"
+                    }
                 },
                 "booth": {
                     "label": "Balie"
@@ -478,7 +584,7 @@
                     "terms": "capaciteit"
                 },
                 "capacity/caravans": {
-                    "label": "Capaciteit (caravans)",
+                    "label": "Capaciteit (camper/caravan)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -501,6 +607,9 @@
                     "label": "Capaciteit (in kubieke meter)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Camper / Caravan"
+                },
                 "cash_in": {
                     "label": "Storting"
                 },
@@ -616,13 +725,73 @@
                     }
                 },
                 "craft": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "agricultural_engines": "Monteur voor landbouwvoertuigen",
+                        "basket_maker": "Mandenvlechter",
+                        "beekeeper": "Imker",
+                        "blacksmith": "Smid",
+                        "boatbuilder": "Scheepsbouwer",
+                        "bookbinder": "Boekbinder",
+                        "brewery": "Brouwerij",
+                        "builder": "Bouwer",
+                        "carpenter": "Timmerman",
+                        "carpet_layer": "Tapijtlegger",
+                        "caterer": "Cateraar",
+                        "chimney_sweeper": "Schoorsteenveger",
+                        "cleaning": "Schoonmaker",
+                        "clockmaker": "Klokmaker",
+                        "confectionery": "Snoepmaker",
+                        "distillery": "Destilleerderij",
+                        "dressmaker": "Kleermaker",
+                        "electrician": "Elektricien",
+                        "electronics_repair": "Reparateur van elektrische apparaten",
+                        "floorer": "Vloerenlegger",
+                        "gardener": "Hovenier",
+                        "glaziery": "Glaszetter",
+                        "grinding_mill": "Molen",
+                        "handicraft": "Ambacht",
+                        "hvac": "Installateur",
+                        "insulation": "Installateur van thermische isolatie ",
+                        "jeweller": "Juwelier",
+                        "joiner": "Meubelmaker",
+                        "key_cutter": "Sleutelmaker",
+                        "locksmith": "Slotenmaker",
+                        "metal_construction": "Metaalbewerker",
+                        "oil_mill": "Oliemolen",
+                        "painter": "Schilder",
+                        "parquet_layer": "Parketlegger",
+                        "photographer": "Fotograaf",
+                        "photographic_laboratory": "Fotolab",
+                        "plasterer": "Stukadoor",
+                        "plumber": "Loodgieter",
+                        "pottery": "Pottenbakker",
+                        "rigger": "Rigger",
+                        "roofer": "Dakdekker",
+                        "saddler": "Zadelmaker",
+                        "sailmaker": "Zeilmaker",
+                        "sawmill": "Zaagmolen",
+                        "scaffolder": "Steigerbouwer",
+                        "sculptor": "Beeldhouwer",
+                        "shoemaker": "Schoenmaker",
+                        "signmaker": "Bordenmaker",
+                        "stonemason": "Steenhouwer",
+                        "tailor": "Kleermaker",
+                        "tiler": "Tegelzetter",
+                        "tinsmith": "Blikslager",
+                        "upholsterer": "Stoffeerder",
+                        "watchmaker": "Horlogemaker",
+                        "window_construction": "Raam- en kozijnenmaker",
+                        "winery": "Wijnmakerij"
+                    }
                 },
                 "crane/type": {
                     "label": "Soort kraan",
                     "options": {
                         "floor-mounted_crane": "Vaste kraan",
+                        "gantry_crane": "Brugkraan",
                         "portal_crane": "Portaalkraan",
+                        "tower_crane": "Torenkraan",
                         "travel_lift": "Scheepslift"
                     }
                 },
@@ -2584,7 +2753,19 @@
                     "label": "Soort Wikidata"
                 },
                 "sport": {
-                    "label": "Sporten"
+                    "label": "Sporten",
+                    "options": {
+                        "running": "Hardlopen",
+                        "shooting": "Schieten",
+                        "skateboard": "Skateboarden",
+                        "skiing": "Skiën",
+                        "soccer": "Voetbal",
+                        "softball": "Softbal",
+                        "swimming": "Zwemmen",
+                        "table_tennis": "Tafeltennis",
+                        "tennis": "Tennis",
+                        "volleyball": "Volleybal"
+                    }
                 },
                 "sport_ice": {
                     "label": "Sporten",
@@ -2632,6 +2813,9 @@
                     "placeholder": "JJJJ-MM-DD",
                     "terms": "startdatum,start,begin,datum"
                 },
+                "static_caravans": {
+                    "label": "Woonwagen"
+                },
                 "step_count": {
                     "label": "Aantal treden",
                     "terms": "aantal,treden,hoeveelheid,opstap,tredes,trede"
@@ -4264,10 +4448,6 @@
                     "name": "Dier",
                     "terms": "zoo,dierenpark,kooi"
                 },
-                "attraction/big_wheel": {
-                    "name": "Reuzenrad",
-                    "terms": "panoramisch rad,gondelrad"
-                },
                 "attraction/bumper_car": {
                     "name": "Botsauto's",
                     "terms": "botsauto,kermis,pretpark"
@@ -4438,10 +4618,6 @@
                     "name": "Voetgangershek",
                     "terms": "veehek,kushek,kusjeshek,kissing gate"
                 },
-                "barrier/lift_gate": {
-                    "name": "Slagboom",
-                    "terms": "bareel"
-                },
                 "barrier/log": {
                     "name": "Omgevallen boom"
                 },
@@ -4706,10 +4882,6 @@
                     "name": "Stadiongebouw",
                     "terms": "stadion,voetbatlstadion"
                 },
-                "building/static_caravan": {
-                    "name": "Stacaravan",
-                    "terms": "woonwagen,chalet"
-                },
                 "building/sty": {
                     "name": "Varkensstal",
                     "terms": "stal,varkensstal,varkens,schuur,boerderij"
@@ -5269,22 +5441,13 @@
                 "highway/crossing": {
                     "name": "Oversteekplaats"
                 },
-                "highway/crossing/marked": {
-                    "name": "Gemarkeerde Voetgangersoversteekplaats"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Kruispunt met voetgangersverkeerslichten"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Gemarkeerde voetgangersoversteekplaats"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Ongemarkeerde oversteekplaats",
                     "terms": "ongemarkeerde oversteekplaats"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Zebrapad"
-                },
                 "highway/cycleway": {
                     "name": "Fietspad",
                     "terms": "rijwielpad,fietssnelweg,flitsfietspad,fietsoversteekplaats"
@@ -5300,9 +5463,6 @@
                     "name": "Fiets- en voetgangersoversteekplaats",
                     "terms": "oversteekplaats,gecombineerd,fietser,voetganger,zebrapad"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Gemarkeerde fietsoversteekplaats"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Ongemarkeerde fietsoversteekplaats",
                     "terms": "fietsoversteek,oversteekplaats,ongemarkeerd,niet aangeduid"

dist/translations/no.json

@@ -439,7 +439,6 @@
                     "placeholder": "50, 100, 200..."
                 },
                 "capacity/caravans": {
-                    "label": "Kapasitet (Caravans)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -3192,9 +3191,6 @@
                 "attraction/animal": {
                     "name": "Dyreinnhegning"
                 },
-                "attraction/big_wheel": {
-                    "name": "Pariserhjul"
-                },
                 "attraction/bumper_car": {
                     "name": "Radiobil"
                 },
@@ -3294,9 +3290,6 @@
                 "barrier/kerb/raised": {
                     "name": "Hevet kantstein"
                 },
-                "barrier/lift_gate": {
-                    "name": "Vippebom"
-                },
                 "barrier/retaining_wall": {
                     "name": "Støttemur"
                 },
@@ -3465,9 +3458,6 @@
                 "building/stadium": {
                     "name": "Stadionbyging"
                 },
-                "building/static_caravan": {
-                    "name": "Statisk campingvogn"
-                },
                 "building/temple": {
                     "name": "Tempelbygning"
                 },
@@ -3787,15 +3777,9 @@
                 "highway/corridor": {
                     "name": "Innendørs korridor"
                 },
-                "highway/crossing/marked": {
-                    "name": "Fotgjengerovergang"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Tilrettelagt kryssing"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Fotgjengerovergang"
-                },
                 "highway/cycleway": {
                     "name": "Sykkelvei"
                 },
@@ -3808,9 +3792,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Sykkel- og fotgjengerovergang"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Merket Sykkelovergang"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Umerket sykkelovergang"
                 },

dist/translations/pl.json

@@ -244,7 +244,11 @@
                     "label": "Dla zwierząt"
                 },
                 "archaeological_site": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "baths": "Łaźnie",
+                        "roman_villa": "Willa rzymska"
+                    }
                 },
                 "architect": {
                     "label": "Architekt",
@@ -259,7 +263,10 @@
                 "artwork_type": {
                     "label": "Rodzaj",
                     "options": {
-                        "graffiti": "Graffiti"
+                        "bust": "Popiersie",
+                        "graffiti": "Graffiti",
+                        "mural": "Mural",
+                        "sculpture": "Rzeźba"
                     }
                 },
                 "ascent": {
@@ -270,7 +277,11 @@
                     "label": "Bankomat"
                 },
                 "attraction": {
-                    "label": "Rodzaj"
+                    "label": "Rodzaj",
+                    "options": {
+                        "carousel": "Karuzela",
+                        "maze": "Labirtynt"
+                    }
                 },
                 "automated": {
                     "label": "Automatyczna"
@@ -299,7 +310,22 @@
                     "terms": "bar"
                 },
                 "barrier": {
-                    "label": "Rodzaj"
+                    "label": "Rodzaj",
+                    "options": {
+                        "bollard": "Słupek",
+                        "chain": "Łańcuch",
+                        "city_wall": "Mur miejski",
+                        "ditch": "Rów",
+                        "entrance": "Wejście",
+                        "fence": "Płot",
+                        "gate": "Brama",
+                        "guard_rail": "Barierka energochłonna",
+                        "hedge": "Żywopłot",
+                        "kerb": "Krawężnik",
+                        "retaining_wall": "Mur oporowy",
+                        "stile": "Przełaz",
+                        "wall": "Mur"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Bariera",
@@ -318,7 +344,10 @@
                     "label": "Kąpiele piaskowe"
                 },
                 "bath/type": {
-                    "label": "Rodzaj"
+                    "label": "Rodzaj",
+                    "options": {
+                        "hot_spring": "Gorące źródło"
+                    }
                 },
                 "beauty": {
                     "label": "Usługi",
@@ -475,7 +504,6 @@
                     "terms": "liczba miejsc,pojemność"
                 },
                 "capacity/caravans": {
-                    "label": "Pojemność (karawany)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -612,7 +640,14 @@
                     }
                 },
                 "craft": {
-                    "label": "Rodzaj"
+                    "label": "Rodzaj",
+                    "options": {
+                        "beekeeper": "Pszczelarz",
+                        "blacksmith": "Kowal",
+                        "boatbuilder": "Budowniczy łodzi",
+                        "bookbinder": "Introligator",
+                        "carpenter": "Stolarz"
+                    }
                 },
                 "crane/type": {
                     "label": "Rodzaj żurawia",
@@ -1191,7 +1226,10 @@
                     "label": "Rodzaj"
                 },
                 "healthcare/speciality": {
-                    "label": "Specjalności"
+                    "label": "Specjalności",
+                    "options": {
+                        "cardiology": "Kardiologia"
+                    }
                 },
                 "heating": {
                     "label": "Ogrzewanie"
@@ -3295,6 +3333,9 @@
                     "name": "Gabinet lekarski lub przychodnia",
                     "terms": "przychodnia,nzoz,lekarz,doktor,gabinet lekarski,centrum medyczne,klinika,poradnia,leczenie,medycyna,zdrowie,alergolog,chirurg,dermatolog,endokrynolog,geriatra,ginekolog,hematolog,internista,kardiochirurg,kardiolog,laryngolog,nefrolog,neonatolog,neurolog,okulista,onkolog,ortopeda,otorynolaryngolog,pediatra,psychiatra,reumatolog,seksuolog,urolog"
                 },
+                "amenity/doctors/cardiology": {
+                    "name": "Kardiolog"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Ginekolog"
                 },
@@ -4052,10 +4093,6 @@
                     "name": "Zwierzę",
                     "terms": "zwierzę,zwierzęta,minizoo,woliera,papugarnia,akwarium,safari"
                 },
-                "attraction/big_wheel": {
-                    "name": "Diabelski młyn",
-                    "terms": "diabelski młyn,park rozrywki,lunapark,wesołe miasteczko"
-                },
                 "attraction/bumper_car": {
                     "name": "Autodrom (w parku rozrywki)",
                     "terms": "autodrom,samochodziki,park rozrywki,lunapark,wesołe miasteczko"
@@ -4219,10 +4256,6 @@
                     "name": "Kissing gate",
                     "terms": "kissing gate,bariera"
                 },
-                "barrier/lift_gate": {
-                    "name": "Szlaban",
-                    "terms": "szlaban,bariera"
-                },
                 "barrier/log": {
                     "name": "Powalone drzewo"
                 },
@@ -4453,7 +4486,7 @@
                 },
                 "building/ruins": {
                     "name": "Ruiny budynku",
-                    "terms": "ruiny,wyburzony"
+                    "terms": "sztuczne ruiny,wyburzony"
                 },
                 "building/school": {
                     "name": "Budynek szkolny",
@@ -4479,10 +4512,6 @@
                     "name": "Budynek stadionu",
                     "terms": "stadion,sporotowy"
                 },
-                "building/static_caravan": {
-                    "name": "Przyczepa/wóz kempingowy ustawiony na stałe",
-                    "terms": "mieszkalny wóz kempingowy"
-                },
                 "building/sty": {
                     "name": "Chlew",
                     "terms": "chlew,chlewnia,świniarnia,świnie,trzoda chlewna"
@@ -5024,23 +5053,14 @@
                 "highway/crossing": {
                     "name": "Przejście"
                 },
-                "highway/crossing/marked": {
-                    "name": "Oznakowane przejście dla pieszych"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Przejście z sygnałami dla pieszych",
                     "terms": "przejście z sygnalizacją dla pieszych"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Oznaczone przejście dla pieszych"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Nieoznaczone przejście",
                     "terms": "nieoznakowane przejście dla pieszych"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Oznakowane przejście dla pieszych"
-                },
                 "highway/cycleway": {
                     "name": "Droga rowerowa",
                     "terms": "droga rowerowa,ścieżka dla rowerów"
@@ -5056,9 +5076,6 @@
                     "name": "Przejazd pieszo-rowerowy",
                     "terms": "przejazd pieszo-rowerowy"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Oznakowany przejazd rowerowy"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Przejazd rowerowy z sygnalizacją świetlną"
                 },
@@ -5099,9 +5116,6 @@
                 "highway/footway/crossing": {
                     "name": "Przejście dla pieszych"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Oznakowane przejście"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Przejście z sygnałami dla pieszych"
                 },
@@ -5112,9 +5126,6 @@
                     "name": "Nieoznaczone przejście",
                     "terms": "nieoznaczone przejście dla pieszych"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Przejście zebra"
-                },
                 "highway/footway/informal": {
                     "name": "Nieformalna ścieżka dla pieszych"
                 },

dist/translations/pt-BR.json

@@ -500,7 +500,6 @@
                     "terms": "capacidade,lotação,número máximo,total de capacidade,total de pessoas,número de pessoas"
                 },
                 "capacity/caravans": {
-                    "label": "Capacidade (caravanas)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -728,9 +727,9 @@
                 "crossing": {
                     "label": "Tipo",
                     "options": {
-                        "traffic_signals": "Com Semáforos",
-                        "uncontrolled": "Apenas pintura na via",
-                        "unmarked": "Sem semáforos ou pinturas"
+                        "traffic_signals": "Com semáforos",
+                        "uncontrolled": "Apenas marcação na via",
+                        "unmarked": "Sem marcação ou semáforos"
                     }
                 },
                 "crossing/barrier": {
@@ -2602,7 +2601,7 @@
                     "placeholder": "Sim, Não, Apenas"
                 },
                 "segregated": {
-                    "label": "Separação Bicicleta-Pedestre"
+                    "label": "Separação bicicleta-pedestre"
                 },
                 "self_service": {
                     "label": "Autosserviço"
@@ -3130,7 +3129,7 @@
                     "label": "Tipo"
                 },
                 "trolley_wire": {
-                    "label": "Fios de carrinho aéreos"
+                    "label": "Rede aérea de trólebus"
                 },
                 "tunnel": {
                     "label": "Tipo",
@@ -4427,7 +4426,7 @@
                     "terms": "área,região,espaço,limite"
                 },
                 "area/footway": {
-                    "name": "Área de Pedestre"
+                    "name": "Área de pedestres"
                 },
                 "area/highway": {
                     "name": "Área da estrada",
@@ -4444,10 +4443,6 @@
                     "name": "Cerca de animal",
                     "terms": "cerca de animal"
                 },
-                "attraction/big_wheel": {
-                    "name": "Roda gigante",
-                    "terms": "roda panorâmica,parque de diversões,brinquedo,parque temático"
-                },
                 "attraction/bumper_car": {
                     "name": "Adesivos para carros",
                     "terms": "adesivos para carros"
@@ -4608,10 +4603,6 @@
                     "name": "Quebra-corpo",
                     "terms": "porteira giratória,quebra cabeça,quebra costela,passa um,passador,imbricação"
                 },
-                "barrier/lift_gate": {
-                    "name": "Cancela elevatória",
-                    "terms": "cancela,barreira elevatória"
-                },
                 "barrier/log": {
                     "name": "Árvore caída"
                 },
@@ -4872,10 +4863,6 @@
                     "name": "Edifício de estádio",
                     "terms": "estádio,esportes,ginásio de esportes"
                 },
-                "building/static_caravan": {
-                    "name": "Casa transportável",
-                    "terms": "casa transportável"
-                },
                 "building/sty": {
                     "name": "Chiqueiro",
                     "terms": "chiqueiro"
@@ -5401,8 +5388,9 @@
                     "name": "Ponto de ônibus"
                 },
                 "highway/busway": {
-                    "name": "BRT",
-                    "terms": "metrobus,ônibus de trânsito rápido,autocarro de trânsito rápido,ônibus de alto nível de serviço,autocarro de alto nível de serviço"
+                    "name": "Via exclusiva de ônibus",
+                    "terms": "metrobus,ônibus de trânsito rápido,autocarro de trânsito rápido,ônibus de alto nível de serviço,autocarro de alto nível de serviço",
+                    "aliases": "Corredor de ônibus (via segregada)\nBRT"
                 },
                 "highway/construction": {
                     "name": "Via em construção"
@@ -5414,9 +5402,6 @@
                 "highway/crossing": {
                     "name": "Travessia"
                 },
-                "highway/crossing/marked": {
-                    "name": "Faixa de pedestres"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Travessia de pedestres com semáforo",
                     "terms": "sinal de travessia de pedestres,travessia de pedestres com sinal,travessia de bicicletas com sinal",
@@ -5432,15 +5417,12 @@
                     "terms": "travessia de pedestres sem marcação",
                     "aliases": "Travessia de pedestres sem sinalização horizontal"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Faixa de pedestres zebrada"
-                },
                 "highway/cycleway": {
                     "name": "Ciclovia",
                     "terms": "ciclovia,ciclofaixa,bicicletas,ciclismo,ciclista"
                 },
                 "highway/cycleway/bicycle_foot": {
-                    "name": "Ciclovia e Via de Pedestre",
+                    "name": "Ciclovia e via de pedestre",
                     "terms": "ciclovia e via de pedestre"
                 },
                 "highway/cycleway/crossing": {
@@ -5450,9 +5432,6 @@
                     "name": "Travessia de pedestres com ciclovia",
                     "terms": "travessia de pedestres com ciclovia"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Travessia de bicicleta marcada"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Travessia de bicicleta com semáforos"
                 },
@@ -5492,10 +5471,6 @@
                 "highway/footway/crossing": {
                     "name": "Travessia de pedestres"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Travessia de pedestres marcada",
-                    "aliases": "Faixa de pedestres"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Travessia de pedestres marcada com semáforo",
                     "aliases": "Travessia de pedestres marcada com sinal de tráfego\nFaixa de pedestres com semáforo"
@@ -5509,9 +5484,6 @@
                     "name": "Travessia de pedestres sem marcação",
                     "terms": "faixa de pedestres não marcada,passagem de pedestres não marcada,faixa de pedestre sem marcas,atravessamento,pedestre,faixa de segurança"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Travessia de pedestres zebrada"
-                },
                 "highway/footway/informal": {
                     "name": "Caminho informal"
                 },

dist/translations/pt.json

@@ -241,7 +241,22 @@
                     "label": "Animais"
                 },
                 "archaeological_site": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "baths": "Termas",
+                        "city": "Cidade histórica",
+                        "crannog": "Crannog",
+                        "enclosure": "Cercado",
+                        "fortification": "Fortificação",
+                        "hut_circle": "Vestígios de habitação circular",
+                        "megalith": "Megálito",
+                        "necropolis": "Necrópole",
+                        "petroglyph": "Petróglifo",
+                        "roman_circus": "Circo romano",
+                        "roman_villa": "Vila romana",
+                        "settlement": "Povoado histórico",
+                        "tumulus": "Monte funerário"
+                    }
                 },
                 "architect": {
                     "label": "Arquiteto",
@@ -275,7 +290,21 @@
                     "label": "Multibanco"
                 },
                 "attraction": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "alpine_coaster": "Montanha russa alpina",
+                        "animal": "Recinto para animais",
+                        "big_wheel": "Roda gigante",
+                        "bumper_car": "Carrinhos de choque",
+                        "bungee_jumping": "Bungee jumping",
+                        "carousel": "Carrossel",
+                        "dark_ride": "Comboio fantasma",
+                        "maze": "Labirinto",
+                        "pirate_ship": "Navio pirata",
+                        "roller_coaster": "Montanha russa",
+                        "train": "Comboio turístico",
+                        "water_slide": "Escorrega de água"
+                    }
                 },
                 "automated": {
                     "label": "Automatizado"
@@ -304,7 +333,32 @@
                     "terms": "estabelecimento,bebidas,música ao vivo,consumo,noturno,noite,nocturno"
                 },
                 "barrier": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "block": "Bloco grande",
+                        "bollard": "Pilarete",
+                        "cattle_grid": "Grelha antigado",
+                        "chain": "Corrente",
+                        "city_wall": "Muralha de cidade",
+                        "cycle_barrier": "Barreira para bicicletas",
+                        "ditch": "Valeta",
+                        "entrance": "Entrada",
+                        "fence": "Vedação",
+                        "gate": "Portão",
+                        "guard_rail": "Rails",
+                        "hedge": "Sebe",
+                        "height_restrictor": "Limitador de altura",
+                        "jersey_barrier": "Barreira Jersey",
+                        "kerb": "Lancil",
+                        "kissing_gate": "Cancela de encosto antigado",
+                        "lift_gate": "Portão de empurrar",
+                        "retaining_wall": "Muro de contenção",
+                        "stile": "Passagem antigado",
+                        "swing_gate": "Cancela giratória",
+                        "toll_booth": "Portagem",
+                        "turnstile": "Torniquete",
+                        "wall": "Muro"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barreira",
@@ -316,7 +370,7 @@
                 "basin": {
                     "label": "Tipo",
                     "options": {
-                        "detention": "Retardação",
+                        "detention": "Retardamento",
                         "evaporation": "Evaporação",
                         "infiltration": "Infiltração",
                         "retention": "Retenção"
@@ -329,7 +383,14 @@
                     "label": "Banho de areia"
                 },
                 "bath/type": {
-                    "label": "Especialidade"
+                    "label": "Especialidade",
+                    "options": {
+                        "hammam": "Hammam",
+                        "hot_spring": "Termas",
+                        "lake": "Lago",
+                        "onsen": "Onsen",
+                        "thermal": "Nascente termal"
+                    }
                 },
                 "beauty": {
                     "label": "Especialidade",
@@ -394,18 +455,18 @@
                         "nature": "Natureza",
                         "notice": "Painel informativo",
                         "plants": "Plantas",
-                        "welcome_sign": "Sinal de boas-vindas",
+                        "welcome_sign": "Boas-vindas",
                         "wildlife": "Vida selvagem"
                     }
                 },
                 "bollard": {
                     "label": "Tipo",
                     "options": {
-                        "fixed": "Pilarete fixo",
-                        "flexible": "Pilarete flexível",
-                        "foldable": "Pilarete inclinável",
-                        "removable": "Pilarete removível",
-                        "rising": "Pilarete de subir e descer"
+                        "fixed": "Fixo",
+                        "flexible": "Flexível",
+                        "foldable": "Rebatível",
+                        "removable": "Removível",
+                        "rising": "Retráctil"
                     }
                 },
                 "booth": {
@@ -515,7 +576,7 @@
                     "terms": "capacidade,lotação,número máximo,total de capacidade,total de pessoas,número de pessoas"
                 },
                 "capacity/caravans": {
-                    "label": "Capacidade (caravanas)",
+                    "label": "Capacidade",
                     "placeholder": "5, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -538,6 +599,9 @@
                     "label": "Capacidade (m³)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Caravanas"
+                },
                 "cash_in": {
                     "label": "Depósitos"
                 },
@@ -570,7 +634,8 @@
                 },
                 "check_date": {
                     "label": "Última data de verificação",
-                    "placeholder": "AAAA-MM-DD"
+                    "placeholder": "AAAA-MM-DD",
+                    "terms": "confirmado,confirmação,data,última data,recente"
                 },
                 "circumference": {
                     "label": "Circunferência (a 1,3 m de altura)",
@@ -672,21 +737,22 @@
                         "clockmaker": "Relojoeiro",
                         "confectionery": "Confeiteiro",
                         "distillery": "Destilador",
-                        "dressmaker": "Costureiro",
+                        "dressmaker": "Costureira",
                         "electrician": "Eletricista",
                         "electronics_repair": "Reparação eletrónica",
                         "floorer": "Assentador de chãos",
                         "gardener": "Jardineiro",
                         "glaziery": "Vidraceiro",
-                        "grinding_mill": "Moinho",
+                        "grinding_mill": "Moleiro",
                         "handicraft": "Artesão",
                         "hvac": " Técnico de aquecimento e ventilação",
                         "insulation": "Técnico de isolamento térmico",
                         "jeweller": "Joalheiro",
+                        "joiner": "Marceneiro",
                         "key_cutter": "Chaveiro",
                         "locksmith": "Técnico de fechaduras",
                         "metal_construction": "Serralheiro",
-                        "oil_mill": "Moinho de azeite",
+                        "oil_mill": "Lagar de azeite",
                         "painter": "Pintor",
                         "parquet_layer": "Técnico de parqué",
                         "photographer": "Fotógrafo",
@@ -702,11 +768,12 @@
                         "scaffolder": "Técnico de andaimes",
                         "sculptor": "Escultor",
                         "shoemaker": "Sapateiro",
+                        "signmaker": "Fabricante de sinais",
                         "stonemason": "Pedreiro",
                         "tailor": "Alfaiate",
-                        "tiler": "Assentador de tijoleira",
+                        "tiler": "Ladrilhador",
                         "tinsmith": "Latoeiro",
-                        "upholsterer": "Estufador",
+                        "upholsterer": "Estofador",
                         "watchmaker": "Relojoeiro de relógios de pulso",
                         "window_construction": "Construção de janelas",
                         "winery": "Casa vinícola"
@@ -873,27 +940,39 @@
                     "label": "Vias de bicicleta",
                     "options": {
                         "lane": {
-                            "description": "Uma via para bicicletas separada do trânsito automóvel por uma linha pintada"
+                            "description": "Uma via para bicicletas separada do trânsito automóvel por uma linha pintada",
+                            "title": "Normal"
+                        },
+                        "no": {
+                            "description": "Sem via para ciclistas",
+                            "title": "Nenhuma"
                         },
                         "opposite": {
-                            "description": "Uma via para bicicletas com dois sentidos numa rua de sentido único para trânsito automóvel"
+                            "description": "Uma via para bicicletas com dois sentidos numa rua de sentido único para trânsito automóvel",
+                            "title": "Em contramão"
                         },
                         "opposite_lane": {
-                            "description": "Uma via para bicicletas onde o sentido é o oposto do trânsito automóvel"
+                            "description": "Uma via para bicicletas onde o sentido é o oposto do trânsito automóvel",
+                            "title": "De dois sentidos"
                         },
                         "separate": {
-                            "description": "Indica que a ciclovia foi mapeada como geometria separada"
+                            "description": "Indica que a ciclovia foi mapeada como geometria separada",
+                            "title": "Mapeada separadamente"
                         },
                         "share_busway": {
-                            "description": "Uma via para bicicletas partilhada com uma faixa para autocarros"
+                            "description": "Uma via para bicicletas partilhada com uma faixa para autocarros",
+                            "title": "Partilhada com autocarros"
                         },
                         "shared_lane": {
-                            "description": "Uma via para bicicletas partilhada com o trânsito automóvel"
+                            "description": "Uma via para bicicletas partilhada com o trânsito automóvel",
+                            "title": "Partilhada"
                         },
                         "track": {
-                            "description": "Uma via para bicicletas separada do restante trânsito por uma barreira física"
+                            "description": "Uma via para bicicletas separada do restante trânsito por uma barreira física",
+                            "title": "Ciclovia (separada da estrada)"
                         }
                     },
+                    "placeholder": "Via, ciclovia, contramão…",
                     "terms": "bicicleta,ciclovias",
                     "types": {
                         "cycleway:left": "Lado esquerdo",
@@ -1780,6 +1859,13 @@
                 "lifeguard": {
                     "label": "Nadador-salvador"
                 },
+                "lift_gate/type": {
+                    "label": "Tipo",
+                    "options": {
+                        "double": "Duas barras",
+                        "single": "Uma barra"
+                    }
+                },
                 "line_attachment": {
                     "label": "Ligação dos cabos",
                     "terms": "catenária,conexão,ligar,conectar,fios"
@@ -1838,6 +1924,30 @@
                 },
                 "material": {
                     "label": "Material",
+                    "options": {
+                        "adobe": "Adobe",
+                        "aluminium": "Alumínio",
+                        "brass": "Latão",
+                        "brick": "Tijolo",
+                        "bronze": "Bronze",
+                        "concrete": "Betão",
+                        "dry_stone": "Pedra seca",
+                        "glass": "Vidro",
+                        "granite": "Granito",
+                        "iron": "Ferro",
+                        "limestone": "Calcário",
+                        "marble": "Mármore",
+                        "metal": "Metal",
+                        "plastic": "Plástico",
+                        "reinforced_conrete": "Betão armado",
+                        "rock": "Rocha",
+                        "sand": "Areia",
+                        "sandstone": "Arenito",
+                        "soil": "Solo/Terra",
+                        "steel": "Aço",
+                        "stone": "Pedras",
+                        "wood": "Madeira"
+                    },
                     "terms": "materiais"
                 },
                 "mattress": {
@@ -1880,7 +1990,20 @@
                     "terms": "largura,máxima,max,máximo"
                 },
                 "memorial": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "blue_plaque": "Placa azul (UK)",
+                        "bust": "Busto",
+                        "cross": "Cruz",
+                        "obelisk": "Obelisco",
+                        "plaque": "Placa",
+                        "sculpture": "Escultura",
+                        "statue": "Estátua",
+                        "stele": "Estela",
+                        "stolperstein": "Stolperstein",
+                        "stone": "Pedra",
+                        "war_memorial": "Memorial de guerra"
+                    }
                 },
                 "microbrewery": {
                     "label": "Microcervejaria",
@@ -2010,6 +2133,18 @@
                     "label": "Notas",
                     "terms": "comentário,comentários,nota"
                 },
+                "nudism": {
+                    "label": "Nudismo",
+                    "options": {
+                        "customary": "Habitual",
+                        "designated": "Exclusivo",
+                        "no": "Proibido",
+                        "obligatory": "Obrigatório",
+                        "permissive": "Tolerado",
+                        "yes": "Permitido"
+                    },
+                    "terms": "naturismo,nudismo,naturista,nu,despido,despida,sem roupa,naturist,nudism,naturism"
+                },
                 "office": {
                     "label": "Tipo"
                 },
@@ -2098,12 +2233,15 @@
                     "options": {
                         "carports": "Telheiros",
                         "garage_boxes": "Garagens",
+                        "half_on_kerb": "Metade sobre o passeio",
                         "lane": "Estacionamento paralelo à estrada",
                         "layby": "Área de descanso",
                         "multi-storey": "Multinível",
+                        "on_kerb": "Sobre o passeio",
                         "rooftop": "Topo de edifício",
                         "sheds": "Barracões",
-                        "street_side": "Estacionamento na berma",
+                        "shoulder": "Berma",
+                        "street_side": "Ao lado da rua",
                         "surface": "Superfície",
                         "underground": "Subterrâneo"
                     }
@@ -2116,6 +2254,37 @@
                         "perpendicular": "Perpendicular"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Orientação",
+                    "options": {
+                        "diagonal": "Diagonal em relação à rua",
+                        "parallel": "Paralelo em relação à rua",
+                        "perpendicular": "Perpendicular em relação à rua"
+                    },
+                    "terms": "orientação,orientation,posição,direção,inclinação",
+                    "types": {
+                        "parking:left:orientation": "Lado esquerdo",
+                        "parking:right:orientation": "Lado direito"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Estacionamento",
+                    "options": {
+                        "half_on_kerb": "Metade sobre o passeio",
+                        "lane": "Via na estrada",
+                        "no": "Não",
+                        "on_kerb": "Sobre o passeio",
+                        "separate": "Mapeado em separado",
+                        "shoulder": "Berma",
+                        "street_side": "Ao lado da rua",
+                        "yes": "Sim (não especificado)"
+                    },
+                    "terms": "estacionar,estacionamento,parking,park,parquear,parqueamento",
+                    "types": {
+                        "parking:left": "Lado esquerdo",
+                        "parking:right": "Lado direito"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Tipo"
                 },
@@ -2177,6 +2346,10 @@
                     "placeholder": "+351 211 123 456",
                     "terms": "número de telefone,telemóvel,phone,fone,contacto telefónico"
                 },
+                "picnic_table": {
+                    "label": "Mesa de piquenique",
+                    "terms": "table,pique-nique,picnic"
+                },
                 "pipeline": {
                     "label": "Tipo"
                 },
@@ -2523,7 +2696,17 @@
                     "label": "Tipo"
                 },
                 "resource": {
-                    "label": "Recursos"
+                    "label": "Recursos",
+                    "options": {
+                        "clay": "Barro",
+                        "coal": "Carvão",
+                        "gold": "Ouro",
+                        "gravel": "Gravilha",
+                        "iron_ore": "Minério de ferro",
+                        "limestone": "Calcário",
+                        "peat": "Turfa",
+                        "sand": "Areia"
+                    }
                 },
                 "restriction": {
                     "label": "Tipo"
@@ -2809,7 +2992,7 @@
                 "social_facility": {
                     "label": "Tipo",
                     "options": {
-                        "ambulatory_care": "Cuidado ambulatório",
+                        "ambulatory_care": "Cuidados de ambulatório",
                         "food_bank": "Banco alimentar"
                     }
                 },
@@ -2841,7 +3024,44 @@
                     "terms": "wikidata"
                 },
                 "sport": {
-                    "label": "Desportos"
+                    "label": "Desportos",
+                    "options": {
+                        "american_football": "Futebol americano",
+                        "athletics": "Atletismo",
+                        "badminton": "Badminton",
+                        "baseball": "Beisebol",
+                        "basketball": "Basquetebol",
+                        "beachvolleyball": "Voleibol de praia",
+                        "boules": "Boccia",
+                        "bowls": "Bowls",
+                        "climbing": "Escalada",
+                        "cricket": "Críquete",
+                        "cycling": "Ciclismo",
+                        "equestrian": "Hipismo",
+                        "fitness": "Fitness",
+                        "free_flying": "Voo livre",
+                        "futsal": "Futsal",
+                        "golf": "Golfe",
+                        "gymnastics": "Ginástica",
+                        "handball": "Andebol",
+                        "horse_racing": "Corridas de cavalos",
+                        "karting": "Karting",
+                        "motocross": "Motocrosse",
+                        "motor": "Desportos motorizados",
+                        "netball": "Netbol",
+                        "padel": "Padel",
+                        "rugby_union": "Râguebi",
+                        "running": "Corrida",
+                        "shooting": "Tiro",
+                        "skateboard": "Skate",
+                        "skiing": "Esqui",
+                        "soccer": "Futebol",
+                        "softball": "Softbol",
+                        "swimming": "Natação",
+                        "table_tennis": "Ténis de mesa",
+                        "tennis": "Ténis",
+                        "volleyball": "Voleibol"
+                    }
                 },
                 "sport_ice": {
                     "label": "Desportos",
@@ -2890,6 +3110,9 @@
                     "placeholder": "AAAA-MM-DD",
                     "terms": "criação,fundado,fundada,construída,construído,lançado,lançada"
                 },
+                "static_caravans": {
+                    "label": "Caravanas estáticas"
+                },
                 "step_count": {
                     "label": "Número de degraus",
                     "terms": "número,degraus,escada,escadaria"
@@ -2955,7 +3178,16 @@
                     "terms": "assunto,tópico,palavra-chave,tema principal"
                 },
                 "substance": {
-                    "label": "Substância"
+                    "label": "Substância",
+                    "options": {
+                        "fuel": "Combustível",
+                        "gas": "Gás natural",
+                        "hot_water": "Água quente",
+                        "oil": "Crude",
+                        "rainwater": "Águas pluviais",
+                        "sewage": "Águas residuais",
+                        "water": "Água potável"
+                    }
                 },
                 "substation": {
                     "label": "Tipo",
@@ -3109,6 +3341,9 @@
                 "telecom/medium": {
                     "label": "Condutor"
                 },
+                "tents": {
+                    "label": "Tendas"
+                },
                 "tidal": {
                     "label": "Maré",
                     "terms": "maré"
@@ -3189,9 +3424,17 @@
                     "options": {
                         "bump": "Lomba",
                         "chicane": "Chicana rodoviária",
-                        "island": "Ilha rodoviária"
-                    },
-                    "terms": "motas,motos,motocicletas,motociclismo,pista,desporto,competição,motorizado,motorizada"
+                        "choked_table": "Estrangulador com lomba plana",
+                        "choker": "Estrangulador de tráfego",
+                        "cushion": "Lomba almofada",
+                        "dip": "Depressão",
+                        "double_dip": "Depressão dupla",
+                        "hump": "Lomba grande",
+                        "island": "Ilha rodoviária",
+                        "mini_bumps": "Minilombas",
+                        "rumble_strip": "Banda cromática",
+                        "table": "Lomba de topo plano"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Sinal de trânsito"
@@ -3416,7 +3659,13 @@
                     "label": "Tipo"
                 },
                 "waste": {
-                    "label": "Lixo"
+                    "label": "Lixo",
+                    "options": {
+                        "cigarettes": "Cigarros",
+                        "dog_excrement": "Excrementos de cão",
+                        "organic": "Lixo orgânico",
+                        "trash": "Lixo"
+                    }
                 },
                 "water": {
                     "label": "Tipo"
@@ -3452,8 +3701,10 @@
                     "options": {
                         "bog": "Turfeira",
                         "mangrove": "Manguezal",
+                        "marsh": "Pântano (arbustivo)",
                         "reedbed": "Canavial",
                         "saltmarsh": "Sapal",
+                        "swamp": "Pântano (florestal)",
                         "tidalflat": "Planície mareal",
                         "wet_meadow": "Lezíria"
                     }
@@ -3854,10 +4105,110 @@
                     "name": "Consultório médico",
                     "terms": "doctor,médico,médicos,consultório,médico privado,doutor"
                 },
+                "amenity/doctors/allergology": {
+                    "name": "Alergista",
+                    "terms": "alergólogo,alergista,alergia,asma,médico especialista em alergia,médico especialista em imunologia,imunologia"
+                },
+                "amenity/doctors/cardiology": {
+                    "name": "Cardiologista",
+                    "terms": "cirurgião cardíaco,cardiologia,sistema cardiovascular,coração,sistema circulatório,cirurgia cardíaca,cardíaco,cardiólogo"
+                },
+                "amenity/doctors/dermatology": {
+                    "name": "Dermatologista",
+                    "terms": "dermatologia,cabelos,pele,unhas,pelos,derme,dermatólogo"
+                },
+                "amenity/doctors/gastroenterology": {
+                    "name": "Gastroenterologista",
+                    "terms": "gastroenterólogo,intestinos,sistema digestivo,digestão,esófago,tubo digestivo,cálculos biliares,trato gastrointestinal,gastroenterologia,intestino grosso,fígado,intestino delgado,estômago"
+                },
+                "amenity/doctors/general": {
+                    "name": "Médico de família",
+                    "terms": "cuidados de saúde primários,atenção primária à saúde,cuidados primários,médico de cuidados primários"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Ginecologista",
                     "terms": "medicina,médico,ginecológico,ginecologia,médica,consultório"
                 },
+                "amenity/doctors/haematology": {
+                    "name": "Hematologista",
+                    "terms": "hematólogo,anemia,sangue,medula óssea,hematologia,leucemia,linfoma"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Médico internista",
+                    "terms": "médico de medicina interna,medicina interna,especialista em medicina interna,internólogo,internista"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Nefrologista",
+                    "terms": "nefrólogo,nefrologia,sistema urinário,rins,rim"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Neurologista",
+                    "terms": "cérebro,nervos,sistema nervoso,neurologia,neurólogo"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "Neurocirurgião",
+                    "terms": "cérebro,cirurgia neurológica,neurocirurgia,nervos,sistema nervoso,neurologia"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Oncologista",
+                    "terms": "cancro,câncer,quimioterapia,oncologia,oncológico,tumor,cancerologia,cancrologia,oncólogo,linfoma"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Oftalmologista",
+                    "terms": "olho,olhos,ocular,oftalmologia,oftalmólogo,visão,óculos,vista"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Cirurgião ortopedista",
+                    "terms": "cirurgião ortopédico,cirurgia ortopédica,ortopedia,ortopédico"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Otorrinolaringologista",
+                    "terms": "otorrino,ouvidos,otorrinolaringologia,nariz,crânio,garganta,cabeça,pescoço,boca,esófago,otorrinolaringólogo"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Pediatra",
+                    "terms": "pediatria,médico de crianças,médico de adolescentes,adolescentes,crianças,bebés,pediólogo"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Patologista",
+                    "terms": "patólogo,autópsia,patologia anatómica,diagnóstico de doença"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Cirurgião plástico",
+                    "terms": "cirurgia reconstrutiva,cirurgia estética,cirurgia cosmética,cirurgia craniofacial,cirurgia plástica"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Podólogo",
+                    "terms": "podologia,podologista,podiatria,pé,perna,quiropodista,podiatra"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Proctologista",
+                    "terms": "cirurgião colorretal,proctólogo,cirurgia colorretal,proctologia,cólon,ânus,coloproctologia,coloproctologista,reto,retal"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Pneumologista",
+                    "terms": "pneumologia,asma,medicina torácica,pulmão,pulmões,medicina respiratória,pneumólogo"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Radiologista",
+                    "terms": "radiologia,tomografia computorizada,imagens por ressonância magnética,ressonância,ressonância magnética,ecografia,mamografia,ultrassonografia,radiólogo"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Reumatologista",
+                    "terms": "reumatólogo,lúpus,osteoporose,reuma,reumatologia,doença reumática,reumatismo"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Cirurgião",
+                    "terms": "cirurgia,geral,médico,especialista,operação,operador,surgery,surgeon"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Traumatologista",
+                    "terms": "traumatólogo,traumatismo,traumata"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Urulogista",
+                    "terms": "urologia,urólogo,urinário,urinária,próstata,prostatite,uretra,pénis,baço,adrenal,testículos,testicular"
+                },
                 "amenity/dojo": {
                     "name": "Centro de artes marciais",
                     "terms": "dojo,karaté,taekwondo,judo,jiu-jitsu,jiu-jitsu brasileiro,kung fu,capoeira,eskrima,escrima,escryma,muay thai,krav magá,jeet kune do,karate,kata,bujutsu,budo"
@@ -4087,7 +4438,7 @@
                     "terms": "parque de estacionamento integrado,parque de estacionamento de incentivo,parque de estacionamento de metro,parque de estacionamento dissuasor,p&r,park & ride"
                 },
                 "amenity/parking/street-side": {
-                    "name": "Estacionamento na berma",
+                    "name": "Estacionamento ao lado da rua",
                     "terms": "estacionar,parqueamento,veículos,carros,parquímetro"
                 },
                 "amenity/parking/underground": {
@@ -4099,7 +4450,7 @@
                     "terms": "entrada para estacionamento,entrada,saída,estacionamento,estacionar,subterrâneo,parque de estacionamento"
                 },
                 "amenity/parking_space": {
-                    "name": "Lugar de estacionamento",
+                    "name": "Lugar (1) de estacionamento",
                     "terms": "estacionamento,estacionar,área de estacionamento,parquear"
                 },
                 "amenity/parking_space/disabled": {
@@ -4269,6 +4620,10 @@
                     "name": "Restaurante asiático",
                     "terms": "restaurante de comida asiática,restaurante,comida asiática,cozinha asiática,asiático,asiática,oriental,japonês,chinês,tailandês,vietnamita,coreano"
                 },
+                "amenity/restaurant/barbeque": {
+                    "name": "Restaurante de grelhados",
+                    "terms": "barbeque,bbq,grill,grelhados,refeições,churrasco,churrascaria"
+                },
                 "amenity/restaurant/chinese": {
                     "name": "Restaurante chinês",
                     "terms": "restaurante de comida chinesa,comida chinesa,chinesa,chinês"
@@ -4630,7 +4985,7 @@
                 },
                 "attraction/big_wheel": {
                     "name": "Roda gigante",
-                    "terms": "ferris wheel,big wheel,roda-gigante,roda panorâmica,roda"
+                    "terms": "atração,parque,diversões,feira,roda,panorâmica,roda panorâmica"
                 },
                 "attraction/bumper_car": {
                     "name": "Carrinhos de choque",
@@ -4812,7 +5167,7 @@
                 },
                 "barrier/lift_gate": {
                     "name": "Cancela elevatória",
-                    "terms": "barreira automática,barreira,barreira de estacionamento"
+                    "terms": "boom gate,lift,barreita,pivoted,barra,braço,passagem,passar"
                 },
                 "barrier/log": {
                     "name": "Árvore tombada"
@@ -5083,8 +5438,8 @@
                     "terms": "estádio,arena,bancadas,arquibancadas,praça"
                 },
                 "building/static_caravan": {
-                    "name": "Casa pré-fabricada",
-                    "terms": "static mobile home,trailer,caravana,edifício,casa móvel"
+                    "name": "Caravana",
+                    "terms": "trailer,pré-fabricado,caravanana estática,móvel"
                 },
                 "building/sty": {
                     "name": "Pocilga",
@@ -5553,10 +5908,26 @@
                     "name": "Medicina alternativa",
                     "terms": "alternativa,terapia alternativa,acupuntura,aromaterapia,auriculoterapia,cromoterapia,fitoterapia,homeopatia,magnetoterapia,quiropraxia,shiatsu"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Acunpuntorista",
+                    "terms": "acunpuntor,acunpuntora,acunpunctor,acunpunctora,acunpuntura,acunpuctura"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Quiropraxia",
                     "terms": "chiropractor,chiropractic,quiropraxista,quiroprático"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Homeopata",
+                    "terms": "homeopatia,homeopático,homeopática"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturopata",
+                    "terms": "naturopatia,naturopático,naturopática"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Osteopata",
+                    "terms": "osteopatia,osteopático,osteopática,ossos,coluna.articulações"
+                },
                 "healthcare/audiologist": {
                     "name": "Fonoaudiologista",
                     "terms": "fonoaudiologia,fonoaudiólogo,terapia da fala,audiologia,fono-audiologia,fono-audiólogo"
@@ -5649,20 +6020,18 @@
                 "highway/crossing": {
                     "name": "Passadeira"
                 },
-                "highway/crossing/marked": {
-                    "name": "Passadeira marcada"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Passadeira com semáforos",
                     "terms": "pedestre,peão,peões,travessia,crossing,luzes,luminoso,luminosas,atravessamento"
                 },
+                "highway/crossing/uncontrolled": {
+                    "name": "Passadeira marcada sem semáforos",
+                    "terms": "passadeira,peões,pedestres,estrada,trânsito,travessia,faixa de segurança"
+                },
                 "highway/crossing/unmarked": {
                     "name": "Travessia sem marcações",
                     "terms": "passagem de pedestres não marcada,passadeira não marcada,passadeira sem marcas,atravessamento,pedestre,peões,passadeira,faixa de segurança"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Passadeira marcada"
-                },
                 "highway/cycleway": {
                     "name": "Ciclovia",
                     "terms": "bicicleta,bicicletas,ciclistas"
@@ -5678,13 +6047,14 @@
                     "name": "Passadeira p/bicicletas e peões",
                     "terms": "passadeira,faixa de segurança,ciclovia,ciclistas,bicicletas,travessia,pedestres,peões"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Passadeira marcada para bicicletas"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Passadeira de ciclistas com semáforos",
                     "terms": "ciclovia,bicicletas,bina,bicycle,travessia,crossing,semáforos,sinaleira"
                 },
+                "highway/cycleway/crossing/uncontrolled": {
+                    "name": "Travessia de ciclistas sem semáforos",
+                    "terms": "passadeira,peões,pedestres,estrada,trânsito,travessia,faixa de segurança,bicicletas,binas,ciclistas,ciclismo,cicloturismo,ciclovia"
+                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Passadeira para bicicletas não marcada",
                     "terms": "atravessamento de bicicletas,atravessamento para bicicletas,atravessamento de ciclista,atravessamento para ciclista,travessia,passadeira,bicicletas,ciclistas"
@@ -5732,6 +6102,14 @@
                     "name": "Passadeira com semáforos",
                     "terms": "pedestres,peões,peão,travessia,faixa,segurança,sinaleira,luzes"
                 },
+                "highway/footway/crossing/uncontrolled": {
+                    "name": "Passadeira marcada sem semáforos",
+                    "terms": "passadeira,peões,pedestres,estrada,trânsito,travessia,faixa de segurança"
+                },
+                "highway/footway/crossing/unmarked": {
+                    "name": "Passadeira sem marcações",
+                    "terms": "passadeira,peões,pedestres,estrada,trânsito,travessia,faixa de segurança"
+                },
                 "highway/footway/sidewalk": {
                     "name": "Passeio",
                     "terms": "calçada,passeios,bermas,berma"
@@ -6228,6 +6606,10 @@
                     "name": "Complexo de apartamentos",
                     "terms": "condomínio,apartamentos,habitação,residenciais,prédio,prédios,edifícios,zona"
                 },
+                "landuse/residential/trailer_park": {
+                    "name": "Área de caravanas residenciais",
+                    "terms": "caravanas,autocaravanas,parque,rulote,rulotes,roulote,roulotes,caravan park,manufactured home community,trailer par"
+                },
                 "landuse/retail": {
                     "name": "Área comercial",
                     "terms": "retalho,varejo,compras,vendas,retail,comercial,comércio"
@@ -6375,6 +6757,10 @@
                     "name": "Jardim comunitário",
                     "terms": "cooperação,cooperativo,comunal,coletivo,comunidade,espaço verde,flores,vegetais"
                 },
+                "leisure/garden/residential": {
+                    "name": "Jardim residencial",
+                    "terms": "jardim,quintal,relvado,flores,canteiro,arbustos,privado,casa,back garden,backyard,domestic garden,front garden,front yard"
+                },
                 "leisure/golf_course": {
                     "name": "Campo de golfe",
                     "terms": "campo de golf,golf,golf course,golfistas,fairway,green"
@@ -7205,7 +7591,7 @@
                 },
                 "natural/wetland": {
                     "name": "Área alagada",
-                    "terms": "pântano,sapal,paul,turfeira,wetland,zona,entremarés,aluvial"
+                    "terms": "pântano,sapal,paul,turfeira,wetland,entremarés,aluvial,brejo,marisma,mareal"
                 },
                 "natural/wetland/bog": {
                     "name": "Turfeira",
@@ -7215,20 +7601,29 @@
                     "name": "Manguezal",
                     "terms": "mangue,mangal,mangues"
                 },
+                "natural/wetland/marsh": {
+                    "name": "Pântano (arbustivo)",
+                    "terms": "alagadiço,alagado,alagada,pantanal,pantanoso,brejo,charco,paul,pantaneiro"
+                },
                 "natural/wetland/reedbed": {
-                    "name": "Canavial"
+                    "name": "Canavial",
+                    "terms": "caniçal,caniço,canas,juncos,juncal,junqueiro,canavial,cana"
                 },
                 "natural/wetland/saltmarsh": {
                     "name": "Sapal",
                     "terms": "alagadiço,alagado,alagada,costeira,sal,salgado,salino"
                 },
+                "natural/wetland/swamp": {
+                    "name": "Pântano (florestal)",
+                    "terms": "pantanal,pantanoso,alagado,alagada,alagadiço"
+                },
                 "natural/wetland/tidalflat": {
                     "name": "Planície mareal",
                     "terms": "maré,alagada,alagadiço,entre-marés,tidal,costeira"
                 },
                 "natural/wetland/wet_meadow": {
                     "name": "Lezíria",
-                    "terms": "lezira"
+                    "terms": "lezira,ripícola,prado,alagado,alagadiço,brejo"
                 },
                 "natural/wood": {
                     "name": "Bosque",
@@ -7399,6 +7794,10 @@
                     "name": "Detetive privado",
                     "terms": "particular,investigação,investigar"
                 },
+                "office/property_management": {
+                    "name": "Gestão de condomínios",
+                    "terms": "property,administração,administrar,condomínio,rendas,arrendamento,propriedades,casas,arrendar,aluguer,inquilinos,senhorio,senhoria,residência,residencial,habitação"
+                },
                 "office/quango": {
                     "name": "ONG subsidiada",
                     "terms": "organização não governamental,ong,ngo,sede ong,sede organização não governamental,ispp,ong subsidiada,ong subsidiada governo,ong subsidiada estado,quango,associação,instituto,fundação"

dist/translations/ro.json

@@ -1183,9 +1183,6 @@
                 "building/semidetached_house": {
                     "name": "Casă Semi-detașată"
                 },
-                "building/static_caravan": {
-                    "name": "Casă Mobilă Statică"
-                },
                 "building/terrace": {
                     "name": "Case în Rând"
                 },

dist/translations/ru.json

@@ -449,7 +449,6 @@
                     "placeholder": "50, 100, 200…"
                 },
                 "capacity/caravans": {
-                    "label": "Вместимость (автодома или трейлеры)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -3121,10 +3120,6 @@
                 "attraction/animal": {
                     "name": "Вольер для животных"
                 },
-                "attraction/big_wheel": {
-                    "name": "Колесо обозрения",
-                    "terms": "колесо обозрения"
-                },
                 "attraction/bungee_jumping": {
                     "name": "Банджи-джампинг",
                     "terms": "батут"
@@ -3228,10 +3223,6 @@
                     "name": "Преграда для животных",
                     "terms": "ворота с защитой от животных,преграда для животных"
                 },
-                "barrier/lift_gate": {
-                    "name": "Шлагбаум",
-                    "terms": "шлагбаум,барьер"
-                },
                 "barrier/retaining_wall": {
                     "name": "Подпорная стена",
                     "terms": "подпорная стена,укрепляющая стена"
@@ -3429,10 +3420,6 @@
                     "name": "Здание стадиона",
                     "terms": "здание стадиона,стадион"
                 },
-                "building/static_caravan": {
-                    "name": "Стационарный дом на колёсах",
-                    "terms": "дом на колёсах"
-                },
                 "building/temple": {
                     "name": "Здание храма",
                     "terms": "здание храма,здание церкви"
@@ -3817,9 +3804,6 @@
                 "highway/crossing": {
                     "name": "Пешеходный переход"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "Нерегулируемый пешеходный переход"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Неразмеченный переход",
                     "terms": "народная тропа,пешеходный переход без разметки"

dist/translations/sk.json

@@ -243,6 +243,19 @@
                 "animal_shelter": {
                     "label": "Pre zvieratá"
                 },
+                "archaeological_site": {
+                    "label": "Typ",
+                    "options": {
+                        "baths": "Kúpele",
+                        "city": "Historické mesto",
+                        "fortification": "Opevnenie",
+                        "hut_circle": "Osada chatrčí",
+                        "megalith": "Megalit",
+                        "necropolis": "Nekropola",
+                        "roman_villa": "Rímska vila",
+                        "settlement": "Historické osídlenie"
+                    }
+                },
                 "architect": {
                     "label": "Architekt",
                     "terms": "architekt,tvorca,autor"
@@ -254,7 +267,17 @@
                     "label": "Umelec"
                 },
                 "artwork_type": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "bust": "Busta",
+                        "graffiti": "Graffiti",
+                        "mosaic": "Mozaika",
+                        "mural": "Nástenná maľba",
+                        "painting": "Obraz",
+                        "relief": "Reliéf",
+                        "sculpture": "Skulptúra",
+                        "statue": "Socha"
+                    }
                 },
                 "ascent": {
                     "label": "Celkové stúpanie",
@@ -293,7 +316,25 @@
                     "terms": "bar,pohostinstvo,krcma,krčma"
                 },
                 "barrier": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "block": "Veľký blok",
+                        "bollard": "Stĺpik",
+                        "chain": "Reťaz",
+                        "city_wall": "Mestké opevnenie",
+                        "cycle_barrier": "Spomaľovač cyklistov",
+                        "ditch": "Priekopa",
+                        "entrance": "Vchod",
+                        "fence": "Plot",
+                        "gate": "Brána",
+                        "guard_rail": "Zábradlie",
+                        "hedge": "Živý plot",
+                        "height_restrictor": "Obmedzenie výšky",
+                        "jersey_barrier": "Prenosná betónová zábrana ",
+                        "kerb": "Obrubník",
+                        "retaining_wall": "Oporná stena",
+                        "wall": "Múr"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Bariéra",
@@ -303,7 +344,11 @@
                     }
                 },
                 "basin": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "detention": "Zadržiavacia nádrž",
+                        "evaporation": "Vyparovacia nádrž"
+                    }
                 },
                 "bath/open_air": {
                     "label": "Vonkajší"
@@ -312,7 +357,11 @@
                     "label": "Piesočná kúpeľ"
                 },
                 "bath/type": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "lake": "Jazero",
+                        "thermal": "Termálne kúpele"
+                    }
                 },
                 "beauty": {
                     "label": "Služby",
@@ -364,10 +413,27 @@
                     }
                 },
                 "board_type": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "art": "Umenie",
+                        "astronomy": "Astronómia",
+                        "geology": "Geológia",
+                        "history": "História",
+                        "nature": "Príroda",
+                        "notice": "Oznamy",
+                        "plants": "Rastlinstvo",
+                        "welcome_sign": "Vitajte"
+                    }
                 },
                 "bollard": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "fixed": "Pevný stĺpik",
+                        "flexible": "Ohybný stĺpik",
+                        "foldable": "Sklopný stĺpik",
+                        "removable": "Odnímateľný stĺpik",
+                        "rising": "Zasúvací stĺpik"
+                    }
                 },
                 "booth": {
                     "label": "Búdka"
@@ -455,7 +521,6 @@
                     "terms": "kapacita"
                 },
                 "capacity/caravans": {
-                    "label": "Kapacita (karavany)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -2059,6 +2124,9 @@
                 },
                 "religion": {
                     "label": "Náboženstvo",
+                    "options": {
+                        "christian": "Kresťanstvo"
+                    },
                     "terms": "náboženstvo,vierovyznanie,viera"
                 },
                 "reservation": {
@@ -2462,14 +2530,21 @@
                         "asphalt": "Asfalt",
                         "compacted": "Kompaktný (mlat)",
                         "concrete": "Betón",
+                        "dirt": "Odpad",
                         "grass": "Tráva",
                         "gravel": "Štrk",
                         "ground": "Zem",
+                        "metal": "Kov",
+                        "mud": "Blato",
                         "paved": "Spevnený",
                         "paving_stones": "Dlažba",
+                        "salt": "Soľ",
                         "sand": "Piesok",
+                        "sett": "Dlažobné kocky",
+                        "unhewn_cobblestone": "Dlažba (neopracovaná, obliaky)",
                         "unpaved": "Nespevnený",
-                        "wood": "Drevo"
+                        "wood": "Drevo",
+                        "woodchips": "Štiepka"
                     }
                 },
                 "surveillance": {
@@ -3771,9 +3846,6 @@
                 "attraction/animal": {
                     "name": "Ohrada pre zvieratá"
                 },
-                "attraction/big_wheel": {
-                    "name": "Ruské koleso"
-                },
                 "attraction/bumper_car": {
                     "name": "Autodrom"
                 },
@@ -3895,10 +3967,6 @@
                     "name": "Zábrana pre dobytok",
                     "terms": "zabrana pre dobytok,kravy"
                 },
-                "barrier/lift_gate": {
-                    "name": "Rampa",
-                    "terms": "tyc,tyč,zdvihajuca brana,zdvíhajúca brána,závora,zavora"
-                },
                 "barrier/retaining_wall": {
                     "name": "Oporný múr",
                     "terms": "podporna stena,múr,mur,vyrovnávacia stena,vyrovnavacia stena,oporny mur,podporná stena"
@@ -4115,10 +4183,6 @@
                 "building/stadium": {
                     "name": "Budova štadiónu"
                 },
-                "building/static_caravan": {
-                    "name": "Statický karavan",
-                    "terms": "staticky karavan"
-                },
                 "building/sty": {
                     "name": "Chliev pre ošípané"
                 },
@@ -4589,15 +4653,9 @@
                 "highway/crossing": {
                     "name": "Priechod pre chodcov"
                 },
-                "highway/crossing/marked": {
-                    "name": "Značený priechod pre chodcov"
-                },
                 "highway/crossing/unmarked": {
                     "name": "Neznačený priechod pre chodcov"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Značený priechod pre chodcov"
-                },
                 "highway/cycleway": {
                     "name": "Cyklocesta",
                     "terms": "cesta pre bicykle,cestička,cesticka,cyklopruh,cyklocesta"
@@ -4611,9 +4669,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Priechod pre cyklistov a peších"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Značený priechod pre cyklistov"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "Neznačený priechod pre cyklistov"
                 },

dist/translations/sl.json

@@ -1883,10 +1883,6 @@
                     "name": "Vrata \"na poljub\"",
                     "terms": "vrata ki skozi ograjo spustijo le po eno osebo naenkrat"
                 },
-                "barrier/lift_gate": {
-                    "name": "Dvižna zapornica",
-                    "terms": "rampa"
-                },
                 "barrier/retaining_wall": {
                     "name": "Škarpa",
                     "terms": "zid,škarfa"
@@ -2015,10 +2011,6 @@
                     "name": "Hlev",
                     "terms": "štala"
                 },
-                "building/static_caravan": {
-                    "name": "Nepremična bivalna prikolica",
-                    "terms": "nepremični avtodom,fiksni bivalnik"
-                },
                 "building/terrace": {
                     "name": "Vrstne hiše",
                     "terms": "vrstna hiša"

dist/translations/sr.json

@@ -2582,9 +2582,6 @@
                 "barrier/kissing_gate": {
                     "name": "Капија са двоје врата"
                 },
-                "barrier/lift_gate": {
-                    "name": "Покретна рампа"
-                },
                 "barrier/retaining_wall": {
                     "name": "Потпорни зид"
                 },

dist/translations/sv.json

@@ -244,7 +244,22 @@
                     "label": "För djur"
                 },
                 "archaeological_site": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "baths": "Bad",
+                        "city": "Historisk stad",
+                        "crannog": "Crannog",
+                        "enclosure": "Inhägnad",
+                        "fortification": "Befästning",
+                        "hut_circle": "Cirkel från rundhus",
+                        "megalith": "Megalit",
+                        "necropolis": "Begravningsplats",
+                        "petroglyph": "Hällristning",
+                        "roman_circus": "Romersk cirkus",
+                        "roman_villa": "Romersk villa",
+                        "settlement": "Historisk bosättning",
+                        "tumulus": "Gravhög"
+                    }
                 },
                 "architect": {
                     "label": "Arkitekt",
@@ -278,7 +293,28 @@
                     "label": "Uttagsautomat"
                 },
                 "attraction": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "alpine_coaster": "Sommarrodel",
+                        "amusement_ride": "Åkattraktion",
+                        "animal": "Djurinhägnad",
+                        "big_wheel": "Pariserhjul",
+                        "bumper_car": "Radiobilar",
+                        "bungee_jumping": "Bungyjump",
+                        "carousel": "Karusell (roterande)",
+                        "dark_ride": "Dark Ride",
+                        "drop_tower": "Fritt fall",
+                        "kiddie_ride": "Kiddie Ride (åkattraktion för små barn)",
+                        "log_flume": "Flumeride",
+                        "maze": "Labyrint",
+                        "pirate_ship": "Båtgunga",
+                        "river_rafting": "Forsränning",
+                        "roller_coaster": "Berg- och dalbana",
+                        "summer_toboggan": "Sommarrodel",
+                        "swing_carousel": "Gungkarusell",
+                        "train": "Turisttåg (ej på räls)",
+                        "water_slide": "Vattenrutschbana"
+                    }
                 },
                 "automated": {
                     "label": "Automatisk"
@@ -307,7 +343,32 @@
                     "terms": "bar,krog,servering,matställe,pub,cocktailsalong,saloon,öl,sprit"
                 },
                 "barrier": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "block": "Stort block",
+                        "bollard": "Pollare (stolpe)",
+                        "cattle_grid": "Färist",
+                        "chain": "Kedja",
+                        "city_wall": "Stadsmur",
+                        "cycle_barrier": "Cykelbarriär ",
+                        "ditch": "Dike",
+                        "entrance": "Ingång",
+                        "fence": "Stängsel",
+                        "gate": "Grind",
+                        "guard_rail": "Skyddsräcke",
+                        "hedge": "Häck",
+                        "height_restrictor": "Höjdrestriktion",
+                        "jersey_barrier": "Betongsugga",
+                        "kerb": "Trottoarkant",
+                        "kissing_gate": "Grind på betesmark (boskapsgrind)",
+                        "lift_gate": "Vägbom",
+                        "retaining_wall": "Stödmur",
+                        "stile": "Övergång",
+                        "swing_gate": "Svänggrind",
+                        "toll_booth": "Tullstation",
+                        "turnstile": "Vändkors",
+                        "wall": "Mur"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Barriär",
@@ -332,7 +393,14 @@
                     "label": "Sandbad"
                 },
                 "bath/type": {
-                    "label": "Specialitet"
+                    "label": "Specialitet",
+                    "options": {
+                        "hammam": "Hamam",
+                        "hot_spring": "Het källa",
+                        "lake": "Sjö",
+                        "onsen": "Onsen",
+                        "thermal": "Termalbad"
+                    }
                 },
                 "beauty": {
                     "label": "Tjänster",
@@ -518,7 +586,7 @@
                     "terms": "kapacitet,antal,besökare,användare"
                 },
                 "capacity/caravans": {
-                    "label": "Kapacitet (Husvagnar)",
+                    "label": "Kapacitet (Husvagn / Husbil)",
                     "placeholder": "10, 20, 50..."
                 },
                 "capacity/disabled_parking": {
@@ -541,6 +609,9 @@
                     "label": "Kapacitet (kubikmeter)",
                     "placeholder": "50, 100, 200..."
                 },
+                "caravans": {
+                    "label": "Husvagn / Husbil"
+                },
                 "cash_in": {
                     "label": "Insättning"
                 },
@@ -573,7 +644,8 @@
                 },
                 "check_date": {
                     "label": "Datum senast kontrollerad",
-                    "placeholder": "ÅÅÅÅ-MM-DD"
+                    "placeholder": "ÅÅÅÅ-MM-DD",
+                    "terms": "senaste undersökningsdatum,undersökningsdatum,senast kollad,senast undersökt,kontrolldatum,datum för kontroll,tid för kontroll"
                 },
                 "circumference": {
                     "label": "Omkrets (vid brösthöjd)",
@@ -1804,6 +1876,13 @@
                 "lifeguard": {
                     "label": "Livvakt"
                 },
+                "lift_gate/type": {
+                    "label": "Typ",
+                    "options": {
+                        "double": "Motsatta bommar",
+                        "single": "Enkel bom"
+                    }
+                },
                 "line_attachment": {
                     "label": "Ledningsanslutning",
                     "terms": "ledningsanslutning,kabelanslutning"
@@ -1862,6 +1941,30 @@
                 },
                 "material": {
                     "label": "Material",
+                    "options": {
+                        "adobe": "Soltorkat tegel",
+                        "aluminium": "Aluminium",
+                        "brass": "Mässing",
+                        "brick": "Tegel",
+                        "bronze": "Brons",
+                        "concrete": "Betong",
+                        "dry_stone": "Kallmur",
+                        "glass": "Glas",
+                        "granite": "Granit",
+                        "iron": "Järn",
+                        "limestone": "Kalksten",
+                        "marble": "Marmor",
+                        "metal": "Metall",
+                        "plastic": "Plast",
+                        "reinforced_conrete": "Armerad betong",
+                        "rock": "Sten",
+                        "sand": "Sand",
+                        "sandstone": "Sandsten",
+                        "soil": "Jord",
+                        "steel": "Stål",
+                        "stone": "Sten",
+                        "wood": "Trä"
+                    },
                     "terms": "material,tillverkad av"
                 },
                 "mattress": {
@@ -1904,7 +2007,20 @@
                     "terms": "maxbredd,bredd,maximal bredd,begränsning,begränsad bredd,breddrestrektion"
                 },
                 "memorial": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "blue_plaque": "Blå minnestavla",
+                        "bust": "Byst",
+                        "cross": "Minneskors",
+                        "obelisk": "Obelisk",
+                        "plaque": "Minnestavla",
+                        "sculpture": "Skulptur",
+                        "statue": "Staty",
+                        "stele": "Stele",
+                        "stolperstein": "Snubbelsten (Stolperstein)",
+                        "stone": "Sten",
+                        "war_memorial": "Krigsmonument"
+                    }
                 },
                 "microbrewery": {
                     "label": "Microbryggeri",
@@ -2034,8 +2150,69 @@
                     "label": "Notering",
                     "terms": "notering,kommentar,anmärkning"
                 },
+                "nudism": {
+                    "label": "Nudism",
+                    "options": {
+                        "customary": "Vanligtvis",
+                        "designated": "Föredragen",
+                        "no": "Förbjudet",
+                        "obligatory": "Obligatorisk",
+                        "permissive": "Tolereras",
+                        "yes": "Tillåten"
+                    },
+                    "terms": "nudism,nudist,naturism,naturist,naken rekreation,naken,nakenbad"
+                },
                 "office": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "accountant": "Bokhållare",
+                        "adoption_agency": "Adoptionsbyrå",
+                        "advertising_agency": "Reklambyrå",
+                        "architect": "Arkitektbyrå",
+                        "association": "Frivilligorganisation",
+                        "charity": "Välgörenhetsorganisation",
+                        "company": "Företagskontor",
+                        "construction_company": "Byggföretagetskontor",
+                        "consulting": "Konsultkontor",
+                        "courier": "Budkontor",
+                        "coworking": "Kontorskollektiv",
+                        "diplomatic": "Diplomatkontor",
+                        "educational_institution": "Utbildningskontor",
+                        "employment_agency": "Arbetsförmedling",
+                        "energy_supplier": "Energibolag",
+                        "engineer": "Ingenjörskontoret",
+                        "estate_agent": "Mäklare/bostadsförmedling",
+                        "financial": "Bankkontor",
+                        "financial_advisor": "Finansiell rådgivare",
+                        "forestry": "Skogsbolag",
+                        "foundation": "Stiftelse",
+                        "government": "Myndighet",
+                        "graphic_design": "Kontor för grafiskt designer",
+                        "guide": "Guidekontor",
+                        "insurance": "Försäkringskontor",
+                        "it": "IT-kontor",
+                        "lawyer": "Advokatkontor",
+                        "logistics": "Speditör",
+                        "moving_company": "Flyttfirma",
+                        "newspaper": "Tidningsredaktion",
+                        "ngo": "Icke-statlig organisation",
+                        "notary": "Notariekontor",
+                        "physician": "Läkare",
+                        "political_party": "Partikontor",
+                        "private_investigator": "Privatdetektiv",
+                        "property_management": "Fastighetsförvaltning",
+                        "quango": "Kvasiautonom icke-statlig organisation",
+                        "religion": "Religiöst kontor",
+                        "research": "Forskning och utveckling",
+                        "security": "Bevakningskontor",
+                        "surveyor": "Undersökning/inspektion",
+                        "tax_advisor": "Skatterådgivning",
+                        "telecommunication": "Telekom",
+                        "therapist": "Terapeut",
+                        "travel_agent": "Resebyrå",
+                        "union": "Fackföreningskontor",
+                        "water_utility": "Vattenleverantör"
+                    }
                 },
                 "oneway": {
                     "label": "Enkelriktat",
@@ -2122,11 +2299,14 @@
                     "options": {
                         "carports": "Carportar",
                         "garage_boxes": "Garageboxar",
+                        "half_on_kerb": "Halvvägs på trotoar",
                         "lane": "Fickparkering",
                         "layby": "Rastplats",
                         "multi-storey": "Flera våningar",
+                        "on_kerb": "På trotoar",
                         "rooftop": "På taket",
                         "sheds": "Skjul",
+                        "shoulder": "Vägren",
                         "street_side": "Sidan av väg",
                         "surface": "Yta",
                         "underground": "Underjordisk"
@@ -2140,6 +2320,37 @@
                         "perpendicular": "Möter gatan i en rät vinkel"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Parkeringsorientering",
+                    "options": {
+                        "diagonal": "Diagonalt i förhållande till gatan (~45°)",
+                        "parallel": "Parallellt med gatan",
+                        "perpendicular": "Möter gatan i en rät vinkel (~90°)"
+                    },
+                    "terms": "parkeringsorientering,orientering,parkering,fickparkering,paring längs gata",
+                    "types": {
+                        "parking:left:orientation": "Vänster sida",
+                        "parking:right:orientation": "Höger sida"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Parkering",
+                    "options": {
+                        "half_on_kerb": "Halvägs på trotoar",
+                        "lane": "Fickparkering",
+                        "no": "Nej",
+                        "on_kerb": "På trotoar",
+                        "separate": "Parkering kartläggs separat",
+                        "shoulder": "Vägren",
+                        "street_side": "Sidan av väg",
+                        "yes": "Ja (ospecificerad)"
+                    },
+                    "terms": "parkering,bilparkering,parkera",
+                    "types": {
+                        "parking:left": "Vänster sida",
+                        "parking:right": "Höger sida"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Typ"
                 },
@@ -2201,6 +2412,10 @@
                     "placeholder": "+46 31 123 4567",
                     "terms": "telefonnummer,telefon,nummer,mobil,mobilnummer"
                 },
+                "picnic_table": {
+                    "label": "Picknickbord",
+                    "terms": "picknickbord,bord,picknick,matbord,utflyktsbord,utebord,bänk"
+                },
                 "pipeline": {
                     "label": "Typ"
                 },
@@ -2547,7 +2762,18 @@
                     "label": "Typ"
                 },
                 "resource": {
-                    "label": "Resurser"
+                    "label": "Resurser",
+                    "options": {
+                        "aggregate": "Ballast",
+                        "clay": "Lera",
+                        "coal": "Kol",
+                        "gold": "Guld",
+                        "gravel": "Grus",
+                        "iron_ore": "Järnmalm",
+                        "limestone": "Kalksten",
+                        "peat": "Torv",
+                        "sand": "Sand"
+                    }
                 },
                 "restriction": {
                     "label": "Typ"
@@ -2872,7 +3098,44 @@
                     "terms": "wikidata för art,wikidata,art-wikidata"
                 },
                 "sport": {
-                    "label": "Sporter"
+                    "label": "Sporter",
+                    "options": {
+                        "american_football": "Amerikansk fotboll",
+                        "athletics": "Friidrott",
+                        "badminton": "Badminton",
+                        "baseball": "Baseball",
+                        "basketball": "Basket",
+                        "beachvolleyball": "Beachvolleyboll",
+                        "boules": "Boule",
+                        "bowls": "Bowls",
+                        "climbing": "Klättring",
+                        "cricket": "Cricket",
+                        "cycling": "Cycling",
+                        "equestrian": "Ryttare",
+                        "fitness": "Fitness-träning",
+                        "free_flying": "Skärmflygning / Paragliding",
+                        "futsal": "Futsal",
+                        "golf": "Golf",
+                        "gymnastics": "Gymnastik",
+                        "handball": "Handboll",
+                        "horse_racing": "Hästkapplöpning",
+                        "karting": "Go-kart racing",
+                        "motocross": "Motocross",
+                        "motor": "Motorsport",
+                        "netball": "Nätboll",
+                        "padel": "Padel",
+                        "rugby_union": "Rugby Union",
+                        "running": "Löpning",
+                        "shooting": "Skytte",
+                        "skateboard": "Skateboard",
+                        "skiing": "Skidåkning",
+                        "soccer": "Fotboll",
+                        "softball": "Softboll",
+                        "swimming": "Simning",
+                        "table_tennis": "Bordtennis",
+                        "tennis": "Tennis",
+                        "volleyball": "Volleyball"
+                    }
                 },
                 "sport_ice": {
                     "label": "Sporter",
@@ -2921,6 +3184,9 @@
                     "placeholder": "ÅÅÅÅ-MM-DD",
                     "terms": "startdatum,öppnat,början,påbörjat,start"
                 },
+                "static_caravans": {
+                    "label": "Villavagnar"
+                },
                 "step_count": {
                     "label": "Antal steg",
                     "terms": "antal steg,antal trappsteg,trappsteg,trappa,steg"
@@ -2986,7 +3252,16 @@
                     "terms": "ämnets wikidata,ämnets wikisida,ämneswiki,wiki,wikipedia,wikidata"
                 },
                 "substance": {
-                    "label": "Substans"
+                    "label": "Substans",
+                    "options": {
+                        "fuel": "Bränsle",
+                        "gas": "Naturgas",
+                        "hot_water": "Varmvatten",
+                        "oil": "Råolja",
+                        "rainwater": "Regnvatten",
+                        "sewage": "Avlopp",
+                        "water": "Dricksvatten"
+                    }
                 },
                 "substation": {
                     "label": "Typ",
@@ -3140,6 +3415,9 @@
                 "telecom/medium": {
                     "label": "Medium"
                 },
+                "tents": {
+                    "label": "Tält"
+                },
                 "tidal": {
                     "label": "Tidvatten",
                     "terms": "tidvatten,flod,ebb"
@@ -3230,8 +3508,7 @@
                         "mini_bumps": "Små farthinder",
                         "rumble_strip": "Bullerräfflor",
                         "table": "Platågupp"
-                    },
-                    "terms": "typ,gupp,farthinder,fartgupp"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Vägmärke"
@@ -3456,7 +3733,13 @@
                     "label": "Typ"
                 },
                 "waste": {
-                    "label": "Skräp"
+                    "label": "Skräp",
+                    "options": {
+                        "cigarettes": "Cigaretter",
+                        "dog_excrement": "Hundbajs",
+                        "organic": "Organiskt avfall",
+                        "trash": "Skräp"
+                    }
                 },
                 "water": {
                     "label": "Typ"
@@ -3982,6 +4265,30 @@
                     "name": "Kolorektal kirurg",
                     "terms": "kolorektal kirurg,kolorektal kirurgi,proktologi"
                 },
+                "amenity/doctors/pulmonology": {
+                    "name": "Pulmonolog (lungläkare)",
+                    "terms": "pulmonolog,lungläkare,astma,bröstmedicin,lunga,pneumologi,pneumonologi,lunginflammation,pulmonologi,andningsvägar,andningsmedicin,respirationssystemet,luftvägar,lungor,brösthåla"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Radiolog (Röntgenläkare)",
+                    "terms": "radiolog,röntgenolog,röntgenläkare,radiologi,datortomografi,ct,magnetisk resonanstomografi,medicinsk ultraljud,mri,sonografi,röntgen"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Reumatolog",
+                    "terms": "reumatolog,reumatologi,lupus,oteoporos,reuma,reumatism"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Allmänkirurg",
+                    "terms": "allmänkirurg,allmän kirurg,kirug"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Akutkirurg",
+                    "terms": "akutkirurg,akutkirurgi,traumakirurg,kirug"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Urolog",
+                    "terms": "urolog,binjurar,urinblåsa,epididymis,njure,penis,prostata,reproduktiv,pung,testiklar,urinrör,urinledare,urologi,urinvägar"
+                },
                 "amenity/dojo": {
                     "name": "Dojo / Akademi för kampsport",
                     "terms": "dojo,kampsport,träningslokal,budo,japansk konst,japan,kampkonst,dojang"
@@ -4939,8 +5246,8 @@
                     "terms": "grind vid betesmark,kryssgrind"
                 },
                 "barrier/lift_gate": {
-                    "name": "Bom",
-                    "terms": "bom,lyftbom,spärr,avspärrning"
+                    "name": "Bom-bariär",
+                    "terms": "bom-bariär,bombariär,bomgrind,bom,lyftbom,bomlyft,lyftgrind,vägbom,spärr,avspärrning,vridbar stolpe"
                 },
                 "barrier/log": {
                     "name": "Fallet träd"
@@ -5220,7 +5527,7 @@
                 },
                 "building/static_caravan": {
                     "name": "Villavagn",
-                    "terms": "villavagn,husvagn,campingvagn"
+                    "terms": "villavagn,husvagn,campingvagn,prefabricerat hem,bostadshusvagn,fast husvagn,fast husbil"
                 },
                 "building/sty": {
                     "name": "Svinstia",
@@ -5689,10 +5996,34 @@
                     "name": "Alternativmedicin",
                     "terms": "alternativmedicin,alternativ medicin,akupunktur,antroposofisk,tillämpad kinesiologi,aromaterapi,ayurveda,herbalism,örtmedicin,homeopati,hydroterapi,hypnos,naturopati,osteopati,reflexologi,reiki,shiatsu,traditionell,tuina,unani"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Akupunkturläkare",
+                    "terms": "akupunkturläkare,akupunktur"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Ayurveda-utövare",
+                    "terms": "ayurveda,traditionell indisk medicin,ayurvedisk medicin,indisk medicin"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Kiropraktik (rygg)",
                     "terms": "kiropraktor,kiropraktik,ryggbesvär,ryggen,smärta,ryggsmärta,ryggrad,kotknackare"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Homeopat",
+                    "terms": "homeopat,homeopati"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturterapeut (naturläkare)",
+                    "terms": "naturterapeut,naturläkare,naturopatisk medicin,naturopati"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Osteopat",
+                    "terms": "osteopat,osteopati,osteopater"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Traditionell kinesisk medicin-utövare",
+                    "terms": "traditionell kinesisk medicin-utövare,traditionell kinesisk medicin,die da,dit da,reiki,tcm,tui na,shiatsu,zhongyi,zhongyaoxue,tkm,traditional chinese medicine"
+                },
                 "healthcare/audiologist": {
                     "name": "Audionomi (hörsel)",
                     "terms": "audionomist,audionomi,audionom,öra,örat,hörsel,ljud,hörapparat"
@@ -5789,24 +6120,18 @@
                 "highway/crossing": {
                     "name": "Korsning"
                 },
-                "highway/crossing/marked": {
-                    "name": "Markerad gångpassage"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Korsning med trafikljus för fotgängare",
                     "terms": "trafikljus för fotgängare,trafiksignaler för fotgängare,övergångsställe (trafiksignal),cykelöverfart (trafiksignal)"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "Markerat övergångsställe",
-                    "terms": "övergångsställe för gående,övergångsställe,vägövergång,vägpassage,gångvägspassage,gångpassage,markerat övergångsställe,markerad gångpassage"
+                    "name": "Markerad korsning",
+                    "terms": "övergångsställe för gående,övergångsställe,vägövergång,vägpassage,gångvägspassage,gångpassage,markerat övergångsställe,markerad gångpassage,markerad övergång,markerad korsning,markerad gångvägsövergång,märkt övergångsställe,passage"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Omarkerad övergång",
                     "terms": "övergångsställe för gående,övergångsställe,vägövergång,vägpassage,gångvägspassage,gångpassage,omarkerat övergångsställe,omarkerad gångpassage,omarkerad övergång"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Markerat övergångsställe"
-                },
                 "highway/cycleway": {
                     "name": "Cykelväg",
                     "terms": "cykelväg,cykelled,gc-väg,cykel"
@@ -5822,9 +6147,6 @@
                     "name": "Cykel- och gångkorsning",
                     "terms": "cykel- och gångkorsning,gång- och cykelkorsning,gång och cykelkorsning,gc-korsning,cykelkorsning,gångkorsning,cykelpassage,gångpassage,övergångsställe,gående,cyklande,cykel,gång,cykelväg,gångväg,gc-passage,gc-övergång"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Markerad cykelkorsning"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Cykelkorsning med trafiksignal",
                     "terms": "cykelkorsning med trafiksignal,cykelfil,cykelväg,cykelvägskorsning,cykelkorsning,cykel"
@@ -5876,9 +6198,6 @@
                 "highway/footway/crossing": {
                     "name": "Gångpassage"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Markerad korsning"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Korsning med trafikljus för fotgängare",
                     "terms": "trafikljus för fotgängare,trafiksignaler för fotgängare,övergångsställe (trafiksignal),cykelöverfart (trafiksignal)"
@@ -5891,9 +6210,6 @@
                     "name": "Omarkerad övergång",
                     "terms": "övergångsställe för gående,övergångsställe,vägövergång,vägpassage,gångvägspassage,gångpassage,omarkerat övergångsställe,omarkerad gångpassage,omarkerad övergång"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Markerad korsning"
-                },
                 "highway/footway/informal": {
                     "name": "Informell gångstig"
                 },
@@ -6547,6 +6863,10 @@
                     "name": "Koloniområde",
                     "terms": "kolonilott,lott,täppa,koloniträdgård,odlingslott,koloniområde"
                 },
+                "leisure/garden/residential": {
+                    "name": "Bostadsträdgård",
+                    "terms": "bostadsträdgård,bakgård,privat trädgård,trädgård,husträdgård,villaträdgård,villatomt,gräsmatta,tomt"
+                },
                 "leisure/golf_course": {
                     "name": "Golfbana",
                     "terms": "golfbana,golf,golfanläggning,golfcenter"

dist/translations/th.json

@@ -234,9 +234,6 @@
                     "label": "ความจุ",
                     "terms": "ปริมาตร,ความจุ,จำนวนรองรับ"
                 },
-                "capacity/caravans": {
-                    "label": "ความจุ (คาราวาน)"
-                },
                 "capacity/persons": {
                     "label": "ความจุ (คน)"
                 },
@@ -1273,9 +1270,6 @@
                 "barrier/kissing_gate": {
                     "name": "ประตูกั้นปศุสัตว์"
                 },
-                "barrier/lift_gate": {
-                    "name": "ประตูกั้นแบบยกขึ้น"
-                },
                 "barrier/motorcycle_barrier": {
                     "name": "ที่กั้นจักรยานยนต์"
                 },
@@ -1716,21 +1710,12 @@
                 "highway/crossing": {
                     "name": "ทางข้าม"
                 },
-                "highway/crossing/marked": {
-                    "name": "ทางข้ามมีเครื่องหมายจราจร"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "ทางข้ามมีไฟจราจร"
                 },
-                "highway/crossing/uncontrolled": {
-                    "name": "ทางข้ามที่มีเครื่องหมายจราจร"
-                },
                 "highway/crossing/unmarked": {
                     "name": "ทางข้ามไม่มีเครื่องหมายจราจร"
                 },
-                "highway/crossing/zebra": {
-                    "name": "ทางข้ามที่มีเครื่องหมายจราจร"
-                },
                 "highway/cycleway": {
                     "name": "ทางจักรยาน"
                 },
@@ -1743,9 +1728,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "ทางข้ามจักรยานกับคนเดิน"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "ทางข้ามจักรยานมีเครื่องหมายจราจร"
-                },
                 "highway/cycleway/crossing/uncontrolled": {
                     "name": "ทางข้ามจักรยานมีเครื่องหมายจราจร"
                 },
@@ -1761,9 +1743,6 @@
                 "highway/footway/crossing": {
                     "name": "ทางข้ามคนเดิน"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "ทางข้ามมีเครื่องหมายจราจร"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "ทางข้ามมีเครื่องหมายจราจรสำหรับคนเดิน"
                 },
@@ -1773,9 +1752,6 @@
                 "highway/footway/crossing/unmarked": {
                     "name": "ทางข้ามไม่มีเครื่องหมายจราจร"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "ทางข้ามมีเครื่องหมายจราจร"
-                },
                 "highway/footway/informal": {
                     "name": "ทางเดินไม่เป็นทางการ"
                 },

dist/translations/tr.json

@@ -3097,6 +3097,9 @@
                 "amenity/theatre/type/amphi": {
                     "name": "Amfitiyatro"
                 },
+                "amenity/toilets": {
+                    "terms": "tuvalet"
+                },
                 "amenity/toilets/disposal/flush": {
                     "name": "Alafranga tuvaletler"
                 },
@@ -3245,10 +3248,6 @@
                 "attraction/animal": {
                     "name": "Hayvan Muhafazası"
                 },
-                "attraction/big_wheel": {
-                    "name": "Dönme Dolap",
-                    "terms": "dönme dolap"
-                },
                 "attraction/bumper_car": {
                     "name": "Çarpışan Arabalar"
                 },
@@ -3381,8 +3380,8 @@
                     "terms": "sadece i̇nsanlar i̇çin giriş kapısı"
                 },
                 "barrier/lift_gate": {
-                    "name": "Asansör Kapı",
-                    "terms": "asansör kapı"
+                    "name": "Bom Bariyeri",
+                    "terms": "bariyer,turnike,yol bariyeri"
                 },
                 "barrier/retaining_wall": {
                     "name": "İstinat Duvarı",
@@ -3602,10 +3601,6 @@
                     "name": "Stadyum",
                     "terms": "stadyum"
                 },
-                "building/static_caravan": {
-                    "name": "Karavan",
-                    "terms": "karavan"
-                },
                 "building/sty": {
                     "name": "Domuz Ahırı"
                 },
@@ -3672,6 +3667,9 @@
                     "name": "Ciltçi",
                     "terms": "ciltçi"
                 },
+                "craft/brewery": {
+                    "name": "El Yapımı Bira İşletmesi"
+                },
                 "craft/carpenter": {
                     "name": "Marangoz",
                     "terms": "marangoz,dülger,doğramacı"
@@ -4076,15 +4074,9 @@
                 "highway/crossing": {
                     "name": "Geçit"
                 },
-                "highway/crossing/marked": {
-                    "name": "İşaretli Yaya Geçidi"
-                },
                 "highway/crossing/unmarked": {
                     "name": "İşaretsiz Yaya Geçidi"
                 },
-                "highway/crossing/zebra": {
-                    "name": "İşaretli Yaya Geçidi"
-                },
                 "highway/cycleway": {
                     "name": "Bisiklet Yolu",
                     "terms": "bisiklet yolu"
@@ -4098,9 +4090,6 @@
                 "highway/cycleway/crossing/bicycle_foot": {
                     "name": "Bisiklet ve Yaya Geçidi"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "İşaretli Bisiklet Geçidi"
-                },
                 "highway/cycleway/crossing/unmarked": {
                     "name": "İşaretsiz Bisiklet Geçidi"
                 },
@@ -4274,6 +4263,10 @@
                 "highway/toll_gantry": {
                     "name": "Açık Yol Geçiş Ücreti"
                 },
+                "highway/track": {
+                    "name": "Pist / Arazi Erişim Yolu",
+                    "terms": "tarım yolu,bakımsız yol,bakımsız patika,bakımsız araç yolu"
+                },
                 "highway/traffic_mirror": {
                     "name": "Trafik Aynası",
                     "terms": "trafik aynası"
@@ -4853,6 +4846,9 @@
                     "name": "Çizgi",
                     "terms": "çizgi"
                 },
+                "man_made": {
+                    "name": "İnsan Yapımı Özellik"
+                },
                 "man_made/adit": {
                     "name": "Tünel Girişi",
                     "terms": "tünel girişi,maden girişi"
@@ -6019,6 +6015,10 @@
                     "name": "Bahis Merkezi",
                     "terms": "bahis merkezi"
                 },
+                "shop/books": {
+                    "name": "Kitapçı",
+                    "terms": "kitapçı"
+                },
                 "shop/boutique": {
                     "name": "Butik Mağaza"
                 },
@@ -6131,6 +6131,10 @@
                     "name": "Süt Mağazası",
                     "terms": "süt mağazası"
                 },
+                "shop/deli": {
+                    "name": "Şarküteri",
+                    "terms": "şarküteri"
+                },
                 "shop/department_store": {
                     "name": "Mağaza",
                     "terms": "mağaza"
@@ -6344,6 +6348,10 @@
                     "name": "Müzik Aletleri Mağazası",
                     "terms": "müzik aletleri mağazası"
                 },
+                "shop/newsagent": {
+                    "name": "Gazete Bayii",
+                    "terms": "gazete bayii"
+                },
                 "shop/nutrition_supplements": {
                     "name": "Gıda Takviye Ürünleri Mağazası",
                     "terms": "gıda takviye ürünleri mağazası,enerji takviye ürünleri mağazası"
@@ -6509,6 +6517,10 @@
                     "name": "Elektrikli Süpürge Mağazası",
                     "terms": "elektrikli süpürge mağazası"
                 },
+                "shop/variety_store": {
+                    "name": "İndirim Mağazası",
+                    "terms": "1 tl mağazası"
+                },
                 "shop/video": {
                     "name": "Film - Video Mağazası",
                     "terms": "film - video mağazası"
@@ -6558,6 +6570,10 @@
                 "tourism": {
                     "name": "Turizm Özelliği"
                 },
+                "tourism/alpine_hut": {
+                    "name": "Dağ Köşkü",
+                    "terms": "dağ evi,dağ kulübesi,baraka"
+                },
                 "tourism/apartment": {
                     "name": "Misafir Apartmanı",
                     "terms": "misafir apartmanı"
@@ -6792,6 +6808,10 @@
                 "type/route/aerialway": {
                     "name": "Araç Güzergahı"
                 },
+                "type/route/bicycle": {
+                    "name": "Bisiklet Rotası",
+                    "terms": "bisiklet güzergahı,bisiklet rotası"
+                },
                 "type/route/bus": {
                     "name": "Otobüs Güzergahı",
                     "terms": "otobüs güzergahı,otobüs rotası"

dist/translations/uk.json

@@ -244,7 +244,22 @@
                     "label": "Для тварин"
                 },
                 "archaeological_site": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "baths": "Бані",
+                        "city": "Історичне місто",
+                        "crannog": "Кранног",
+                        "enclosure": "Огороджене місце",
+                        "fortification": "Фортифікація",
+                        "hut_circle": "Кругла хатина",
+                        "megalith": "Мегаліт",
+                        "necropolis": "Некрополь",
+                        "petroglyph": "Наскельні зображення",
+                        "roman_circus": "Римський цирк",
+                        "roman_villa": "Римська вілла",
+                        "settlement": "Історичне поселення",
+                        "tumulus": "Курган"
+                    }
                 },
                 "architect": {
                     "label": "Архітектор",
@@ -278,7 +293,28 @@
                     "label": "Банкомат"
                 },
                 "attraction": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "alpine_coaster": "Альпійські гірки",
+                        "amusement_ride": "Атракціон",
+                        "animal": "Вольєр з тваринами",
+                        "big_wheel": "Оглядове колесо",
+                        "bumper_car": "Автодром",
+                        "bungee_jumping": "Банджі-джампінг",
+                        "carousel": "Карусель",
+                        "dark_ride": "Кімната жахів",
+                        "drop_tower": "Башта Вільне падіння",
+                        "kiddie_ride": "Гойдалка для малечі",
+                        "log_flume": "Водний спуск",
+                        "maze": "Лабіринт",
+                        "pirate_ship": "Піратський човен",
+                        "river_rafting": "Сплав по річці",
+                        "roller_coaster": "Американські гірки",
+                        "summer_toboggan": "Альпійські гірки",
+                        "swing_carousel": "Ланцюгова карусель",
+                        "train": "Туристичний потяг",
+                        "water_slide": "Водна гірка"
+                    }
                 },
                 "automated": {
                     "label": "Автоматизовано"
@@ -307,7 +343,32 @@
                     "terms": "бар,алкоголь,заклад,їжа,дозвілля"
                 },
                 "barrier": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "block": "Великий блок",
+                        "bollard": "Болард",
+                        "cattle_grid": "Перепона для худоби",
+                        "chain": "Ланцюг",
+                        "city_wall": "Міська стіна",
+                        "cycle_barrier": "Велосипедний барʼєр",
+                        "ditch": "Канава",
+                        "entrance": "Вхід",
+                        "fence": "Паркан",
+                        "gate": "Ворота",
+                        "guard_rail": "Відбійник",
+                        "hedge": "Жива огорожа",
+                        "height_restrictor": "Обмежувач висоти",
+                        "jersey_barrier": "Джерсі барʼєр",
+                        "kerb": "Бордюр",
+                        "kissing_gate": "Вузька хвіртка",
+                        "lift_gate": "Шлагбаум",
+                        "retaining_wall": "Підпірна стіна",
+                        "stile": "Перелаз",
+                        "swing_gate": "Відкидні ворота",
+                        "toll_booth": "Пункт оплати",
+                        "turnstile": "Турнікет",
+                        "wall": "Стіна"
+                    }
                 },
                 "barrier_planter": {
                     "label": "Бар'єр",
@@ -317,7 +378,13 @@
                     }
                 },
                 "basin": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "detention": "Протипаводковий",
+                        "evaporation": "Ставок-випарник",
+                        "infiltration": "Інфільтраційний ставок",
+                        "retention": "Ставок-накопичувач"
+                    }
                 },
                 "bath/open_air": {
                     "label": "На відкритому повітрі"
@@ -326,7 +393,14 @@
                     "label": "Піщана  лазня"
                 },
                 "bath/type": {
-                    "label": "Спеціалізація"
+                    "label": "Спеціалізація",
+                    "options": {
+                        "hammam": "Хамам",
+                        "hot_spring": "Термальні води",
+                        "lake": "Озеро",
+                        "onsen": "Онсен",
+                        "thermal": "Термальні бані"
+                    }
                 },
                 "beauty": {
                     "label": "Послуги",
@@ -512,7 +586,7 @@
                     "terms": "об’єм,обсяг,місткість,кількість"
                 },
                 "capacity/caravans": {
-                    "label": "Кількість (Фургони)",
+                    "label": "Місткість (кемперів)",
                     "placeholder": "10, 20, 50…"
                 },
                 "capacity/disabled_parking": {
@@ -535,6 +609,9 @@
                     "label": "Ємність (м³)",
                     "placeholder": "50, 100, 200…"
                 },
+                "caravans": {
+                    "label": "Кемпер"
+                },
                 "cash_in": {
                     "label": "Внесення готівки"
                 },
@@ -1798,6 +1875,13 @@
                 "lifeguard": {
                     "label": "Рятувальник"
                 },
+                "lift_gate/type": {
+                    "label": "Тип",
+                    "options": {
+                        "double": "З обох боків дороги",
+                        "single": "З одного боку дороги"
+                    }
+                },
                 "line_attachment": {
                     "label": "Кріплення",
                     "terms": "кріплення,фіксація"
@@ -1856,6 +1940,30 @@
                 },
                 "material": {
                     "label": "Матеріал",
+                    "options": {
+                        "adobe": "Саман",
+                        "aluminium": "Алюміній",
+                        "brass": "Латунь",
+                        "brick": "Цегла",
+                        "bronze": "Бронза",
+                        "concrete": "Бетон",
+                        "dry_stone": "Суха кладка",
+                        "glass": "Скло",
+                        "granite": "Граніт",
+                        "iron": "Залізо",
+                        "limestone": "Вапняк",
+                        "marble": "Мармур",
+                        "metal": "Метал",
+                        "plastic": "Пластик",
+                        "reinforced_conrete": "Залізобетон",
+                        "rock": "Брила",
+                        "sand": "Пісок",
+                        "sandstone": "Пісковик",
+                        "soil": "Грунт",
+                        "steel": "Сталь",
+                        "stone": "Камінь",
+                        "wood": "Деревина"
+                    },
                     "terms": "бетон,цегла,кирпич,дерево,глина,очерет,листя,рубероїд"
                 },
                 "mattress": {
@@ -1898,7 +2006,20 @@
                     "terms": "обмеження,ширина,максимально,дозволена"
                 },
                 "memorial": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "blue_plaque": "Меморіальний знак (табличка)",
+                        "bust": "Погруддя",
+                        "cross": "Памʼятний хрест",
+                        "obelisk": "Обеліск",
+                        "plaque": "Памʼятна дошка",
+                        "sculpture": "Скульптура",
+                        "statue": "Статуя",
+                        "stele": "Стела",
+                        "stolperstein": "Камені спотикання",
+                        "stone": "Меморіальний камінь",
+                        "war_memorial": "Військовий меморіал"
+                    }
                 },
                 "microbrewery": {
                     "label": "Міні-пивоварня",
@@ -2028,8 +2149,69 @@
                     "label": "Примітка",
                     "terms": "нотатка,коментар,примітка"
                 },
+                "nudism": {
+                    "label": "Нудизм",
+                    "options": {
+                        "customary": "Звичайно",
+                        "designated": "Призначено",
+                        "no": "Заборонено",
+                        "obligatory": "Обовʼязково",
+                        "permissive": "З дозволу",
+                        "yes": "Дозволено"
+                    },
+                    "terms": "нудизм,натуризм"
+                },
                 "office": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "accountant": "Бухгалтер",
+                        "adoption_agency": "Агенція з усиновлення",
+                        "advertising_agency": "Рекламна агенція",
+                        "architect": "Архітектор",
+                        "association": "Неприбуткова організація",
+                        "charity": "Благодійна організація",
+                        "company": "Офіс компанії",
+                        "construction_company": "Офіс будівельної компанії",
+                        "consulting": "Консалтингова фірма",
+                        "courier": "Курʼєрська служба",
+                        "coworking": "Коворкінг",
+                        "diplomatic": "Дипломатична установа",
+                        "educational_institution": "Офіс освітнього закладу",
+                        "employment_agency": "Кадрова агенція",
+                        "energy_supplier": "Електропостачальна компанія",
+                        "engineer": "Відділ державної реєстрації актів цивільного стану",
+                        "estate_agent": "Агенція з нерухомості",
+                        "financial": "Офіс фінансової компанії",
+                        "financial_advisor": "Радник з фінансових питань",
+                        "forestry": "Лісництво",
+                        "foundation": "Фундація",
+                        "government": "Офіс держаної установи",
+                        "graphic_design": "Графічний дизайн",
+                        "guide": "Гід",
+                        "insurance": "Страхова компанія",
+                        "it": "ІТ компанія",
+                        "lawyer": "Адвокатське бюро",
+                        "logistics": "Експедиторська агенція",
+                        "moving_company": "Перевезення речей",
+                        "newspaper": "Редакція газети",
+                        "ngo": "Недержавна громадська організація",
+                        "notary": "Нотаріус",
+                        "physician": "Лікар",
+                        "political_party": "Офіс політичної партії",
+                        "private_investigator": "Приватний детектив",
+                        "property_management": "Офіс управляючої нерухомістю компанії.",
+                        "quango": "Квазі-НГО",
+                        "religion": "Релігійна організація",
+                        "research": "Дослідницька лабораторія",
+                        "security": "Охоронна фірма",
+                        "surveyor": "Експерт-оцінник",
+                        "tax_advisor": "Податкова консультація",
+                        "telecommunication": "Телекомунікаційна компанія",
+                        "therapist": "Терапевт",
+                        "travel_agent": "Туристична агенція",
+                        "union": "Офіс профспілки",
+                        "water_utility": "Водоканал"
+                    }
                 },
                 "oneway": {
                     "label": "Односторонній рух",
@@ -2116,11 +2298,14 @@
                     "options": {
                         "carports": "Навіси",
                         "garage_boxes": "Гаражі",
+                        "half_on_kerb": "Одним боком на тротуарі",
                         "lane": "Смуга вздовж дороги",
                         "layby": "Місце відпочинку",
                         "multi-storey": "Багаторівнева",
+                        "on_kerb": "На тротуарі",
                         "rooftop": "На даху",
                         "sheds": "Сарайчики",
+                        "shoulder": "На узбіччі",
                         "street_side": "Вздовж дороги",
                         "surface": "Наземна",
                         "underground": "Підземна"
@@ -2134,6 +2319,37 @@
                         "perpendicular": "Перпендикулярно до проїзної частини"
                     }
                 },
+                "parking/side/orientation": {
+                    "label": "Орієнтація стоянки",
+                    "options": {
+                        "diagonal": "По діагоналі до проїзної частини (~45°)",
+                        "parallel": "Паралельно до проїзної частини",
+                        "perpendicular": "Перпендикулярно до проїзної частини (~90°)"
+                    },
+                    "terms": "проїзд,стоянка,дорога,автомобіль,парковка,діагонально,перпендикулярно,паралельно",
+                    "types": {
+                        "parking:left:orientation": "Ліворуч",
+                        "parking:right:orientation": "Праворуч"
+                    }
+                },
+                "parking/side/parking": {
+                    "label": "Стоянка",
+                    "options": {
+                        "half_on_kerb": "Одним боком на тротуарі",
+                        "lane": "Смуга вздовж дороги",
+                        "no": "Ні",
+                        "on_kerb": "На тротуарі",
+                        "separate": "Окремо намаплена стоянка",
+                        "shoulder": "На узбіччі",
+                        "street_side": "Вздовж дороги",
+                        "yes": "Так (невизначено)"
+                    },
+                    "terms": "стоянка,парковка,паркінг,місце",
+                    "types": {
+                        "parking:left": "Ліворуч",
+                        "parking:right": "Праворуч"
+                    }
+                },
                 "parking_entrance": {
                     "label": "Тип"
                 },
@@ -2195,6 +2411,10 @@
                     "placeholder": "+380 44 123 4567",
                     "terms": "номер,телефон"
                 },
+                "picnic_table": {
+                    "label": "Стіл для пікніка",
+                    "terms": "пікнік,відпочинок,лавка,стіл,мангал"
+                },
                 "pipeline": {
                     "label": "Тип"
                 },
@@ -2541,7 +2761,18 @@
                     "label": "Тип"
                 },
                 "resource": {
-                    "label": "Ресурси"
+                    "label": "Ресурси",
+                    "options": {
+                        "aggregate": "Композити",
+                        "clay": "Глина",
+                        "coal": "Вугілля",
+                        "gold": "Золото",
+                        "gravel": "Гравій",
+                        "iron_ore": "Залізна руда",
+                        "limestone": "Вапняк",
+                        "peat": "Торф",
+                        "sand": "Пісок"
+                    }
                 },
                 "restriction": {
                     "label": "Тип"
@@ -2825,7 +3056,18 @@
                     "terms": "смс,sms,повідомлення"
                 },
                 "social_facility": {
-                    "label": "Тип"
+                    "label": "Тип",
+                    "options": {
+                        "ambulatory_care": "Служба соцзахисту",
+                        "assisted_living": "Пансіонат для людей похилого віку з особливими потребами",
+                        "day_care": "Денний догляд",
+                        "food_bank": "Банк харчів",
+                        "group_home": "Інтернат для осіб з особливими потребами",
+                        "nursing_home": "Будинок престарілих",
+                        "outreach": "Центр соціальної підтримки",
+                        "shelter": "Притулок",
+                        "workshop": "Робота для інвалідів"
+                    }
                 },
                 "social_facility_for": {
                     "label": "Обслуговуються"
@@ -2855,7 +3097,44 @@
                     "terms": "вікі,вид,опис,рослина,царство,тварина"
                 },
                 "sport": {
-                    "label": "Спорт"
+                    "label": "Спорт",
+                    "options": {
+                        "american_football": "Американський футбол",
+                        "athletics": "Легка атлетика",
+                        "badminton": "Бадмінтон",
+                        "baseball": "Бейсбол",
+                        "basketball": "Баскетбол",
+                        "beachvolleyball": "Пляжний волейбол",
+                        "boules": "Бочче",
+                        "bowls": "Боулз",
+                        "climbing": "Скелелазіння",
+                        "cricket": "Крікет",
+                        "cycling": "Велоспорт",
+                        "equestrian": "Кінний спорт",
+                        "fitness": "Фітнес",
+                        "free_flying": "Парапланеризм",
+                        "futsal": "Футзал",
+                        "golf": "Гольф",
+                        "gymnastics": "Гімнастика",
+                        "handball": "Гандбол",
+                        "horse_racing": "Скачки",
+                        "karting": "Картинг",
+                        "motocross": "Мотокрос",
+                        "motor": "Мотоспорт",
+                        "netball": "Нетбол",
+                        "padel": "Падель",
+                        "rugby_union": "Регбі юніон",
+                        "running": "Біг",
+                        "shooting": "Стрільба",
+                        "skateboard": "Скейтбординг",
+                        "skiing": "Катання на лижах",
+                        "soccer": "Футбол",
+                        "softball": "Софтбол",
+                        "swimming": "Плавання",
+                        "table_tennis": "Настільний теніс",
+                        "tennis": "Теніс",
+                        "volleyball": "Волейбол"
+                    }
                 },
                 "sport_ice": {
                     "label": "Спорт",
@@ -2904,6 +3183,9 @@
                     "placeholder": "РРРР-ММ-ДД",
                     "terms": "початок,починання,відкриття"
                 },
+                "static_caravans": {
+                    "label": "Дома на колесах"
+                },
                 "step_count": {
                     "label": "Кількість сходинок",
                     "terms": "сходи,драбина,підйом,спуск,пандус,кількість,щабель"
@@ -2969,7 +3251,16 @@
                     "terms": "мистецтво,культура,археологія,природа,особистість,музей,наука,тема"
                 },
                 "substance": {
-                    "label": "Речовина"
+                    "label": "Речовина",
+                    "options": {
+                        "fuel": "Паливо",
+                        "gas": "Природний газ",
+                        "hot_water": "Гаряча вода",
+                        "oil": "Нафтопродукти",
+                        "rainwater": "Дощова вода",
+                        "sewage": "Каналізація",
+                        "water": "Питна вода"
+                    }
                 },
                 "substation": {
                     "label": "Тип",
@@ -3123,6 +3414,9 @@
                 "telecom/medium": {
                     "label": "Тип"
                 },
+                "tents": {
+                    "label": "Навіс"
+                },
                 "tidal": {
                     "label": "Заплава",
                     "terms": "прилив,відлив,вода,мілина,ранок,вечір"
@@ -3213,8 +3507,7 @@
                         "mini_bumps": "Полусфери",
                         "rumble_strip": "Шумові смуги",
                         "table": "Широкий лежачий поліцейський (стіл)"
-                    },
-                    "terms": "шикана,звуження,стіл,подушка,лежачий,поліцейський,безпка,острівець,заглиблення,горб,полусфера,заспокоєння"
+                    }
                 },
                 "traffic_sign": {
                     "label": "Дорожній знак"
@@ -3351,7 +3644,16 @@
                     }
                 },
                 "utility": {
-                    "label": "Комунальні послуги"
+                    "label": "Комунальні послуги",
+                    "options": {
+                        "gas": "Газ",
+                        "oil": "Нафта",
+                        "power": "Електрика",
+                        "sewerage": "Каналізація",
+                        "street_lighting": "Вуличне освітлення",
+                        "telecom": "Телекомунікації",
+                        "water": "Вода"
+                    }
                 },
                 "utility_semi": {
                     "label": "Комунальні послуги"
@@ -3430,7 +3732,13 @@
                     "label": "Тип"
                 },
                 "waste": {
-                    "label": "Відходи"
+                    "label": "Відходи",
+                    "options": {
+                        "cigarettes": "Сигарети",
+                        "dog_excrement": "Собачі екскременти",
+                        "organic": "Органічні відходи",
+                        "trash": "Сміття"
+                    }
                 },
                 "water": {
                     "label": "Тип"
@@ -3876,10 +4184,110 @@
                     "name": "Лікар",
                     "terms": "лікар,медицина,допомога"
                 },
+                "amenity/doctors/allergology": {
+                    "name": "Алерголог",
+                    "terms": "лікар,алегргія"
+                },
+                "amenity/doctors/cardiology": {
+                    "name": "Кардіолог",
+                    "terms": "лікар,кардіолог,серце"
+                },
+                "amenity/doctors/dermatology": {
+                    "name": "Дерматолог",
+                    "terms": "лікар,дерматолог,шкіра,висипка"
+                },
+                "amenity/doctors/gastroenterology": {
+                    "name": "Гастроентеролог",
+                    "terms": "лікар,гастріт"
+                },
+                "amenity/doctors/general": {
+                    "name": "Лікар первинної ланки",
+                    "terms": "лікар,сімейний"
+                },
                 "amenity/doctors/gynaecology": {
                     "name": "Гінеколог",
                     "terms": "лікар,гінеколог,жіночий"
                 },
+                "amenity/doctors/haematology": {
+                    "name": "Гематолог",
+                    "terms": "лікар,гематолог"
+                },
+                "amenity/doctors/internal": {
+                    "name": "Терапевт",
+                    "terms": "лікар,інтерніст"
+                },
+                "amenity/doctors/nephrology": {
+                    "name": "Нефролог",
+                    "terms": "лікар,нефролог,нирки"
+                },
+                "amenity/doctors/neurology": {
+                    "name": "Невролог",
+                    "terms": "лікар,неврологія"
+                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "Нейрохірург",
+                    "terms": "лікар,хірург,мозок"
+                },
+                "amenity/doctors/oncology": {
+                    "name": "Онколог",
+                    "terms": "лікар,онкологія,рак,пухлина"
+                },
+                "amenity/doctors/ophthalmology": {
+                    "name": "Офтальмолог",
+                    "terms": "лікар,офтальмолог,окуліст"
+                },
+                "amenity/doctors/orthopaedics": {
+                    "name": "Хірург-ортопед",
+                    "terms": "лікар,хірург,ортопед"
+                },
+                "amenity/doctors/otolaryngology": {
+                    "name": "Отоларинголог",
+                    "terms": "лікар,вухо,горло,ніс"
+                },
+                "amenity/doctors/paediatrics": {
+                    "name": "Педіатр",
+                    "terms": "лікар,педіатр"
+                },
+                "amenity/doctors/pathology": {
+                    "name": "Патологоанатом",
+                    "terms": "морг,патолог,анатом"
+                },
+                "amenity/doctors/plastic_surgery": {
+                    "name": "Пластичний хірург",
+                    "terms": "лікар,краса,пластика"
+                },
+                "amenity/doctors/podiatry": {
+                    "name": "Ортопед",
+                    "terms": "суглоби,коліна,ноги,нігті,лікті,лікар"
+                },
+                "amenity/doctors/proctology": {
+                    "name": "Колоректальний хірург",
+                    "terms": "лікар,ректа*,хірург"
+                },
+                "amenity/doctors/pulmonology": {
+                    "name": "Пульмонолог",
+                    "terms": "лікар,пульманол*"
+                },
+                "amenity/doctors/radiology": {
+                    "name": "Рентгенолог",
+                    "terms": "лікар,рентген*"
+                },
+                "amenity/doctors/rheumatology": {
+                    "name": "Ревматолог",
+                    "terms": "лікар,ревматиз"
+                },
+                "amenity/doctors/surgery": {
+                    "name": "Хірург",
+                    "terms": "лікар,хірург"
+                },
+                "amenity/doctors/trauma": {
+                    "name": "Хірург-травматолог",
+                    "terms": "лікар,хірург,травма*"
+                },
+                "amenity/doctors/urology": {
+                    "name": "Уролог",
+                    "terms": "нирки,міхур,простата,залоза,аденома,простатит"
+                },
                 "amenity/dojo": {
                     "name": "Додзьо / Школа бойових мистецтв",
                     "terms": "додзьо,бій,навчання,бойові мистецтва"
@@ -4655,8 +5063,8 @@
                     "terms": "зоопарк,вольєр,звіринець,акваріум,басейн,тварини,дельфіни,хижаки,леви,тигри"
                 },
                 "attraction/big_wheel": {
-                    "name": "Оглядове колесо",
-                    "terms": "огляд,колесо,чортове,тематичний,парк,розваги,атракціони"
+                    "name": "Велике оглядове колесо",
+                    "terms": "оглядове,колесо,чортове,тематичний,парк,розваги,атракціони"
                 },
                 "attraction/bumper_car": {
                     "name": "Бамперні машинки",
@@ -4809,7 +5217,7 @@
                     "terms": "шлях,автомагістраль,шосе,тротуар,стежка,тропа,путівець,напрямок,проїзд,висота,обмеження,максимально"
                 },
                 "barrier/jersey_barrier": {
-                    "name": "Джерсі бар'єр",
+                    "name": "Джерсі барʼєр",
                     "terms": "бар'єр,пластик,бетон,пересувниий"
                 },
                 "barrier/kerb": {
@@ -4838,7 +5246,7 @@
                 },
                 "barrier/lift_gate": {
                     "name": "Шлагбаум",
-                    "terms": "шлагбаум,вхід,в'їзд"
+                    "terms": "бар’єр,шлагбаум,перешкода,рубіж,межа,застава,лінія поділу,огорожа,перемичка,поручні,перепона"
                 },
                 "barrier/log": {
                     "name": "Повалене дерево"
@@ -5117,8 +5525,8 @@
                     "terms": "стадіон,споруда,арена,будівля"
                 },
                 "building/static_caravan": {
-                    "name": "Пересувний будинок",
-                    "terms": "пересувний будинок,кемпер,трейлер"
+                    "name": "Дім на колесах",
+                    "terms": "кемпер,трейлер,караван"
                 },
                 "building/sty": {
                     "name": "Свинарник",
@@ -5587,10 +5995,34 @@
                     "name": "Альтернативна медицина",
                     "terms": "нетрадиційна,медицина,акупунктура,антропософія,прикладна,кінезіологія,ароматерапія,аюрведа,трави,гомеопатія,гідротерапія,гіпноз,натуропатія,остеопатія,рефлексологія,реікі,шиацу,традиційні,туйна,уніані"
                 },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Лікар акупунктури",
+                    "terms": "голка,акупунтура,рефлекс,терапія"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Лікар аюрведи",
+                    "terms": "аюрведа"
+                },
                 "healthcare/alternative/chiropractic": {
                     "name": "Хіропрактика",
                     "terms": "хіропрактика,костоправ,мануальна терапія,хребет"
                 },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Гомеопат",
+                    "terms": "лікар,гомеопатія"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Травник",
+                    "terms": "трави,рослини,лікар"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Остеопат",
+                    "terms": "остеопатія,лікар"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Традиційна китайська медицина",
+                    "terms": "тайська,традиційна,медицина,лікар"
+                },
                 "healthcare/audiologist": {
                     "name": "Аудіолог",
                     "terms": "лікарня,вухо,слух,апарат,аудіологія"
@@ -5687,24 +6119,18 @@
                 "highway/crossing": {
                     "name": "Перехід"
                 },
-                "highway/crossing/marked": {
-                    "name": "Пішохідний перехід з розміткою"
-                },
                 "highway/crossing/traffic_signals": {
                     "name": "Пішохідний перехід зі світлофором",
                     "terms": "перехід,світлофор,пішохідний,сигнал,пішохід"
                 },
                 "highway/crossing/uncontrolled": {
-                    "name": "Пішохідний перехід з розміткою",
-                    "terms": "зебра,пішохід,перехід,переход,перехресття"
+                    "name": "Позначений пішохідний перехід",
+                    "terms": "перехід,пішохідний,позначений,розмітка"
                 },
                 "highway/crossing/unmarked": {
                     "name": "Непозначений пішохідний перехід",
                     "terms": "перехід,пішохідний,непозначений,без розмітки"
                 },
-                "highway/crossing/zebra": {
-                    "name": "Пішохідний перехід з розміткою"
-                },
                 "highway/cycleway": {
                     "name": "Велодоріжка",
                     "terms": "велодоріжка,стежка"
@@ -5720,9 +6146,6 @@
                     "name": "Вело і пішохідний перехід",
                     "terms": "перехід,переїзд,велосипед,ровер,пішохід"
                 },
-                "highway/cycleway/crossing/marked": {
-                    "name": "Велосипедний переїзд з розміткою"
-                },
                 "highway/cycleway/crossing/traffic_signals": {
                     "name": "Велопереїзд зі світлофором",
                     "terms": "перехід,світлофор,пішохідний,сигнал,велосипед,ровер,переїзд"
@@ -5774,9 +6197,6 @@
                 "highway/footway/crossing": {
                     "name": "Пішохідний перехід"
                 },
-                "highway/footway/crossing/marked": {
-                    "name": "Позначений пішохідний перехід"
-                },
                 "highway/footway/crossing/traffic_signals": {
                     "name": "Пішохідний перехід зі світлофором",
                     "terms": "перехід,світлофор,пішохідний,сигнал,пішохід,рейки,переїзд,залізниця"
@@ -5789,9 +6209,6 @@
                     "name": "Непозначений пішохідний перехід",
                     "terms": "перехід,пішохідний,непозначений,без розмітки"
                 },
-                "highway/footway/crossing/zebra": {
-                    "name": "Позначений пішохідний перехід"
-                },
                 "highway/footway/informal": {
                     "name": "Неофіційний пішохідний маршрут"
                 },
@@ -6445,6 +6862,10 @@
                     "name": "Комунальний сад",
                     "terms": "садівництво,комуна,спільнота,росдлинництво,спільно"
                 },
+                "leisure/garden/residential": {
+                    "name": "Садок біля хати",
+                    "terms": "садок,житло,хата"
+                },
                 "leisure/golf_course": {
                     "name": "Поле для гольфу",
                     "terms": "гольф,поле,гра"