v6.5.0

2026-06-05 14:38:00 +02:00 · 2023-12-15 15:33:04 +01:00
parent 9a623c9990
commit fa503f106d
135 changed files with 11840 additions and 2249 deletions
@@ -23,6 +23,57 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@xxxx]: https://github.com/xxxx
 -->

+# 6.5.0
+##### 2023-Dec-15
+
+#### New Presets
+* Add preset for `memorial=stolperstein` with `memorial:addr` field ([#964], thanks [@tordans])
+* Add presets for `amenity=baking_oven` and `building=bakehouse` ([#975], thanks [@N-45div])
+* Add preset for `man_made=satellite_dish` ([#976], thanks [@N-45div])
+* Add preset for "Unspecified Traffic Sign" ([#984], thanks [@tordans])
+* Add presets for Optical and Radio Telescopes
+* Add Adventure Park preset for `sport=climbing_adventure` ([#1051], thanks [@arch0345])
+* Add preset for `building=riding_hall` ([#1048], thanks [@Hufkratzer])
+* Add preset for `amenity=loading_dock` and corresponding `dock:*` attribute fields ([#1043], thanks [@arch0345])
+* Add Funeral Service Hall preset ([#1045], thanks [@arch0345])
+* Add Switchgear preset ([#1059], thanks [@arch0345])
+#### Changed Presets
+* Drop undocumented/deprecated fields of the `tourism=trail_riding_station` preset
+* Improve equestrian search terms ([#1055], thanks [@Hufkratzer])
+#### New and Changed Fields
+* Add `riding_hall` as an option to the "building type" field
+* Change label of `brewery` field to "Sold Beer Brands" ([#1047], thanks [@mcliquid])
+#### Regional Presets and Fields
+* Use `highway=path` as base tag for Cycle & Foot Path in Israel ([#1058], thanks [@zstadler])
+#### Deprecated Tags
+* Replace `memorial:type=stolperstein` with `memorial=stolperstein` ([#964], thanks [@tordans])
+* Replace `door=loadingdock` with `amenity=loading_dock` ([#1043], thanks [@arch0345])
+#### Bugfixes
+* Allow Log Flume to be mapped as a line ([#980])
+* Fix icons for `fast_food=bagel` and `fast_food=wings` presets ([#1057], thanks [@arch0345])
+* Fix typo `pancake` in tag value for `cuisine` field ([#1063], thanks [@matkoniecz])
+#### Documentation and Other Changes
+* Upgrade to schema-builder v6.4 (which offers slightly enhanced taginfo output)
+
+[#964]: https://github.com/openstreetmap/id-tagging-schema/pull/964
+[#975]: https://github.com/openstreetmap/id-tagging-schema/issues/975
+[#976]: https://github.com/openstreetmap/id-tagging-schema/issues/976
+[#980]: https://github.com/openstreetmap/id-tagging-schema/issues/980
+[#984]: https://github.com/openstreetmap/id-tagging-schema/pull/984
+[#1043]: https://github.com/openstreetmap/id-tagging-schema/pull/1043
+[#1045]: https://github.com/openstreetmap/id-tagging-schema/pull/1045
+[#1047]: https://github.com/openstreetmap/id-tagging-schema/pull/1047
+[#1048]: https://github.com/openstreetmap/id-tagging-schema/pull/1048
+[#1051]: https://github.com/openstreetmap/id-tagging-schema/pull/1051
+[#1055]: https://github.com/openstreetmap/id-tagging-schema/pull/1055
+[#1057]: https://github.com/openstreetmap/id-tagging-schema/pull/1057
+[#1059]: https://github.com/openstreetmap/id-tagging-schema/pull/1059
+[#1063]: https://github.com/openstreetmap/id-tagging-schema/pull/1063
+[@N-45div]: https://github.com/N-45div
+[@mcliquid]: https://github.com/mcliquid
+[@zstadler]: https://github.com/zstadler
+
+
 # 6.4.1
 ##### 2023-Aug-16

@@ -1132,6 +1132,14 @@
            "capacity:disabled": "$1"
        }
    },
+    {
+        "old": {
+            "door": "loadingdock"
+        },
+        "replace": {
+            "amenity": "loading_dock"
+        }
+    },
    {
        "old": {
            "drinkable": "*"
@@ -4043,5 +4051,21 @@
            "man_made": "utility_pole",
            "utility": "telecom"
        }
+    },
+    {
+        "old": {
+            "memorial:type": "stolperstein"
+        },
+        "replace": {
+            "memorial": "stolperstein"
+        }
+    },
+    {
+        "old": {
+            "memorial:text": "*"
+        },
+        "replace": {
+            "inscription": "$1"
+        }
    }
 ]
@@ -972,11 +972,16 @@
        "key": "ruins",
        "type": "combo"
    },
-    "royal_cypher": {
+    "royal_cypher-GB": {
        "key": "royal_cypher",
        "type": "typeCombo",
        "autoSuggestions": false,
        "customValues": false,
+        "locationSet": {
+            "include": [
+                "gb"
+            ]
+        },
        "options": [
            "VR",
            "EVIIR",
@@ -2128,18 +2133,6 @@
        "key": "hot_water",
        "type": "check"
    },
-    "horse_stables": {
-        "key": "amenity",
-        "type": "check",
-        "reference": {
-            "key": "amenity",
-            "value": "stables"
-        },
-        "options": [
-            "undefined",
-            "stables"
-        ]
-    },
    "horse_scale": {
        "key": "horse_scale",
        "type": "combo",
@@ -2166,18 +2159,6 @@
            "horse_riding"
        ]
    },
-    "horse_dressage": {
-        "key": "sport",
-        "type": "check",
-        "reference": {
-            "key": "sport",
-            "value": "equestrian"
-        },
-        "options": [
-            "undefined",
-            "equestrian"
-        ]
-    },
    "hoops": {
        "key": "hoops",
        "type": "number",
@@ -3019,7 +3000,7 @@
            "bubble_tea",
            "hot_dog",
            "cake",
-            "pankcake",
+            "pancake",
            "pasta",
            "salad",
            "chocolate",
@@ -3444,6 +3425,7 @@
            "public",
            "residential",
            "retail",
+            "riding_hall",
            "roof",
            "ruins",
            "school",
@@ -4095,6 +4077,20 @@
            "bucket"
        ]
    },
+    "telescope/type": {
+        "key": "telescope:type",
+        "type": "combo",
+        "icons": {
+            "optical": "temaki-telescope",
+            "radio": "roentgen-telescope-radio"
+        },
+        "autoSuggestions": true,
+        "customValues": true,
+        "options": [
+            "optical",
+            "radio"
+        ]
+    },
    "telecom/medium": {
        "key": "telecom:medium",
        "type": "combo"
@@ -4869,6 +4865,29 @@
            "4"
        ]
    },
+    "memorial/addr_subtags": {
+        "type": "address",
+        "key": "memorial:addr",
+        "keys": [
+            "memorial:addr:city",
+            "memorial:addr:housename",
+            "memorial:addr:housenumber",
+            "memorial:addr:place",
+            "memorial:addr:postcode",
+            "memorial:addr:street"
+        ],
+        "label": "{memorial/addr}",
+        "prerequisiteTag": {
+            "key": "memorial:addr:street"
+        }
+    },
+    "memorial/addr": {
+        "type": "text",
+        "key": "memorial:addr",
+        "prerequisiteTag": {
+            "keyNot": "memorial:addr:street"
+        }
+    },
    "maxspeed/hgv": {
        "key": "maxspeed:hgv",
        "type": "roadspeed"
@@ -5248,6 +5267,26 @@
        "type": "combo",
        "snake_case": false
    },
+    "door/width": {
+        "key": "door:width",
+        "minValue": 0,
+        "type": "number"
+    },
+    "door/height": {
+        "key": "door:height",
+        "minValue": 0,
+        "type": "number"
+    },
+    "dock/width": {
+        "key": "dock:width",
+        "minValue": 0,
+        "type": "number"
+    },
+    "dock/height": {
+        "key": "dock:height",
+        "minValue": 0,
+        "type": "number"
+    },
    "disused/shop": {
        "key": "disused:shop",
        "type": "typeCombo"
@@ -2373,9 +2373,7 @@
        "icon": "maki-horse-riding",
        "fields": [
            "name",
-            "horse_stables",
-            "horse_riding",
-            "horse_dressage"
+            "horse_riding"
        ],
        "moreFields": [
            "{@templates/contact}",
@@ -7048,6 +7046,19 @@
        },
        "matchScore": 1.05
    },
+    "power/switchgear": {
+        "icon": "temaki-power_switch",
+        "fields": [
+            "voltage",
+            "location"
+        ],
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "power": "switchgear"
+        }
+    },
    "power/switch": {
        "icon": "temaki-power_switch",
        "fields": [
@@ -10547,6 +10558,25 @@
            "man_made": "torii"
        }
    },
+    "man_made/telescope": {
+        "icon": "fas-satellite-dish",
+        "fields": [
+            "name",
+            "telescope/type",
+            "operator",
+            "ref"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "telescope"
+        },
+        "reference": {
+            "key": "man_made"
+        }
+    },
    "man_made/tailings_pond": {
        "icon": "maki-water",
        "fields": [
@@ -10660,6 +10690,20 @@
            "man_made": "silo"
        }
    },
+    "man_made/satellite_dish": {
+        "icon": "fas-satellite-dish",
+        "fields": [
+            "operator",
+            "ref"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "satellite_dish"
+        }
+    },
    "man_made/reservoir_covered": {
        "icon": "maki-water",
        "fields": [
@@ -11546,6 +11590,38 @@
            "value": "bell_tower"
        }
    },
+    "man_made/telescope/radio": {
+        "icon": "roentgen-telescope-radio",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "telescope",
+            "telescope:type": "radio"
+        },
+        "reference": {
+            "key": "man_made"
+        }
+    },
+    "man_made/telescope/optical": {
+        "icon": "temaki-telescope",
+        "fields": [
+            "operator",
+            "ref"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "man_made": "telescope",
+            "telescope:type": "optical"
+        },
+        "reference": {
+            "key": "man_made"
+        }
+    },
    "man_made/surveillance/camera": {
        "icon": "temaki-security_camera",
        "geometry": [
@@ -12531,6 +12607,7 @@
        ],
        "moreFields": [
            "{@templates/contact}",
+            "contact/facebook",
            "gnis/feature_id-US",
            "opening_hours",
            "payment_multi"
@@ -13234,6 +13311,24 @@
            "value": "horse_racing"
        }
    },
+    "leisure/sports_centre/climbing_adventure": {
+        "icon": "temaki-abseiling",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "fields": [
+            "{leisure/sports_centre}"
+        ],
+        "tags": {
+            "leisure": "sports_centre",
+            "sport": "climbing_adventure"
+        },
+        "reference": {
+            "key": "sport",
+            "value": "climbing_adventure"
+        }
+    },
    "leisure/sports_centre/climbing": {
        "icon": "temaki-abseiling",
        "geometry": [
@@ -15643,6 +15738,35 @@
            "historic": "archaeological_site"
        }
    },
+    "historic/memorial/stolperstein-EU": {
+        "icon": "temaki-plaque",
+        "fields": [
+            "name",
+            "inscription",
+            "wikidata"
+        ],
+        "moreFields": [
+            "memorial/addr",
+            "memorial/addr_subtags",
+            "subject/wikidata",
+            "image",
+            "wikimedia_commons",
+            "website"
+        ],
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "historic": "memorial",
+            "memorial": "stolperstein"
+        },
+        "locationSet": {
+            "include": [
+                "Q46"
+            ]
+        }
+    },
    "historic/memorial/plaque": {
        "icon": "temaki-plaque",
        "fields": [
@@ -17043,6 +17167,21 @@
            "highway": "bridleway"
        }
    },
+    "highway/traffic_sign": {
+        "icon": "fas-directions",
+        "fields": [
+            "{traffic_sign}"
+        ],
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "highway": "traffic_sign"
+        },
+        "searchable": false,
+        "name": "{traffic_sign}"
+    },
    "highway/bus_stop": {
        "icon": "temaki-bus",
        "fields": [
@@ -17605,7 +17744,9 @@
                "fr",
                "lt",
                "pl",
-                "de"
+                "de",
+                "il",
+                "ps"
            ]
        },
        "icon": "temaki-pedestrian_and_cyclist",
@@ -17759,7 +17900,9 @@
            "exclude": [
                "fr",
                "lt",
-                "pl"
+                "pl",
+                "il",
+                "ps"
            ]
        },
        "icon": "temaki-ped_cyclist_crosswalk",
@@ -19894,6 +20037,16 @@
        },
        "matchScore": 0.5
    },
+    "building/riding_hall": {
+        "icon": "maki-horse-riding",
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "building": "riding_hall"
+        },
+        "matchScore": 0.5
+    },
    "building/retail": {
        "icon": "maki-commercial",
        "fields": [
@@ -20353,6 +20506,16 @@
        },
        "matchScore": 0.5
    },
+    "building/bakehouse": {
+        "icon": "temaki-bread",
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "building": "bakehouse"
+        },
+        "matchScore": 0.5
+    },
    "building/apartments": {
        "icon": "maki-building",
        "fields": [
@@ -21391,6 +21554,7 @@
        ],
        "geometry": [
            "point",
+            "line",
            "area"
        ],
        "tags": {
@@ -22628,7 +22792,9 @@
        "fields": [
            "operator",
            "collection_times",
-            "ref"
+            "ref",
+            "post_box/type-GB",
+            "royal_cypher-GB"
        ],
        "moreFields": [
            "access_simple",
@@ -22655,7 +22821,6 @@
        },
        "locationSet": {
            "exclude": [
-                "gb",
                "us"
            ]
        }
@@ -23186,15 +23351,20 @@
            "ref",
            "operator",
            "access_simple",
-            "door",
-            "width",
-            "height"
+            "door"
        ],
        "moreFields": [
            "address",
+            "dock/height",
+            "dock/width",
+            "door/height",
+            "door/width",
            "colour",
            "level",
            "lit",
+            "maxheight",
+            "maxlength",
+            "maxwidth",
            "wheelchair"
        ],
        "geometry": [
@@ -23596,6 +23766,25 @@
            "amenity": "gambling"
        }
    },
+    "amenity/funeral_hall": {
+        "icon": "maki-cemetery",
+        "fields": [
+            "name",
+            "operator",
+            "address"
+        ],
+        "moreFields": [
+            "religion",
+            "denomination"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "funeral_hall"
+        }
+    },
    "amenity/fuel": {
        "icon": "maki-fuel",
        "fields": [
@@ -24714,6 +24903,23 @@
            "amenity": "bank"
        }
    },
+    "amenity/baking_oven": {
+        "icon": "temaki-bread",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "baking_oven"
+        },
+        "fields": [
+            "covered",
+            "access_simple"
+        ],
+        "moreFields": [
+            "lit"
+        ]
+    },
    "amenity/atm": {
        "icon": "temaki-atm2",
        "fields": [
@@ -26251,31 +26457,6 @@
        },
        "name": "{amenity/post_box}"
    },
-    "amenity/post_box/post_box-GB": {
-        "icon": "temaki-post_box",
-        "locationSet": {
-            "include": [
-                "gb"
-            ]
-        },
-        "fields": [
-            "{amenity/post_box}",
-            "post_box/type-GB",
-            "royal_cypher"
-        ],
-        "moreFields": [
-            "{amenity/post_box}",
-            "drive_through"
-        ],
-        "geometry": [
-            "point",
-            "vertex"
-        ],
-        "tags": {
-            "amenity": "post_box"
-        },
-        "name": "{amenity/post_box}"
-    },
    "amenity/place_of_worship/taoist": {
        "icon": "temaki-taoism",
        "fields": [
@@ -26627,7 +26808,7 @@
        }
    },
    "amenity/fast_food/wings": {
-        "icon": "maki-fast_food",
+        "icon": "maki-fast-food",
        "geometry": [
            "point",
            "area"
@@ -26807,7 +26988,7 @@
        }
    },
    "amenity/fast_food/bagel": {
-        "icon": "maki-fast_food",
+        "icon": "maki-fast-food",
        "geometry": [
            "point",
            "area"
@@ -286,7 +286,7 @@
        },
        {
            "key": "leisure",
-            "description": "🄿 Leisure Feature (unsearchable), 🄵 Type, 🄵 Horseback Riding",
+            "description": "🄿 Leisure Feature (unsearchable), 🄵 Type, 🄵 Horseback Riding Center",
            "object_types": [
                "node",
                "way",
@@ -362,7 +362,7 @@
        },
        {
            "key": "amenity",
-            "description": "🄿 Amenity (unsearchable), 🄵 Riding Stable, 🄵 Type",
+            "description": "🄿 Amenity (unsearchable), 🄵 Type",
            "object_types": [
                "node",
                "way",
@@ -3775,6 +3775,15 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/power_tower.svg"
        },
+        {
+            "key": "power",
+            "value": "switchgear",
+            "description": "🄿 Switchgear",
+            "object_types": [
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/power_switch.svg"
+        },
        {
            "key": "power",
            "value": "switch",
@@ -5888,6 +5897,16 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/shinto.svg"
        },
+        {
+            "key": "man_made",
+            "value": "telescope",
+            "description": "🄿 Telescope",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-satellite-dish.svg"
+        },
        {
            "key": "man_made",
            "value": "tailings_pond",
@@ -5945,6 +5964,16 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/silo.svg"
        },
+        {
+            "key": "man_made",
+            "value": "satellite_dish",
+            "description": "🄿 Satellite Dish",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-satellite-dish.svg"
+        },
        {
            "key": "man_made",
            "value": "reservoir_covered",
@@ -6424,6 +6453,25 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-bell.svg"
        },
+        {
+            "key": "telescope:type",
+            "value": "radio",
+            "description": "🄿 Radio Telescope, 🄵🅅 Type: Radio Telescope",
+            "object_types": [
+                "node",
+                "area"
+            ]
+        },
+        {
+            "key": "telescope:type",
+            "value": "optical",
+            "description": "🄿 Optical Telescope, 🄵🅅 Type: Optical Telescope",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/telescope.svg"
+        },
        {
            "key": "surveillance:type",
            "value": "camera",
@@ -6842,7 +6890,7 @@
        {
            "key": "leisure",
            "value": "horse_riding",
-            "description": "🄿 Horseback Riding Center, 🄵🅅 Horseback Riding: Yes",
+            "description": "🄿 Horseback Riding Center, 🄵🅅 Horseback Riding Center: Yes",
            "object_types": [
                "node",
                "area"
@@ -7189,6 +7237,16 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-crosshairs.svg"
        },
+        {
+            "key": "sport",
+            "value": "climbing_adventure",
+            "description": "🄿 Adventure Park",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/abseiling.svg"
+        },
        {
            "key": "sport",
            "value": "climbing",
@@ -7431,7 +7489,7 @@
        {
            "key": "sport",
            "value": "equestrian",
-            "description": "🄿 Horseback Riding / Rodeo Arena, 🄵🅅 Sports: Equestrian Sports, 🄵🅅 Dressage Riding: Yes",
+            "description": "🄿 Horseback Riding / Rodeo Arena, 🄵🅅 Sports: Equestrian Sports",
            "object_types": [
                "area",
                "node"
@@ -8432,6 +8490,15 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/ruins.svg"
        },
+        {
+            "key": "memorial",
+            "value": "stolperstein",
+            "description": "🄿 Memorial Plaque Stolperstein, 🄵🅅 Type: Stolperstein",
+            "object_types": [
+                "node"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/plaque.svg"
+        },
        {
            "key": "memorial",
            "value": "plaque",
@@ -8905,6 +8972,15 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"
        },
+        {
+            "key": "highway",
+            "value": "traffic_sign",
+            "description": "🄿 Traffic Sign (unsearchable)",
+            "object_types": [
+                "node"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-directions.svg"
+        },
        {
            "key": "highway",
            "value": "bus_stop",
@@ -10480,6 +10556,15 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/ruins.svg"
        },
+        {
+            "key": "building",
+            "value": "riding_hall",
+            "description": "🄿 Indoor Horseback Riding Arena, 🄵🅅 Building: Horseback Riding Arena",
+            "object_types": [
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"
+        },
        {
            "key": "building",
            "value": "retail",
@@ -10813,6 +10898,15 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/barn.svg"
        },
+        {
+            "key": "building",
+            "value": "bakehouse",
+            "description": "🄿 Bakehouse",
+            "object_types": [
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/bread.svg"
+        },
        {
            "key": "building",
            "value": "apartments",
@@ -11431,6 +11525,7 @@
            "description": "🄿 Log Flume, 🄵🅅 Type: Log Flume",
            "object_types": [
                "node",
+                "way",
                "area"
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"
@@ -12336,6 +12431,16 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@develop/svg/fontawesome/fas-coins.svg"
        },
+        {
+            "key": "amenity",
+            "value": "funeral_hall",
+            "description": "🄿 Funeral Service Hall",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"
+        },
        {
            "key": "amenity",
            "value": "fuel",
@@ -12772,6 +12877,16 @@
            ],
            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"
        },
+        {
+            "key": "amenity",
+            "value": "baking_oven",
+            "description": "🄿 Baking Oven",
+            "object_types": [
+                "node",
+                "area"
+            ],
+            "icon_url": "https://cdn.jsdelivr.net/gh/rapideditor/temaki/icons/bread.svg"
+        },
        {
            "key": "amenity",
            "value": "atm",
@@ -13756,7 +13871,7 @@
                "node",
                "area"
            ],
-            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast_food-15.svg"
+            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast-food-15.svg"
        },
        {
            "key": "cuisine",
@@ -13856,7 +13971,7 @@
                "node",
                "area"
            ],
-            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast_food-15.svg"
+            "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast-food-15.svg"
        },
        {
            "key": "cuisine",
@@ -15479,7 +15594,7 @@
        },
        {
            "key": "sport",
-            "description": "🄵 Sports, 🄵 Dressage Riding"
+            "description": "🄵 Sports"
        },
        {
            "key": "sport",
@@ -17075,11 +17190,6 @@
            "value": "stele",
            "description": "🄵🅅 Type: Stele"
        },
-        {
-            "key": "memorial",
-            "value": "stolperstein",
-            "description": "🄵🅅 Type: Stolperstein"
-        },
        {
            "key": "memorial",
            "value": "stone",
@@ -17589,11 +17699,6 @@
            "key": "hot_water",
            "description": "🄵 Hot Water"
        },
-        {
-            "key": "amenity",
-            "value": "stables",
-            "description": "🄵🅅 Riding Stable: Yes"
-        },
        {
            "key": "horse_scale",
            "description": "🄵 Horseback Riding Difficulty"
@@ -18575,7 +18680,7 @@
        },
        {
            "key": "cuisine",
-            "value": "pankcake",
+            "value": "pancake",
            "description": "🄵🅅 Cuisines: Pancake"
        },
        {
@@ -19092,7 +19197,7 @@
        },
        {
            "key": "brewery",
-            "description": "🄵 Draft Beers"
+            "description": "🄵 Sold Beer brands"
        },
        {
            "key": "brand",
@@ -20077,6 +20182,10 @@
            "value": "bucket",
            "description": "🄵🅅 Disposal: Bucket"
        },
+        {
+            "key": "telescope:type",
+            "description": "🄵 Type"
+        },
        {
            "key": "telecom:medium",
            "description": "🄵 Medium"
@@ -21025,6 +21134,34 @@
            "value": "4",
            "description": "🄵🅅 IMBA Trail Difficulty: ◆◆ Extremely Difficult (double black diamond)"
        },
+        {
+            "key": "memorial:addr:city",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr:housename",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr:housenumber",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr:place",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr:postcode",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr:street",
+            "description": "🄵 Nearest Building Address"
+        },
+        {
+            "key": "memorial:addr",
+            "description": "🄵 Nearest Building Address"
+        },
        {
            "key": "maxspeed:hgv",
            "description": "🄵 Truck Speed Limit"
@@ -21694,6 +21831,22 @@
            "key": "fire_hydrant:diameter",
            "description": "🄵 Diameter (mm, in, or letters)"
        },
+        {
+            "key": "door:width",
+            "description": "🄵 Door Width (Meters)"
+        },
+        {
+            "key": "door:height",
+            "description": "🄵 Door Height (Meters)"
+        },
+        {
+            "key": "dock:width",
+            "description": "🄵 Dock Width (Meters)"
+        },
+        {
+            "key": "dock:height",
+            "description": "🄵 Dock Height (Meters)"
+        },
        {
            "key": "diplomatic:services:",
            "description": "🄵 Services"
@@ -22666,6 +22819,11 @@
            "key": "disabled_spaces",
            "description": "🄳 (deprecated tag) ➜ capacity:disabled=*"
        },
+        {
+            "key": "door",
+            "value": "loadingdock",
+            "description": "🄳 (deprecated tag) ➜ amenity=loading_dock"
+        },
        {
            "key": "drinkable",
            "description": "🄳 (deprecated tag) ➜ drinking_water=*"
@@ -24095,6 +24253,15 @@
            "value": "pole",
            "description": "🄳 (deprecated tag) ➜ man_made=utility_pole + utility=telecom"
        },
+        {
+            "key": "memorial:type",
+            "value": "stolperstein",
+            "description": "🄳 (deprecated tag) ➜ memorial=stolperstein"
+        },
+        {
+            "key": "memorial:text",
+            "description": "🄳 (deprecated tag) ➜ inscription=*"
+        },
        {
            "key": "created_by",
            "description": "🄳🄳 (discarded tag)"
@@ -24284,4 +24451,4 @@
            "description": "🄳🄳 (discarded tag)"
        }
    ]
-}
+}
@@ -424,24 +424,12 @@
                "hoops": {
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nee"
-                    }
-                },
                "horse_riding": {
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nee"
                    }
                },
-                "horse_stables": {
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nee"
-                    }
-                },
                "incline": {
                    "label": "Steilte"
                },
@@ -408,9 +408,6 @@
                    "label": "العلامة التجارية",
                    "terms": "العلامة التجارية,الماركة,البراند"
                },
-                "brewery": {
-                    "label": "بيرة برميل"
-                },
                "bridge": {
                    "label": "النوع",
                    "placeholder": "الافتراضي"
@@ -757,7 +754,6 @@
                        "lebanese": "لبناني",
                        "malaysian": "ماليزي",
                        "mexican": "مكسيكي",
-                        "pankcake": "بان كيك (فطيرة مسطحة)",
                        "pasta": "باستا",
                        "pizza": "بيتزا",
                        "polish": "بولندي",
@@ -1361,15 +1357,7 @@
                    "label": "عدد أطواق كرة السلة",
                    "placeholder": "1، 2، 4..."
                },
-                "horse_dressage": {
-                    "label": "ترويض الخيول",
-                    "options": {
-                        "equestrian": "نعم",
-                        "undefined": "لا"
-                    }
-                },
                "horse_riding": {
-                    "label": "ركوب الخيل",
                    "options": {
                        "horse_riding": "نعم",
                        "undefined": "لا"
@@ -1387,13 +1375,6 @@
                    "placeholder": "صعب، خطير...",
                    "terms": "صعوبة ركوب الخيل"
                },
-                "horse_stables": {
-                    "label": "ركوب مستقر",
-                    "options": {
-                        "stables": "نعم",
-                        "undefined": "لا"
-                    }
-                },
                "hot_water": {
                    "label": "المياة الساخنة"
                },
@@ -8,6 +8,9 @@
                "category-building": {
                    "name": "Сгради"
                },
+                "category-golf": {
+                    "name": "Голф обекти"
+                },
                "category-landuse": {
                    "name": "Обекти за земеползване"
                },
@@ -263,9 +266,6 @@
                "brand": {
                    "label": "Търговска марка"
                },
-                "brewery": {
-                    "label": "Наливни бири"
-                },
                "bridge": {
                    "label": "Вид",
                    "placeholder": "По подразбиране"
@@ -404,7 +404,6 @@
                        "korean": "Корейска",
                        "malaysian": "Малоазийска",
                        "mexican": "Мексиканска",
-                        "pankcake": "Палачинки",
                        "pasta": "Паста",
                        "pizza": "Пица",
                        "polish": "Полска",
@@ -1086,7 +1085,7 @@
                    "label": "Път номер"
                },
                "ref_route": {
-                    "label": "Маршрут номер"
+                    "label": "Номер на маршрута"
                },
                "ref_runway": {
                    "label": "Писта номер",
@@ -1152,7 +1151,10 @@
                "service": {
                    "label": "Вид",
                    "options": {
-                        "alley": "Алея"
+                        "alley": "Алея",
+                        "drive-through": "Обслужване, без да напускате автомобила",
+                        "driveway": "Алея за коли към жилище/бизнес",
+                        "parking_aisle": "Паркинг алея"
                    }
                },
                "shelter": {
@@ -1884,6 +1886,9 @@
                "highway/footway/sidewalk": {
                    "name": "Тротоар"
                },
+                "highway/footway/traffic_island": {
+                    "name": "Пешеходен остров"
+                },
                "highway/living_street": {
                    "name": "Улица в жилищна зона"
                },
@@ -1928,16 +1933,16 @@
                    "name": "Тясна уличка между имоти"
                },
                "highway/service/drive-through": {
-                    "name": "Обслужване без напускане на автомобила"
+                    "name": "Обслужване, без да напускате автомобила"
                },
                "highway/service/driveway": {
-                    "name": "Алея за коли към жилище"
+                    "name": "Алея за коли към жилище/бизнес"
                },
                "highway/service/emergency_access": {
                    "name": "За достъп при спешни случаи"
                },
                "highway/service/parking_aisle": {
-                    "name": "Път в паркинг"
+                    "name": "Паркинг алея"
                },
                "highway/speed_camera": {
                    "name": "Камера за скорост"
@@ -2034,17 +2039,18 @@
                },
                "landuse/construction": {
                    "name": "Строителна площадка",
-                    "terms": "сграда,булдозер,строителна площадка,строителна зона,кран,събаряне,развитие,инфраструктура"
+                    "terms": "сграда,булдозер,строителна площадка,строителна зона,кран,събаряне,развитие,инфраструктура,строеж"
                },
                "landuse/farm": {
-                    "name": "Земеделска земя"
+                    "name": "Ферма"
                },
                "landuse/farmland": {
                    "name": "Земеделска земя",
                    "terms": "поле"
                },
                "landuse/farmyard": {
-                    "name": "Селскостопански двор"
+                    "name": "Селскостопански двор",
+                    "terms": "ткзс"
                },
                "landuse/grass": {
                    "name": "Трева"
@@ -2055,6 +2061,10 @@
                "landuse/industrial": {
                    "name": "Индустриална зона"
                },
+                "landuse/industrial/depot": {
+                    "name": "Депо",
+                    "terms": "гараж,автобус,камион,паркинг"
+                },
                "landuse/industrial/scrap_yard": {
                    "name": "Вторични суровини",
                    "terms": "автоморга,скрап"
@@ -2078,9 +2088,15 @@
                "landuse/military/barracks": {
                    "name": "Казарми"
                },
+                "landuse/military/base": {
+                    "name": "Военна база"
+                },
                "landuse/orchard": {
                    "name": "Овощна градина"
                },
+                "landuse/plant_nursery": {
+                    "name": "Разсадник"
+                },
                "landuse/quarry": {
                    "name": "Кариера"
                },
@@ -2289,6 +2305,10 @@
                "natural/tree": {
                    "name": "Дърво"
                },
+                "natural/tree_stump": {
+                    "name": "Пън на дърво",
+                    "terms": "отсечено дърво,премахнато дърво"
+                },
                "natural/volcano": {
                    "name": "Вулкан"
                },
@@ -2525,7 +2545,7 @@
                    "terms": "железопътен сигнал"
                },
                "railway/station": {
-                    "name": "ЖП гара"
+                    "name": "Гара"
                },
                "railway/subway_entrance": {
                    "name": "Вход на метростанция"
@@ -2909,6 +2929,9 @@
                "type/route": {
                    "name": "Маршрут"
                },
+                "type/route/bicycle": {
+                    "name": "Велосипеден маршрут"
+                },
                "type/route/bus": {
                    "name": "Автобусен маршрут"
                },
@@ -2922,21 +2945,30 @@
                "type/route/foot": {
                    "name": "Пешеходен маршрут"
                },
+                "type/route/light_rail": {
+                    "name": "Маршрут на леко метро"
+                },
                "type/route/pipeline": {
                    "name": "Трасе на тръбопровод"
                },
                "type/route/power": {
                    "name": "Трасе на електропровод"
                },
+                "type/route/railway": {
+                    "name": "Маршрут на железопътна линия"
+                },
                "type/route/road": {
                    "name": "Път"
                },
                "type/route/train": {
-                    "name": "Железопътен маршрут"
+                    "name": "Маршрут на влак"
                },
                "type/route/tram": {
                    "name": "Трамваен маршрут"
                },
+                "type/route/trolleybus": {
+                    "name": "Тролейбусен маршрут"
+                },
                "type/route_master": {
                    "name": "Маршрутна схема"
                },
@@ -491,6 +491,7 @@
                        "public": "Savadur foran",
                        "residential": "Savadur annez",
                        "retail": "Savadur kenwerzhel",
+                        "riding_hall": "Aren marc'hegezh",
                        "roof": "Toenn",
                        "ruins": "Dismantroù",
                        "school": "Skol",
@@ -731,6 +732,7 @@
                        "boatbuilder": "Saver-bigi",
                        "bookbinder": "Koubler-levrioù",
                        "brewery": "Breserezh",
+                        "builder": "Mañsoner",
                        "carpenter": "Kalvez",
                        "caterer": "Tineller pretiour",
                        "chimney_sweeper": "Skarzher-siminalioù",
@@ -814,7 +816,7 @@
                "crossing": {
                    "label": "Seurt",
                    "options": {
-                        "traffic_signals": "Treuzenn gant gouleier panellerezh"
+                        "traffic_signals": "Treuzenn gant gouleier triliv"
                    }
                },
                "crossing/barrier": {
@@ -882,7 +884,7 @@
                        "lebanese": "Libanat",
                        "malaysian": "Malezianat",
                        "mexican": "Mec'hikan",
-                        "pankcake": "Krampouezh",
+                        "pancake": "Krampouezh",
                        "pasta": "Toazennoù",
                        "peruvian": "Perouat",
                        "pizza": "Pizza",
@@ -1052,6 +1054,14 @@
                "dock": {
                    "label": "Seurt"
                },
+                "dock/height": {
+                    "label": "Uhelder a c'hae (metroù)",
+                    "terms": "kar,uhelded,uhelder,uhelder ar c'hae,uhelded ar c'hae"
+                },
+                "dock/width": {
+                    "label": "Ledander ar c'hae (metroù)",
+                    "terms": "ledander ar c'hae,ledanded ar c'hae,ledanded,ledander,kae"
+                },
                "dog": {
                    "label": "Chas",
                    "options": {
@@ -1063,6 +1073,14 @@
                "door": {
                    "label": "Dor"
                },
+                "door/height": {
+                    "label": "Uhelder an nor (metroù)",
+                    "terms": "uhelder an nor,uhelded an nor"
+                },
+                "door/width": {
+                    "label": "Ledander an nor (metroù)",
+                    "terms": "ledander an nor,ledanded an nor,led an nor"
+                },
                "door_type": {
                    "label": "Seurt"
                },
@@ -1093,9 +1111,10 @@
                    "label": "Tredanañ",
                    "options": {
                        "no": "Ket",
+                        "rail": "Railhoù tredanet",
                        "yes": "Ya (n'eo ket spisaet)"
                    },
-                    "terms": "tredan,tredanadur,tredanañ"
+                    "terms": "tredan,tredanadur,tredanañ,elektrisite,elektrifiet"
                },
                "email": {
                    "label": "Chomlec'h postel",
@@ -1544,14 +1563,8 @@
                "hoops": {
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Ya",
-                        "undefined": "Ket"
-                    }
-                },
                "horse_riding": {
-                    "label": "Marc'hegezh",
+                    "label": "Kreizenn varc'hegezh",
                    "options": {
                        "horse_riding": "Ya",
                        "undefined": "Ket"
@@ -1563,13 +1576,6 @@
                    },
                    "placeholder": "Diaes, dañjerus"
                },
-                "horse_stables": {
-                    "label": "Kaou-kezeg",
-                    "options": {
-                        "stables": "Ya",
-                        "undefined": "Ket"
-                    }
-                },
                "hot_water": {
                    "label": "Dour zomm"
                },
@@ -1642,7 +1648,7 @@
                },
                "kitchen": {
                    "label": "Kegin",
-                    "terms": "kegin"
+                    "terms": "kegin,kuizin"
                },
                "kneipp_water_cure_multi": {
                    "label": "Seurt oglennoù"
@@ -1762,12 +1768,22 @@
                "marker": {
                    "label": "Seurt",
                    "options": {
+                        "aerial": {
+                            "description": "Graet evit bout gwelet diouzh an neñv.",
+                            "title": "Aerel"
+                        },
+                        "ground": {
+                            "title": "Leur"
+                        },
                        "pedestal": {
                            "title": "Sichenn"
                        },
                        "plate": {
                            "title": "Plakenn"
                        },
+                        "post": {
+                            "title": "Peul"
+                        },
                        "stone": {
                            "title": "Maen"
                        }
@@ -1855,6 +1871,10 @@
                        "war_memorial": "Kounlec'h brezel"
                    }
                },
+                "memorial/addr": {
+                    "label": "Chomlec'h tostañ",
+                    "terms": "chomlec'h tostañ,chomlec'h,tostañ,nesañ"
+                },
                "message": {
                    "label": "Kemennad",
                    "terms": "kemenn,kemennad,kemennadenn,evezhiadenn,enskrivadenn,enskrivadur,engravadur,engravadenn,testenn"
@@ -2488,7 +2508,7 @@
                "route_master": {
                    "label": "Seurt"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Lizherennoù roueel",
                    "options": {
                        "CIIIR": "CIIIR (Charlez III)",
@@ -2993,6 +3013,13 @@
                        "data_center": "Kreizenn roadennoù"
                    }
                },
+                "telescope/type": {
+                    "label": "Seurt",
+                    "options": {
+                        "optical": "Teleskop optikel",
+                        "radio": "Radioteleskop"
+                    }
+                },
                "tents": {
                    "label": "Teltennoù"
                },
@@ -3449,6 +3476,10 @@
                    "name": "Bilhedaouer",
                    "terms": "atm,dasparzher,arc'hant,argant,ingaler,emgefre,emgefreek"
                },
+                "amenity/baking_oven": {
+                    "name": "Forn dre geuneud",
+                    "terms": "forn dre geuneud,forn,fornigell,poazhañ,pobañ,forn koad,forn dre goad,keuneud"
+                },
                "amenity/bank": {
                    "name": "Ti-bank",
                    "terms": "ti-bank,arc'hanti,bank"
@@ -3761,6 +3792,10 @@
                "amenity/fuel": {
                    "name": "Porzh Servij"
                },
+                "amenity/funeral_hall": {
+                    "name": "Funerariom",
+                    "terms": "funerariom"
+                },
                "amenity/grave_yard": {
                    "name": "Bered"
                },
@@ -4443,6 +4478,10 @@
                    "name": "Kendi",
                    "terms": "ranndi,kendi,tiez,tioù,savadur"
                },
+                "building/bakehouse": {
+                    "name": "Forn-vara",
+                    "terms": "forn,bara,forn-vara,forn vara"
+                },
                "building/boathouse": {
                    "name": "Karrdi ar bigi",
                    "terms": "karrdi ar bigi,karrdi ar bagoù,hangar,bag,bagoù,bigi,sanailh,lab,skiber"
@@ -4571,6 +4610,10 @@
                    "name": "Savadur kenwerzhel",
                    "terms": "kenwerzh,koñvers,ti,savadur"
                },
+                "building/riding_hall": {
+                    "name": "Aren marc'hegezh diabarzh",
+                    "terms": "aren marc'hegezh diabarzh,aren,leur,stadion,marc'hegezh,marc'hegerezh,diabarzh"
+                },
                "building/roof": {
                    "name": "Toenn",
                    "terms": "to,toenn"
@@ -4732,7 +4775,7 @@
                },
                "craft/joiner": {
                    "name": "Kalvez",
-                    "terms": "kalvez,kilvizien"
+                    "terms": "kalvez,kilvizien,prenestrer,munuzer,kilvizerezh,munuzerezh,amunuzerezh,junter"
                },
                "craft/key_cutter": {
                    "name": "Alc'hwezer",
@@ -4834,7 +4877,7 @@
                },
                "craft/winery": {
                    "name": "Kav-gwin",
-                    "terms": "kav-gwin,keller,selier,kav"
+                    "terms": "kav-gwin,keller,selier,kav,gwin,chistr,sistr"
                },
                "demolished/building": {
                    "name": "Savadur nevez-distrujet"
@@ -5030,13 +5073,20 @@
                    "terms": "o sevel,sevel,savidigezh,labourioù,labour,konstruidigezh,ober,obererezh,war ober,oc'h ober,o vezañ savet,o vezañ krouet,hent,gourhent,hent-tizh,straed,ru,banell,alez,bali,boulouard"
                },
                "highway/crossing": {
-                    "terms": "treuzenn,kerzhourien,kerzhet,kerzherien"
+                    "name": "Treuzenn gerzhourien",
+                    "terms": "treuzenn,kerzhourien,kerzhet,kerzherien,gerzhourien,gerzhet,gerzherien"
+                },
+                "highway/crossing/traffic_signals": {
+                    "name": "Treuzenn gerzhourien gant gouleier heñchañ",
+                    "terms": "treuzenn,kerzhourien,kerzhet,kerzherien,gerzhourien,gerzhet,gerzherien,gouloù,triliv,panellerezh,gouleier,heñchañ"
                },
                "highway/crossing/uncontrolled": {
-                    "terms": "treuzenn,merket,livet"
+                    "name": "Treuzenn livet",
+                    "terms": "treuzenn,merket,livet,treuzenn gerzhourien"
                },
                "highway/crossing/unmarked": {
-                    "name": "Treuzenn n'eo ket livet"
+                    "name": "Treuzenn ha n'eo ket livet",
+                    "terms": "treuzenn n'eo ket livet,treuzenn,merket,livet,treuzenn gerzhourien,n'eo ket livet,diliv,nann-livet,nann merket,n'eo ket merket"
                },
                "highway/cycleway": {
                    "name": "Hent marc'hoù-houarn",
@@ -5046,8 +5096,24 @@
                    "name": "Gwenodenn-vale ha marc'h-houarn",
                    "terms": "war-droad,war varc'h-houarn,marc'h-houarn,gwenodenn-vale,hent bale"
                },
+                "highway/cycleway/crossing": {
+                    "name": "Treuzenn marc'hoù-houarn"
+                },
+                "highway/cycleway/crossing/bicycle_foot": {
+                    "name": "Treuzenn evit kerzhourien ha beloioù",
+                    "terms": "treuzenn evit kerzhourien ha beloioù,treuzenn,treuzenn gerzhourien,gerzhourien,kerzhourien,marc'hoù-houarn,marc'h-houarn,varc'hoù-houarn,varc'h-houarn,belo,velo,beloioù,veloioù"
+                },
+                "highway/cycleway/crossing/traffic_signals": {
+                    "name": "Treuzenn marc'hoù-houarn gant gouleier heñchañ",
+                    "terms": "treuzenn marc'hoù-houarn gant gouleier heñchañ,treuzenn,marc'h-houarn,marc'hoù-houarn,gouloù,gouleier,triliv,heñchañ,panellerezh,belo,velo,beloioù,varc'h-houarn,varc'hoù-houarn"
+                },
+                "highway/cycleway/crossing/uncontrolled": {
+                    "name": "Treuzenn marc'h-houarn livet",
+                    "terms": "treuzenn livet,treuzenn,merket,livet,marc'hoù-houarn,marc'h-houarn,varc'hoù-houarn,varc'h-houarn,belo,velo,beloioù,veloioù"
+                },
                "highway/cycleway/crossing/unmarked": {
-                    "name": "Treuzenn marc'h-houarn n'eo ket livet"
+                    "name": "Treuzenn marc'h-houarn n'eo ket livet",
+                    "terms": "treuzenn marc'h-houarn n'eo ket livet"
                },
                "highway/elevator": {
                    "name": "Pignerez",
@@ -5065,15 +5131,20 @@
                    "terms": "tapis-ruilh"
                },
                "highway/footway/crossing": {
-                    "name": "Treuzenn kerzhourien",
-                    "terms": "treuzenn,treuzenn kerzhourien"
+                    "name": "Treuzenn gerzhourien",
+                    "terms": "treuzenn,treuzenn gerzhourien,kerzhourien,tud war droad"
+                },
+                "highway/footway/crossing/traffic_signals": {
+                    "name": "Treuzenn gerzhourien gant gouleier heñchañ",
+                    "terms": "treuzenn,kerzhourien,kerzhet,kerzherien,gerzhourien,gerzhet,gerzherien,gouloù,triliv,panellerezh,gouleier,heñchañ"
                },
                "highway/footway/crossing/uncontrolled": {
                    "name": "Treuzenn gerzherien livet",
                    "terms": "merket,livet,treuzenn,kerzhourien"
                },
                "highway/footway/crossing/unmarked": {
-                    "name": "Treuzenn n'eo ket livet"
+                    "name": "Treuzenn n'eo ket livet",
+                    "terms": "treuzenn n'eo ket livet,treuzenn,merket,livet,treuzenn gerzhourien,n'eo ket livet,diliv,nann-livet,nann merket,n'eo ket merket"
                },
                "highway/footway/informal": {
                    "name": "Gwenodenn gerzhet anfurmel"
@@ -5303,6 +5374,10 @@
                    "name": "Plakenn-goun",
                    "terms": "koun,plakenn,plakenn goun,meuliñ,lidañ"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Plakenn-goun Stolpersteine",
+                    "terms": "plakenn-goun stolpersteine,stolpersteine,plakenn-eñvor,plakenn-vemor,plakenn,koun"
+                },
                "historic/monument": {
                    "name": "Monumant",
                    "terms": "monumant"
@@ -5398,7 +5473,7 @@
                },
                "landuse/education": {
                    "name": "Takad deskadurezh",
-                    "terms": "takad,kampus,skol,skolaj,lise,skol-veur,deskadurezh,deskiñ"
+                    "terms": "takad,kampus,skol,skolaj,lise,skol-veur,deskadurezh,deskiñ,kelenn"
                },
                "landuse/farm": {
                    "name": "Takad labour-douar"
@@ -5782,6 +5857,10 @@
                "leisure/sports_centre/climbing": {
                    "name": "Sal-krapañ"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Park avantur",
+                    "terms": "park avantur,park,avantur,park avanturioù,avanturioù,park troioù-kaer,troioù-kaer"
+                },
                "leisure/sports_centre/shooting": {
                    "name": "Kreizenn-dennañ"
                },
@@ -5984,6 +6063,10 @@
                    "name": "Kae",
                    "terms": "kae"
                },
+                "man_made/satellite_dish": {
+                    "name": "Stign loarel",
+                    "terms": "stign,loarel,satelit,gwern"
+                },
                "man_made/silo": {
                    "name": "Silo"
                },
@@ -6015,6 +6098,18 @@
                    "name": "Kamera-evezhiañ",
                    "terms": "kamera,evezhiañ,evezh,diwall,eveshaat,plediñ,surentez,merañ,webcam,video,fiñvskeudenner,gwarez,anaoudegezh,marilh,cctv"
                },
+                "man_made/telescope": {
+                    "name": "Teleskop",
+                    "terms": "teleskop,pellseller"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Teleskop optikel",
+                    "terms": "optik,optikel,teleskop,pellseller"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radioteleskop",
+                    "terms": "radioteleskop,teleskop,pellseller,radio,skin"
+                },
                "man_made/tower": {
                    "name": "Tour",
                    "terms": "tour,savadur,skraber-oabl"
@@ -6155,8 +6250,8 @@
                    "terms": "fank,pri,bouilhenn,morfont,kailhar"
                },
                "natural/peak": {
-                    "name": "Kern",
-                    "terms": "lein,beg"
+                    "name": "Lein",
+                    "terms": "lein,beg,bre,menez,blein,kern,penn"
                },
                "natural/peninsula": {
                    "name": "Gourenez",
@@ -6337,7 +6432,7 @@
                },
                "office/educational_institution": {
                    "name": "Kreizenn stummañ",
-                    "terms": "kreizenn,stummañ,deskadurezh,ensavadur"
+                    "terms": "kreizenn,stummañ,deskadurezh,ensavadur,kelenn,deskiñ,skol"
                },
                "office/employment_agency": {
                    "name": "Ajañs implijout",
@@ -6681,11 +6776,11 @@
                },
                "public_transport/platform/trolleybus": {
                    "name": "Kae trolleybus",
-                    "terms": "kae trolleybus,savenn,arsav"
+                    "terms": "kae trolleybus,savenn,arsav,trollebus"
                },
                "public_transport/platform/trolleybus_point": {
                    "name": "Arsav trolleybus",
-                    "terms": "trolleybus,savenn,arsav,ehan"
+                    "terms": "trolleybus,savenn,arsav,ehan,trollebus"
                },
                "public_transport/platform_point": {
                    "name": "Arsav / kae treuzdougen foran",
@@ -6720,31 +6815,44 @@
                    "terms": "arsav,ehan,tram,tramgarr"
                },
                "public_transport/station_trolleybus": {
-                    "name": "Arsav-dibenn trolleybus"
+                    "name": "Arsav-dibenn trolleybus",
+                    "terms": "arsav-dibenn trolleybus,arsav,ehan,dibenn,terminus,fin,trolleybus,trollebus"
+                },
+                "public_transport/stop_area": {
+                    "name": "Takad arsav",
+                    "terms": "takad,arsav,arsaviñ,ehan,lec'h"
                },
                "public_transport/stop_position_bus": {
-                    "name": "Lec'h ma'z ehan ar bus"
+                    "name": "Lec'h ma'z ehan ar bus",
+                    "terms": "lec'h ma'z ehan ar bus,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_ferry": {
-                    "name": "Lec'h ma'z arsav ar ferry"
+                    "name": "Lec'h ma'z arsav ar ferry",
+                    "terms": "lec'h ma'z arsav ar ferry,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_light_rail": {
-                    "name": "Lec'h ma'z ehan ar metro skañv"
+                    "name": "Lec'h ma'z ehan ar metro skañv",
+                    "terms": "lec'h ma'z ehan ar metro skañv,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_monorail": {
-                    "name": "Lec'h ma'z ehan an unroudenn"
+                    "name": "Lec'h ma'z ehan an unroudenn",
+                    "terms": "lec'h ma'z ehan an unroudenn,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_subway": {
-                    "name": "Lec'h ma'z ehan ar metro"
+                    "name": "Lec'h ma'z ehan ar metro",
+                    "terms": "lec'h ma'z ehan ar metro,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_train": {
-                    "name": "Lec'h ma'z ehan an tren"
+                    "name": "Lec'h ma'z ehan an tren",
+                    "terms": "lec'h ma'z ehan an tren,lec'h-ehan,lec'h-arsav,arsav,tren"
                },
                "public_transport/stop_position_tram": {
-                    "name": "Lec'h ma'z ehan an tramgarr"
+                    "name": "Lec'h ma'z ehan an tramgarr",
+                    "terms": "lec'h ma'z ehan an tramgarr,lec'h-ehan,lec'h-arsav,arsav"
                },
                "public_transport/stop_position_trolleybus": {
-                    "name": "Lec'h ma'z ehan an trolleybus"
+                    "name": "Lec'h ma'z ehan an trolleybus",
+                    "terms": "lec'h ma'z ehan an trolleybus,lec'h-ehan,lec'h-arsav,arsav"
                },
                "railway": {
                    "name": "Elfenn hent-houarn"
@@ -6762,7 +6870,8 @@
                    "terms": "o sevel,sevel,savidigezh,labourioù,labour,konstruidigezh,ober,obererezh,war ober,oc'h ober,o vezañ savet,o vezañ krouet,hent-houarn,tren,karr-houarn,hentoù-houarn,porzh-houarn,gar,ti-gar"
                },
                "railway/crossing": {
-                    "name": "Kroashent-houarn"
+                    "name": "Kroashent-houarn",
+                    "terms": "kroashent-houarn"
                },
                "railway/disused": {
                    "name": "Hent-houarn dilezet",
@@ -6775,12 +6884,17 @@
                "railway/halt": {
                    "name": "Ti-gar (arsav diwar c'houlenn)"
                },
+                "railway/level_crossing": {
+                    "name": "Kroashent-houarn",
+                    "terms": "kroashent-houarn"
+                },
                "railway/light_rail": {
                    "name": "Forzh metro skañv",
                    "terms": "forzh,hent,hentad,hent-houarn,tren,tram,tramgarr,metro,metro-skañv"
                },
                "railway/milestone": {
-                    "name": "Maen-bonn tren"
+                    "name": "Maen-bonn tren",
+                    "terms": "maen-bonn tren"
                },
                "railway/miniature": {
                    "name": "Hent trenig bihan",
@@ -6794,7 +6908,8 @@
                    "name": "Kae ti-gar"
                },
                "railway/preserved": {
-                    "name": "Hent-houarn touristel"
+                    "name": "Hent-houarn touristel",
+                    "terms": "hent-houarn touristel"
                },
                "railway/rail": {
                    "name": "Hent-houarn",
@@ -6812,7 +6927,8 @@
                    "terms": "forzh,hent,hentad,hent-houarn,tren-buzhug,dindandouar,metro"
                },
                "railway/subway_entrance": {
-                    "name": "Moned metro"
+                    "name": "Moned metro",
+                    "terms": "moned metro"
                },
                "railway/train_wash": {
                    "name": "Porzh gwalc'hiñ trenioù",
@@ -6849,6 +6965,10 @@
                    "name": "Stal",
                    "terms": "stal,stalioù,magazenn,marc'had,gourmarc'had,gourstal,adstal,gwerzhañ,prenañ,gwerzher,pratik,embregerezh,staliaoua,prenadenn,aradenn"
                },
+                "shop/agrarian": {
+                    "name": "Stal dafar labour-douar",
+                    "terms": "stal dafar labour-douar"
+                },
                "shop/alcohol": {
                    "name": "Stal alkool",
                    "terms": "alkool,bier,gwin,sistr,chistr,vodka,evaj kreñv,hini kreñv,likor,korev,koreñv"
@@ -6861,23 +6981,32 @@
                    "terms": "hendraour"
                },
                "shop/appliance": {
-                    "name": "Stal mekanikoù tredan"
+                    "name": "Stal mekanikoù tredan",
+                    "terms": "stal mekanikoù tredan,mekanikoù,ardivinkoù"
                },
                "shop/art": {
-                    "name": "Stal-arz"
+                    "name": "Stal-arz",
+                    "terms": "stal-arz,arz,stal arz"
+                },
+                "shop/bag": {
+                    "name": "Stal malizennoù ha seier",
+                    "terms": "stal malizennoù ha seier,sac'h,seier,malizenn,stal valizennoù"
                },
                "shop/bakery": {
                    "name": "Bouloñjerezh",
                    "terms": "pastezerezh,baraerdi,baraerezh,ti-bara,stal-vara,bouloñjeri,poberezh"
                },
                "shop/bathroom_furnishing": {
-                    "name": "Stal dafar sal-gibellañ"
+                    "name": "Stal dafar sal-gibellañ",
+                    "terms": "stal dafar sal-gibellañ"
                },
                "shop/beauty": {
-                    "name": "Kenederezh"
+                    "name": "Kenederezh",
+                    "terms": "kenederezh,stal gened,kened,stal-gened"
                },
                "shop/bed": {
-                    "name": "Stal dafar gwele"
+                    "name": "Stal dafar gwele",
+                    "terms": "stal dafar gwele,gweleoù,gwele,matarasenn,stal vatarasennoù,matarasennoù"
                },
                "shop/beverages": {
                    "name": "Stal-evajoù",
@@ -6899,7 +7028,8 @@
                    "name": "Stalig"
                },
                "shop/butcher": {
-                    "name": "Kigerezh"
+                    "name": "Kigerezh",
+                    "terms": "kigerezh,kiger,kigerez,stal-gig"
                },
                "shop/camera": {
                    "name": "Stal dafar luc'hskeudennerezh"
@@ -6909,7 +7039,8 @@
                    "terms": "boujienn,goulaouenn-goar,goulaouenn,koar,kantol-elfenniñ,kantol,enaouell,bouji,gouloù-koar"
                },
                "shop/cannabis": {
-                    "name": "Stal ganabiz"
+                    "name": "Stal ganabiz",
+                    "terms": "stal ganabiz,kanabiz,kanab,ganab,stal ganab"
                },
                "shop/car": {
                    "name": "Gwerzher kirri",
@@ -7063,7 +7194,12 @@
                    "name": "Marc'hadour frouezh ha legumaj"
                },
                "shop/hairdresser": {
-                    "name": "Perukenner"
+                    "name": "Perukenner",
+                    "terms": "perukenner,ficher,ficherez,blev,ficher-blev,ficherez-vlev,peruker,troc'her,troc'herez,troc'her-blev,troc'herez-vlev,barver,perukerezh,perukennerezh"
+                },
+                "shop/hairdresser_supply": {
+                    "name": "Stal dafar perukenner",
+                    "terms": "perukenner,ficher,ficherez,blev,ficher-blev,ficherez-vlev,peruker,troc'her,troc'herez,troc'her-blev,troc'herez-vlev,barver,perukerezh,perukennerezh,stal dafar perukenner,kribañ,gribañ,fichañ"
                },
                "shop/hardware": {
                    "name": "Kinkailherezh"
@@ -7094,7 +7230,8 @@
                    "name": "Kiosk"
                },
                "shop/kitchen": {
-                    "name": "Stal-gegin"
+                    "name": "Stal keginoù",
+                    "terms": "kegin,stal-gegin,stal kegin,stal geginoù,stal,keginoù,keginañ,kuizin,kuizinoù,dafar keginañ"
                },
                "shop/laundry": {
                    "name": "Kanndi",
@@ -7335,8 +7472,8 @@
                    "terms": "stal perukennoù"
                },
                "shop/wine": {
-                    "name": "Kav-gwin",
-                    "terms": "kav-gwin,stal win,gwin,alkool,chistr,sistr,bier,korev"
+                    "name": "Stal gwin",
+                    "terms": "kav-gwin,stal win,gwin,alkool,chistr,sistr,bier,korev,stal-gwin,kav gwin"
                },
                "shop/yes": {
                    "name": "Stal (n'eo ket spisaet)"
@@ -535,10 +535,6 @@
                    "label": "Marca",
                    "terms": "marca"
                },
-                "brewery": {
-                    "label": "Cervesa de barril / tirada",
-                    "terms": "cervesa de barril,cervesa tirada"
-                },
                "bridge": {
                    "label": "Tipus",
                    "placeholder": "Predeterminat"
@@ -1060,7 +1056,6 @@
                        "lebanese": "Libanesa",
                        "malaysian": "Malàisia",
                        "mexican": "Mexicana",
-                        "pankcake": "Crep americana",
                        "pasta": "Pasta",
                        "peruvian": "Peruà",
                        "pizza": "Pizza",
@@ -1911,15 +1906,7 @@
                    "label": "Cistella de basquetbol",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Doma clàssica",
-                    "options": {
-                        "equestrian": "Sí",
-                        "undefined": "No"
-                    }
-                },
                "horse_riding": {
-                    "label": "Equitació",
                    "options": {
                        "horse_riding": "Sí",
                        "undefined": "No"
@@ -1938,13 +1925,6 @@
                    "placeholder": "Difícil, perillós...",
                    "terms": "dificultat per a muntar a cavall,difucultat de l'equitació"
                },
-                "horse_stables": {
-                    "label": "Hípica",
-                    "options": {
-                        "stables": "Sí",
-                        "undefined": "No"
-                    }
-                },
                "hot_water": {
                    "label": "Aigua calenta"
                },
@@ -3029,20 +3009,6 @@
                "route_master": {
                    "label": "Tipus"
                },
-                "royal_cypher": {
-                    "label": " Insígnia reial",
-                    "options": {
-                        "CIIIR": "CIIIR (Carles III)",
-                        "EIIR": "EIIR (Elisabet II)",
-                        "EVIIIR": "EVIIIR (Eduard VIII)",
-                        "EVIIR": "EVIIR (Eduard VII)",
-                        "GR": "GR (Jordi V)",
-                        "GVIR": "GVIR (Jordi VI)",
-                        "VR": "VR (Victòria)",
-                        "no": "No",
-                        "scottish_crown": "Corona escocesa"
-                    }
-                },
                "ruins": {
                    "label": "Tipus"
                },
@@ -4096,7 +4062,8 @@
                    "terms": "lloguer de cotxes,servei de lloguer de turismes"
                },
                "amenity/car_sharing": {
-                    "name": "Estació de cotxes compartits"
+                    "name": "Estació de cotxes compartits",
+                    "terms": "punt de càrrega,estació de càrrega,càrrega,cotxe elèctric,vehicle elèctric,elèctric,cotxe,vehicle,zero emissions"
                },
                "amenity/car_wash": {
                    "name": "Rentat de cotxes",
@@ -4721,6 +4688,9 @@
                "amenity/theatre/type/amphi": {
                    "name": "Amfiteatre"
                },
+                "amenity/ticket_validator": {
+                    "name": "Validador de bitllets"
+                },
                "amenity/toilets": {
                    "name": "lavabo",
                    "terms": "lavabos,serveis,lavabos públics,w.c"
@@ -5457,6 +5427,9 @@
                "emergency/siren": {
                    "name": "Sirena"
                },
+                "emergency/water_reservoir_covered": {
+                    "name": "Dipòsit d'aigua d'emergència (subterrani)"
+                },
                "emergency/water_tank": {
                    "name": "Dipòsit d'aigua d'emergència",
                    "terms": "tanc d'aigua,cisterna,dipòsit"
@@ -5950,7 +5923,8 @@
                    "name": "Port"
                },
                "landuse/industrial": {
-                    "name": "Zona Industrial"
+                    "name": "Zona Industrial",
+                    "terms": "polígon,polígon industrial,industrial,fàbrica,empresa,comerç,manufactura,dipòsit"
                },
                "landuse/industrial/scrap_yard": {
                    "name": "Desballestador de vehicles"
@@ -7488,6 +7462,9 @@
                "shop/dairy": {
                    "name": "Botiga de productes làctics"
                },
+                "shop/deli": {
+                    "name": "Delicadeses"
+                },
                "shop/department_store": {
                    "name": "Grans magatzems"
                },
@@ -452,9 +452,9 @@
                        "building": "V budově",
                        "handlebar_holder": "Držák na řídítka",
                        "lockers": "Individuální skříňky",
-                        "shed": "Uzavřená bouda",
+                        "shed": "Uzavřený přístřešek",
                        "stands": "Stojan (podpírá rám jízdního kola)",
-                        "wall_loops": "Držák kol (podpírá pouze kolo)"
+                        "wall_loops": "Držák ráfku (drží pouze přední kolo)"
                    }
                },
                "bicycle_road": {
@@ -537,8 +537,8 @@
                    "terms": "značka,firma,logo,provozovatel,majitel"
                },
                "brewery": {
-                    "label": "Točená piva",
-                    "terms": "minipivovar,malý pivovar,pivo,pivovar,místní,lokální,speciální pivo"
+                    "label": "Prodávané značky piva",
+                    "terms": "značka piva,výčep piva,lahvové pivo,točené pivo,točené,čepované pivo"
                },
                "bridge": {
                    "label": "Typ",
@@ -599,6 +599,7 @@
                        "public": "Veřejná budova",
                        "residential": "Obytná budova",
                        "retail": "Budova s obchody",
+                        "riding_hall": "Jezdecká aréna",
                        "roof": "Střecha",
                        "ruins": "Zřícená budova",
                        "school": "Budova školy",
@@ -1062,7 +1063,7 @@
                        "lebanese": "Libanonská",
                        "malaysian": "Malajská",
                        "mexican": "Mexická",
-                        "pankcake": "Lívance",
+                        "pancake": "Lívance",
                        "pasta": "Těstoviny",
                        "peruvian": "Peruánská",
                        "pizza": "Pizza",
@@ -1309,6 +1310,14 @@
                        "tidal": "Ponorný přílivový dok"
                    }
                },
+                "dock/height": {
+                    "label": "Výška doku (metry)",
+                    "terms": "výška v metrech,rozměr doku,dok,výška,rozměr,velikost,metr,velikost doku"
+                },
+                "dock/width": {
+                    "label": "Šířka doku (metry)",
+                    "terms": "šířka v metrech,rozměr doku,dok,šířka,rozměr,velikost,metr,velikost doku"
+                },
                "dog": {
                    "label": "Psi",
                    "options": {
@@ -1321,6 +1330,14 @@
                "door": {
                    "label": "Dveře"
                },
+                "door/height": {
+                    "label": "Výška dveří (metry)",
+                    "terms": "výška v metrech,rozměr dveří,dveře,výška,rozměr,velikost,metr,velikost dveří"
+                },
+                "door/width": {
+                    "label": "Šířka dveří (metry)",
+                    "terms": "šířka v metrech,rozměr dveří,dveře,šířka,rozměr,velikost,metr,velikost dveří"
+                },
                "door_type": {
                    "label": "Typ"
                },
@@ -1670,7 +1687,7 @@
                    "label": "Výška výtrysku"
                },
                "gnis/feature_id-US": {
-                    "label": "Identifikační číslo prvku GNIS",
+                    "label": "ID prvku GNIS",
                    "terms": "informační služba o federálních zeměpisných názvech,deska spojených států pro zeměpisná jména,usa"
                },
                "government": {
@@ -1923,15 +1940,8 @@
                    "label": "Počet košů",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Drezura",
-                    "options": {
-                        "equestrian": "Ano",
-                        "undefined": "Ne"
-                    }
-                },
                "horse_riding": {
-                    "label": "Jízda na koni",
+                    "label": "Jezdecké centrum",
                    "options": {
                        "horse_riding": "Ano",
                        "undefined": "Ne"
@@ -1950,13 +1960,6 @@
                    "placeholder": "Obtížné, nebezpečné…",
                    "terms": "koně,obtížnost,jízda na koni,náročnost,kůň,koňská,jezdec,jezdectví"
                },
-                "horse_stables": {
-                    "label": "Jezdecká stáj",
-                    "options": {
-                        "stables": "Ano",
-                        "undefined": "Ne"
-                    }
-                },
                "hot_water": {
                    "label": "Horká voda"
                },
@@ -2209,7 +2212,33 @@
                    "terms": "id,identifikace,číslo obrázku,kód,označení,značka,mapillary,obrázek,fotografie,fotka,zdroj"
                },
                "marker": {
-                    "label": "Typ"
+                    "label": "Typ",
+                    "options": {
+                        "aerial": {
+                            "description": "Navržené tak, aby bylo viditelné ze vzduchu.",
+                            "title": "Letecká"
+                        },
+                        "ground": {
+                            "description": "Plochý označník položený na zemi.",
+                            "title": "Země"
+                        },
+                        "pedestal": {
+                            "description": "Vyvýšená značka na malém podstavci.",
+                            "title": "Podstavec"
+                        },
+                        "plate": {
+                            "description": "Plochá značka namontovaná přímo na stěnu nebo podobně.",
+                            "title": "Deska"
+                        },
+                        "post": {
+                            "description": "Vyvýšená značka umístěná na malém sloupku nebo stožáru.",
+                            "title": "Pošta"
+                        },
+                        "stone": {
+                            "description": "Značky vyryté nebo namalované přímo na kameni.",
+                            "title": "Kámen"
+                        }
+                    }
                },
                "material": {
                    "label": "Materiál",
@@ -2302,6 +2331,9 @@
                        "war_memorial": "Památník na válku"
                    }
                },
+                "memorial/addr": {
+                    "label": "Adresa nejbližší budovy"
+                },
                "message": {
                    "label": "Zpráva",
                    "terms": "textovka,sms,smska,psaní,textová zpráva,dopis"
@@ -2311,7 +2343,14 @@
                    "terms": "mini pivovar,mini-pivovar,malý pivovar,drobný pivovar,místní pivovar,vaření piva,pivo,lokální"
                },
                "military_service": {
-                    "label": "Vojenská služba"
+                    "label": "Vojenská služba",
+                    "options": {
+                        "air_force": "Letectvo",
+                        "army": "Armáda",
+                        "coast_guard": "Pobřežní hlídka",
+                        "marines": "Námořní pěchota",
+                        "navy": "Válečné loďstvo"
+                    }
                },
                "mimics": {
                    "label": "Kamuflovaný vysílač",
@@ -3113,7 +3152,7 @@
                "route_master": {
                    "label": "Typ"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Královská šifra",
                    "options": {
                        "CIIIR": "CIIIR (Karel III.)",
@@ -3322,7 +3361,7 @@
                    "terms": "druh vlečky,určení,železnice,místní dráha,užití,účel,typ,dráhy,drážní,popis,vedlejší,obslužná"
                },
                "service_times": {
-                    "label": "Provozní doba"
+                    "label": "Čas služeb/bohoslužeb:"
                },
                "shelter": {
                    "label": "Přístřešek"
@@ -3526,7 +3565,7 @@
                    "terms": "hodnocení"
                },
                "start_date": {
-                    "label": "Datum počátku existence",
+                    "label": "Datum vzniku",
                    "placeholder": "RRRR-MM-DD",
                    "terms": "počátek"
                },
@@ -3655,7 +3694,7 @@
                        "compacted": "Zhutněný",
                        "concrete": "Beton",
                        "dirt": "Hlína",
-                        "fine_gravel": "Jemný štěrk;",
+                        "fine_gravel": "Jemný štěrk",
                        "grass": "Tráva",
                        "gravel": "Štěrk",
                        "ground": "Země",
@@ -3793,6 +3832,13 @@
                "telecom/medium": {
                    "label": "Materiál"
                },
+                "telescope/type": {
+                    "label": "Typ",
+                    "options": {
+                        "optical": "Optický teleskop",
+                        "radio": "Radiový teleskop"
+                    }
+                },
                "tents": {
                    "label": "Stany"
                },
@@ -4228,7 +4274,7 @@
                    "terms": "vikidata,data wikipedie,zdroj dat,automatický výpis informací,podrobnosti,automatizace,wiki"
                },
                "wikimedia_commons": {
-                    "label": "Stránka Wikimedia Commons",
+                    "label": "Wikimedia Commons",
                    "placeholder": "Soubor:Příklad.jpg",
                    "terms": "reference,wikimedia,commons,wiki,odkaz,zdroj,média,obraz,foto,propojení"
                },
@@ -4433,6 +4479,10 @@
                    "name": "Bankomat",
                    "terms": "peníze,hotovost,automat"
                },
+                "amenity/baking_oven": {
+                    "name": "Pečící trouba",
+                    "terms": "pekárna,úlová pec,chléb,hliněná pec,horno,zednická pec,tabunová pec,pec na pizzu"
+                },
                "amenity/bank": {
                    "name": "Banka",
                    "terms": "šek,vklad,fond,investice,úložiště,rezerva,trezor,úspory,akcie,pokladna,důvěra,sejf"
@@ -4834,7 +4884,11 @@
                },
                "amenity/fuel": {
                    "name": "Čerpací stanice",
-                    "terms": "benzínka,palivo,benzín,propan,nafta,lng,cng,bionafta"
+                    "terms": "benzínová pumpa,benzínka,palivo,pohonné hmoty,benzín,propan,nafta,lng,cng,bionafta"
+                },
+                "amenity/funeral_hall": {
+                    "name": "Síň pohřební služby",
+                    "terms": "pohřební obřad,pohřební síň"
                },
                "amenity/gambling": {
                    "name": "Místo pro hazard",
@@ -5131,8 +5185,8 @@
                    "terms": "láhev,plechovka,skládka,sklo,odpad,odpadky,šrot,odpadní"
                },
                "amenity/recycling_container": {
-                    "name": "Odpadkový koš",
-                    "terms": "koš,plechovka,láhev,sklo,odpad,odpadky,šrot,odpadní"
+                    "name": "Kontejner na tříděný odpad",
+                    "terms": "recyklacni kontejner,koš,plechovka,láhev,sklo,odpad,odpadky,šrot,odpadní"
                },
                "amenity/refugee_site": {
                    "name": "Uprchlický tábor",
@@ -5836,6 +5890,10 @@
                    "name": "Budova s byty",
                    "terms": "bytová budova,panelový dům,činžový dům,panelák,činžák,apartmány"
                },
+                "building/bakehouse": {
+                    "name": "Pekárna",
+                    "terms": "pekařství,pečivo,chléb,pekař"
+                },
                "building/barn": {
                    "name": "Stodola",
                    "terms": "kůlna,seník,sýpka"
@@ -6000,6 +6058,10 @@
                    "name": "Budova s obchody",
                    "terms": "obchodní budova,nákupní budova"
                },
+                "building/riding_hall": {
+                    "name": "Krytá jezdecká aréna",
+                    "terms": "aréna jezdectví,jezdecká krytá aréna,jízda na koni,krytá aréna,krytý kruh,halová jízda,longeingová hala"
+                },
                "building/roof": {
                    "name": "Střecha",
                    "terms": "přístřešek,čekárna,pumpa,benzinka,benzínka"
@@ -6516,7 +6578,8 @@
                    "terms": "akupunktura,antroposofická,aplikovaná kineziologie,aromaterapie,ajurvéda,bylinkářství,homeopatie,hydroterapie,hypnóza,naturopatie,osteopatie,reflexní terapie,reiki,shiatsu,tradiční,tuina,unani'"
                },
                "healthcare/alternative/acupuncture": {
-                    "name": "Akupunkturní praktik"
+                    "name": "Akupunkturní praktik",
+                    "terms": "léčitel akupunkturou"
                },
                "healthcare/alternative/ayurveda": {
                    "name": "Praktik ájurvédy",
@@ -6687,8 +6750,8 @@
                    "terms": "lanová dráha"
                },
                "highway/emergency_access_point": {
-                    "name": "Místo vjezdu záchranných vozidel",
-                    "terms": "záchrana,pohotovost,nouzová značka,jilm"
+                    "name": "Bod záchrany",
+                    "terms": "bod zachrany,nouzové číslo,nouzove cislo,záchrana,zachrana,pohotovost,nouzová značka,jilm"
                },
                "highway/emergency_bay": {
                    "name": "Místo nouzového zastavení",
@@ -6742,7 +6805,8 @@
                    "terms": "dej přednost v jízdě,dej přednost,značka přednosti v jízdě,vedlejší silnice,vedlejší ulice"
                },
                "highway/living_street": {
-                    "name": "Obytná zóna"
+                    "name": "Obytná zóna",
+                    "terms": "obytná zóna,obytná ulice"
                },
                "highway/milestone": {
                    "name": "Milník dálnice",
@@ -6851,7 +6915,8 @@
                    "name": "Nouzový vjezd"
                },
                "highway/service/parking_aisle": {
-                    "name": "Parkovací ulička"
+                    "name": "Parkovací ulička",
+                    "terms": "parkovací ulička,ulička pro parkování"
                },
                "highway/service_area": {
                    "name": "Zpevněná účelová plocha"
@@ -6982,6 +7047,9 @@
                    "name": "Pamětní deska",
                    "terms": "dedikační,epitaf,historická značka,pamatovat,vzpomínka,paměť"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Kameny zmizelých"
+                },
                "historic/monument": {
                    "name": "Monument",
                    "terms": "pamětihodnost,památník,pomník,hrdina"
@@ -7636,6 +7704,10 @@
                    "name": "Lezecká stěna",
                    "terms": "slaňování,umělá lezecká stěna,jištění,bouldering,horolezecké zařízení,vnitřní skalní stěna,slaňovat,skalní tělocvična,lana"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Dobrodružný park",
+                    "terms": "překážková dráha,lezení na laně,lanová dráha,lanový skluz"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Kurz jízdy na koni",
                    "terms": "jezdecká dostihová dráha,cval,sázení na dostihy,dostihy,dostihové,sázky,dostihová dráha,jezdecká dráha"
@@ -7928,7 +8000,7 @@
                    "name": "Plantážník"
                },
                "man_made/pumping_station": {
-                    "name": "Čerpací stanice",
+                    "name": "Přečerpávací stanice",
                    "terms": "přečerpávací stanice,benzín,motorest,pohonné hmoty,nafta"
                },
                "man_made/quay": {
@@ -7939,6 +8011,10 @@
                    "name": "Krytá vodní nádrž",
                    "terms": "podzemní nádrž,vodní nádrž,krytá nádrž,rezervoár"
                },
+                "man_made/satellite_dish": {
+                    "name": "Parabolická anténa",
+                    "terms": "pevná satelitní parabola,motorizovaná satelitní parabola,satelitní anténa,satelitní komunikace,sledování satelitní paraboly"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "silo,zásobník,silážní,sýpka,špýchar,špejchar"
@@ -7991,6 +8067,17 @@
                    "name": "Odkaliště",
                    "terms": "těžba,separace,kejda"
                },
+                "man_made/telescope": {
+                    "name": "Teleskop"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Optický teleskop",
+                    "terms": "refrakční dalekohled,odrazný dalekohled"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radiový teleskop",
+                    "terms": "pozemní stanice,rádiová parabola,rádiová anténa"
+                },
                "man_made/torii": {
                    "name": "Torii (šintoistická brána)",
                    "terms": "japonská brána,šintoistická svatyně"
@@ -8909,6 +8996,9 @@
                    "name": "Odpojovač",
                    "terms": "spínač,vypínač"
                },
+                "power/switchgear": {
+                    "name": "Spínače"
+                },
                "power/tower": {
                    "name": "Elektrický stožár",
                    "terms": "sloup vysokého napětí,vysoké napětí"
@@ -9320,7 +9410,8 @@
                    "terms": "sázková kancelář,sázky,sázení,kurzové sázení,bookmaker,sazka,tipsport,fortuna"
                },
                "shop/books": {
-                    "name": "Knihkupectví"
+                    "name": "Knihkupectví",
+                    "terms": "koníček"
                },
                "shop/boutique": {
                    "name": "Módní butik"
@@ -9538,7 +9629,7 @@
                },
                "shop/funeral_directors": {
                    "name": "Pohřební služba",
-                    "terms": "pohřební služba,pohřebák,hřbitovní služby,hřbitovní služba,hrobař"
+                    "terms": "pohřebák,hřbitovní služby,hřbitovní služba,hrobař"
                },
                "shop/furniture": {
                    "name": "Nábytek",
@@ -10224,19 +10315,24 @@
                    "terms": "odbočování vpravo,odbočit vpravo,odbočení vpravo,zatočit vpravo,zatočení vpravo"
                },
                "type/restriction/no_straight_on": {
-                    "name": "Zákaz jízdy vpřed"
+                    "name": "Zákaz jízdy vpřed",
+                    "terms": "zákaz jízdy rovně,zákaz jízdy přímo,zakázáno jet rovně,zakázáno jet přímo,přikázaný směr jízdy vlevo a vpravo,přikázaný směr jízdy vpravo a vlevo,přikázáno odbočit,přikázáno odbočení"
                },
                "type/restriction/no_u_turn": {
-                    "name": "Zákaz otáčení"
+                    "name": "Zákaz otáčení",
+                    "terms": "zákaz otáčení,zakázáno otáčení,zákaz otočení,zakázáno otočení,otáčení zakázáno,otočení zakázáno,neotáčet se"
                },
                "type/restriction/only_left_turn": {
-                    "name": "Pouze odbočení doleva"
+                    "name": "Pouze odbočení doleva",
+                    "terms": "přikázaný směr jízdy doleva,přikázaný směr jízdy vlevo,příkaz jet doleva,jen vlevo,jen doleva,pouze vlevo,pouze doleva"
                },
                "type/restriction/only_right_turn": {
-                    "name": "Pouze odbočování doprava"
+                    "name": "Pouze odbočování doprava",
+                    "terms": "přikázaný směr jízdy doprava,přikázaný směr jízdy vpravo,příkaz jet doprava,jen vpravo,jen doprava,pouze vpravo,pouze doprava"
                },
                "type/restriction/only_straight_on": {
-                    "name": "Pouze jízda vpřed"
+                    "name": "Pouze jízda vpřed",
+                    "terms": "přikázaný směr jízdy rovně,přikázaný směr jízdy přímo,příkaz jet rovně,jen přímo,jen rovně,pouze přímo,pouze rovně"
                },
                "type/restriction/only_u_turn": {
                    "name": "Pouze otáčení"
@@ -242,6 +242,7 @@
                },
                "archaeological_site": {
                    "options": {
+                        "baths": "Bade",
                        "city": "Historisk by",
                        "enclosure": "Indhegning",
                        "fortification": "Befæstning",
@@ -281,6 +282,7 @@
                    "terms": "op,klatre,stigning,vandre,vandring"
                },
                "athletics_pitch": {
+                    "label": "Begivenhed",
                    "options": {
                        "hammer_throw": "Hammerkast",
                        "high_jump": "Højdespring",
@@ -368,9 +370,12 @@
                        "height_restrictor": "Højdebegrænser",
                        "jersey_barrier": "Betongris",
                        "kerb": "Kantsten",
+                        "lift_gate": "Bomled",
                        "retaining_wall": "Støttemur",
                        "stile": "Stente",
-                        "toll_booth": "Betalingsanlæg"
+                        "toll_booth": "Betalingsanlæg",
+                        "turnstile": "Drejekors",
+                        "wall": "Mur"
                    }
                },
                "barrier_planter": {
@@ -381,7 +386,10 @@
                    }
                },
                "basin": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "evaporation": "Fordampning"
+                    }
                },
                "bath/open_air": {
                    "label": "Friluftsbad"
@@ -390,7 +398,10 @@
                    "label": "Mudderbad"
                },
                "bath/type": {
-                    "label": "Specialitet"
+                    "label": "Specialitet",
+                    "options": {
+                        "lake": "Sø"
+                    }
                },
                "beauty": {
                    "label": "Skønhedsspecialitet",
@@ -492,10 +503,6 @@
                    "label": "Varemærke",
                    "terms": "mærke,varemærke,kæde"
                },
-                "brewery": {
-                    "label": "Fadøl",
-                    "terms": "fad,fustage"
-                },
                "bridge": {
                    "label": "Type",
                    "placeholder": "Standard"
@@ -848,7 +855,6 @@
                        "lebanese": "Lebanesisk",
                        "malaysian": "Malaysisk",
                        "mexican": "Mexikansk",
-                        "pankcake": "Pandekage",
                        "polish": "Polsk",
                        "portuguese": "Portugisisk",
                        "russian": "Russisk",
@@ -1358,7 +1364,28 @@
                    "placeholder": "#eksempel"
                },
                "healthcare": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "alternative": "Alternativ medicin",
+                        "audiologist": "Audiolog",
+                        "birthing_centre": "Fødselscenter",
+                        "blood_bank": "Blodbank",
+                        "blood_donation": "Bloddonationscenter",
+                        "clinic": "Klink",
+                        "counselling": "Rådgivningscenter",
+                        "dentist": "Tandlæge",
+                        "dialysis": "Dialysecenter",
+                        "doctor": "Læge",
+                        "midwife": "Jordmoder",
+                        "nurse": "Sygeplejer",
+                        "pharmacy": "Apotek",
+                        "physiotherapist": "Fysioterapeut",
+                        "podiatrist": "Fodterapeut",
+                        "psychotherapist": "Psykoterapeut",
+                        "rehabilitation": "Rehabiliteting",
+                        "speech_therapist": "Taleterapeut",
+                        "vaccination_centre": "Vaccinatinoscenter"
+                    }
                },
                "healthcare/speciality": {
                    "label": "Specialer",
@@ -1368,15 +1395,61 @@
                        "allergology": "Allergi og astma",
                        "anaesthetics": "Anæstesiologi",
                        "angiology": "Angiologi",
+                        "applied_kinesiology": "Kinesiologi",
+                        "aromatherapy": "Aromaterapi",
+                        "behavior": "Adfærdsterapi",
                        "biochemistry": "Biokemi",
                        "biology": "Biologi",
                        "blood_check": "Blodprøve",
+                        "body": "Kropsterapi",
+                        "cardiology": "Kardiologi",
                        "child_psychiatry": "Børne- og Ungepsykiatri",
+                        "chiropractic": "Kiropraktik",
+                        "clinical_pathology": "Klinisk patologi",
+                        "community": "Fællesskab og offentlig sundhed",
+                        "depth": "Dybdepsykologi",
+                        "dermatology": "Dermatologi",
+                        "diagnostic_radiology": "Diagnostisk radiologi",
+                        "emergency": "Akutmedicin",
+                        "endocrinology": "Endokrinologi",
+                        "fertility": "Fertilitet",
+                        "gastroenterology": "Gastroenterologi",
+                        "general": "Praktiserende læge",
+                        "geriatrics": "Ældremedicin",
+                        "gynaecology": "Obstetrik & gynækologi",
+                        "haematology": "Hematologi",
                        "homeopathy": "Homøopati",
+                        "hypnosis": "Hypnose",
+                        "infectious_diseases": "Infektionssygdomme",
+                        "intensive": "Intensiv pleje",
+                        "neonatology": "Neonatalogi",
+                        "neurology": "Neurologi",
+                        "neuropsychiatry": "Neuropsykiatri",
+                        "neurosurgery": "Neurokirurgi",
+                        "nuclear": "Nuklearmedicin",
+                        "oncology": "Onkologi",
                        "osteopathy": "Osteopati",
+                        "otolaryngology": "Øre, næse & hals",
+                        "paediatric_surgery": "Pædiatrisk kirurgi",
+                        "paediatrics": "Pædiatrisk",
+                        "palliative": "Palliativ pleje",
+                        "pathology": "Patologi",
                        "plastic_surgery": "Plastikkirurgi",
+                        "podiatry": "Podiatri",
+                        "psychiatry": "Psykiatri",
+                        "radiology": "Radiologi",
+                        "radiotherapy": "Radioterapi",
+                        "reflexology": "Zoneterapi",
+                        "rheumatology": "Reumatologi",
+                        "surgery": "Almenkirurgi",
+                        "systemic": "Systemisk terapi",
+                        "traditional_chinese_medicine": "Traditionel kinesisk medicin",
+                        "transplant": "Transplantationskirurgi",
                        "trauma": "Traumekirurgi",
-                        "vaccination": "Vaccination"
+                        "tropical": "Tropisk medicin",
+                        "urology": "Urologi",
+                        "vaccination": "Vaccination",
+                        "vascular_surgery": "Vaskulær kirurgi"
                    }
                },
                "heating": {
@@ -1443,15 +1516,7 @@
                    "label": "Kurve",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Dressurridning",
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nej"
-                    }
-                },
                "horse_riding": {
-                    "label": "Ridning",
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nej"
@@ -1469,13 +1534,6 @@
                    "placeholder": "Svær, Farlig...",
                    "terms": "sværhedsgrad,grad,svær"
                },
-                "horse_stables": {
-                    "label": "Ridestald",
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nej"
-                    }
-                },
                "hot_water": {
                    "label": "Varmt vand"
                },
@@ -1599,10 +1657,10 @@
                    "label": "Bladcyklus",
                    "options": {
                        "deciduous": "Løvfældende",
-                        "evergreen": "Stedsegrønt",
+                        "evergreen": "Stedsegrøn",
                        "mixed": "Blandet",
                        "semi_deciduous": "Delvist løvfældende",
-                        "semi_evergreen": "Delvist stedsegrønt"
+                        "semi_evergreen": "Delvist stedsegrøn"
                    }
                },
                "leaf_type": {
@@ -1875,6 +1933,7 @@
                        "government": "Regeringskontor",
                        "graphic_design": "Kontor for grafisk design",
                        "religion": "Religiøst kontor",
+                        "surveyor": "Landinspektørs kontor",
                        "union": "Fagforeningskontor"
                    }
                },
@@ -2154,6 +2213,9 @@
                        "forward": "Forlæns"
                    }
                },
+                "ramp": {
+                    "label": "Indbygget rampe"
+                },
                "recycling_accepts": {
                    "label": "Accepterer",
                    "options": {
@@ -2277,11 +2339,6 @@
                "route_master": {
                    "label": "Type"
                },
-                "royal_cypher": {
-                    "options": {
-                        "no": "Nej"
-                    }
-                },
                "ruins": {
                    "label": "Type"
                },
@@ -2487,7 +2544,10 @@
                    "label": "Type"
                },
                "social_facility_for": {
-                    "label": "Serviceret gruppe"
+                    "label": "Serviceret gruppe",
+                    "options": {
+                        "mental_health": "Mennesker med mentale helbredsproblemer"
+                    }
                },
                "source": {
                    "label": "Kilder",
@@ -2555,7 +2615,7 @@
                    "options": {
                        "bridge": "Bro",
                        "cutting": "Forsænkning",
-                        "embankment": "Forhøjning til tog, vej",
+                        "embankment": "Forhøjning / vejdæmning",
                        "ford": "Vadested",
                        "tunnel": "Tunnel"
                    },
@@ -2989,8 +3049,12 @@
                    "terms": "opslagstavle,tavle"
                },
                "advertising/column": {
-                    "name": "Reklamesøjle",
-                    "terms": "søjle,reklame,marketing,skilt,plakat"
+                    "name": "Plakatsøjle",
+                    "terms": "plakatsøjle,reklamesøjle,søjle,reklame,marketing,skilt,plakat"
+                },
+                "advertising/poster_box": {
+                    "name": "Plakatstander",
+                    "terms": "plakatstander,reklamestander,reklameboks"
                },
                "advertising/totem": {
                    "name": "Reklame-totem",
@@ -3548,7 +3612,7 @@
                },
                "amenity/prison": {
                    "name": "Fængselsområde",
-                    "terms": "fængselsgrund,fængselsområde"
+                    "terms": "fængselsgrund,arrest,fængselsområde"
                },
                "amenity/pub": {
                    "name": "Værtshus",
@@ -3590,8 +3654,8 @@
                    "name": "Flygtningelejr"
                },
                "amenity/research_institute": {
-                    "name": "Forskningsinstitutsområde",
-                    "terms": "forskning,institut,universitet,udvikling,videnskab"
+                    "name": "Forskningscenter",
+                    "terms": "forskning,forskningsinstitutsområde,institut,universitet,udvikling,videnskab"
                },
                "amenity/restaurant": {
                    "name": "Restaurant",
@@ -3637,7 +3701,8 @@
                    "name": "Fiskerestaurant"
                },
                "amenity/restaurant/steakhouse": {
-                    "name": "Steakhouse"
+                    "name": "Steakhouse",
+                    "terms": "bøfhus"
                },
                "amenity/restaurant/sushi": {
                    "name": "Sushi restaurant"
@@ -3959,6 +4024,10 @@
                    "name": "Grænsekontrol",
                    "terms": "grænsekontrol,landegrænsekontrol"
                },
+                "barrier/bump_gate": {
+                    "name": "Skubbeled",
+                    "terms": "skubbeled,skubbeport,skubbelåge,led,port"
+                },
                "barrier/bus_trap": {
                    "name": "Bussluse"
                },
@@ -3992,6 +4061,9 @@
                    "name": "Rækværk",
                    "terms": "rækværk,gelænder,hegn"
                },
+                "barrier/full-height_turnstile": {
+                    "name": "Drejekors i fuld højde"
+                },
                "barrier/gate": {
                    "name": "Led/låge",
                    "terms": "led,låge,havelåge,port,åbning,indgang,udgang"
@@ -3999,6 +4071,10 @@
                "barrier/guard_rail": {
                    "name": "Rækværk"
                },
+                "barrier/hampshire_gate": {
+                    "name": "Trådhegnsled",
+                    "terms": "trådhegnsled,trådlåge,trådhegnsåbning,led,port"
+                },
                "barrier/handrail": {
                    "name": "Gelænder"
                },
@@ -4034,6 +4110,10 @@
                    "name": "Dyrefoldslåge",
                    "terms": "dyrefoldsport,låge,dyr,fold,dyrefold"
                },
+                "barrier/lift_gate": {
+                    "name": "Bombarriere",
+                    "terms": "bombarriere,bom,barriere,afspærring,blokering"
+                },
                "barrier/retaining_wall": {
                    "name": "Støttemur",
                    "terms": "støttemur"
@@ -4054,9 +4134,17 @@
                    "name": "Betalingsanlæg",
                    "terms": "betalingsanlæg,vejafgifthus"
                },
+                "barrier/turnstile": {
+                    "name": "Drejekors",
+                    "terms": "drejekors,adgangskors,entrékors,adgangsbarriere,passagekors,drejespærrer"
+                },
                "barrier/wall": {
                    "name": "Mur"
                },
+                "barrier/wicket_gate": {
+                    "name": "Portlåge",
+                    "terms": "portlåge,portled,låge,port"
+                },
                "barrier/yes": {
                    "name": "Barriere (uspecificeret type)"
                },
@@ -4519,14 +4607,14 @@
                    "name": "Lukket forretning"
                },
                "embankment": {
-                    "name": "Forhøjning til tog, vej"
+                    "name": "Forhøjning / vejdæmning"
                },
                "emergency": {
                    "name": "Nødhjælpsegenskaber"
                },
                "emergency/ambulance_station": {
-                    "name": "Udrykningsstation",
-                    "terms": "ambulancestation,falckstation"
+                    "name": "Ambulancestation",
+                    "terms": "ambulancestation,falckstation,udrykningsstation"
                },
                "emergency/assembly_point": {
                    "name": "Samlingssted ved nødsituationer",
@@ -4554,6 +4642,9 @@
                    "name": "Brandhane",
                    "terms": "brandhane"
                },
+                "emergency/fire_service_inlet": {
+                    "name": "Stigrør"
+                },
                "emergency/first_aid_kit": {
                    "name": "Førstehjælpsudstyr",
                    "terms": "førstehjælpsudstyr,førstehjælpskasse"
@@ -4801,6 +4892,9 @@
                "highway/footway/crossing": {
                    "name": "Fodgængerfelt"
                },
+                "highway/footway/crossing/traffic_signals": {
+                    "name": "Fodgængerovergang med lyssignal"
+                },
                "highway/footway/crossing/uncontrolled": {
                    "name": "Markeret overgang",
                    "terms": "markeret overgang,fodgængerovergang,fodgængerfelt"
@@ -4957,6 +5051,10 @@
                    "name": "Trafiksignal",
                    "terms": "trafiksignal,lyskryds,lyskurv"
                },
+                "highway/trailhead": {
+                    "name": "Sporstart",
+                    "terms": "sporstart,sporhoved,stistart,stihoved,sti,spor"
+                },
                "highway/trunk": {
                    "name": "Motortrafikvej",
                    "terms": "motortrafikvej"
@@ -5101,6 +5199,9 @@
                "landuse/basin": {
                    "name": "Bassin"
                },
+                "landuse/brownfield": {
+                    "terms": "byggefelt,byggegrund"
+                },
                "landuse/cemetery": {
                    "name": "Gravplads",
                    "terms": "gravplads,kirkegård,begravelsesplads"
@@ -5146,6 +5247,9 @@
                    "name": "Græs",
                    "terms": "græs"
                },
+                "landuse/greenfield": {
+                    "terms": "byggegrund,udstykning"
+                },
                "landuse/harbour": {
                    "name": "Havn",
                    "terms": "havn"
@@ -5181,11 +5285,15 @@
                    "terms": "barakker,militærbarakker"
                },
                "landuse/military/base": {
-                    "name": "Militærbase"
+                    "name": "Militærbase",
+                    "terms": "militærbase,militæranlæg,base,flådebase,flådestation,marinestation,flådehavn"
                },
                "landuse/military/base/navy": {
                    "name": "Flådebase"
                },
+                "landuse/military/danger_area": {
+                    "name": "Militært fareområde"
+                },
                "landuse/military/obstacle_course": {
                    "name": "Militær forhindringsbane"
                },
@@ -5242,6 +5350,9 @@
                    "name": "Vintersportsområde",
                    "terms": "ski,snowboard,vinter,ferie,rekreation,bakke,løjpe,kælk,sne"
                },
+                "leisure": {
+                    "name": "Rekreativt element"
+                },
                "leisure/adult_gaming_centre": {
                    "name": "Voksen spillecenter",
                    "terms": "voksen spillecenter,spillehal"
@@ -5513,7 +5624,8 @@
                    "terms": "swimmingpool,svømmepool"
                },
                "leisure/sports_hall": {
-                    "name": "Fitness"
+                    "name": "Idrætshal",
+                    "terms": "idrætshal,sportshal,tennishal,gymnastiksal"
                },
                "leisure/stadium": {
                    "name": "Stadion",
@@ -5631,7 +5743,8 @@
                    "terms": "dige,vold,dæmning"
                },
                "man_made/embankment": {
-                    "name": "Forhøjning til tog, vej"
+                    "name": "Forhøjning / vejdæmning",
+                    "terms": "forhøjning,vejdæmning,vold"
                },
                "man_made/flagpole": {
                    "name": "Flagstang",
@@ -5698,6 +5811,9 @@
                "man_made/mast/lighting": {
                    "name": "Lysmast"
                },
+                "man_made/mineshaft": {
+                    "name": "Mineskakt"
+                },
                "man_made/monitoring_station": {
                    "name": "Overvågningsstation"
                },
@@ -5849,6 +5965,12 @@
                    "name": "Militær kontrolpost",
                    "terms": "militær,kontrol,check,vagt,krig,luftværn,base,hær"
                },
+                "military/office": {
+                    "name": "Militærkontor"
+                },
+                "military/trench": {
+                    "name": "Skyttegrav"
+                },
                "natural": {
                    "name": "Naturligt element"
                },
@@ -5892,12 +6014,12 @@
                    "terms": "gletsjer,isbræ"
                },
                "natural/grassland": {
-                    "name": "Overdrev eller græshede",
+                    "name": "Overdrev eller græsland",
                    "terms": "overdrev,græshede,græsslette,græsland,slette"
                },
                "natural/heath": {
                    "name": "Hede",
-                    "terms": "hede"
+                    "terms": "hede,hedeland,hedeslette,hedeflade,lynghede,lyng"
                },
                "natural/hot_spring": {
                    "name": "Varm kilde",
@@ -5963,6 +6085,18 @@
                    "name": "Træ",
                    "terms": "træ"
                },
+                "natural/tree/broadleaved": {
+                    "name": "Løvtræ"
+                },
+                "natural/tree/broadleaved/deciduous": {
+                    "name": "Løvtræ (løvfældende)"
+                },
+                "natural/tree/broadleaved/evergreen": {
+                    "name": "Løvtræ (stedsegrøn)"
+                },
+                "natural/tree/needleleaved/evergreen": {
+                    "name": "Nåletræ (stedsegrøn)"
+                },
                "natural/tree_row": {
                    "name": "Trærække/læhegn",
                    "terms": "trærække,læhegn"
@@ -6049,7 +6183,7 @@
                },
                "natural/wood": {
                    "name": "Naturskov",
-                    "terms": "skov,træ,træer,natur,urørt"
+                    "terms": "skov,træ,træer,natur,urørt,jungle"
                },
                "noexit/yes": {
                    "name": "Ingen udvej",
@@ -6215,7 +6349,7 @@
                    "terms": "forskning"
                },
                "office/surveyor": {
-                    "name": "Undersøgelse eller kontor"
+                    "name": "Landinspektørs kontor"
                },
                "office/tax_advisor": {
                    "name": "Skatterådgivningskontor",
@@ -6938,6 +7072,10 @@
                "shop/hobby": {
                    "name": "Hobbybutik"
                },
+                "shop/honey": {
+                    "name": "Honningbutik",
+                    "terms": "honningbutik,honningsalg"
+                },
                "shop/houseware": {
                    "name": "Køkkenudstyr",
                    "terms": "køkkenudstyr"
@@ -6996,6 +7134,9 @@
                    "name": "Håndkøbsmedicinforhandler",
                    "terms": "håndkøbsmedicinforhandler"
                },
+                "shop/military_surplus": {
+                    "name": "Militær overskudslager"
+                },
                "shop/mobile_phone": {
                    "name": "Mobiltelefonforhandler",
                    "terms": "mobiltelefonforhandler"
@@ -7038,6 +7179,10 @@
                    "name": "Friluftsudstyrsbutik",
                    "terms": "friluftsudstyrsbutik,friluftsudstyrsforretning,eventyr,sport,udendørs"
                },
+                "shop/outpost": {
+                    "name": "Udlevering for onlineforhandlere",
+                    "terms": "udpost for onlineforhandlere,online,afhentning"
+                },
                "shop/paint": {
                    "name": "Farvehandel",
                    "terms": "farvehandel,malerforretning,malerbutik"
@@ -537,8 +537,8 @@
                    "terms": "marke"
                },
                "brewery": {
-                    "label": "Fassbiere",
-                    "terms": "fassbiere"
+                    "label": "Angebotene Biermarken",
+                    "terms": "biermarke,biersorte"
                },
                "bridge": {
                    "label": "Typ",
@@ -599,6 +599,7 @@
                        "public": "Öffentliches Amtsgebäude",
                        "residential": "Allgemeines Wohngebäude",
                        "retail": "Geschäftsgebäude",
+                        "riding_hall": "Reithalle",
                        "roof": "Dach",
                        "ruins": "Künstliche Ruine",
                        "school": "Schulgebäude",
@@ -1062,7 +1063,7 @@
                        "lebanese": "Libanesisch",
                        "malaysian": "Malaysisch",
                        "mexican": "Mexikanisch",
-                        "pankcake": "Pfannkuchen",
+                        "pancake": "Pfannkuchen",
                        "pasta": "Teigwaren",
                        "peruvian": "Peruanisch",
                        "pizza": "Pizza",
@@ -1309,6 +1310,14 @@
                        "tidal": "Dockhafen"
                    }
                },
+                "dock/height": {
+                    "label": "Höhe der Laderampe (Meter)",
+                    "terms": "laderampenhöhe"
+                },
+                "dock/width": {
+                    "label": "Breite der Laderampe (Meter)",
+                    "terms": "laderampenbreite"
+                },
                "dog": {
                    "label": "Hunde",
                    "options": {
@@ -1321,6 +1330,14 @@
                "door": {
                    "label": "Tür"
                },
+                "door/height": {
+                    "label": "Türhöhe (Meter)",
+                    "terms": "durchgangshöhe,lichte höhe"
+                },
+                "door/width": {
+                    "label": "Türbreite (Meter)",
+                    "terms": "durchgangsbreite,lichte breite"
+                },
                "door_type": {
                    "label": "Typ"
                },
@@ -1609,7 +1626,7 @@
                    "options": {
                        "female": "Weiblich ♀",
                        "male": "Männlich ♂",
-                        "unisex": "Beide Geschlechter ♂♀"
+                        "unisex": "Unisex"
                    },
                    "placeholder": "Unbekannt",
                    "terms": "geschlecht,zugang,männlich,weiblich,unisex,egal,divers"
@@ -1739,7 +1756,7 @@
                        "optometrist": "Augenoptiker",
                        "pharmacy": "Apotheke",
                        "physiotherapist": "Physiotherapeut",
-                        "podiatrist": "Podiater",
+                        "podiatrist": "Podologe",
                        "psychotherapist": "Psychotherapeut",
                        "rehabilitation": "Reha-Klinik",
                        "sample_collection": "Probensammlungseinrichtung",
@@ -1808,12 +1825,12 @@
                        "osteopathy": "Osteopathie",
                        "otolaryngology": "Hals-Nasen-Ohren-Heilkunde",
                        "paediatric_surgery": "Kinderchirurgie",
-                        "paediatrics": "Pädiatrie (Kinderarzt)",
+                        "paediatrics": "Pädiatrie (Kinder- und Jugendmedizin)",
                        "palliative": "Palliativmedizin",
                        "pathology": "Pathologie (Gewebeuntersuchung)",
                        "physiatry": "Physikalische und Rehabilitative Medizin",
                        "plastic_surgery": "Plastische Chirurgie (Schönheitsoperationen)",
-                        "podiatry": "Fußmedizin",
+                        "podiatry": "Fußchirurgie",
                        "proctology": "Proktologie (Darmerkrankungen)",
                        "psychiatry": "Psychiatrie",
                        "pulmonology": "Pneumologie (Lungenerkrankungen)",
@@ -1923,15 +1940,8 @@
                    "label": "Ringe",
                    "placeholder": "1, 2, 4 ..."
                },
-                "horse_dressage": {
-                    "label": "Dressurreiten",
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nein"
-                    }
-                },
                "horse_riding": {
-                    "label": "Pferdereiten",
+                    "label": "Reitanlage",
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nein"
@@ -1950,13 +1960,6 @@
                    "placeholder": "schwierig, gefährlich ...",
                    "terms": "reitschwierigkeitsgrad,reitschwierigkeit"
                },
-                "horse_stables": {
-                    "label": "Reitstall",
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nein"
-                    }
-                },
                "hot_water": {
                    "label": "Heißwasser"
                },
@@ -2242,7 +2245,7 @@
                    "options": {
                        "adobe": "Lehm",
                        "aluminium": "Aluminium",
-                        "brass": "Blech",
+                        "brass": "Messing",
                        "brick": "Backstein",
                        "bronze": "Bronze",
                        "concrete": "Beton",
@@ -2328,6 +2331,10 @@
                        "war_memorial": "Kriegsmahnmal"
                    }
                },
+                "memorial/addr": {
+                    "label": "Adresse des nächstgelegenen Gebäudes",
+                    "terms": "adresse des nächstgelegenen gebäudes"
+                },
                "message": {
                    "label": "Art der Werbebotschaft",
                    "terms": "slogan,botschaft,werbespruch"
@@ -2873,7 +2880,7 @@
                    "label": "Thema"
                },
                "plots": {
-                    "label": "Parzelle",
+                    "label": "Parzellen",
                    "placeholder": "10, 20, 30..."
                },
                "polling_station": {
@@ -3146,7 +3153,7 @@
                "route_master": {
                    "label": "Typ"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Monogramm",
                    "options": {
                        "CIIIR": "CIIIR (Charles III)",
@@ -3826,6 +3833,13 @@
                "telecom/medium": {
                    "label": "Medium"
                },
+                "telescope/type": {
+                    "label": "Typ",
+                    "options": {
+                        "optical": "Optisches Teleskop",
+                        "radio": "Radioteleskop"
+                    }
+                },
                "tents": {
                    "label": "Zelte"
                },
@@ -4465,6 +4479,10 @@
                    "name": "Geldautomat",
                    "terms": "geldautomat,bankautomat,bankomat,bancomat,geldausgabeautomat,atm"
                },
+                "amenity/baking_oven": {
+                    "name": "Backofen",
+                    "terms": "ofen,pizzaofen,steinofen,holzofen"
+                },
                "amenity/bank": {
                    "name": "Bank-Filiale",
                    "terms": "bank,kreditinstitut,sparkasse,kreditgenossenschaft,treuhandgesellschaft"
@@ -4731,8 +4749,8 @@
                    "aliases": "Schönheitschirurg"
                },
                "amenity/doctors/podiatry": {
-                    "name": "Podiater",
-                    "terms": "fußchirurg"
+                    "name": "Podiater (Fußchirurgie)",
+                    "terms": "fußchirurg,fußchirurgie"
                },
                "amenity/doctors/proctology": {
                    "name": "Proktologe",
@@ -4876,6 +4894,10 @@
                    "name": "Tankstelle",
                    "terms": "tankstelle,tanke"
                },
+                "amenity/funeral_hall": {
+                    "name": "Trauerhalle",
+                    "terms": "feierhalle,aussegnungshalle,einsegnungshalle,abdankungshalle,beerdigung,bestattung,trauerfeier"
+                },
                "amenity/gambling": {
                    "name": "Spielhalle",
                    "terms": "glücksspiel,bingo,kartenspiele,blackjack,casino,würfelspiel,lotto,pachinko,poker,roulette,slotmaschinen"
@@ -5882,6 +5904,10 @@
                    "name": "Mehrfamilienhaus",
                    "terms": "mehrfamilienhaus,apartmenthaus,wohnblock,miethaus,wohnturm,wohnhochhaus,großes wohnhaus,geschosswohnungsbau,wohnungen"
                },
+                "building/bakehouse": {
+                    "name": "Backhaus",
+                    "terms": "gemeindebackhaus,backes,ofenhaus"
+                },
                "building/barn": {
                    "name": "Scheune",
                    "terms": "scheune,stadl"
@@ -6046,6 +6072,10 @@
                    "name": "Geschäftsgebäude",
                    "terms": "geschäftsgebäude,gebäude mit läden"
                },
+                "building/riding_hall": {
+                    "name": "Reithalle",
+                    "terms": "reitbahn,reiten,longierhalle,longieren"
+                },
                "building/roof": {
                    "name": "Dach",
                    "terms": "dach"
@@ -6397,7 +6427,7 @@
                },
                "emergency/defibrillator": {
                    "name": "Defibrillator",
-                    "terms": "defibrillator,defi,schockgeber"
+                    "terms": "defibrillator,defi,schockgeber,aed"
                },
                "emergency/designated": {
                    "name": "Rettungsweg"
@@ -6642,8 +6672,8 @@
                    "aliases": "Physiotherapeutin"
                },
                "healthcare/podiatrist": {
-                    "name": "Fußpflege",
-                    "terms": "podologe,fußheilerin,fußpflege"
+                    "name": "Podologe",
+                    "terms": "podologe,fußheiler,fußpflege,podologie,fußnagel,zehnagel"
                },
                "healthcare/psychotherapist": {
                    "name": "Psychotherapeut",
@@ -7053,6 +7083,10 @@
                    "name": "Gedenktafel",
                    "terms": "gedenktafel"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Stolperstein",
+                    "terms": "stolperstein"
+                },
                "historic/monument": {
                    "name": "Monument",
                    "terms": "denkmal,monument"
@@ -7462,8 +7496,8 @@
                },
                "leisure/horse_riding": {
                    "name": "Reitanlage",
-                    "terms": "pferdehof,pferdereiteinrichtung,pferdereitstall,pferdesport,pferdesportanlage,pferdesportzentrum,ponyhof,reitanlage,reitbetrieb,reiten,reiterhof,reithof,reitpark,reitsport,reitsportanlage,reitsportzentrum,reitstall,reitzentrum",
-                    "aliases": "Reiterhof\nReitstall\nReitzentrum"
+                    "terms": "pferdehof,pferdereitstall,pferdesportanlage,pferdesportzentrum,ponyhof,reitbetrieb,reiten,reiterhof,reithof,reitpark,reitsportanlage,reitsportzentrum,reitstall",
+                    "aliases": "Reitzentrum"
                },
                "leisure/ice_rink": {
                    "name": "Eislaufbahn",
@@ -7594,7 +7628,8 @@
                },
                "leisure/pitch/equestrian": {
                    "name": "Reitplatz",
-                    "terms": "reitplatz,pferdesportplatz,reitbahn,reiten,longieren,longierzirkel,roundpen,round-pen,dressurplatz,springplatz,rodeo"
+                    "terms": "reitplatz,pferdesportplatz,reitbahn,reiten,longieren,longierzirkel,roundpen,round-pen,dressurplatz,springplatz,rodeo",
+                    "aliases": "Reitbahn"
                },
                "leisure/pitch/field_hockey": {
                    "name": "Hockeyfeld",
@@ -7721,6 +7756,10 @@
                    "name": "Kletterhalle",
                    "terms": "kletterhalle"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Hochseilgarten",
+                    "terms": "kletterpark,seilgarten,waldseilgarten,niedrigseilgarten,kletterwald"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Pferderennbahn",
                    "terms": "rennbahn,pferderennen,galopprennen,trabrennen,galopp,trab,rennwiese,turf,reit,reiten"
@@ -7980,7 +8019,8 @@
                },
                "man_made/milk_churn_stand": {
                    "name": "Milchrampe",
-                    "terms": "milchkanne,milchbank,melkbank,milchbock,milchtisch"
+                    "terms": "milchkanne,milchbank,melkbank,milchbock,milchtisch",
+                    "aliases": "Melkbank\nMilchbock\nMilchtisch"
                },
                "man_made/mineshaft": {
                    "name": "Bergmännischer Schacht (vertikal)",
@@ -8035,6 +8075,10 @@
                    "name": "Wasserhochbehälter",
                    "terms": "untergrund,unterirdisch,reservoir,wassertank"
                },
+                "man_made/satellite_dish": {
+                    "name": "Satellitenschüssel",
+                    "terms": "satellitenschüssel"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "speicher,silo"
@@ -8087,6 +8131,18 @@
                    "name": "Absetzbecken",
                    "terms": "absetzteich,staubecken,stauteich,schlamm,schlämme,rotschlamm,deponie"
                },
+                "man_made/telescope": {
+                    "name": "Teleskop",
+                    "terms": "teleskop"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Optisches Teleskop",
+                    "terms": "optikteleskop"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radioteleskop",
+                    "terms": "radioteleskop"
+                },
                "man_made/torii": {
                    "name": "Torii",
                    "terms": "japanisches tor,shinto schrein"
@@ -8797,7 +8853,7 @@
                    "terms": "dorf"
                },
                "playground": {
-                    "name": "Spielgeräte des Spielplatz"
+                    "name": "Spielplatzgerät"
                },
                "playground/activitypanel": {
                    "name": "Spielwand",
@@ -9035,6 +9091,10 @@
                    "name": "Hochspannungsschalter",
                    "terms": "netzschalter,ein/ausschalter,hochspannungsschalter"
                },
+                "power/switchgear": {
+                    "name": "Schaltanlage",
+                    "terms": "stromschaltanlage"
+                },
                "power/tower": {
                    "name": "Hochspannungsmast",
                    "terms": "hauptstrommast,freileitungsmast"
@@ -6,8 +6,10 @@
                    "label": "Rubbish Bin",
                    "terms": "waste bin,garbage bin"
                },
-                "brewery": {
-                    "label": "Draught Beers"
+                "building": {
+                    "options": {
+                        "terrace": "Terrace Houses"
+                    }
                },
                "building/flats": {
                    "label": "Unit Count"
@@ -61,6 +63,30 @@
                        "sidewalk": "Footpath"
                    }
                },
+                "fuel/fuel_multi": {
+                    "options": {
+                        "e10": "E10 Petrol",
+                        "e85": "E85 Petrol",
+                        "octane_100": "Petrol (100 Octane)",
+                        "octane_80": "Petrol (80 Octane)",
+                        "octane_85": "Petrol (85 Octane)",
+                        "octane_87": "Petrol (87 Octane)",
+                        "octane_88": "Petrol (88 Octane)",
+                        "octane_89": "Petrol (89 Octane)",
+                        "octane_90": "Petrol (90 Octane)",
+                        "octane_91": "Petrol (91 Octane)",
+                        "octane_92": "Petrol (92 Octane)",
+                        "octane_93": "Petrol (93 Octane)",
+                        "octane_95": "Petrol (95 Octane)",
+                        "octane_97": "Petrol (97 Octane)",
+                        "octane_98": "Petrol (98 Octane)"
+                    }
+                },
+                "generator/source": {
+                    "options": {
+                        "gasoline": "Petrol"
+                    }
+                },
                "height": {
                    "label": "Height (Metres)"
                },
@@ -108,6 +134,11 @@
                        "ALPR": "Automatic Number Plate Reader"
                    }
                },
+                "waste": {
+                    "options": {
+                        "trash": "Rubbish"
+                    }
+                },
                "water_tank/volume": {
                    "label": "Volume (Litres)"
                },
@@ -184,6 +215,9 @@
                "amenity/recycling_centre": {
                    "name": "Recycling Centre"
                },
+                "amenity/shelter/public_transport": {
+                    "name": "Public Transport Shelter"
+                },
                "amenity/social_centre": {
                    "name": "Social Centre"
                },
@@ -206,6 +240,15 @@
                "amenity/vending_machine/fuel": {
                    "name": "Fuel Pump"
                },
+                "amenity/vending_machine/public_transport_tickets": {
+                    "name": "Public Transport Ticket Vending Machine"
+                },
+                "amenity/waste_basket": {
+                    "name": "Rubbish Bin"
+                },
+                "amenity/waste_disposal": {
+                    "name": "Skip Bin"
+                },
                "amenity/weighbridge": {
                    "name": "Weighbridge",
                    "aliases": "Truck Scale"
@@ -225,6 +268,9 @@
                "barrier/kerb/rolled": {
                    "name": "Rolled Kerb"
                },
+                "building/terrace": {
+                    "name": "Terraced Houses"
+                },
                "healthcare/birthing_center": {
                    "name": "Birthing Centre"
                },
@@ -257,7 +303,7 @@
                    "aliases": "Informal Footpath"
                },
                "highway/footway/sidewalk": {
-                    "name": "Footpath (sidewalk)"
+                    "name": "Footpath (alongside a road)"
                },
                "highway/give_way": {
                    "name": "Give Way Sign"
@@ -314,6 +360,39 @@
                "playground/zipwire": {
                    "name": "Playground Flying Fox"
                },
+                "public_transport/platform": {
+                    "name": "Public Transport Platform"
+                },
+                "public_transport/platform/subway": {
+                    "name": "Metro Train Platform"
+                },
+                "public_transport/platform/subway_point": {
+                    "name": "Metro Train Stop / Platform"
+                },
+                "public_transport/platform_point": {
+                    "name": "Public Transport Stop / Platform"
+                },
+                "public_transport/station": {
+                    "name": "Public Transport Station"
+                },
+                "public_transport/station_subway": {
+                    "name": "Metro Train Station"
+                },
+                "public_transport/stop_area": {
+                    "name": "Public Transport Stop Area"
+                },
+                "public_transport/stop_position": {
+                    "name": "Public Transport Stopping Location"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Metro Train Stopping Location"
+                },
+                "railway/subway": {
+                    "name": "Metro Train Track"
+                },
+                "railway/subway_entrance": {
+                    "name": "Metro Train Entrance"
+                },
                "shop/caravan": {
                    "name": "Caravan Dealership"
                },
@@ -347,11 +426,20 @@
                "telecom/data_center": {
                    "name": "Data Centre"
                },
+                "tourism/apartment": {
+                    "name": "Holiday Apartment"
+                },
                "tourism/caravan_site": {
                    "name": "Caravan Site"
                },
                "tourism/viewpoint": {
                    "name": "Lookout"
+                },
+                "type/public_transport/stop_area_group": {
+                    "name": "Public Transport Stop Area Group"
+                },
+                "type/route/subway": {
+                    "name": "Metro Train Route"
                }
            }
        }
@@ -345,9 +345,6 @@
                "brand": {
                    "label": "Brand"
                },
-                "brewery": {
-                    "terms": "on tap"
-                },
                "building": {
                    "label": "Building"
                },
@@ -266,10 +266,6 @@
                "brand": {
                    "label": "Brand"
                },
-                "brewery": {
-                    "label": "Draught Beers",
-                    "terms": "on tap"
-                },
                "bridge": {
                    "label": "Type",
                    "placeholder": "Default"
@@ -637,15 +633,7 @@
                    "label": "Hoops",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Dressage Riding",
-                    "options": {
-                        "equestrian": "Yes",
-                        "undefined": "No"
-                    }
-                },
                "horse_riding": {
-                    "label": "Horseback Riding",
                    "options": {
                        "horse_riding": "Yes",
                        "undefined": "No"
@@ -662,13 +650,6 @@
                    },
                    "placeholder": "Difficult, Dangerous..."
                },
-                "horse_stables": {
-                    "label": "Riding Stable",
-                    "options": {
-                        "stables": "Yes",
-                        "undefined": "No"
-                    }
-                },
                "incline": {
                    "label": "Incline"
                },
@@ -2087,6 +2068,10 @@
                "building/retail": {
                    "name": "Retail Building"
                },
+                "building/riding_hall": {
+                    "name": "Indoor Horse Riding Arena",
+                    "aliases": "Indoor Riding Arena\nHorse Riding Hall"
+                },
                "building/roof": {
                    "name": "Roof"
                },
@@ -2,6 +2,11 @@
    "en-NZ": {
        "presets": {
            "fields": {
+                "barrier": {
+                    "options": {
+                        "kerb": "Kerb"
+                    }
+                },
                "bath/type": {
                    "label": "Speciality"
                },
@@ -52,7 +57,8 @@
                    "label": "Building Height (Metres)"
                },
                "kerb": {
-                    "label": "Kerb"
+                    "label": "Kerb",
+                    "terms": "curb"
                },
                "length": {
                    "label": "Length (Metres)"
@@ -176,6 +182,10 @@
                "amenity/recycling_centre": {
                    "name": "Recycling Centre"
                },
+                "amenity/restaurant/barbecue": {
+                    "name": "Barbeque Restaurant",
+                    "terms": "barbecue restaurant,bar,bbq,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                "amenity/sanitary_dump_station": {
                    "name": "Caravan Toilet Disposal"
                },
@@ -214,7 +224,24 @@
                    "terms": "weigh station,truck scale"
                },
                "barrier/kerb": {
-                    "name": "Kerb"
+                    "name": "Kerb",
+                    "terms": "curb"
+                },
+                "barrier/kerb/flush": {
+                    "name": "Flush Kerb",
+                    "terms": "flush curb,even curb,level curb,tactile curb,even kerb,level kerb,tactile kerb"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "Lowered Kerb",
+                    "terms": "lowered curb,curb cut,kerb cut,kerb ramp,curb ramp,dropped kerb,pram ramp"
+                },
+                "barrier/kerb/raised": {
+                    "name": "Raised Kerb",
+                    "terms": "raised curb"
+                },
+                "barrier/kerb/rolled": {
+                    "name": "Rolled Kerb",
+                    "terms": "rolled curb"
                },
                "building/pavilion": {
                    "name": "Sports Pavilion",
@@ -232,9 +259,28 @@
                "healthcare/blood_donation": {
                    "name": "Blood Donation Centre"
                },
+                "highway/cycleway/bicycle_foot": {
+                    "name": "Shared Path",
+                    "terms": "cycle & foot path,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/bicycle_foot": {
+                    "name": "Shared Path Crossing",
+                    "terms": "cycle & foot crossing,bicycle and foot crosswalk,bike and pedestrian crossing,cycleway,cycling,cyclist"
+                },
+                "highway/footway": {
+                    "name": "Walkway",
+                    "terms": "foot path,footpath,path,track,hike,hiking,promenade,trackway,trail,walk"
+                },
+                "highway/footway/access_aisle": {
+                    "name": "Accessible Carpark Aisle",
+                    "terms": "access aisle,accessible van loading zone,disabled parking access zone,parking access zone,parking lot aisle,striped zone,tow zone,tow-away zone,towaway zone,wheelchair aisle"
+                },
                "highway/footway/conveying": {
                    "name": "Travelator"
                },
+                "highway/footway/sidewalk": {
+                    "terms": "foot path,footpath,pavement,sidepath,sidewalk"
+                },
                "highway/give_way": {
                    "name": "Give Way Sign",
                    "terms": "yield,sign"
@@ -815,7 +815,7 @@
                "ruins": {
                    "label": "Type"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Royal Cypher",
                    "options": {
                        "VR": "VR (Victoria)",
@@ -1681,13 +1681,6 @@
                "hot_water": {
                    "label": "Hot Water"
                },
-                "horse_stables": {
-                    "label": "Riding Stable",
-                    "options": {
-                        "undefined": "No",
-                        "stables": "Yes"
-                    }
-                },
                "horse_scale": {
                    "label": "Horseback Riding Difficulty",
                    "placeholder": "Difficult, Dangerous...",
@@ -1701,19 +1694,12 @@
                    }
                },
                "horse_riding": {
-                    "label": "Horseback Riding",
+                    "label": "Horseback Riding Center",
                    "options": {
                        "undefined": "No",
                        "horse_riding": "Yes"
                    }
                },
-                "horse_dressage": {
-                    "label": "Dressage Riding",
-                    "options": {
-                        "undefined": "No",
-                        "equestrian": "Yes"
-                    }
-                },
                "hoops": {
                    "label": "Hoops",
                    "placeholder": "1, 2, 4..."
@@ -2314,7 +2300,7 @@
                        "bubble_tea": "Bubble Tea",
                        "hot_dog": "Hot Dog",
                        "cake": "Cake",
-                        "pankcake": "Pancake",
+                        "pancake": "Pancake",
                        "pasta": "Pasta",
                        "salad": "Salad",
                        "chocolate": "Chocolate",
@@ -2654,6 +2640,7 @@
                        "public": "Public Building",
                        "residential": "Residential Building",
                        "retail": "Retail Building",
+                        "riding_hall": "Horseback Riding Arena",
                        "roof": "Roof",
                        "ruins": "Building Ruins",
                        "school": "School Building",
@@ -2681,8 +2668,8 @@
                    "placeholder": "Default"
                },
                "brewery": {
-                    "label": "Draft Beers",
-                    "terms": "on tap"
+                    "label": "Sold Beer brands",
+                    "terms": "beer brand,beer dispensing,bottled beer,draft beer,on tap,tap beer"
                },
                "brand": {
                    "label": "Brand"
@@ -3233,6 +3220,13 @@
                        "bucket": "Bucket"
                    }
                },
+                "telescope/type": {
+                    "label": "Type",
+                    "options": {
+                        "optical": "Optical Telescope",
+                        "radio": "Radio Telescope"
+                    }
+                },
                "telecom/medium": {
                    "label": "Medium"
                },
@@ -3676,6 +3670,10 @@
                        "4": "◆◆ Extremely Difficult (double black diamond)"
                    }
                },
+                "memorial/addr_subtags": {},
+                "memorial/addr": {
+                    "label": "Nearest Building Address"
+                },
                "maxspeed/hgv": {
                    "label": "Truck Speed Limit",
                    "placeholder": "40, 50, 60..."
@@ -3946,6 +3944,18 @@
                "fire_hydrant/diameter": {
                    "label": "Diameter (mm, in, or letters)"
                },
+                "door/width": {
+                    "label": "Door Width (Meters)"
+                },
+                "door/height": {
+                    "label": "Door Height (Meters)"
+                },
+                "dock/width": {
+                    "label": "Dock Width (Meters)"
+                },
+                "dock/height": {
+                    "label": "Dock Height (Meters)"
+                },
                "disused/shop": {
                    "label": "Type"
                },
@@ -5774,6 +5784,9 @@
                    "name": "High-Voltage Tower",
                    "terms": "power,power tower"
                },
+                "power/switchgear": {
+                    "name": "Switchgear"
+                },
                "power/switch": {
                    "name": "Power Switch"
                },
@@ -6609,6 +6622,9 @@
                    "name": "Torii",
                    "terms": "japanese gate,shinto shrine"
                },
+                "man_made/telescope": {
+                    "name": "Telescope"
+                },
                "man_made/tailings_pond": {
                    "name": "Tailings Pond",
                    "aliases": "Tailing Pond\nSettling Pond\nSettling Pit",
@@ -6634,6 +6650,10 @@
                    "name": "Silo",
                    "terms": "grain,corn,wheat"
                },
+                "man_made/satellite_dish": {
+                    "name": "Satellite Dish",
+                    "terms": "fixed satellite dish,motorized satellite dish,parabolic dish,satellite communication,tracking satellite dish"
+                },
                "man_made/reservoir_covered": {
                    "name": "Covered Reservoir",
                    "terms": "underground reservoir,water tank"
@@ -6821,6 +6841,14 @@
                    "name": "Bell Tower",
                    "terms": "belfry,bell gable,campanile,church tower,klockstapel"
                },
+                "man_made/telescope/radio": {
+                    "name": "Radio Telescope",
+                    "terms": "ground station,radio dish,radio antenna"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Optical Telescope",
+                    "terms": "refracting telescope,reflecting telescope"
+                },
                "man_made/surveillance/camera": {
                    "name": "Surveillance Camera",
                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
@@ -7000,7 +7028,7 @@
                },
                "leisure/horse_riding": {
                    "name": "Horseback Riding Center",
-                    "terms": "equestrian facility,equestrian,horse farm,horse park,horse ranch,horse riding center,horse riding facility,horse riding,riding facility,riding stables,stables"
+                    "terms": "equestrian center,equestrian facility,horse farm,horse park,horse ranch,horse riding center,horse riding facility,horse riding,riding facility,riding stables,stables"
                },
                "leisure/hackerspace": {
                    "name": "Hackerspace",
@@ -7138,6 +7166,10 @@
                    "aliases": "Horse Racecourse\nHippodrome",
                    "terms": "equestrian race course,gallop,horse race betting,horse race,horse racing,horseracing,race course,racecourse"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Adventure Park",
+                    "terms": "obstacle course,rope climbing,ropes course,zip line"
+                },
                "leisure/sports_centre/climbing": {
                    "name": "Climbing Gym",
                    "terms": "abseiling,artificial climbing wall,belaying,bouldering,rock climbing facility,indoor rock wall,rappeling,rock gym,ropes"
@@ -7237,7 +7269,7 @@
                "leisure/pitch/equestrian": {
                    "name": "Horseback Riding / Rodeo Arena",
                    "aliases": "Horseback Riding Ring",
-                    "terms": "arena,dressage arena,dressage ring,dressage,equestrian,horse riding ring,horse riding,horse,horseback riding arena,horseback riding,horseback,jumping arena,jumping ring,longeing,pen,polo,riding ring,riding,ring,rodeo,round pen"
+                    "terms": "arena,dressage arena,dressage ring,dressage,equestrian arena,horse riding ring,horse riding,horse,horseback riding arena,horseback riding,horseback,jumping arena,jumping ring,longeing,pen,polo,riding ring,riding,ring,rodeo,round pen"
                },
                "leisure/pitch/cricket": {
                    "name": "Cricket Field",
@@ -7660,6 +7692,9 @@
                "historic/archaeological_site": {
                    "name": "Archaeological Site"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Memorial Plaque Stolperstein"
+                },
                "historic/memorial/plaque": {
                    "name": "Commemorative Plaque",
                    "terms": "dedicatory,epitaph,historical marker,remember,remembrance,memory"
@@ -7889,6 +7924,7 @@
                    "name": "Bridle Path",
                    "terms": "bridleway,equestrian,horse,trail"
                },
+                "highway/traffic_sign": {},
                "highway/bus_stop": {
                    "name": "Bus Stop"
                },
@@ -8533,6 +8569,11 @@
                "building/roof": {
                    "name": "Roof"
                },
+                "building/riding_hall": {
+                    "name": "Indoor Horseback Riding Arena",
+                    "aliases": "Horse Riding Hall\nHorseback Riding Hall\nIndoor Horse Arena\nIndoor Horse Riding Arena\nIndoor Horse Riding Ring\nIndoor Horseback Riding Ring\nIndoor Riding Arena\nIndoor Riding Ring",
+                    "terms": "equestrian arena,equestrian indoor arena,horse riding,indoor arena,indoor ring,indoor riding,longeing hall"
+                },
                "building/retail": {
                    "name": "Retail Building",
                    "terms": "shop building,store building"
@@ -8659,6 +8700,9 @@
                "building/barn": {
                    "name": "Barn"
                },
+                "building/bakehouse": {
+                    "name": "Bakehouse"
+                },
                "building/apartments": {
                    "name": "Apartment Building"
                },
@@ -9264,6 +9308,10 @@
                    "name": "Gambling Hall",
                    "terms": "betting,bingo,blackjack,casino,craps,gamble,gambling,keno,lottery,pachinko,poker,roulette,slot machines,slots"
                },
+                "amenity/funeral_hall": {
+                    "name": "Funeral Service Hall",
+                    "terms": "funeral ceremony,funeral hall"
+                },
                "amenity/fuel": {
                    "name": "Gas Station",
                    "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
@@ -9439,6 +9487,10 @@
                    "aliases": "Credit Union",
                    "terms": "check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault"
                },
+                "amenity/baking_oven": {
+                    "name": "Baking Oven",
+                    "terms": "bakehouse,beehive oven,bread,clay oven,horno,masonry oven,tabun oven,pizza oven"
+                },
                "amenity/atm": {
                    "name": "ATM",
                    "aliases": "Cash Machine\nAutomated Teller Machine",
@@ -9783,7 +9835,6 @@
                    "terms": "irish bar"
                },
                "amenity/post_box/post_box-US": {},
-                "amenity/post_box/post_box-GB": {},
                "amenity/place_of_worship/taoist": {
                    "name": "Taoist Temple",
                    "terms": "daoist,monastery,temple"
@@ -378,10 +378,6 @@
                    "label": "Marko",
                    "terms": "marko,firmao,reto"
                },
-                "brewery": {
-                    "label": "Verŝataj bieroj",
-                    "terms": "verŝata,krana,barela"
-                },
                "bridge": {
                    "label": "Speco",
                    "placeholder": "Norma"
@@ -666,7 +662,6 @@
                        "lebanese": "libana",
                        "malaysian": "malajzia",
                        "mexican": "meksika",
-                        "pankcake": "patkukoj",
                        "pasta": "makaronioj",
                        "pizza": "picoj",
                        "polish": "pola",
@@ -1224,15 +1219,7 @@
                    "label": "Korboj",
                    "placeholder": "1, 2, 4…"
                },
-                "horse_dressage": {
-                    "label": "Dresrajdado",
-                    "options": {
-                        "equestrian": "Jes",
-                        "undefined": "Ne"
-                    }
-                },
                "horse_riding": {
-                    "label": "Ĉeval-rajdado",
                    "options": {
                        "horse_riding": "Jes",
                        "undefined": "Ne"
@@ -1250,13 +1237,6 @@
                    "placeholder": "Malfacila, danĝera…",
                    "terms": "malfacilo,facileco"
                },
-                "horse_stables": {
-                    "label": "Ĉeval-domo",
-                    "options": {
-                        "stables": "Jes",
-                        "undefined": "Ne"
-                    }
-                },
                "hot_water": {
                    "label": "Varma akvo"
                },
@@ -537,8 +537,8 @@
                    "terms": "marca,firma"
                },
                "brewery": {
-                    "label": "Cerveza de barril / tirada",
-                    "terms": "cerveza de barril,cerveza tirada"
+                    "label": "Marcas de cerveza vendidas",
+                    "terms": "marca de cerveza,dispensador de cerveza,cerveza embotellada,cerveza de barril,de grifo,cerveza de grifo,cerveza tirada"
                },
                "bridge": {
                    "label": "Tipo",
@@ -599,6 +599,7 @@
                        "public": "Edificio público",
                        "residential": "Edificio residencial",
                        "retail": "Edificio de tiendas comerciales",
+                        "riding_hall": "Pista de equitación",
                        "roof": "Techo",
                        "ruins": "Edificio en ruinas",
                        "school": "Edificio escolar",
@@ -1062,7 +1063,7 @@
                        "lebanese": "Libanesa",
                        "malaysian": "Malaya",
                        "mexican": "Mexicana",
-                        "pankcake": "Panqueque / Crep",
+                        "pancake": "Panqueque",
                        "pasta": "Pasta",
                        "peruvian": "Peruana",
                        "pizza": "Pizza",
@@ -1277,7 +1278,7 @@
                    "terms": "dirección,rumbo"
                },
                "dispensing": {
-                    "label": "Prepara recetas"
+                    "label": "Dispensa medicamentos recetados"
                },
                "display": {
                    "label": "Visualización",
@@ -1309,6 +1310,14 @@
                        "tidal": "Dique de mareas"
                    }
                },
+                "dock/height": {
+                    "label": "Altura del muelle (Metros)",
+                    "terms": "altura del muelle,elevación del muelle,nivel del muelle"
+                },
+                "dock/width": {
+                    "label": "Ancho del muelle (Metros)",
+                    "terms": "ancho del muelle,anchura del muelle,extensión del muelle"
+                },
                "dog": {
                    "label": "Perros",
                    "options": {
@@ -1321,6 +1330,14 @@
                "door": {
                    "label": "Puerta"
                },
+                "door/height": {
+                    "label": "Altura de la puerta (Metros)",
+                    "terms": "altura de la puerta,elevación de la puerta,nivel de la puerta"
+                },
+                "door/width": {
+                    "label": "Ancho de la puerta (Metros)",
+                    "terms": "ancho de la puerta,anchura de la puerta,extensión de la puerta"
+                },
                "door_type": {
                    "label": "Tipo"
                },
@@ -1923,15 +1940,8 @@
                    "label": "Aros",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Doma de equinos",
-                    "options": {
-                        "equestrian": "Sí",
-                        "undefined": "No"
-                    }
-                },
                "horse_riding": {
-                    "label": "Equitación",
+                    "label": "Centro de equitación",
                    "options": {
                        "horse_riding": "Sí",
                        "undefined": "No"
@@ -1950,13 +1960,6 @@
                    "placeholder": "Difícil, Peligroso...",
                    "terms": "dificultad para montar a caballo,caballo,montar"
                },
-                "horse_stables": {
-                    "label": "Establo para equitación",
-                    "options": {
-                        "stables": "Sí",
-                        "undefined": "No"
-                    }
-                },
                "hot_water": {
                    "label": "Agua caliente"
                },
@@ -2327,6 +2330,10 @@
                        "war_memorial": "Monumento al soldado caído"
                    }
                },
+                "memorial/addr": {
+                    "label": "Dirección del edificio más cercano",
+                    "terms": "ubicación del edificio más próximo,domicilio del inmueble más próximo,dirección del inmueble más próximo,más cercano,más inmediato,más vecino,más contiguo"
+                },
                "message": {
                    "label": "Mensaje",
                    "terms": "mensaje,aviso,texto"
@@ -3145,7 +3152,7 @@
                "route_master": {
                    "label": "Tipo"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Monograma real",
                    "options": {
                        "CIIIR": "CIIIR (Carlos III)",
@@ -3825,6 +3832,13 @@
                "telecom/medium": {
                    "label": "Medio"
                },
+                "telescope/type": {
+                    "label": "Tipo",
+                    "options": {
+                        "optical": "Telescopio óptico",
+                        "radio": "Telescopio de radio"
+                    }
+                },
                "tents": {
                    "label": "Carpas"
                },
@@ -4465,6 +4479,10 @@
                    "name": "Cajero automático",
                    "terms": "cajero automático,retiro,dinero,efectivo,banco"
                },
+                "amenity/baking_oven": {
+                    "name": "Horno de panadería",
+                    "terms": "horno de panadería,horno de repostería,horno para hornear"
+                },
                "amenity/bank": {
                    "name": "Banco",
                    "terms": "banco,bancario,cooperativa de ahorro y crédito,cooperativa de crédito,financiera,entidad bancaria"
@@ -4868,6 +4886,10 @@
                    "name": "Estación de servicio / Gasolinera",
                    "terms": "gasolinera,surtidor,estación de servicio,combustible"
                },
+                "amenity/funeral_hall": {
+                    "name": "Sala de servicio funerario",
+                    "terms": "sala de servicio funerario,servicio funerario,sala de velatorio,velatorio,sala de funeral,funeral"
+                },
                "amenity/gambling": {
                    "name": "Salón de juegos de azar",
                    "terms": "apuestas,bingo,blackjack,casino,dados,azar,juegos de azar,keno,lotería,pachinko,póker,poker,ruleta,máquinas tragamonedas,tragamonedas"
@@ -5868,6 +5890,10 @@
                    "name": "Edificio de apartamentos",
                    "terms": "apartamentos,departamentos,piso,residencia,vivienda"
                },
+                "building/bakehouse": {
+                    "name": "Panadería",
+                    "terms": "panadería,pastelería"
+                },
                "building/barn": {
                    "name": "Granero",
                    "terms": "granero,hórreo,silo,depósito de cereal,troj"
@@ -6031,6 +6057,10 @@
                    "name": "Edificio de tiendas comerciales",
                    "terms": "venta al por menor,venta al detalle,edificio de tiendas comerciales,tiendas comerciales"
                },
+                "building/riding_hall": {
+                    "name": "Pista de equitación cubierta",
+                    "terms": "ecuestre,equitación,pista cubierta,equitación cubierta"
+                },
                "building/roof": {
                    "name": "Techo",
                    "terms": "tejado,techumbre,cubierta,techo"
@@ -6902,7 +6932,7 @@
                },
                "highway/speed_camera": {
                    "name": "Radar de tráfico / Cámara de velocidad",
-                    "terms": "cámara de velocidad,camara de velocidad,radar de velocidad,radares de tráfico,cámara,camara,radar,tráfico,trafico,trampa,cámara de policía de tráfico,cámara de luz roja,fotomulta,radar de foto,cámara de carril de autobús,límite velocidad,control velocidad,fotorradar"
+                    "terms": "cámara de velocidad,camara de velocidad,radar de velocidad,radares de tráfico,cámara,camara,radar,tráfico,trafico,trampa,cámara de policía de tráfico,cámara de luz roja,fotomulta,radar de foto,cámara de carril de autobús,límite velocidad,control velocidad,fotorradar,radar vigila,vigila"
                },
                "highway/speed_display": {
                    "name": "Señal de velocidad por radar",
@@ -7024,6 +7054,10 @@
                    "name": "Placa conmemorativa",
                    "terms": "dedicatoria,epitafio,marcador histórico,recuerdo,memoria"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Placa conmemorativa Stolperstein",
+                    "terms": "placa conmemorativa stolperstein,lápida memorial stolperstein,monumento recordatorio stolperstein,homenaje póstumo stolperstein,memoria histórica stolperstein"
+                },
                "historic/monument": {
                    "name": "Monumento grande",
                    "terms": "monumento,monolito,obelisco,pirámide,estatua,túmulo,panteón,mausoleo,menhir,dolmen"
@@ -7599,7 +7633,7 @@
                    "terms": "netball,baloncesto"
                },
                "leisure/pitch/padel": {
-                    "name": "Cancha de paddle / Pista de pádle",
+                    "name": "Cancha de paddle / Pista de pádel",
                    "terms": "tenis,pádel,padel,paddle,cancha,campo,pista"
                },
                "leisure/pitch/paintball": {
@@ -7690,6 +7724,10 @@
                    "name": "Gimnasio de escalada",
                    "terms": "rappel,muro de escalada artificial,instalación de escalada en roca,muro interior de roca,gimnasio de roca,cuerdas,escalada"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Parque de aventuras",
+                    "terms": "circuito de obstáculos,escalada con cuerda,circuito de cuerdas,tirolina,tirolesa"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Hipódromo",
                    "terms": "hipódromo,hipodromo,carrera de caballos,apuestas de caballos"
@@ -7998,6 +8036,10 @@
                    "name": "Depósito de agua cubierto",
                    "terms": "depósito subterráneo,tanque de agua,reservorio subterráneo,embalse,depósito de agua,cubierto"
                },
+                "man_made/satellite_dish": {
+                    "name": "Antena parabólica",
+                    "terms": "antena parabólica,antena satelital,plato satelital"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "silo,contenedor,grano,maíz,trigo,granero"
@@ -8050,6 +8092,18 @@
                    "name": "Estanque de relaves",
                    "terms": "estanque,relaves,minería,separación,lodo"
                },
+                "man_made/telescope": {
+                    "name": "Telescopio",
+                    "terms": "telescopio,catalejo,luneta"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Telescopio óptico",
+                    "terms": "telescopio óptico,telescopio refractor,telescopio reflector"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Telescopio de radio",
+                    "terms": "telescopio de radio,radiotelescopio,antena de radioastronomía"
+                },
                "man_made/torii": {
                    "name": "Torii",
                    "terms": "puerta japonesa,santuario sintoísta"
@@ -8993,6 +9047,10 @@
                    "name": "Interruptor de alimentación",
                    "terms": "interruptor de encendido,botón de alimentación,interruptor de red,botón de encendido,interruptor de corriente,encendido,alimentación,alimentacion,red,corriente"
                },
+                "power/switchgear": {
+                    "name": "Aparellaje eléctrico",
+                    "terms": "switchgear,aparellaje eléctrico,equipo de conmutación,aparato de maniobra,interruptor"
+                },
                "power/tower": {
                    "name": "Torre de alta tensión",
                    "terms": "torre de alto voltaje,torres de alta tensión,torre de electricidad"
@@ -9441,7 +9499,7 @@
                    "terms": "automóvil,automotriz,auto,coche,carro,vehículo,concesionaria"
                },
                "shop/car_parts": {
-                    "name": "Tienda de componentes de automóvil",
+                    "name": "Tienda de repuestos de automóvil",
                    "terms": "coche,carro,auto,automóvil,vehículo,repuestos,piezas,partes,tienda de partes,autopartes"
                },
                "shop/car_repair": {
@@ -364,9 +364,6 @@
                "brand": {
                    "label": "Marka"
                },
-                "brewery": {
-                    "label": "Presioko garagardoa"
-                },
                "bridge": {
                    "label": "Mota",
                    "placeholder": "Akats"
@@ -906,14 +903,7 @@
                    "label": "Aroak",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Bai",
-                        "undefined": "Ez"
-                    }
-                },
                "horse_riding": {
-                    "label": "Ekitazio",
                    "options": {
                        "horse_riding": "Bai",
                        "undefined": "Ez"
@@ -930,13 +920,6 @@
                    },
                    "placeholder": "Zaila, Arriskutsua..."
                },
-                "horse_stables": {
-                    "label": "Zalditegi",
-                    "options": {
-                        "stables": "Bai",
-                        "undefined": "Ez"
-                    }
-                },
                "image": {
                    "label": "Irudia",
                    "terms": "irudia,ikonoa,argazkia,marrazkia"
@@ -1362,11 +1345,6 @@
                "route_master": {
                    "label": "Mota"
                },
-                "royal_cypher": {
-                    "options": {
-                        "no": "Ez"
-                    }
-                },
                "seamark/beacon_isolated_danger/shape": {
                    "label": "Forma"
                },
@@ -385,9 +385,6 @@
                    "label": "نام تجاری",
                    "terms": "برند، مارک، نمانام، نشان تجاری، مدل"
                },
-                "brewery": {
-                    "label": "محل آماده سازی آبجو"
-                },
                "bridge": {
                    "label": "نوع",
                    "placeholder": "پیش فرض"
@@ -658,7 +655,6 @@
                        "lebanese": "لبنانی",
                        "malaysian": "مالزیایی",
                        "mexican": "مکزیکی",
-                        "pankcake": "پن‌کیک",
                        "pasta": "پاستا",
                        "pizza": "پیتزا",
                        "polish": "لهستانی",
@@ -1130,15 +1126,7 @@
                    "label": "حلقه ها",
                    "placeholder": "۱, ۲, ۴..."
                },
-                "horse_dressage": {
-                    "label": "درساژ سواری (حرکات نمایشی اسب)",
-                    "options": {
-                        "equestrian": "بله",
-                        "undefined": "خیر"
-                    }
-                },
                "horse_riding": {
-                    "label": "سوارکاری",
                    "options": {
                        "horse_riding": "بله",
                        "undefined": "خیر"
@@ -1156,13 +1144,6 @@
                    "placeholder": "سخت، خطرناک...",
                    "terms": "سطح سوارکاری، دشواری سوارکاری"
                },
-                "horse_stables": {
-                    "label": "پایدار سواری (مکانی که اسب‌ها را برای سوار ماندن مردم نگهداری می‌کنند)",
-                    "options": {
-                        "stables": "بله",
-                        "undefined": "خیر"
-                    }
-                },
                "hot_water": {
                    "label": "آب گرم"
                },
@@ -1947,12 +1928,6 @@
                "route_master": {
                    "label": "نوع"
                },
-                "royal_cypher": {
-                    "options": {
-                        "no": "خیر",
-                        "scottish_crown": "تاج اسکاتلند"
-                    }
-                },
                "ruins": {
                    "label": "نوع"
                },
@@ -2297,6 +2272,7 @@
                        "ground": "زمین",
                        "paved": "روسازی‌شده",
                        "paving_stones": "سنگ‌فرش هموار",
+                        "salt": "نمک",
                        "sand": "شنی (ریز)",
                        "unpaved": "روسازی‌نشده",
                        "wood": "چوب"
@@ -5134,6 +5110,10 @@
                    "name": "منطقه خرید و فروش جزئی / بازارچه",
                    "terms": "منطقه خرده فروشی ، منطقه بازارچه ، خرید ، فروش ، بازار ، منطقه بازارچه خرده فروشی ، داد و ستد ، آل وِر ، خرید و فروش"
                },
+                "landuse/salt_pond": {
+                    "name": "حوضچه نمک تبخیری",
+                    "aliases": "حوضچه تبخیر"
+                },
                "landuse/vineyard": {
                    "name": "باغ انگور",
                    "terms": "تاکستان"
@@ -263,11 +263,18 @@
                "ascent": {
                    "label": "Nousu yhteensä"
                },
+                "athletics_pitch": {
+                    "options": {
+                        "long_jump": "pituushyppy",
+                        "triple_jump": "kolmiloikka"
+                    }
+                },
                "athletics_track": {
                    "options": {
                        "long_jump": "pituushyppy",
                        "pole_vault": "seiväshyppy",
-                        "running": "juoksu"
+                        "running": "juoksu",
+                        "triple_jump": "kolmiloikka"
                    }
                },
                "atm": {
@@ -278,7 +285,8 @@
                    "options": {
                        "big_wheel": "Maailmanpyörä",
                        "bumper_car": "Törmäilyautot",
-                        "carousel": "Karuselli"
+                        "carousel": "Karuselli",
+                        "maze": "sokkelo"
                    }
                },
                "automated": {
@@ -401,7 +409,8 @@
                        "history": "Historia",
                        "nature": "Luonto",
                        "notice": "Ilmoitustaulu",
-                        "plants": "Kasvit"
+                        "plants": "Kasvit",
+                        "welcome_sign": "tervetuloa-kyltti"
                    }
                },
                "bollard": {
@@ -431,13 +440,13 @@
                "brand": {
                    "label": "Brändi"
                },
-                "brewery": {
-                    "label": "Oluthana"
-                },
                "bridge": {
                    "label": "Tyyppi",
                    "placeholder": "Oletus"
                },
+                "bridge/ref": {
+                    "label": "Sillan tunnus"
+                },
                "bridge/support": {
                    "label": "Tukirakenne"
                },
@@ -461,6 +470,11 @@
                        "hospital": "sairaala",
                        "hotel": "hotelli",
                        "house": "pientalo",
+                        "industrial": "teollisuusrakennus",
+                        "kindergarten": "esikoulurakennus",
+                        "manufacture": "teollinen tuotantorakennus",
+                        "mosque": "moskeija",
+                        "office": "toimistorakennus",
                        "residential": "asuinrakennus",
                        "roof": "katto",
                        "ruins": "rauniot",
@@ -770,8 +784,10 @@
                        "coffee_shop": "kahvila",
                        "dessert": "Jälkiruoka",
                        "donut": "Donitsi",
+                        "filipino": "filippiiniläinen",
                        "fish": "Kala",
                        "french": "ranskalainen",
+                        "georgian": "georgialainen",
                        "german": "saksalainen",
                        "greek": "kreikkalainen",
                        "hot_dog": "Nakkisämpylä",
@@ -786,8 +802,8 @@
                        "lebanese": "libanonilainen",
                        "malaysian": "malesialainen",
                        "mexican": "meksikolainen",
-                        "pankcake": "pannukakku",
                        "pasta": "pasta",
+                        "peruvian": "perulainen",
                        "pizza": "pitsa",
                        "polish": "puolalainen",
                        "portuguese": "portugalilainen",
@@ -800,8 +816,10 @@
                        "steak_house": "Pihviravintola",
                        "sushi": "sushi",
                        "taiwanese": "taiwanilainen",
+                        "tex-mex": "tex-mex",
                        "thai": "thaimaalainen",
                        "turkish": "turkkilainen",
+                        "ukrainian": "ukrainalainen",
                        "vietnamese": "vietnamilainen"
                    }
                },
@@ -1004,7 +1022,10 @@
                    "label": "Tyyppi"
                },
                "dock": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "drydock": "kuivatelakka"
+                    }
                },
                "dog": {
                    "label": "Koirat",
@@ -1103,6 +1124,9 @@
                "except": {
                    "label": "Poikkeukset"
                },
+                "expressway-US": {
+                    "label": "Expressway"
+                },
                "faces": {
                    "label": "Etupuoliskojen lukumäärä"
                },
@@ -1199,7 +1223,7 @@
                    "label": "Tyyppi"
                },
                "frequency": {
-                    "label": "Operoinnin taajuus"
+                    "label": "Käyttötaajuus"
                },
                "from": {
                    "label": "Lähtöpaikka"
@@ -1216,23 +1240,23 @@
                        "biodiesel": "Biodiesel",
                        "cng": "Paineistettu maakaasu",
                        "diesel": "Dieselöljy",
-                        "e10": "E10 Bensiini",
-                        "e85": "E85 Bensiini",
+                        "e10": "E10-bensiini",
+                        "e85": "E85-bensiini",
                        "h70": "Kaasumainen typpi (700 bar)",
                        "lpg": "Nesteytetty maakaasu (LNG)",
-                        "octane_100": "Bensiini (100 oktaaninen)",
-                        "octane_80": "Bensiini (80 oktaaninen)",
-                        "octane_85": "Bensiini (85 oktaaninen)",
-                        "octane_87": "Bensiini (87 oktaaninen)",
-                        "octane_88": "Bensiini (88 oktaaninen)",
-                        "octane_89": "Bensiini (89 oktaaninen)",
-                        "octane_90": "Bensiini (90 oktaaninen)",
-                        "octane_91": "Bensiini (91 oktaaninen)",
-                        "octane_92": "Bensiini (92 oktaaninen)",
-                        "octane_93": "Bensiini (93 oktaaninen)",
-                        "octane_95": "Bensiini (95 oktaaninen)",
-                        "octane_97": "Bensiini (97 oktaaninen)",
-                        "octane_98": "Bensiini (98 oktaaninen)",
+                        "octane_100": "Bensiini (100-oktaaninen)",
+                        "octane_80": "Bensiini (80-oktaaninen)",
+                        "octane_85": "Bensiini (85-oktaaninen)",
+                        "octane_87": "Bensiini (87-oktaaninen)",
+                        "octane_88": "Bensiini (88-oktaaninen)",
+                        "octane_89": "Bensiini (89-oktaaninen)",
+                        "octane_90": "Bensiini (90-oktaaninen)",
+                        "octane_91": "Bensiini (91-oktaaninen)",
+                        "octane_92": "Bensiini (92-oktaaninen)",
+                        "octane_93": "Bensiini (93-oktaaninen)",
+                        "octane_95": "Bensiini (95-oktaaninen)",
+                        "octane_97": "Bensiini (97-oktaaninen)",
+                        "octane_98": "Bensiini (98-oktaaninen)",
                        "propane": "Propaani"
                    }
                },
@@ -1243,7 +1267,7 @@
                    "label": "Puutarhan tyyppi"
                },
                "gauge": {
-                    "label": "Raideväli"
+                    "label": "Raideleveys"
                },
                "gender": {
                    "label": "Sukupuolirajoitus",
@@ -1322,8 +1346,31 @@
                    "label": "Aihetunnisteet",
                    "placeholder": "#esimerkki"
                },
+                "hazard_boundary": {
+                    "label": "Vaara",
+                    "options": {
+                        "archery_range": "jousiammuntakenttä",
+                        "avalanche": "lumivyöryjä",
+                        "biohazard": "biohasardi",
+                        "contamination": "kemiallisesti saastunut",
+                        "electricity": "sähköisku",
+                        "hole": "reikä",
+                        "minefield": "miinakenttä",
+                        "nuclear": "säteilyvaara",
+                        "quicksand": "juoksuhiekka",
+                        "shooting_range": "ampumarata"
+                    }
+                },
                "healthcare": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "birthing_centre": "synnytysosasto",
+                        "blood_donation": "verenluovutus",
+                        "clinic": "terveyskeskus",
+                        "dentist": "hammaslääkäri",
+                        "speech_therapist": "puheterapeutti",
+                        "vaccination_centre": "rokotuskeskus"
+                    }
                },
                "healthcare/speciality": {
                    "label": "Erikoisalat",
@@ -1349,8 +1396,14 @@
                        "infectious_diseases": "Tartuntataudit",
                        "intensive": "Tehohoito",
                        "neurology": "Neurologia",
+                        "neurosurgery": "neurokirurgia",
+                        "palliative": "palliatiivinen",
+                        "pathology": "patologia",
+                        "plastic_surgery": "plastiikkakirurgia",
                        "radiology": "Radiologia",
-                        "urology": "Urologia"
+                        "trauma": "traumakirurgia",
+                        "urology": "Urologia",
+                        "vaccination": "rokotus"
                    }
                },
                "heating": {
@@ -1375,7 +1428,13 @@
                    }
                },
                "historic": {
-                    "label": "Tyyppi"
+                    "label": "Tyyppi",
+                    "options": {
+                        "bomb_crater": "pommikraatteri",
+                        "boundary_stone": "rajakivi",
+                        "castle": "linna",
+                        "wreck": "hylky"
+                    }
                },
                "historic/civilization": {
                    "label": "Historiallinen kulttuuri"
@@ -1400,14 +1459,7 @@
                    "label": "Koritelineet",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Kyllä",
-                        "undefined": "Ei"
-                    }
-                },
                "horse_riding": {
-                    "label": "Hevosratsastus",
                    "options": {
                        "horse_riding": "Kyllä",
                        "undefined": "Ei"
@@ -1422,13 +1474,6 @@
                    },
                    "placeholder": "Vaikea, vaarallinen..."
                },
-                "horse_stables": {
-                    "label": "Hevostalli",
-                    "options": {
-                        "stables": "Kyllä",
-                        "undefined": "Ei"
-                    }
-                },
                "hot_water": {
                    "label": "Kuuma vesi"
                },
@@ -1583,6 +1628,12 @@
                "lifeguard": {
                    "label": "Hengenpelastaja"
                },
+                "lift_gate/type": {
+                    "options": {
+                        "double": "kaksoispuomi",
+                        "single": "yksittäinen puomi"
+                    }
+                },
                "line_attachment": {
                    "label": "Langan liitostyyppi"
                },
@@ -1643,6 +1694,7 @@
                        "glass": "lasi",
                        "granite": "graniitti",
                        "iron": "rauta",
+                        "limestone": "kalkkikivi",
                        "marble": "marmori",
                        "metal": "metalli",
                        "plastic": "muovi",
@@ -1658,6 +1710,16 @@
                "max_age": {
                    "label": "Yläikäraja"
                },
+                "maxaxleload_bridge": {
+                    "label": "Suurin sallittu akselille kohdistuva massa",
+                    "terms": "akselipaino,akseli,massa,raja"
+                },
+                "maxheight": {
+                    "label": "Suurin sallittu korkeus"
+                },
+                "maxlength": {
+                    "label": "Suurin sallittu korkeus"
+                },
                "maxspeed": {
                    "label": "Nopeusrajoitus",
                    "placeholder": "40, 50, 60..."
@@ -2606,6 +2668,7 @@
                        "asphalt": "asfaltti",
                        "concrete": "betoni",
                        "dirt": "multa",
+                        "fine_gravel": "Hieno sora",
                        "grass": "ruoho",
                        "gravel": "sora",
                        "ground": "maa",
@@ -2682,7 +2745,7 @@
                    "label": "Käsienpesu"
                },
                "toilets/position": {
-                    "label": "Sijainnit"
+                    "label": "Asennot"
                },
                "toilets/wheelchair": {
                    "label": "Esteetön vessa",
@@ -3345,7 +3408,7 @@
                    "name": "Kerrosvoileipäpikaruokaravintola"
                },
                "amenity/ferry_terminal": {
-                    "name": "Laivaterminaali"
+                    "name": "Lauttaterminaali"
                },
                "amenity/fire_station": {
                    "name": "Paloasema",
@@ -5472,6 +5535,10 @@
                "man_made/mast/communication/television": {
                    "name": "Televisiomasto"
                },
+                "man_made/milk_churn_stand": {
+                    "name": "Maitolaituri",
+                    "aliases": "Maitolava"
+                },
                "man_made/mineshaft": {
                    "name": "Kaivoskuilu"
                },
@@ -5656,6 +5723,9 @@
                    "name": "Vuorenhuippu",
                    "terms": "huippu,vuorenhuippu,korkein kohta,vuoren huippu"
                },
+                "natural/peninsula": {
+                    "name": "Niemimaa"
+                },
                "natural/reef": {
                    "name": "Riutta"
                },
@@ -6144,10 +6214,11 @@
                    "name": "Raitiotie- ja linja-autopysäkki"
                },
                "public_transport/platform/ferry": {
-                    "name": "Laivalaituri"
+                    "name": "Lauttalaituri",
+                    "terms": "laiva,laituri"
                },
                "public_transport/platform/ferry_point": {
-                    "name": "Laivapaikka/-matkustajalaituri"
+                    "name": "Lautan pysähtymispaikka/matkustajalaituri"
                },
                "public_transport/platform/light_rail": {
                    "name": "Pikaraitiotielaituri"
@@ -6202,8 +6273,8 @@
                    "terms": "bussi,terminaali"
                },
                "public_transport/station_ferry": {
-                    "name": "Laivaterminaali",
-                    "terms": "lautta"
+                    "name": "Lauttaterminaali",
+                    "terms": "laiva"
                },
                "public_transport/station_light_rail": {
                    "name": "Pikaraitiotieasema",
@@ -6244,7 +6315,8 @@
                    "name": "Linja-auton pysähtymiskohta"
                },
                "public_transport/stop_position_ferry": {
-                    "name": "Laivan pysähtymiskohta"
+                    "name": "Lautan pysähtymiskohta",
+                    "terms": "laiva"
                },
                "public_transport/stop_position_light_rail": {
                    "name": "Pikaraitiovaunun pysähtymiskohta"
@@ -6381,7 +6453,7 @@
                },
                "route/ferry": {
                    "name": "Lauttareitti",
-                    "terms": "lauttareitti,lauttalinja"
+                    "terms": "laiva,vene,reitti"
                },
                "seamark": {
                    "name": "Merimerkintä"
@@ -536,10 +536,6 @@
                    "label": "Marque",
                    "terms": "marque"
                },
-                "brewery": {
-                    "label": "Bières à la pression",
-                    "terms": "bière pression,à la pression,pression"
-                },
                "bridge": {
                    "label": "Type",
                    "placeholder": "Défaut"
@@ -599,6 +595,7 @@
                        "public": "Établissement public",
                        "residential": "Bâtiment résidentiel",
                        "retail": "Bâtiment commercial",
+                        "riding_hall": "Terrain d'équitation",
                        "roof": "Toit",
                        "ruins": "Bâtiment en ruine",
                        "school": "Bâtiment scolaire - élémentaire ou secondaire",
@@ -1062,7 +1059,7 @@
                        "lebanese": "Libanaise",
                        "malaysian": "Malais",
                        "mexican": "Mexicaine",
-                        "pankcake": "Pancakes",
+                        "pancake": "Pancakes",
                        "pasta": "Pâtes",
                        "peruvian": "Péruvienne",
                        "pizza": "Pizza",
@@ -1321,6 +1318,14 @@
                "door": {
                    "label": "Porte"
                },
+                "door/height": {
+                    "label": "Hauteur de la porte (mètres)",
+                    "terms": "hauteur de la porte"
+                },
+                "door/width": {
+                    "label": "Largeur de la porte (mètres)",
+                    "terms": "largeur de la porte"
+                },
                "door_type": {
                    "label": "Type"
                },
@@ -1923,15 +1928,8 @@
                    "label": "Nombre d'arceaux",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Dressage",
-                    "options": {
-                        "equestrian": "Oui",
-                        "undefined": "Non"
-                    }
-                },
                "horse_riding": {
-                    "label": "Équitation",
+                    "label": "Centre équestre",
                    "options": {
                        "horse_riding": "Oui",
                        "undefined": "Non"
@@ -1950,13 +1948,6 @@
                    "placeholder": "Difficile, Dangereux...",
                    "terms": "équitation,équestre,cheval,difficulté"
                },
-                "horse_stables": {
-                    "label": "Étable pour cavaliers",
-                    "options": {
-                        "stables": "Oui",
-                        "undefined": "Non"
-                    }
-                },
                "hot_water": {
                    "label": "Eau chaude"
                },
@@ -2211,6 +2202,14 @@
                "marker": {
                    "label": "Type",
                    "options": {
+                        "aerial": {
+                            "description": "Conçu pour être visible depuis le ciel.",
+                            "title": "Aérien"
+                        },
+                        "ground": {
+                            "description": "Marqueur plat posé au sol.",
+                            "title": "Sol"
+                        },
                        "pedestal": {
                            "title": "Piédestal"
                        },
@@ -2218,6 +2217,7 @@
                            "title": "Plaque"
                        },
                        "stone": {
+                            "description": "Marques peintes ou gravées sur une pierre.",
                            "title": "Pierre"
                        }
                    }
@@ -2313,6 +2313,10 @@
                        "war_memorial": "Mémorial de guerre"
                    }
                },
+                "memorial/addr": {
+                    "label": "Adresse la plus proche",
+                    "terms": "adresse la plus proche"
+                },
                "message": {
                    "label": "Message",
                    "terms": "message,commentaire,remarque"
@@ -3131,13 +3135,13 @@
                "route_master": {
                    "label": "Type"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Monogramme royal",
                    "options": {
                        "CIIIR": "CIIIR (Charles III)",
                        "EIIR": "EIIR (Elizabeth II)",
-                        "EVIIIR": "EVIIIR (Edward VIII)",
-                        "EVIIR": "EVIIR (Edward VII)",
+                        "EVIIIR": "EVIIIR (Édouard VIII)",
+                        "EVIIR": "EVIIR (Édouard VII)",
                        "GR": "GR (George V)",
                        "GVIR": "GVIR (George VI)",
                        "VR": "VR (Victoria)",
@@ -3810,6 +3814,13 @@
                "telecom/medium": {
                    "label": "Moyenne"
                },
+                "telescope/type": {
+                    "label": "Type",
+                    "options": {
+                        "optical": "Télescope optique",
+                        "radio": "Radiotélescope"
+                    }
+                },
                "tents": {
                    "label": "Tentes"
                },
@@ -4449,6 +4460,10 @@
                    "name": "Distributeur de billets",
                    "terms": "distributeur de billets,distributeur automatique,distributeur automatique de billets,guichet automatique,dab,gab,billets de banque,retrait d'argent,retrait de liquide,guichet de retrait,retrait automatique,atm,amenity atm,mister cash,bancontact"
                },
+                "amenity/baking_oven": {
+                    "name": "Four à bois",
+                    "terms": "four à bois"
+                },
                "amenity/bank": {
                    "name": "Banque",
                    "terms": "banque,caisse populaire,bank"
@@ -5843,6 +5858,10 @@
                    "name": "Immeuble",
                    "terms": "immeuble,appartements"
                },
+                "building/bakehouse": {
+                    "name": "Four à pain",
+                    "terms": "four à pain"
+                },
                "building/barn": {
                    "name": "Grange",
                    "terms": "grange,hangar agricole,bâtiment agricole,stockage,grenier,abri,remise,étable,ferme,barn"
@@ -6007,6 +6026,10 @@
                    "name": "Bâtiment commercial",
                    "terms": "bâtiment commercial"
                },
+                "building/riding_hall": {
+                    "name": "Terrain d'équitation en intérieur",
+                    "terms": "terrain d'équitation en intérieur,terrain d'équitation,intérieur"
+                },
                "building/roof": {
                    "name": "Toit",
                    "terms": "voûte,toit ouvert,marché couvert"
@@ -7000,6 +7023,10 @@
                    "name": "Plaque commémorative",
                    "terms": "épitaphe,marque historique,historique,souvenir,mémoire,plaque historique"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Plaque mémorielle Stolpersteine",
+                    "terms": "plaque mémorielle stolpersteine,stolpersteine"
+                },
                "historic/monument": {
                    "name": "Grand monument commémoratif",
                    "terms": "grand mémorial"
@@ -7665,6 +7692,10 @@
                    "name": "Salle d'escalade",
                    "terms": "escalade,salle,mur,prises,block,bloque"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Parc d'aventures",
+                    "terms": "parc d'aventures"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Course hippique",
                    "terms": "course équestre,galop,pari,pari sportif,course de cheval,course,équitation,cheval"
@@ -7973,6 +8004,10 @@
                    "name": "Réservoir couvert",
                    "terms": "réservoir,bassin,couvert,enterré,souterrain"
                },
+                "man_made/satellite_dish": {
+                    "name": "Antenne satellite",
+                    "terms": "antenne satellite"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "réservoir,emplacement de stockage"
@@ -8025,6 +8060,18 @@
                    "name": "Bassin de résidus miniers",
                    "terms": "bassin,étang,résidus,déchets,mine,minier,sédimentation"
                },
+                "man_made/telescope": {
+                    "name": "Télescope",
+                    "terms": "télescope"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Télescope optique",
+                    "terms": "télescope optique"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radiotélescope",
+                    "terms": "radiotélescope"
+                },
                "man_made/torii": {
                    "name": "Torii",
                    "terms": "torii,portique,portail,shinto,temple shinto"
@@ -8969,6 +9016,10 @@
                    "name": "Appareil de connexion électrique",
                    "terms": "appareil de connexion électrique"
                },
+                "power/switchgear": {
+                    "name": "Appareillage électrique",
+                    "terms": "appareillage électrique,appareillage,électrique,appareils de commutation électrique,équipements électriques,appareils,équipements"
+                },
                "power/tower": {
                    "name": "Pylône électrique",
                    "terms": "pylône haute-tension"
@@ -1,7 +1,48 @@
 {
    "ga": {
        "presets": {
+            "categories": {
+                "category-path": {
+                    "name": "Cosáin"
+                },
+                "category-rail": {
+                    "name": "Ráillí"
+                }
+            },
            "fields": {
+                "access": {
+                    "options": {
+                        "designated": {
+                            "description": "Tá rochtain cheadaithe de réir comharthaí nó dlíthe áitiúla áirithe"
+                        },
+                        "destination": {
+                            "description": "Ní cheadaítear rochtain ach chun an ceann scríbe a sroicheadh.",
+                            "title": "Ceann Scríbe"
+                        },
+                        "no": {
+                            "description": "Ní cheadaítear rochtain don phobal",
+                            "title": "Coiscthe"
+                        },
+                        "permissive": {
+                            "title": "Ceadaitheach"
+                        },
+                        "permit": {
+                            "description": "Ceadaítear rochtain le ceadúnas bailí"
+                        },
+                        "private": {
+                            "title": "Príobháideach"
+                        },
+                        "yes": {
+                            "title": "Ceadaithe"
+                        }
+                    },
+                    "types": {
+                        "access": "Uile",
+                        "bicycle": "Rothair",
+                        "foot": "Ag Siúl",
+                        "horse": "Capaill"
+                    }
+                },
                "addr/interpolation": {
                    "options": {
                        "even": "Ré-uimhir",
@@ -32,26 +73,125 @@
                        "suburb": "Bruachbhaile"
                    }
                },
+                "aeroway": {
+                    "label": "Cineál"
+                },
+                "amenity": {
+                    "label": "Cineál"
+                },
+                "artist": {
+                    "label": "Ealaíontóir"
+                },
+                "artwork_type": {
+                    "label": "Cineál"
+                },
+                "atm": {
+                    "label": "Meaisín Bainc"
+                },
+                "attraction": {
+                    "options": {
+                        "train": "Traein Turasóireachta"
+                    }
+                },
+                "barrier": {
+                    "label": "Cineál",
+                    "options": {
+                        "toll_booth": "Both Dola"
+                    }
+                },
+                "bicycle_parking": {
+                    "label": "Cineál"
+                },
+                "board_type": {
+                    "options": {
+                        "welcome_sign": "Comhartha Fáilte"
+                    }
+                },
+                "boundary": {
+                    "label": "Cineál"
+                },
                "building": {
+                    "label": "Foirgneamh",
                    "options": {
                        "train_station": "Foirgneamh Stáisiún Traenach"
                    }
                },
+                "capacity": {
+                    "label": "Toilleadh"
+                },
+                "charge_toll": {
+                    "label": "Táille Dola"
+                },
+                "construction": {
+                    "label": "Cineál"
+                },
                "contact/facebook": {
                    "label": "Ainm Úsáideora Facebook nó URL"
                },
+                "country": {
+                    "label": "Tír"
+                },
+                "crossing": {
+                    "label": "Cineál",
+                    "options": {
+                        "traffic_signals": "Crosaire le soilse tráchta",
+                        "unmarked": "Gan marcanna bóthair nó soilse tráchta"
+                    }
+                },
+                "cuisine": {
+                    "label": "Bianna"
+                },
                "cycleway": {
+                    "label": "Lánaí Rothair",
                    "options": {
                        "share_busway": {
                            "description": "Lána rothar roinnte le lána bus",
                            "title": "Lána rothar roinnte le bus"
+                        },
+                        "shared_lane": {
+                            "description": "Raon Rothar gan bacainn idir an raon rothar agus an trácht ar an mbóthar"
+                        },
+                        "track": {
+                            "description": "Tá bacainn fhisiceach idir an raon rothar agus an bóthar",
+                            "title": "Raon Rothar"
                        }
                    }
                },
+                "description": {
+                    "label": "Cur Síos"
+                },
+                "emergency": {
+                    "label": "Éigeandáil"
+                },
+                "entrance": {
+                    "label": "Cineál"
+                },
+                "fax": {
+                    "label": "Facs"
+                },
+                "fee": {
+                    "label": "Táille"
+                },
+                "fire_hydrant/type": {
+                    "label": "Cruth"
+                },
                "gauge": {
                    "label": "Leithead"
                },
+                "generator/method": {
+                    "label": "Modh"
+                },
+                "generator/source": {
+                    "label": "Foinse"
+                },
+                "generator/type": {
+                    "label": "Cineál"
+                },
+                "highway": {
+                    "label": "Cineál"
+                },
                "historic": {
+                    "label": "Cineál",
                    "options": {
                        "archaeological_site": "Láithreán Seandálaíochta",
                        "bomb_crater": "Cráitéar Buama",
@@ -74,6 +214,11 @@
                        "runway": "Rúidbhealach"
                    }
                },
+                "horse_scale": {
+                    "options": {
+                        "impossible": "Ní féidir le capaill taisteal ar an mbealach/droichead seo. Tá sé róchaol, níl a dhóthain taca ann, nó tá constaicí ar nós dréimirí ann. Dainséir don saol."
+                    }
+                },
                "image": {
                    "label": "Íomhá",
                    "placeholder": "https://example.com/photo.jpg",
@@ -88,6 +233,13 @@
                        "up": "Suas"
                    }
                },
+                "internet_access": {
+                    "options": {
+                        "terminal": "Teirminéal",
+                        "wired": "Sreangtha",
+                        "wlan": "Wifi"
+                    }
+                },
                "junction_line": {
                    "label": "Acomhal",
                    "options": {
@@ -104,12 +256,27 @@
                "kitchen": {
                    "label": "Cistin"
                },
+                "landuse": {
+                    "label": "Cineál"
+                },
                "lanes": {
-                    "label": "Teangacha"
+                    "label": "Lánaí"
                },
                "language_multi": {
                    "label": "Teangacha"
                },
+                "layer": {
+                    "label": "Sraith"
+                },
+                "leisure": {
+                    "label": "Cineál"
+                },
+                "location": {
+                    "label": "Suíomh"
+                },
+                "man_made": {
+                    "label": "Cineál"
+                },
                "material": {
                    "options": {
                        "soil": "Ithir",
@@ -130,6 +297,27 @@
                "name": {
                    "label": "Ainm"
                },
+                "natural": {
+                    "label": "Nádúrtha"
+                },
+                "network": {
+                    "label": "Líonra"
+                },
+                "note": {
+                    "label": "Nóta"
+                },
+                "office": {
+                    "label": "Cineál"
+                },
+                "opening_hours": {
+                    "label": "Uaireanta"
+                },
+                "operator": {
+                    "label": "Oibritheoir"
+                },
+                "parking": {
+                    "label": "Cineál"
+                },
                "payment_multi": {
                    "options": {
                        "american_express": "American Express",
@@ -147,16 +335,34 @@
                        "debit_cards": "Cárta Dochair"
                    }
                },
+                "phone": {
+                    "label": "Teileafón"
+                },
+                "place": {
+                    "label": "Cineál"
+                },
                "population": {
                    "label": "Daonra"
                },
                "population/date": {
                    "placeholder": "BBBB-MM-LL"
                },
+                "power": {
+                    "label": "Cineál"
+                },
+                "railway": {
+                    "label": "Cineál"
+                },
+                "ref_road_number": {
+                    "label": "Uimhir Bóthair"
+                },
                "ref_runway": {
                    "label": "Uimhir an Rúidbhealaigh",
                    "placeholder": "m.sh. 01L/19R"
                },
+                "ref_stop_position": {
+                    "label": "Uimhir Stop"
+                },
                "ref_taxiway": {
                    "label": "Ainm an Bhealaigh Innealta",
                    "placeholder": "m.sh. A5"
@@ -239,21 +445,24 @@
                "route_master": {
                    "label": "Cineál"
                },
-                "royal_cypher": {
-                    "options": {
-                        "CIIIR": "CIIIR (Séarlas III)",
-                        "EIIR": "EIIR (Eilís II)",
-                        "EVIIIR": "EVIIIR (Éadbhard VIII)",
-                        "EVIIR": "EVIIR (Éadbhard VII)",
-                        "GR": "GR (Seoirse V)",
-                        "GVIR": "GVIR (Seoirse VI)",
-                        "VR": "VR (Victoria)",
-                        "scottish_crown": "Coróin Albanach"
-                    }
-                },
                "ruins": {
                    "label": "Cineál"
                },
+                "service": {
+                    "label": "Cineál"
+                },
+                "shelter": {
+                    "label": "Scáthlán"
+                },
+                "shelter_type": {
+                    "label": "Cineál"
+                },
+                "shop": {
+                    "label": "Cineál"
+                },
+                "source": {
+                    "label": "Foinsí"
+                },
                "sport": {
                    "label": "Spóirt",
                    "options": {
@@ -413,6 +622,18 @@
                "toilets": {
                    "label": "Leithris"
                },
+                "toll": {
+                    "label": "Dola"
+                },
+                "tourism": {
+                    "label": "Cineál"
+                },
+                "tracktype": {
+                    "options": {
+                        "grade2": "Soladach den chuid is mó: gairbhéal nó cloch le hábhar bog measctha isteach ",
+                        "grade4": "Bog den chuid is mó: ithir/gaineamh/féar le hábhar crua measctha isteach"
+                    }
+                },
                "traffic_calming": {
                    "options": {
                        "bump": "Uchtóg Mhoillithe",
@@ -584,21 +805,177 @@
                },
                "water": {
                    "label": "Cineál"
+                },
+                "waterway": {
+                    "label": "Cineál"
+                },
+                "website": {
+                    "label": "Suíomh Gréasáin",
+                    "placeholder": "https://sampla.com"
+                },
+                "wetland": {
+                    "label": "Cineál"
+                },
+                "wikipedia": {
+                    "label": "Vicipéid"
                }
            },
            "presets": {
+                "address": {
+                    "name": "Seoladh"
+                },
+                "aeroway/aerodrome": {
+                    "name": "Aerfort"
+                },
+                "aeroway/hangar": {
+                    "name": "Haingear"
+                },
+                "aeroway/helipad": {
+                    "name": "Héileapad"
+                },
+                "aeroway/runway": {
+                    "name": "Rúidbhealach"
+                },
+                "aeroway/taxiway": {
+                    "name": "Bealach Innealta"
+                },
+                "amenity": {
+                    "name": "Áis"
+                },
+                "amenity/atm": {
+                    "name": "Meaisín Bainc"
+                },
+                "amenity/bank": {
+                    "name": "Banc"
+                },
+                "amenity/bar": {
+                    "name": "Teach Tábhairne",
+                    "aliases": "Beár\nTeach Ósta"
+                },
+                "amenity/bench": {
+                    "name": "Binse"
+                },
                "amenity/bus_station": {
                    "name": "Stáisiún / Críochfort Bus"
                },
+                "amenity/cafe": {
+                    "name": "Caifé"
+                },
+                "amenity/childcare": {
+                    "name": "Naíonra",
+                    "aliases": "Naíscoil\nNaíolann\nCreis\nCrèche"
+                },
+                "amenity/cinema": {
+                    "name": "Pictiúrlann"
+                },
                "amenity/community_centre": {
                    "name": "Ionad Pobail"
                },
+                "amenity/courthouse": {
+                    "name": "Teach Cúirte"
+                },
+                "amenity/embassy": {
+                    "name": "Ambasáid"
+                },
+                "amenity/fountain": {
+                    "name": "Scairdeán",
+                    "aliases": "Fuarán"
+                },
+                "amenity/grave_yard": {
+                    "name": "Reilig"
+                },
+                "amenity/library": {
+                    "name": "Leabharlann"
+                },
+                "amenity/marketplace": {
+                    "name": "Margadh",
+                    "aliases": "Áit an Mhargaidh"
+                },
+                "amenity/parking_entrance": {
+                    "name": "Slí Isteach/Amach Garáiste Páirceála"
+                },
+                "amenity/police": {
+                    "name": "Póilíní",
+                    "aliases": "Gardaí"
+                },
+                "amenity/pub": {
+                    "name": "Teach Tábhairne",
+                    "aliases": "Pub"
+                },
+                "amenity/restaurant": {
+                    "name": "Bialann"
+                },
                "amenity/school": {
                    "name": "Fearann Scoile"
                },
+                "amenity/shelter": {
+                    "name": "Scáthlán",
+                    "aliases": "Foscadán"
+                },
+                "amenity/telephone": {
+                    "name": "Teileafón",
+                    "aliases": "Fón"
+                },
+                "amenity/theatre": {
+                    "name": "Amharclann"
+                },
+                "amenity/toilets": {
+                    "name": "Leithris",
+                    "aliases": "Leithreas"
+                },
                "amenity/university": {
                    "name": "Fearann Ollscoile"
                },
+                "area": {
+                    "name": "Limistéar",
+                    "aliases": "Crios\nCeantar\nLáthair"
+                },
+                "attraction/train": {
+                    "name": "Traein Turasóireachta"
+                },
+                "barrier": {
+                    "name": "Bacainn"
+                },
+                "barrier/bollard": {
+                    "name": "Mullard"
+                },
+                "barrier/ditch": {
+                    "name": "Díog",
+                    "aliases": "Clais\nTrinse"
+                },
+                "barrier/entrance": {
+                    "name": "Slí Isteach",
+                    "aliases": "Bealach Isteach"
+                },
+                "barrier/fence": {
+                    "name": "Claí"
+                },
+                "barrier/gate": {
+                    "name": "Geata"
+                },
+                "barrier/hedge": {
+                    "name": "Fál"
+                },
+                "barrier/stile": {
+                    "name": "Dreapa",
+                    "aliases": "Strapa\nCéim"
+                },
+                "barrier/toll_booth": {
+                    "name": "Both Dola"
+                },
+                "barrier/wall": {
+                    "name": "Balla"
+                },
+                "building": {
+                    "name": "Foirgneamh"
+                },
+                "building/entrance": {
+                    "name": "Slí Isteach/Amach",
+                    "aliases": "Bealach Isteach/Amach\nSlí Isteach/Slí Amach\nBealach Isteach/Bealach Amach"
+                },
+                "building/garage": {
+                    "name": "Garáiste"
+                },
                "building/school": {
                    "name": "Foirgneamh Scoile"
                },
@@ -611,21 +988,209 @@
                "highway/bus_stop": {
                    "name": "Stad bus"
                },
+                "highway/crossing/traffic_signals": {
+                    "name": "Crosaire le soilse coisithe"
+                },
+                "highway/cycleway/crossing/traffic_signals": {
+                    "name": "Crosaire rothair le soilse tráchta"
+                },
+                "highway/footway/crossing/traffic_signals": {
+                    "name": "Crosaire le soilse coisithe"
+                },
+                "highway/give_way": {
+                    "name": "Comhartha Géill Slí"
+                },
+                "highway/mini_roundabout": {
+                    "name": "Miontimpeallán"
+                },
                "highway/motorway": {
                    "name": "Mótarbhealach"
                },
                "highway/motorway_junction": {
                    "name": "Slí Amach / Acomhal Mótarbhealaigh"
                },
+                "highway/path": {
+                    "name": "Cosán",
+                    "aliases": "Conair\nSlí"
+                },
                "highway/pedestrian_line": {
                    "name": "Sráid Choisithe"
                },
+                "highway/service/alley": {
+                    "name": "Lána",
+                    "aliases": "Caolsráid"
+                },
+                "highway/service/drive-through": {
+                    "name": "Carrsheirbhíse"
+                },
+                "highway/service/driveway": {
+                    "name": "Cabhsa",
+                    "aliases": "Cabhsán"
+                },
+                "highway/steps": {
+                    "name": "Céimeanna"
+                },
+                "highway/stop": {
+                    "name": "Comhartha Stop"
+                },
                "highway/street_lamp": {
                    "name": "Solas sráide"
                },
+                "historic/castle": {
+                    "name": "Caisleán"
+                },
+                "historic/memorial": {
+                    "name": "Leacht Cuimhneacháin",
+                    "aliases": "Leac Chuimhneacháin"
+                },
+                "historic/monument": {
+                    "name": "Leacht"
+                },
+                "historic/ruins": {
+                    "name": "Fothrach",
+                    "aliases": "Ballóga"
+                },
+                "landuse/cemetery": {
+                    "name": "Reilig"
+                },
+                "landuse/farm": {
+                    "name": "Talamh Feirme",
+                    "aliases": "Talamh Feilme"
+                },
+                "landuse/farmyard": {
+                    "name": "Clós Feirme",
+                    "aliases": "Clós Feilme"
+                },
+                "landuse/grass": {
+                    "name": "Féar"
+                },
+                "landuse/meadow": {
+                    "name": "Cluain",
+                    "aliases": "Móinéar"
+                },
                "landuse/military/training_area": {
                    "name": "Limistéar Oiliúna Míleata"
                },
+                "landuse/orchard": {
+                    "name": "Úllord"
+                },
+                "landuse/quarry": {
+                    "name": "Cairéal"
+                },
+                "landuse/vineyard": {
+                    "name": "Fíonghort"
+                },
+                "leisure/garden": {
+                    "name": "Gairdín",
+                    "aliases": "Garraí"
+                },
+                "leisure/marina": {
+                    "name": "Mairíne"
+                },
+                "leisure/park": {
+                    "name": "Páirc"
+                },
+                "leisure/playground": {
+                    "name": "Áit Súgartha",
+                    "aliases": "Clós Súgartha"
+                },
+                "leisure/slipway": {
+                    "name": "Fánán",
+                    "aliases": "Slip\nSleamhnán"
+                },
+                "leisure/stadium": {
+                    "name": "Staid"
+                },
+                "line": {
+                    "name": "Líne"
+                },
+                "man_made/lighthouse": {
+                    "name": "Teach Solais"
+                },
+                "man_made/pier": {
+                    "name": "Cé"
+                },
+                "man_made/pipeline": {
+                    "name": "Píblíne"
+                },
+                "man_made/tower": {
+                    "name": "Túr"
+                },
+                "natural/bay": {
+                    "name": "Bá"
+                },
+                "natural/beach": {
+                    "name": "Trá"
+                },
+                "natural/cliff": {
+                    "name": "Aill"
+                },
+                "natural/coastline": {
+                    "name": "Imeallbhord"
+                },
+                "natural/glacier": {
+                    "name": "Oighearshruth"
+                },
+                "natural/grassland": {
+                    "name": "Talamh Féaraigh",
+                    "aliases": "Féarthalamh\nFéarach"
+                },
+                "natural/heath": {
+                    "name": "Móinteach",
+                    "aliases": "Fraochmhá"
+                },
+                "natural/peak": {
+                    "name": "Binn"
+                },
+                "natural/spring": {
+                    "name": "Tobar",
+                    "aliases": "Fuinse Uisce\nFuarán"
+                },
+                "natural/tree": {
+                    "name": "Crann"
+                },
+                "natural/water": {
+                    "name": "Uisce",
+                    "aliases": "Dobhar"
+                },
+                "natural/water/lake": {
+                    "name": "Loch"
+                },
+                "natural/water/pond": {
+                    "name": "Lochán",
+                    "aliases": "Linn"
+                },
+                "natural/water/reservoir": {
+                    "name": "Taiscumar"
+                },
+                "natural/wetland": {
+                    "name": "Bogach"
+                },
+                "office": {
+                    "name": "Oifig"
+                },
+                "place": {
+                    "name": "Áit"
+                },
+                "place/city": {
+                    "name": "Cathair"
+                },
+                "place/hamlet": {
+                    "name": "Gráig",
+                    "aliases": "Sráidbhaile"
+                },
+                "place/island": {
+                    "name": "Oileán"
+                },
+                "place/town": {
+                    "name": "Baile"
+                },
+                "place/village": {
+                    "name": "Sráidbhaile"
+                },
+                "point": {
+                    "name": "Pointe"
+                },
                "public_transport/platform/bus_point": {
                    "name": "Stad bus"
                },
@@ -650,9 +1215,21 @@
                "public_transport/platform/trolleybus_point": {
                    "name": "Stad bus tralaí"
                },
+                "public_transport/station_subway": {
+                    "name": "Stáisiún Meitreo"
+                },
                "public_transport/station_train": {
                    "name": "Stáisiún Traenach"
                },
+                "public_transport/station_train_halt": {
+                    "name": "Stáisiún Traenach (Stad ar iarratas)"
+                },
+                "public_transport/station_tram": {
+                    "name": "Stáisiún Tram"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Áit Stoptha Meitreo"
+                },
                "public_transport/stop_position_tram": {
                    "name": "Áit Stoptha Tram"
                },
@@ -675,6 +1252,9 @@
                "railway/rail/highspeed": {
                    "name": "Ráille Thraein Ardluais"
                },
+                "railway/signal": {
+                    "name": "Comhartha Iarnróid"
+                },
                "railway/station": {
                    "name": "Stáisiún Traenach"
                },
@@ -693,8 +1273,137 @@
                "railway/tram_level_crossing": {
                    "name": "Crosaire Tram-Bóthar"
                },
+                "relation": {
+                    "name": "Nasc"
+                },
+                "shop": {
+                    "name": "Siopa"
+                },
+                "shop/books": {
+                    "name": "Siopa Leabhair"
+                },
+                "shop/boutique": {
+                    "name": "Búitíc",
+                    "aliases": "Boutique"
+                },
+                "shop/butcher": {
+                    "name": "Búistéir",
+                    "aliases": "Siopa Búistéara"
+                },
+                "shop/chemist": {
+                    "name": "Cógaslann",
+                    "aliases": "Siopa Poitigéara"
+                },
+                "shop/deli": {
+                    "name": "Deilí",
+                    "aliases": "Delicatessen"
+                },
+                "shop/florist": {
+                    "name": "Siopa Bláthanna"
+                },
+                "shop/greengrocer": {
+                    "name": "Siopa Glasraí"
+                },
+                "shop/hairdresser": {
+                    "name": "Gruagaire",
+                    "aliases": "Siopa Gruagaire"
+                },
+                "shop/kiosk": {
+                    "name": "Both",
+                    "aliases": "Stainnín"
+                },
+                "shop/mall": {
+                    "name": "Ionad Siopadóireachta"
+                },
+                "shop/newsagent": {
+                    "name": "Seastán Nuachtán"
+                },
+                "shop/optician": {
+                    "name": "Radharceolaí"
+                },
+                "shop/supermarket": {
+                    "name": "Ollmhargadh"
+                },
+                "tourism/artwork": {
+                    "name": "Obair Ealaíne",
+                    "aliases": "Saothar Ealaíne"
+                },
+                "tourism/hostel": {
+                    "name": "Brú"
+                },
+                "tourism/hotel": {
+                    "name": "Óstán",
+                    "aliases": "Óstlann"
+                },
+                "tourism/information": {
+                    "name": "Eolas"
+                },
+                "tourism/information/board/welcome_sign": {
+                    "name": "Comhartha Fáilte"
+                },
+                "tourism/motel": {
+                    "name": "Óstán Cois Bóthair",
+                    "aliases": "Óstán"
+                },
+                "tourism/museum": {
+                    "name": "Músaem"
+                },
+                "tourism/viewpoint": {
+                    "name": "Pointe Radhairc"
+                },
+                "tourism/zoo": {
+                    "name": "Zú",
+                    "aliases": "Gairdín Ainmhithe"
+                },
+                "traffic_sign": {
+                    "name": "Comhartha Bóthair"
+                },
+                "traffic_sign/maxspeed": {
+                    "name": "Comhartha Teorainn Luais"
+                },
+                "type/boundary": {
+                    "name": "Teorainn"
+                },
+                "type/destination_sign": {
+                    "name": "Comhartha Ceann Scríbe"
+                },
+                "type/multipolygon": {
+                    "name": "Ilpholagán"
+                },
+                "type/restriction": {
+                    "name": "Srian"
+                },
+                "type/route": {
+                    "name": "Bealach",
+                    "aliases": "Slí"
+                },
+                "type/route/subway": {
+                    "name": "Líne Meitreo"
+                },
                "type/route/train": {
                    "name": "Líne Traenach"
+                },
+                "type/route/tram": {
+                    "name": "Bealach Tram",
+                    "aliases": "Slí Tram"
+                },
+                "waterway/canal": {
+                    "name": "Canáil"
+                },
+                "waterway/dam": {
+                    "name": "Damba"
+                },
+                "waterway/drain": {
+                    "name": "Draein"
+                },
+                "waterway/river": {
+                    "name": "Abhainn"
+                },
+                "waterway/stream": {
+                    "name": "Sruth"
+                },
+                "waterway/weir": {
+                    "name": "Cora"
                }
            }
        }
@@ -342,9 +342,6 @@
                    "label": "Marca",
                    "terms": "marca,distintivo,sinal,comercial"
                },
-                "brewery": {
-                    "label": "Cervexa de bocoi / tirada"
-                },
                "bridge": {
                    "label": "Tipo",
                    "placeholder": "Por defecto"
@@ -911,15 +908,7 @@
                    "label": "Canastras",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Doma clásica",
-                    "options": {
-                        "equestrian": "Si",
-                        "undefined": "Non"
-                    }
-                },
                "horse_riding": {
-                    "label": "Centro de equitación",
                    "options": {
                        "horse_riding": "Si",
                        "undefined": "Non"
@@ -936,13 +925,6 @@
                    },
                    "placeholder": "Difícil, perigoso..."
                },
-                "horse_stables": {
-                    "label": "Cortello para montar a cabalo",
-                    "options": {
-                        "stables": "Si",
-                        "undefined": "Non"
-                    }
-                },
                "hot_water": {
                    "label": "Auga quente"
                },
@@ -671,15 +671,7 @@
                    "label": "חישוקים",
                    "placeholder": "1, 2, 4…"
                },
-                "horse_dressage": {
-                    "label": "רכיבה אומנותית",
-                    "options": {
-                        "equestrian": "כן",
-                        "undefined": "לא"
-                    }
-                },
                "horse_riding": {
-                    "label": "רכיבה על סוסים",
                    "options": {
                        "horse_riding": "כן",
                        "undefined": "לא"
@@ -697,13 +689,6 @@
                    },
                    "placeholder": "קשה, מסוכן…"
                },
-                "horse_stables": {
-                    "label": "אורוות רכיבה",
-                    "options": {
-                        "stables": "כן",
-                        "undefined": "לא"
-                    }
-                },
                "hot_water": {
                    "label": "מים חמים"
                },
@@ -840,10 +825,10 @@
                    "label": "אורך (מטרים)"
                },
                "level": {
-                    "label": "רמה"
+                    "label": "קומה"
                },
                "level_semi": {
-                    "label": "רמות"
+                    "label": "קומות"
                },
                "liaison": {
                    "label": "סוג"
@@ -518,10 +518,6 @@
                    "label": "מותג",
                    "terms": "מיתוג,ממותג,שם"
                },
-                "brewery": {
-                    "label": "בירה מהחבית",
-                    "terms": "בירה בוטיק,בוטיק,חבית,מהחבית,בירה מהחבית,מבשלה"
-                },
                "bridge": {
                    "label": "סוג",
                    "placeholder": "בררת מחדל"
@@ -849,7 +845,7 @@
                        "caterer": "הסעדה",
                        "chimney_sweeper": "ניקוי ארובות",
                        "cleaning": "שירות ניקיון",
-                        "clockmaker": "שען",
+                        "clockmaker": "שענות קיר",
                        "confectionery": "מייצר ממתקים",
                        "distillery": "מזקקה",
                        "dressmaker": "תופרת",
@@ -1007,7 +1003,6 @@
                        "lebanese": "לבנוני",
                        "malaysian": "מלזי",
                        "mexican": "מקסיקני",
-                        "pankcake": "פנקייק",
                        "pasta": "פסטה",
                        "peruvian": "פרואני",
                        "pizza": "פיצה",
@@ -1809,15 +1804,7 @@
                    "label": "סלים",
                    "placeholder": "1, 2, 4…"
                },
-                "horse_dressage": {
-                    "label": "רכיבה אומנותית",
-                    "options": {
-                        "equestrian": "יש",
-                        "undefined": "אין"
-                    }
-                },
                "horse_riding": {
-                    "label": "רכיבה על סוסים",
                    "options": {
                        "horse_riding": "יש",
                        "undefined": "אין"
@@ -1834,13 +1821,6 @@
                    },
                    "placeholder": "קשה, מסוכן…"
                },
-                "horse_stables": {
-                    "label": "אורוות רכיבה",
-                    "options": {
-                        "stables": "יש",
-                        "undefined": "אין"
-                    }
-                },
                "hot_water": {
                    "label": "מים חמים"
                },
@@ -2063,7 +2043,12 @@
                    "terms": "מאפילרי,מפילרי,מזהה תמונה מאפילרי,מזהה תמונה מפילרי"
                },
                "marker": {
-                    "label": "סוג"
+                    "label": "סוג",
+                    "options": {
+                        "stone": {
+                            "title": "אבן"
+                        }
+                    }
                },
                "material": {
                    "label": "חומר",
@@ -2139,6 +2124,9 @@
                        "war_memorial": "אנדרטת מלחמה"
                    }
                },
+                "memorial/addr": {
+                    "label": "כתובת המבנה הקרוב ביותר"
+                },
                "message": {
                    "label": "הודעה"
                },
@@ -2698,7 +2686,7 @@
                    "label": "סוג"
                },
                "railway/position": {
-                    "label": "אבן דרך",
+                    "label": "מקום אבן דרך",
                    "placeholder": "מרחק עד נקודה עשרונית אחת (123.4)"
                },
                "railway/signal/direction": {
@@ -2869,14 +2857,6 @@
                "route_master": {
                    "label": "סוג"
                },
-                "royal_cypher": {
-                    "options": {
-                        "CIIIR": "CIIIR (צארלס השלישי)",
-                        "EIIR": "EIIR (אליזבט השניה)",
-                        "VR": "VR (ויקטוריה)",
-                        "no": "אין"
-                    }
-                },
                "ruins": {
                    "label": "סוג"
                },
@@ -3171,6 +3151,9 @@
                "source/population": {
                    "label": "מקור אוכלוסייה"
                },
+                "species": {
+                    "label": "זן"
+                },
                "species/wikidata": {
                    "label": "מינים בוויקינתונים",
                    "terms": "ויקיזנים,ויקימינים,ויקיחיות,ויקיסוגים,ויקי זנים,ויקי מינים,ויקיספישיז"
@@ -3181,11 +3164,14 @@
                        "10pin": "כדורת 10-פינים (באולינג)",
                        "9pin": "כדורת 9-פינים (באולינג)",
                        "american_football": "פוטבול אמריקאי",
+                        "athletics": "אתלטיקה קלה",
                        "badminton": "בדמינטון",
                        "baseball": "בייסבול",
                        "basketball": "כדורסל",
                        "beachvolleyball": "כדורעף חופים",
                        "billiards": "ביליארד",
+                        "bmx": "אופני פעלולים",
+                        "bowls": "כדורת דשא",
                        "canoe": "שייט בקאנו",
                        "chess": "שחמט",
                        "climbing": "טיפוס",
@@ -3198,6 +3184,7 @@
                        "fitness": "אימון כושר",
                        "free_flying": "מצנחי רחיפה/ גלישת רחיפה",
                        "futsal": "קטרגל",
+                        "gaelic_games": "משחקים גאליים",
                        "golf": "גולף",
                        "gymnastics": "התעמלות",
                        "handball": "כדוריד קבוצתי",
@@ -3327,7 +3314,7 @@
                "substation": {
                    "label": "סוג",
                    "options": {
-                        "converter": "ממיר מתח גבוה מAC לDC",
+                        "converter": "שנאי מתח גבוה מ־AC ל־DC",
                        "industrial": "תעשייתי",
                        "minor_distribution": "חלוקה מקומית",
                        "traction": "אספקת מערכת הנע",
@@ -3349,7 +3336,8 @@
                    }
                },
                "supervised": {
-                    "label": "פיקוח"
+                    "label": "פיקוח",
+                    "terms": "מפקח,מפקחת,פקחית,פקח,השגחה,משגיח,משגיחה"
                },
                "support": {
                    "label": "תמיכה",
@@ -3374,7 +3362,7 @@
                        "salt": "מלח",
                        "sand": "חול",
                        "sett": "אבנים תואמות",
-                        "unhewn_cobblestone": "אבן מרוצפת (לא חתוכה או עגולה)",
+                        "unhewn_cobblestone": "אבן מרוצפת (לא חתוכה, עגולה)",
                        "unpaved": "בלתי סלול",
                        "wood": "עץ",
                        "woodchips": "שבבי עץ"
@@ -3399,7 +3387,12 @@
                    "label": "תאריך התשאול האחרון"
                },
                "survey_point/purpose": {
-                    "label": "תכלית"
+                    "label": "תכלית",
+                    "options": {
+                        "both": "גם וגם",
+                        "horizontal": "יישור אופקי",
+                        "vertical": "יישור אנכי"
+                    }
                },
                "survey_point/structure": {
                    "label": "מבנה",
@@ -3471,6 +3464,13 @@
                "telecom/medium": {
                    "label": "צורת תקשורת"
                },
+                "telescope/type": {
+                    "label": "סוג",
+                    "options": {
+                        "optical": "טלסקופ אופטי",
+                        "radio": "רדיו טלסקופ"
+                    }
+                },
                "tents": {
                    "label": "אוהלים"
                },
@@ -4257,12 +4257,20 @@
                "amenity/doctors/haematology": {
                    "name": "המטולוג"
                },
+                "amenity/doctors/internal": {
+                    "name": "רפואה פנימית",
+                    "terms": "רפואת פנים,רופא פנים,רופאת פנים,רופאי פנים"
+                },
                "amenity/doctors/nephrology": {
                    "name": "נפרולוג"
                },
                "amenity/doctors/neurology": {
                    "name": "נוירולוג"
                },
+                "amenity/doctors/neurosurgery": {
+                    "name": "נוירוכירורגיה",
+                    "terms": "ניתוח מוח,מנתח מוח,מנתחת מוח,נתיחת מוח,ניתוח מח,מנתח מח,מנתחת מח,נורוכירורגיה,נוירו"
+                },
                "amenity/doctors/oncology": {
                    "name": "אונקולוג"
                },
@@ -4687,10 +4695,11 @@
                },
                "amenity/recycling_centre": {
                    "name": "מרכז מיחזור",
-                    "terms": "מרכז מיחזור"
+                    "terms": "מרכז מיחזור,מרכז מחזור,מיחזור,פסולת"
                },
                "amenity/recycling_container": {
-                    "name": "סל מיחזור"
+                    "name": "סל מיחזור",
+                    "terms": "פח אשפה,הפרדת אשפה,פח מופרד,פסולת מופרדת,מחזור"
                },
                "amenity/refugee_site": {
                    "name": "מחנה פליטים",
@@ -4748,7 +4757,8 @@
                    "terms": "מסעדת סושי/ראמן"
                },
                "amenity/restaurant/korean": {
-                    "name": "מסעדה קוריאנית"
+                    "name": "מסעדה קוריאנית",
+                    "terms": "טוטובוקקי,קימצ׳י,קמצ׳י,קימצ'י,קמצ'י,גימצ׳י,גמצ׳י,גימצ'י,גמצ'י,ביבימבאפ,פאג׳ון,פג׳און,פאג'ון,פג'און"
                },
                "amenity/restaurant/mexican": {
                    "name": "מסעדה מקסיקנית",
@@ -4762,10 +4772,18 @@
                    "name": "מסעדת פיצה",
                    "terms": "פיצריה,איטלקי"
                },
+                "amenity/restaurant/ramen": {
+                    "name": "מסעדת ראמן",
+                    "terms": "מסעדה יפנית,מטבח יפנית,מרק ראמן,ראמן"
+                },
                "amenity/restaurant/seafood": {
                    "name": "מסעדת פרות ים",
                    "terms": "מאכלי ים"
                },
+                "amenity/restaurant/spanish": {
+                    "name": "מסעדה ספרדית",
+                    "terms": "אספניול,מטבח ספרדי,פריטטה,קסדייה,בוקדילו,בוקדיליו,פאייה,פאאיה,פאיה"
+                },
                "amenity/restaurant/steakhouse": {
                    "name": "בית סטייק",
                    "terms": "סטייקיה"
@@ -4934,7 +4952,7 @@
                },
                "amenity/vehicle_inspection": {
                    "name": "בדיקת כלי רכב",
-                    "terms": "בדיקת מכוניות,בדיקת משאיות,בדיקת אופנועים,בדיקת אוטובוסים,בדיקת מוניות"
+                    "terms": "בדיקת מכוניות,בדיקת משאיות,בדיקת אופנועים,בדיקת אוטובוסים,בדיקת מוניות,מכון טסטים,מכון טסט"
                },
                "amenity/vending_machine": {
                    "name": "מכונת ממכר",
@@ -5753,7 +5771,7 @@
                    "terms": "רפדית"
                },
                "craft/watchmaker": {
-                    "name": "שען",
+                    "name": "שענות יד",
                    "terms": "שענית"
                },
                "craft/window_construction": {
@@ -6172,12 +6190,12 @@
                    "terms": "מתן זכות קדימה,האט"
                },
                "highway/living_street": {
-                    "name": "רחוב מגורים",
-                    "terms": "רחוב מגורים"
+                    "name": "רחוב משולב",
+                    "terms": "רחוב משולב,כביש משולב,מדרחוב,רחוב מגורים"
                },
                "highway/milestone": {
-                    "name": "אבן דרך",
-                    "terms": "אבן דרך"
+                    "name": "אבן דרך בכביש ראשי",
+                    "terms": "אבן דרך כביש ראשי,אבן דרך"
                },
                "highway/mini_roundabout": {
                    "name": "מעגל תנועה קטן",
@@ -6812,14 +6830,16 @@
                    "terms": "מתחם היי טק משותף"
                },
                "leisure/horse_riding": {
-                    "name": "מרכז לרכיבה על סוסים"
+                    "name": "מרכז לרכיבה על סוסים",
+                    "terms": "רכיבה,היפודרום,רכיבת סוסים,רכיבה על סוסים"
                },
                "leisure/ice_rink": {
                    "name": "החלקרח",
                    "terms": "החלקה על הקרח"
                },
                "leisure/indoor_play": {
-                    "name": "מרכז משחקים מקורה"
+                    "name": "מרכז משחקים מקורה",
+                    "terms": "ג׳ימבורי,ג'ימבורי,משחקים בתוך מבנה,משחקים במבנה"
                },
                "leisure/marina": {
                    "name": "מרינה",
@@ -6829,8 +6849,8 @@
                    "name": "רציפי יאכטות"
                },
                "leisure/miniature_golf": {
-                    "name": "מיני-גולף",
-                    "terms": "מיני-גולף"
+                    "name": "מיני גולף",
+                    "terms": "מיני-גולף,מיני־גולף,מיניגולף,גולף"
                },
                "leisure/nature_reserve": {
                    "name": "שמורת טבע",
@@ -6996,6 +7016,9 @@
                    "name": "קיר טיפוס",
                    "terms": "חדר כושר לטיפוס,חדר כושר,כושר"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "פארק הרפתקאות"
+                },
                "leisure/sports_centre/shooting": {
                    "name": "מתקן מטווחי ירי"
                },
@@ -7106,6 +7129,14 @@
                    "name": "מנוף",
                    "terms": "מנוף"
                },
+                "man_made/crane/gantry_crane": {
+                    "name": "עגורן שער",
+                    "terms": "מכולה,מכולות"
+                },
+                "man_made/crane/portal_crane": {
+                    "name": "עגורן גשר",
+                    "terms": "מכולה,מכולות"
+                },
                "man_made/cross": {
                    "name": "צלב",
                    "terms": "צליבה,נצרות,ישו,צלוב,צליינות,נוצרים"
@@ -7128,7 +7159,7 @@
                },
                "man_made/flagpole": {
                    "name": "עמוד דגל",
-                    "terms": "עמוד דגל"
+                    "terms": "תורן,תורן דגל"
                },
                "man_made/gasometer": {
                    "name": "מיכל גז",
@@ -7284,6 +7315,9 @@
                    "name": "נקודת גבול",
                    "terms": "נקודת מדד,נקודת מדידה"
                },
+                "man_made/telescope": {
+                    "name": "טלסקופ"
+                },
                "man_made/torii": {
                    "name": "טוריאי",
                    "terms": "שער יפני,מקדש שינטו"
@@ -7372,7 +7406,7 @@
                },
                "marker": {
                    "name": "סימון",
-                    "terms": "אבן דרך"
+                    "terms": "סמן כביש"
                },
                "marker/utility": {
                    "name": "מדגיש תשתית",
@@ -7683,7 +7717,7 @@
                },
                "office/estate_agent": {
                    "name": "משרד נדל״ן",
-                    "terms": "משרד נדל״ן"
+                    "terms": "משרד נדל״ן,משרד תיווך"
                },
                "office/financial": {
                    "name": "משרד פיננסי",
@@ -7695,7 +7729,7 @@
                },
                "office/forestry": {
                    "name": "משרד יעור",
-                    "terms": "יערנות,יערן,יערנית"
+                    "terms": "יערנות,יערן,יערנית,ייעור"
                },
                "office/foundation": {
                    "name": "משרד קרן",
@@ -7966,8 +8000,8 @@
                    "terms": "חול,ארגז,משחק,שעשוע,צעצועים,גן ילדים,מתחם חול"
                },
                "playground/seesaw": {
-                    "name": "נדנדה",
-                    "terms": "נדנדה"
+                    "name": "נדנדה מאוזנת",
+                    "terms": "נדנדה,נד נד,עלה ורד"
                },
                "playground/slide": {
                    "name": "מגלשה",
@@ -7982,8 +8016,8 @@
                    "terms": "בניין צעצוע,מתקן טיפוס"
                },
                "playground/swing": {
-                    "name": "נדנדות",
-                    "terms": "נדנדות"
+                    "name": "נדנדה תלויה",
+                    "terms": "נדנדות,נדנדה"
                },
                "playground/teenshelter": {
                    "name": "מקלט לנוער"
@@ -8024,7 +8058,7 @@
                },
                "power/generator": {
                    "name": "גנרטור",
-                    "terms": "גנרטור"
+                    "terms": "מחולל"
                },
                "power/generator/method/photovoltaic": {
                    "name": "לוח סולרי",
@@ -8064,15 +8098,15 @@
                },
                "power/plant/source/coal": {
                    "name": "תחנת כוח פחם",
-                    "terms": "תחנת כוח מופעל פחם"
+                    "terms": "תחנת כוח מופעלת פחם"
                },
                "power/plant/source/gas": {
                    "name": "תחנת כוח גז",
-                    "terms": "תחנת כוח מופעל גז"
+                    "terms": "תחנת כוח מופעלת גז"
                },
                "power/plant/source/hydro": {
-                    "name": "תחנת כוח הידרואלקטרי",
-                    "terms": "תחנת כוח מופעל מים"
+                    "name": "תחנת כוח הידרואלקטרית",
+                    "terms": "תחנת כוח מופעלת מים"
                },
                "power/plant/source/method/photovoltaic": {
                    "name": "חווה סולרית"
@@ -8325,8 +8359,8 @@
                    "terms": "רכבת קלה,מסילה"
                },
                "railway/milestone": {
-                    "name": "אבן דרך",
-                    "terms": "אבן דרך"
+                    "name": "אבן דרך רכבת",
+                    "terms": "אבן דרך פסי רכבת"
                },
                "railway/miniature": {
                    "name": "מסילת רכבת זעירה",
@@ -9109,7 +9143,7 @@
                    "terms": "חנות למשחקי מחשב"
                },
                "shop/watches": {
-                    "name": "שען",
+                    "name": "חנות שעונים",
                    "terms": "שענית"
                },
                "shop/water": {
@@ -346,10 +346,6 @@
                    "label": "Marka",
                    "terms": "marka,trgovinska oznaka"
                },
-                "brewery": {
-                    "label": "Točena piva",
-                    "terms": "točeno pivo"
-                },
                "bridge": {
                    "label": "Vrsta"
                },
@@ -780,12 +776,6 @@
                    "label": "Obruči",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Da",
-                        "undefined": "Ne"
-                    }
-                },
                "horse_riding": {
                    "options": {
                        "horse_riding": "Da",
@@ -477,10 +477,6 @@
                    "label": "Márka",
                    "terms": "márka,márkanév,brand"
                },
-                "brewery": {
-                    "label": "Csapolt sörök",
-                    "terms": "sör,sörcsap,csapolt sör"
-                },
                "bridge": {
                    "label": "Típus",
                    "placeholder": "Alapértelmezett"
@@ -918,7 +914,6 @@
                        "lebanese": "libanoni",
                        "malaysian": "malajziai",
                        "mexican": "mexikói",
-                        "pankcake": "palacsinta",
                        "pasta": "pasta (olasz tészta)",
                        "pizza": "pizza",
                        "polish": "lengyel",
@@ -1488,6 +1483,17 @@
                    "label": "Hashtagek",
                    "placeholder": "#példa"
                },
+                "hazard_boundary": {
+                    "label": "Veszély",
+                    "options": {
+                        "avalanche": "Lavina",
+                        "electricity": "Áramütés",
+                        "hole": "Gödör",
+                        "minefield": "Taposóaknák",
+                        "nuclear": "Radioaktivitás",
+                        "quicksand": "Futóhomok"
+                    }
+                },
                "healthcare": {
                    "label": "Típus"
                },
@@ -1613,15 +1619,7 @@
                    "label": "Kosárlabdapalánkok",
                    "placeholder": "1, 2, 4…"
                },
-                "horse_dressage": {
-                    "label": "Díjlovaglás",
-                    "options": {
-                        "equestrian": "Van",
-                        "undefined": "Nincs"
-                    }
-                },
                "horse_riding": {
-                    "label": "Lovaglás",
                    "options": {
                        "horse_riding": "Van",
                        "undefined": "Nincs"
@@ -1639,13 +1637,6 @@
                    },
                    "placeholder": "Nehéz, veszélyes…"
                },
-                "horse_stables": {
-                    "label": "Lovaglóistálló",
-                    "options": {
-                        "stables": "Van",
-                        "undefined": "Nincs"
-                    }
-                },
                "hot_water": {
                    "label": "Forró víz"
                },
@@ -1823,12 +1814,15 @@
                "lifeguard": {
                    "label": "Életmentő, úszómester"
                },
+                "lift_gate/type": {
+                    "label": "Típus"
+                },
                "line_attachment": {
                    "label": "Vezeték rögzítése"
                },
                "line_management": {
-                    "label": "vezetékelrendezés",
-                    "terms": "vezetékelrendezés,leágazás,lezárás,vezeték topológia"
+                    "label": "Vezetékelrendezés",
+                    "terms": "vezetékelrendezés,leágazás,lezárás,vezeték topológia,elágazás,felhasítás,beforgatás"
                },
                "lit": {
                    "label": "Kivilágított",
@@ -1876,7 +1870,12 @@
                    "terms": "mapillary image id"
                },
                "marker": {
-                    "label": "Típus"
+                    "label": "Típus",
+                    "options": {
+                        "stone": {
+                            "title": "Kő"
+                        }
+                    }
                },
                "material": {
                    "label": "Anyag",
@@ -1887,6 +1886,7 @@
                        "brick": "Tégla",
                        "bronze": "Bronz",
                        "concrete": "Beton",
+                        "dry_stone": "Szárazon rakott kő",
                        "glass": "Üveg",
                        "granite": "Gránit",
                        "iron": "Vas",
@@ -1896,7 +1896,12 @@
                        "plastic": "Műanyag",
                        "reinforced_conrete": "Vasbeton",
                        "rock": "Szikla",
-                        "sand": "Homok"
+                        "sand": "Homok",
+                        "sandstone": "Homokkő",
+                        "soil": "Talaj, föld",
+                        "steel": "Acél",
+                        "stone": "Kő",
+                        "wood": "Fa"
                    },
                    "terms": "anyag,építőanyag,alapanyag,összetevő,alkotóelem,matéria"
                },
@@ -2115,10 +2120,10 @@
                    "placeholder": "3, 4, 5…"
                },
                "parcel_dropoff": {
-                    "label": "Csomagátadás"
+                    "label": "Csomagfeladás"
                },
                "parcel_pickup": {
-                    "label": "Csomagfelvétel",
+                    "label": "Csomagátvétel",
                    "options": {
                        "no": "nincs",
                        "undefined": "feltehetően van",
@@ -3477,7 +3482,7 @@
                },
                "aeroway/aerodrome": {
                    "name": "Repülőtér",
-                    "terms": "reptér,légikikötő"
+                    "terms": "repülőtér,reptér,légikikötő"
                },
                "aeroway/apron": {
                    "name": "Forgalmi előtér",
@@ -3493,7 +3498,7 @@
                },
                "aeroway/helipad": {
                    "name": "Helikopter-leszállóhely",
-                    "terms": "heliport,helikopter leszálló,helpad"
+                    "terms": "heliport,helikopter leszálló,helipad"
                },
                "aeroway/holding_position": {
                    "name": "Légi jármű várakozási pozíciója"
@@ -3554,7 +3559,7 @@
                },
                "amenity/bank": {
                    "name": "Bank",
-                    "terms": "takarékszövetkezet,pénzintézet,takarék"
+                    "terms": "bank,csekk,befektetés,széf,megtakarítás,részvény,takarékszövetkezet,pénzintézet,takarék"
                },
                "amenity/bar": {
                    "name": "Bár",
@@ -3830,8 +3835,9 @@
                    "terms": "jótékonyság,polc,könyvtár"
                },
                "amenity/grave_yard": {
-                    "name": "Templom körüli temető",
-                    "terms": "temető,templomkert,sírkert"
+                    "name": "Sírkert",
+                    "terms": "temető,templomkert,sírkert",
+                    "aliases": "Templom körüli temető"
                },
                "amenity/grit_bin": {
                    "name": "Útszóróanyagos láda",
@@ -3839,7 +3845,7 @@
                },
                "amenity/hospital": {
                    "name": "Kórház területe",
-                    "terms": "klinika,orvos,szakorvos,műtét"
+                    "terms": "klinika,orvos,egészség,szanatórium,kórház,szakorvos,műtét"
                },
                "amenity/hunting_stand": {
                    "name": "Magasles",
@@ -3929,7 +3935,7 @@
                    "name": "Ápolóotthon"
                },
                "amenity/parcel_locker": {
-                    "name": "Csomagfeladó automata",
+                    "name": "Csomagautomata",
                    "terms": "automata postaláda,csomagfelvevő automata,postaautomata"
                },
                "amenity/parking": {
@@ -3982,7 +3988,7 @@
                },
                "amenity/place_of_worship": {
                    "name": "Istentiszteleti hely",
-                    "terms": "templom,kápolna,vallás,felszentelt,ima,imádság,áhítat"
+                    "terms": "templom,székesegyház,egyház,kápolna,felszentelt,ima,imádság,istentiszteleti hely"
                },
                "amenity/place_of_worship/buddhist": {
                    "name": "Buddhista szentély",
@@ -4007,7 +4013,7 @@
                },
                "amenity/place_of_worship/jewish": {
                    "name": "Zsinagóga",
-                    "terms": "zsidó,imahely"
+                    "terms": "zsidó,imahely,zsinagóga"
                },
                "amenity/place_of_worship/muslim": {
                    "name": "Mecset",
@@ -4031,7 +4037,7 @@
                },
                "amenity/police": {
                    "name": "Rendőrség",
-                    "terms": "rendőr,csendőr,kapitányság,fogda,zsandár"
+                    "terms": "rendőr,csendőr,kapitányság,fogda,nyomozó,bűnüldözés"
                },
                "amenity/polling_station": {
                    "name": "Állandó szavazóhely",
@@ -4195,7 +4201,7 @@
                },
                "amenity/school": {
                    "name": "Iskola területe",
-                    "terms": "suli,tanítás,oktatás,nevelés,közoktatás,köznevelés"
+                    "terms": "iskola,tanítás,oktatás,nevelés,közoktatás,köznevelés,akadémia,általános iskola,középiskola,gimnázium'"
                },
                "amenity/shelter": {
                    "name": "Esőbeálló",
@@ -4559,8 +4565,8 @@
                    "terms": "fal,középkor"
                },
                "barrier/cycle_barrier": {
-                    "name": "Kerékpáros-akadály",
-                    "terms": "bicikliakadály"
+                    "name": "Kerékpáros akadály",
+                    "terms": "bicikliakadály,kerékpáros akadály"
                },
                "barrier/ditch": {
                    "name": "Árok (akadály)",
@@ -5490,7 +5496,7 @@
                },
                "highway/milestone": {
                    "name": "Kilométerkő",
-                    "terms": "kilométertábla"
+                    "terms": "kilométertábla,kilométerkő"
                },
                "highway/mini_roundabout": {
                    "name": "Kis körforgalom",
@@ -6740,7 +6746,7 @@
                },
                "natural/water/lake": {
                    "name": "Tó",
-                    "terms": "tó,tavacska,pocsolya,állóvíz"
+                    "terms": "tó,tavacska,állóvíz"
                },
                "natural/water/moat": {
                    "name": "Várárok"
@@ -6751,7 +6757,7 @@
                },
                "natural/water/pond": {
                    "name": "Kis tó",
-                    "terms": "tavacska,pocsolya"
+                    "terms": "tavacska,malomtó,medence,kis tó"
                },
                "natural/water/reservoir": {
                    "name": "Víztározó"
@@ -8388,7 +8394,7 @@
                    "terms": "szűkület"
                },
                "traffic_calming/cushion": {
-                    "name": "Fekvőrendőr",
+                    "name": "Forgalomlassító párna",
                    "terms": "bucka,sebességlassító,bukkanó,forgalomlassító,borda"
                },
                "traffic_calming/dip": {
@@ -1 +1 @@
-{"af":{"pct":0.19},"ak":{"pct":0},"am":{"pct":0.01},"ar":{"pct":0.78},"ar-AA":{"pct":0},"as":{"pct":0},"ast":{"pct":0.22},"ay":{"pct":0},"az":{"pct":0},"ba":{"pct":0},"be":{"pct":0},"bg":{"pct":0.21},"bn":{"pct":0.05},"bo":{"pct":0},"bqi":{"pct":0},"br":{"pct":0.68},"bs":{"pct":0.12},"ca":{"pct":0.72},"ckb":{"pct":0.04},"cs":{"pct":0.98},"cv":{"pct":0},"cy":{"pct":0.34},"da":{"pct":0.65},"de":{"pct":1},"de-AT":{"pct":0},"de-CH":{"pct":0},"dv":{"pct":0.01},"ee":{"pct":0},"el":{"pct":0.65},"en":{"pct":1},"en-AU":{"pct":0.02},"en-CA":{"pct":0.03},"en-GB":{"pct":0.26},"en-IE":{"pct":0},"en-IN":{"pct":0},"en-NZ":{"pct":0.02},"en-PH":{"pct":0},"en-US":{"pct":0},"eo":{"pct":0.72},"es":{"pct":1},"et":{"pct":0.48},"eu":{"pct":0.17},"fa":{"pct":0.62},"fa-IR":{"pct":0},"ff":{"pct":0},"fi":{"pct":0.56},"fil":{"pct":0},"fr":{"pct":0.99},"fr-FR":{"pct":0},"fy":{"pct":0.01},"ga":{"pct":0.06},"gan":{"pct":0},"gl":{"pct":0.51},"grt":{"pct":0},"gu":{"pct":0},"ha":{"pct":0},"he":{"pct":0.88},"he-IL":{"pct":0.12},"hi":{"pct":0.01},"hr":{"pct":0.31},"hu":{"pct":0.75},"hy":{"pct":0.02},"ia":{"pct":0},"id":{"pct":0.21},"ig":{"pct":0},"is":{"pct":0.28},"it":{"pct":0.89},"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.06},"ko":{"pct":0.66},"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.24},"lus":{"pct":0},"lv":{"pct":0.18},"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.04},"no":{"pct":0.71},"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.09},"pap":{"pct":0},"pl":{"pct":1},"ps":{"pct":0},"pt":{"pct":0.98},"pt-BR":{"pct":0.88},"qu":{"pct":0},"rm":{"pct":0},"ro":{"pct":0.23},"ru":{"pct":0.7},"rw":{"pct":0},"sat":{"pct":0},"sc":{"pct":0},"sd":{"pct":0},"sg":{"pct":0},"si":{"pct":0},"sk":{"pct":0.7},"skr":{"pct":0},"sl":{"pct":0.28},"sm":{"pct":0},"sn":{"pct":0},"so":{"pct":0.03},"sq":{"pct":0.02},"sr":{"pct":0.49},"ss":{"pct":0},"st":{"pct":0},"su":{"pct":0},"sv":{"pct":0.96},"sw":{"pct":0},"ta":{"pct":0.2},"te":{"pct":0.02},"tg":{"pct":0},"th":{"pct":0.5},"ti":{"pct":0},"tk":{"pct":0},"tl":{"pct":0.03},"tn":{"pct":0},"tr":{"pct":0.97},"ts":{"pct":0},"tt":{"pct":0},"tum":{"pct":0},"ug":{"pct":0},"uk":{"pct":1},"ur":{"pct":0.04},"uz":{"pct":0},"ve":{"pct":0},"vi":{"pct":0.71},"wo":{"pct":0},"xh":{"pct":0},"yo":{"pct":0},"yue":{"pct":0.23},"zh":{"pct":0.05},"zh-CN":{"pct":0.76},"zh-HK":{"pct":0.47},"zh-TW":{"pct":1},"zu":{"pct":0}}
+{"af":{"pct":0.19},"ak":{"pct":0},"am":{"pct":0.01},"ar":{"pct":0.77},"ar-AA":{"pct":0},"as":{"pct":0},"ast":{"pct":0.22},"ay":{"pct":0},"az":{"pct":0},"ba":{"pct":0},"be":{"pct":0},"bg":{"pct":0.22},"bn":{"pct":0.04},"bo":{"pct":0},"bqi":{"pct":0},"br":{"pct":0.69},"bs":{"pct":0.12},"ca":{"pct":0.71},"ckb":{"pct":0.14},"cs":{"pct":0.98},"cv":{"pct":0},"cy":{"pct":0.48},"da":{"pct":0.66},"de":{"pct":1},"de-AT":{"pct":0},"de-CH":{"pct":0},"dv":{"pct":0.01},"ee":{"pct":0},"el":{"pct":0.7},"en":{"pct":1},"en-AU":{"pct":0.02},"en-CA":{"pct":0.03},"en-GB":{"pct":0.26},"en-IE":{"pct":0},"en-IN":{"pct":0},"en-NZ":{"pct":0.02},"en-PH":{"pct":0},"en-US":{"pct":0},"eo":{"pct":0.71},"es":{"pct":1},"et":{"pct":0.52},"eu":{"pct":0.17},"fa":{"pct":0.62},"fa-IR":{"pct":0},"ff":{"pct":0},"fi":{"pct":0.57},"fil":{"pct":0},"fr":{"pct":0.99},"fr-FR":{"pct":0},"fy":{"pct":0.01},"ga":{"pct":0.1},"gan":{"pct":0},"gl":{"pct":0.5},"grt":{"pct":0},"gu":{"pct":0},"ha":{"pct":0},"he":{"pct":0.88},"he-IL":{"pct":0.12},"hi":{"pct":0.01},"hr":{"pct":0.31},"hu":{"pct":0.75},"hy":{"pct":0.02},"ia":{"pct":0},"id":{"pct":0.21},"ig":{"pct":0},"is":{"pct":0.28},"it":{"pct":0.88},"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.06},"ko":{"pct":0.67},"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.24},"lus":{"pct":0},"lv":{"pct":0.18},"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.88},"nl-BE":{"pct":0},"nl-NL":{"pct":0},"nn":{"pct":0.05},"no":{"pct":0.7},"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.09},"pap":{"pct":0},"pl":{"pct":1},"ps":{"pct":0},"pt":{"pct":0.98},"pt-BR":{"pct":0.9},"qu":{"pct":0},"rm":{"pct":0},"ro":{"pct":0.26},"ru":{"pct":0.74},"rw":{"pct":0},"sat":{"pct":0},"sc":{"pct":0},"sd":{"pct":0},"sg":{"pct":0},"si":{"pct":0},"sk":{"pct":0.72},"skr":{"pct":0},"sl":{"pct":0.28},"sm":{"pct":0},"sn":{"pct":0},"so":{"pct":0.03},"sq":{"pct":0.02},"sr":{"pct":0.6},"ss":{"pct":0},"st":{"pct":0},"su":{"pct":0},"sv":{"pct":0.98},"sw":{"pct":0},"ta":{"pct":0.2},"te":{"pct":0.02},"tg":{"pct":0},"th":{"pct":0.5},"ti":{"pct":0},"tk":{"pct":0},"tl":{"pct":0.03},"tn":{"pct":0},"tr":{"pct":0.96},"ts":{"pct":0},"tt":{"pct":0},"tum":{"pct":0},"ug":{"pct":0},"uk":{"pct":1},"ur":{"pct":0.05},"uz":{"pct":0},"ve":{"pct":0},"vi":{"pct":0.7},"wa":{"pct":0},"wo":{"pct":0},"xh":{"pct":0},"yo":{"pct":0},"yue":{"pct":0.23},"zh":{"pct":0.05},"zh-CN":{"pct":0.79},"zh-HK":{"pct":0.46},"zh-TW":{"pct":1},"zu":{"pct":0}}
@@ -9,7 +9,7 @@
        "pct": 0.01
    },
    "ar": {
-        "pct": 0.78
+        "pct": 0.77
    },
    "ar-AA": {
        "pct": 0
@@ -33,10 +33,10 @@
        "pct": 0
    },
    "bg": {
-        "pct": 0.21
+        "pct": 0.22
    },
    "bn": {
-        "pct": 0.05
+        "pct": 0.04
    },
    "bo": {
        "pct": 0
@@ -45,16 +45,16 @@
        "pct": 0
    },
    "br": {
-        "pct": 0.68
+        "pct": 0.69
    },
    "bs": {
        "pct": 0.12
    },
    "ca": {
-        "pct": 0.72
+        "pct": 0.71
    },
    "ckb": {
-        "pct": 0.04
+        "pct": 0.14
    },
    "cs": {
        "pct": 0.98
@@ -63,10 +63,10 @@
        "pct": 0
    },
    "cy": {
-        "pct": 0.34
+        "pct": 0.48
    },
    "da": {
-        "pct": 0.65
+        "pct": 0.66
    },
    "de": {
        "pct": 1
@@ -84,7 +84,7 @@
        "pct": 0
    },
    "el": {
-        "pct": 0.65
+        "pct": 0.7
    },
    "en": {
        "pct": 1
@@ -114,13 +114,13 @@
        "pct": 0
    },
    "eo": {
-        "pct": 0.72
+        "pct": 0.71
    },
    "es": {
        "pct": 1
    },
    "et": {
-        "pct": 0.48
+        "pct": 0.52
    },
    "eu": {
        "pct": 0.17
@@ -135,7 +135,7 @@
        "pct": 0
    },
    "fi": {
-        "pct": 0.56
+        "pct": 0.57
    },
    "fil": {
        "pct": 0
@@ -150,13 +150,13 @@
        "pct": 0.01
    },
    "ga": {
-        "pct": 0.06
+        "pct": 0.1
    },
    "gan": {
        "pct": 0
    },
    "gl": {
-        "pct": 0.51
+        "pct": 0.5
    },
    "grt": {
        "pct": 0
@@ -198,7 +198,7 @@
        "pct": 0.28
    },
    "it": {
-        "pct": 0.89
+        "pct": 0.88
    },
    "ja": {
        "pct": 0.99
@@ -231,7 +231,7 @@
        "pct": 0.06
    },
    "ko": {
-        "pct": 0.66
+        "pct": 0.67
    },
    "ks": {
        "pct": 0
@@ -300,7 +300,7 @@
        "pct": 0.02
    },
    "nl": {
-        "pct": 0.89
+        "pct": 0.88
    },
    "nl-BE": {
        "pct": 0
@@ -309,10 +309,10 @@
        "pct": 0
    },
    "nn": {
-        "pct": 0.04
+        "pct": 0.05
    },
    "no": {
-        "pct": 0.71
+        "pct": 0.7
    },
    "nr": {
        "pct": 0
@@ -354,7 +354,7 @@
        "pct": 0.98
    },
    "pt-BR": {
-        "pct": 0.88
+        "pct": 0.9
    },
    "qu": {
        "pct": 0
@@ -363,10 +363,10 @@
        "pct": 0
    },
    "ro": {
-        "pct": 0.23
+        "pct": 0.26
    },
    "ru": {
-        "pct": 0.7
+        "pct": 0.74
    },
    "rw": {
        "pct": 0
@@ -387,7 +387,7 @@
        "pct": 0
    },
    "sk": {
-        "pct": 0.7
+        "pct": 0.72
    },
    "skr": {
        "pct": 0
@@ -408,7 +408,7 @@
        "pct": 0.02
    },
    "sr": {
-        "pct": 0.49
+        "pct": 0.6
    },
    "ss": {
        "pct": 0
@@ -420,7 +420,7 @@
        "pct": 0
    },
    "sv": {
-        "pct": 0.96
+        "pct": 0.98
    },
    "sw": {
        "pct": 0
@@ -450,7 +450,7 @@
        "pct": 0
    },
    "tr": {
-        "pct": 0.97
+        "pct": 0.96
    },
    "ts": {
        "pct": 0
@@ -468,7 +468,7 @@
        "pct": 1
    },
    "ur": {
-        "pct": 0.04
+        "pct": 0.05
    },
    "uz": {
        "pct": 0
@@ -477,7 +477,10 @@
        "pct": 0
    },
    "vi": {
-        "pct": 0.71
+        "pct": 0.7
+    },
+    "wa": {
+        "pct": 0
    },
    "wo": {
        "pct": 0
@@ -495,10 +498,10 @@
        "pct": 0.05
    },
    "zh-CN": {
-        "pct": 0.76
+        "pct": 0.79
    },
    "zh-HK": {
-        "pct": 0.47
+        "pct": 0.46
    },
    "zh-TW": {
        "pct": 1
@@ -251,9 +251,6 @@
                "brand": {
                    "label": "Vörumerki"
                },
-                "brewery": {
-                    "label": "Bjór úr krana"
-                },
                "bridge": {
                    "label": "Tegund",
                    "placeholder": "Sjálfgefið"
@@ -635,14 +632,7 @@
                    "label": "Körfur",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Já",
-                        "undefined": "Nei"
-                    }
-                },
                "horse_riding": {
-                    "label": "Hestaferðir",
                    "options": {
                        "horse_riding": "Já",
                        "undefined": "Nei"
@@ -655,13 +645,6 @@
                    },
                    "placeholder": "Erfitt, hættulegt..."
                },
-                "horse_stables": {
-                    "label": "Reiðhús",
-                    "options": {
-                        "stables": "Já",
-                        "undefined": "Nei"
-                    }
-                },
                "incline": {
                    "label": "Halli"
                },
@@ -144,7 +144,7 @@
                "address": {
                    "label": "Indirizzo",
                    "placeholders": {
-                        "block_number": "Numero Blocco",
+                        "block_number": "Numero blocco",
                        "block_number!jp": "Num. blocco",
                        "city": "Città",
                        "city!cn": "Città/Prefettura/Lega",
@@ -202,7 +202,7 @@
                    "label": "Copertura paravento"
                },
                "aerialway/capacity": {
-                    "label": "Portata (persone/ora)",
+                    "label": "Portata (per ora)",
                    "placeholder": "500, 2500, 5000..."
                },
                "aerialway/duration": {
@@ -415,7 +415,7 @@
                    }
                },
                "bath/open_air": {
-                    "label": "all'aperto"
+                    "label": "All'aperto"
                },
                "bath/sand_bath": {
                    "label": "Sabbiatura"
@@ -458,7 +458,7 @@
                    }
                },
                "bicycle_road": {
-                    "label": "Strada Ciclabile",
+                    "label": "Strada ciclabile",
                    "options": {
                        "undefined": "No",
                        "yes": "Sì"
@@ -488,7 +488,7 @@
                        "plasma": "plasma",
                        "platelets": "piastrine",
                        "stemcells": "cellule staminali",
-                        "whole": "Sangue intero"
+                        "whole": "sangue intero"
                    }
                },
                "board_type": {
@@ -536,10 +536,6 @@
                    "label": "Brand",
                    "terms": "marca,marchio"
                },
-                "brewery": {
-                    "label": "Birre alla spina",
-                    "terms": "birre alla spina,spina"
-                },
                "bridge": {
                    "label": "Tipo",
                    "placeholder": "Default"
@@ -1062,7 +1058,6 @@
                        "lebanese": "Libanese",
                        "malaysian": "Malaysiano",
                        "mexican": "Messicana",
-                        "pankcake": "Pancake",
                        "pasta": "Pasta",
                        "peruvian": "Peruviana",
                        "pizza": "Pizza",
@@ -1923,15 +1918,8 @@
                    "label": "Canestri",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Dressage",
-                    "options": {
-                        "equestrian": "Sì",
-                        "undefined": "No"
-                    }
-                },
                "horse_riding": {
-                    "label": "Cavalcata",
+                    "label": "Centro equestre",
                    "options": {
                        "horse_riding": "Sì",
                        "undefined": "No"
@@ -1950,13 +1938,6 @@
                    "placeholder": "Difficile, pericoloso...",
                    "terms": "gradi,difficoltà,livello"
                },
-                "horse_stables": {
-                    "label": "Scuderia ippica",
-                    "options": {
-                        "stables": "Sì",
-                        "undefined": "No"
-                    }
-                },
                "hot_water": {
                    "label": "Acqua Calda"
                },
@@ -2227,7 +2208,7 @@
                "material": {
                    "label": "Materiale",
                    "options": {
-                        "adobe": "Adobe",
+                        "adobe": "Mattoni cotti",
                        "aluminium": "Alluminio",
                        "brass": "Ottone",
                        "brick": "Mattone",
@@ -2595,7 +2576,7 @@
                        "on_kerb": "Sul marciapiede",
                        "rooftop": "Tetto",
                        "sheds": "Capanno",
-                        "shoulder": "Spalla",
+                        "shoulder": "Banchina",
                        "street_side": "Lato strada",
                        "surface": "Superficie",
                        "underground": "Sotterraneo"
@@ -2621,7 +2602,7 @@
                        "no": "No",
                        "on_kerb": "Sul marciapiede",
                        "separate": "Parcheggio mappato separatamente",
-                        "shoulder": "Spalla",
+                        "shoulder": "Banchina",
                        "street_side": "Lato strada",
                        "yes": "Sì (non specificato)"
                    },
@@ -2711,7 +2692,7 @@
                },
                "piste/difficulty_downhill": {
                    "options": {
-                        "advanced": "Avanzata (nera)",
+                        "advanced": "Avanzata (losanga nera)",
                        "easy": "Facile (cerchio verde)",
                        "expert": "Esperti (doppia losanga nera)",
                        "extreme": "Estrema (richiede equipaggiamento per alpinismo)",
@@ -2831,7 +2812,8 @@
                    "placeholder": "10, 20, 30..."
                },
                "polling_station": {
-                    "label": "Luogo di Votazione"
+                    "label": "Seggio elettorale",
+                    "terms": "seggio,elezioni,votazione"
                },
                "population": {
                    "label": "Popolazione"
@@ -2845,21 +2827,23 @@
                    "terms": "staccato,non fisso,spostabile,trasportabile,mobile,libero"
                },
                "post": {
-                    "label": "Indirizzo di Consegna"
+                    "label": "Indirizzo di consegna"
                },
                "post_box/type": {
                    "label": "Tipo",
                    "options": {
                        "lamp": "Attaccato a un palo",
                        "pillar": "Scatola autoportante",
-                        "wall": "Montato in una parete"
-                    }
+                        "wall": "Montato su una parete"
+                    },
+                    "terms": "tipo,tipologia"
                },
                "power": {
                    "label": "Tipo"
                },
                "power_supply": {
-                    "label": "Alimentazione Elettrica"
+                    "label": "Alimentazione elettrica",
+                    "terms": "a corrente,corrente"
                },
                "preschool": {
                    "label": "Scuola materna"
@@ -2876,9 +2860,9 @@
                "pump": {
                    "label": "Pompa",
                    "options": {
-                        "manual": "Pompa Manuale",
+                        "manual": "Pompa manuale",
                        "no": "Nessuna",
-                        "powered": "Pompa Azionata da un Macchinario",
+                        "powered": "Pompa azionata da un macchinario",
                        "yes": "Sì"
                    }
                },
@@ -2887,7 +2871,7 @@
                },
                "railway/position": {
                    "label": "Posizione della progressiva chilometrica",
-                    "placeholder": "Distanza ad una cifra decimale (123.4)"
+                    "placeholder": "Distanza a una cifra decimale (123.4)"
                },
                "railway/signal/direction": {
                    "label": "Direzione",
@@ -2898,7 +2882,7 @@
                    }
                },
                "ramp": {
-                    "label": "Rampa Incorporata",
+                    "label": "Rampa incorporata",
                    "options": {
                        "no": "No",
                        "separate": "Mappato separatamente",
@@ -2910,7 +2894,7 @@
                    "label": "Valutazione della potenza"
                },
                "rcn_ref": {
-                    "label": "Codice Ciclabile"
+                    "label": "Codice ciclabile"
                },
                "real_fire-GB-IE": {
                    "label": "Vero fuoco"
@@ -2944,10 +2928,12 @@
                    "placeholder": "Contenitore, centro"
                },
                "ref": {
-                    "label": "Numero di matricola"
+                    "label": "Numero di matricola",
+                    "terms": "matricola"
                },
                "ref/FR/siret-FR": {
-                    "label": "SIRET Numero"
+                    "label": "Numero SIRET",
+                    "terms": "siret"
                },
                "ref/isil": {
                    "label": "Codice ISIL"
@@ -3086,20 +3072,6 @@
                "route_master": {
                    "label": "Tipo"
                },
-                "royal_cypher": {
-                    "label": "Cifra Reale",
-                    "options": {
-                        "CIIIR": "CIIIR (Carlo III)",
-                        "EIIR": "EIIR (Elisabetta II)",
-                        "EVIIIR": "EVIIIR (Edoardo VIII)",
-                        "EVIIR": "EVIIR (Edoardo VII)",
-                        "GR": "GR (Giorgio V)",
-                        "GVIR": "GVIR (Giorgio VI)",
-                        "VR": "VR (Vittoria)",
-                        "no": "No",
-                        "scottish_crown": "Corona scozzese"
-                    }
-                },
                "ruins": {
                    "label": "Tipo"
                },
@@ -3739,6 +3711,13 @@
                "telecom/medium": {
                    "label": "Mezzo"
                },
+                "telescope/type": {
+                    "label": "Tipo",
+                    "options": {
+                        "optical": "Telescopio ottico",
+                        "radio": "Radiotelescopio"
+                    }
+                },
                "tents": {
                    "label": "Tende"
                },
@@ -3897,7 +3876,7 @@
                    "label": "Vibrazione"
                },
                "trail_visibility": {
-                    "label": "Visibilità del Tracciato",
+                    "label": "Visibilità del tracciato",
                    "options": {
                        "bad": "Cattiva: tracciato visibile a stento",
                        "excellent": "Eccellente: tracciato evidente o segnavia sempre presenti",
@@ -4363,13 +4342,16 @@
                    "terms": "adozione,adozioni,gatto,gatti,micio,cane,cani,cucciolo,cuccioli,rettile,rettili,ricovero,riparo"
                },
                "amenity/arts_centre": {
-                    "name": "Centro Culturale",
+                    "name": "Centro artistico",
                    "terms": "circolo,cultura,centro,artistico,arte,danza,pittura,scultura,museo,centro sociale,auditorium,teatro,cinema"
                },
                "amenity/atm": {
                    "name": "Bancomat",
                    "terms": "atm,sportello automatico,automated teller machine"
                },
+                "amenity/baking_oven": {
+                    "name": "Forno"
+                },
                "amenity/bank": {
                    "name": "Banca",
                    "terms": "unione di credito,assegno,deposito,fondo,investimento,riserva,cassaforte,risparmi,azione,tesoreria,credito,caveau"
@@ -4925,7 +4907,7 @@
                    "terms": "abbazia,basilica,sinagoga,cattedrale,presbiterio,cappella,chiesa,casa di dio,luogo di preghiera,luogo di culto,missione,moschea,oratorio,parrocchia,sacello,edicola votiva,tabernacolo,tempio"
                },
                "amenity/place_of_worship/buddhist": {
-                    "name": "Tempio Buddista",
+                    "name": "Tempio buddista",
                    "terms": "stupa,vihara,monastero,tempio,pagoda,zendo,dojo"
                },
                "amenity/place_of_worship/christian": {
@@ -5064,6 +5046,9 @@
                    "name": "Ristorante francese",
                    "terms": "bar,colazione,caffè,mensa,locale,cena,drivein,cibo,mangiare,grigliata,pranzo,tavolo,francese"
                },
+                "amenity/restaurant/georgian": {
+                    "name": "Ristorante georgiano"
+                },
                "amenity/restaurant/german": {
                    "name": "Ristorante tedesco",
                    "terms": "bar,colazione,caffè,mensa,cena,drivein,cibo,mangiare,grigliata,pranzo,tavolo,tedesco,bavarese"
@@ -5207,7 +5192,7 @@
                    "name": "Studio di produzione video"
                },
                "amenity/taxi": {
-                    "name": "Posteggio Taxi",
+                    "name": "Posteggio taxi",
                    "terms": "taxi"
                },
                "amenity/taxi/auto_rickshaw": {
@@ -5228,7 +5213,8 @@
                    "terms": "teatro,spettacoli,giochi,musical"
                },
                "amenity/theatre/type/amphi": {
-                    "name": "Anfiteatro"
+                    "name": "Anfiteatro",
+                    "terms": "anfiteatro,all'aperto,greco,teatro"
                },
                "amenity/ticket_validator": {
                    "name": "Validatore di biglietti"
@@ -5238,8 +5224,8 @@
                    "terms": "bagno,bagni,bagno pubblico,bagni pubblici,toilette,wc,gabinetto,vespasiano,cesso"
                },
                "amenity/toilets/disposal/flush": {
-                    "name": "Sciacquone",
-                    "terms": "bagno,gabinetto,tazza,vespasiano,toilette,latrina,wc,w.c."
+                    "name": "Bagno con sciacquone",
+                    "terms": "bagno,gabinetto,tazza,vespasiano,toilette,latrina,wc,w.c.,sciacquone,flush"
                },
                "amenity/toilets/disposal/pitlatrine": {
                    "name": "Latrina a fossa",
@@ -5640,7 +5626,7 @@
                    "name": "Confine"
                },
                "boundary/administrative": {
-                    "name": "Confine Amministrativo",
+                    "name": "Confine amministrativo",
                    "terms": "confine amministrativo"
                },
                "boundary/hazard": {
@@ -5889,6 +5875,9 @@
                "building_point": {
                    "name": "Edificio"
                },
+                "cemetery/grave": {
+                    "name": "Tomba"
+                },
                "cemetery/sector": {
                    "name": "Sezione cimitero",
                    "terms": "cimitero,cimiteriale,colombario,tomba,campo,camposanto,sepoltura,mausoleo"
@@ -6075,7 +6064,7 @@
                },
                "craft/stonemason": {
                    "name": "Tagliapietre",
-                    "terms": "muratura"
+                    "terms": "muratura,scalpellino,marmista"
                },
                "craft/tailor": {
                    "name": "Sarto"
@@ -6090,20 +6079,19 @@
                },
                "craft/upholsterer": {
                    "name": "Tappezziere",
-                    "terms": "tappezziere"
+                    "terms": "tappezziere,tappezzeria,moquette"
                },
                "craft/watchmaker": {
                    "name": "Orologiaio",
-                    "terms": "orologi,riparazione,riparatore",
-                    "aliases": "riparatore di orologi"
+                    "terms": "orologi,riparazione,riparatore,riparatore di orologi"
                },
                "craft/window_construction": {
                    "name": "Serramentista",
-                    "terms": "serramentista,finestre,porte,vetri,vetraio,glass"
+                    "terms": "serramenti,finestre,porte,vetri,vetraio,glass"
                },
                "craft/winery": {
                    "name": "Cantina vinicola",
-                    "terms": "azienda vinicola,azienda vitivinicola"
+                    "terms": "azienda vinicola,azienda vitivinicola,vino,cantina"
                },
                "cycleway/asl": {
                    "name": "Linea di stop avanzata",
@@ -6119,10 +6107,11 @@
                    "name": "Buca da golf a disco"
                },
                "disc_golf/tee": {
-                    "name": "Maglietta da golf a disco"
+                    "name": "Campo da golf a disco"
                },
                "disused/amenity": {
-                    "name": "Servizio in disuso"
+                    "name": "Servizio in disuso",
+                    "aliases": "Attività in disuso"
                },
                "disused/railway": {
                    "name": "Elemento ferroviario in disuso"
@@ -6239,6 +6228,9 @@
                    "name": "Ingresso principale",
                    "terms": "ingresso,entrata,porta,entrata principale"
                },
+                "entrance/staircase": {
+                    "name": "Entrata a una scalinata"
+                },
                "ford": {
                    "name": "Guado",
                    "terms": "guado"
@@ -6302,10 +6294,28 @@
                    "name": "Medicina alternativa",
                    "terms": "medicina alternativa,agopuntura,kinesiologia applicata,aromaterapia,ayurveda,ayurvedica,omeopatia,erboristeria,idroterapia"
                },
+                "healthcare/alternative/acupuncture": {
+                    "name": "Agopuntura"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "Ayurveda"
+                },
                "healthcare/alternative/chiropractic": {
                    "name": "Chiropratico",
                    "terms": "chiropratica,chiropratico,schiena,dolore,spalle,spina"
                },
+                "healthcare/alternative/homeopathy": {
+                    "name": "Omeopata"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "Naturopata"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "Osteopata"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "Medicina tradizionale cinese"
+                },
                "healthcare/audiologist": {
                    "name": "Audiologo",
                    "terms": "logopedico,logopedista,audiometrista,orecchi,suono,udito"
@@ -6449,6 +6459,9 @@
                    "name": "Piazzola di sosta",
                    "terms": "fermata,emergenza,piazzola,sosta,guasto,guasti,avaria,arresto,sos,soccorso,area,aiuto"
                },
+                "highway/escape": {
+                    "name": "Rampa di rallentamento per camion"
+                },
                "highway/footway": {
                    "name": "Percorso pedonale",
                    "terms": "percorso battuto,viale,pista pedonale,strada,corsia,percorso,sentiero,cammino,rotta,via,traiettoria,camminata"
@@ -6601,6 +6614,10 @@
                "highway/speed_camera": {
                    "name": "Autovelox"
                },
+                "highway/speed_display": {
+                    "name": "Dissuasore radar di velocità",
+                    "terms": "display di velocità"
+                },
                "highway/steps": {
                    "name": "Scale",
                    "terms": "scale,scalinata,gradini"
@@ -6710,6 +6727,9 @@
                    "name": "Targa commemorativa",
                    "terms": "dedica,epitaffio,segno storico,impronta,ricordo,testimonianza,commemorazione,rievocazione,rimembranza,memoria,placca,targa"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Pietra d'inciampo"
+                },
                "historic/monument": {
                    "name": "Monumento",
                    "terms": "monumento"
@@ -6852,6 +6872,9 @@
                    "name": "Area industriale",
                    "terms": "zona industriale,zona artigianale,industria,artigianato"
                },
+                "landuse/industrial/depot": {
+                    "name": "Deposito"
+                },
                "landuse/industrial/scrap_yard": {
                    "name": "Sfasciacarrozze",
                    "terms": "demolitore,autodemolizione"
@@ -6932,6 +6955,9 @@
                    "name": "Area condominiale",
                    "terms": "appartamento,locale,unità immobiliare,immobile,residenza"
                },
+                "landuse/residential/trailer_park": {
+                    "name": "Parcheggio per roulotte"
+                },
                "landuse/retail": {
                    "name": "Area di vendita al dettaglio",
                    "terms": "commerciale"
@@ -7063,15 +7089,19 @@
                "leisure/garden/community": {
                    "name": "Orti in Concessione"
                },
+                "leisure/garden/residential": {
+                    "name": "Giardino residenziale"
+                },
                "leisure/golf_course": {
-                    "name": "Campo da Golf",
+                    "name": "Campo da golf",
                    "terms": "campo da golf"
                },
                "leisure/hackerspace": {
                    "name": "Spazio hacker"
                },
                "leisure/horse_riding": {
-                    "name": "Centro equestre"
+                    "name": "Centro equestre",
+                    "terms": "maneggio,cavalli,equitazione,equestre"
                },
                "leisure/ice_rink": {
                    "name": "Pista di Ghiaccio",
@@ -7085,6 +7115,9 @@
                    "name": "Marina",
                    "terms": "porto turistico"
                },
+                "leisure/marina_no_facilities": {
+                    "name": "Attracco per yacht"
+                },
                "leisure/miniature_golf": {
                    "name": "Minigolf",
                    "terms": "golf,mini,golf su pista"
@@ -7113,7 +7146,7 @@
                    "terms": "campo sportivo"
                },
                "leisure/pitch/american_football": {
-                    "name": "Campo da Football Americano",
+                    "name": "Campo da football americano",
                    "terms": "campo football americano"
                },
                "leisure/pitch/american_handball": {
@@ -7122,6 +7155,24 @@
                "leisure/pitch/archery": {
                    "name": "Campo di tiro con l'arco"
                },
+                "leisure/pitch/athletics": {
+                    "name": "Pista d'atletica"
+                },
+                "leisure/pitch/athletics/discus_throw": {
+                    "name": "Settore per il lancio del disco"
+                },
+                "leisure/pitch/athletics/hammer_throw": {
+                    "name": "Settore per il lancio del martello"
+                },
+                "leisure/pitch/athletics/high_jump": {
+                    "name": "Campo per il salto in alto"
+                },
+                "leisure/pitch/athletics/javelin_throw": {
+                    "name": "Settore per il lancio del giavellotto"
+                },
+                "leisure/pitch/athletics/long_jump": {
+                    "name": "Piscina del salto in lungo"
+                },
                "leisure/pitch/athletics/pole_vault": {
                    "name": "Fossa del salto con l'asta",
                    "terms": "salto con l'asta,salto,asta"
@@ -7130,6 +7181,9 @@
                    "name": "Pedana del getto del peso",
                    "terms": "ring,pedana,area,cerchio,lancio,getto,peso"
                },
+                "leisure/pitch/athletics/triple_jump": {
+                    "name": "Piscina del salto triplo"
+                },
                "leisure/pitch/australian_football": {
                    "name": "Campo di calcio australiano",
                    "terms": "australia,australiano,afl,football,calcio,aussie,footy"
@@ -7161,9 +7215,16 @@
                    "name": "Campo da cricket",
                    "terms": "cricket,campo,sportivo"
                },
+                "leisure/pitch/equestrian": {
+                    "name": "Arena per equitazione",
+                    "terms": "equitazione,passo,trotto,cavalli"
+                },
                "leisure/pitch/field_hockey": {
                    "name": "Campo di hockey su prato"
                },
+                "leisure/pitch/handball": {
+                    "name": "Campo di pallamano a squadre"
+                },
                "leisure/pitch/horseshoes": {
                    "name": "Fossa dei ferri di cavallo"
                },
@@ -7185,6 +7246,9 @@
                    "name": "Campo di rugby",
                    "terms": "campo regolamentare unione rugbistica"
                },
+                "leisure/pitch/shooting": {
+                    "name": "Campo di tiro a volo"
+                },
                "leisure/pitch/shuffleboard": {
                    "name": "Campo da shuffleboard"
                },
@@ -7237,6 +7301,9 @@
                    "name": "Palestra di arrampicata",
                    "terms": "arrampicata,alpinismo,calarsi,corda,corde,cordata,roccia,rock wall,parete,palestra da roccia"
                },
+                "leisure/sports_centre/shooting": {
+                    "name": "Poligono di tiro"
+                },
                "leisure/sports_centre/swimming": {
                    "name": "Piscina pubblica",
                    "terms": "nuoto,acqua,immersione,sub"
@@ -7260,14 +7327,26 @@
                    "name": "Pista (sport non motoristici)",
                    "terms": "circuito,pista,ippodromo"
                },
+                "leisure/track/athletics/javelin_throw": {
+                    "name": "Pista del giavellotto"
+                },
+                "leisure/track/athletics/long_jump": {
+                    "name": "Pista del salto in lungo"
+                },
                "leisure/track/athletics/pole_vault": {
                    "name": "Pista di salto con l'asta",
                    "terms": "pista,salto in alto,salto"
                },
+                "leisure/track/athletics/running": {
+                    "name": "Pista da corsa"
+                },
                "leisure/track/cycling": {
                    "name": "Pista per ciclismo",
                    "terms": "pista bici,pista bicicletta,pista,pista ciclismo,ciclismo,bici,velodromo,circuito"
                },
+                "leisure/track/horse_racing": {
+                    "name": "Pista ippica"
+                },
                "leisure/track/running": {
                    "name": "Pista da corsa",
                    "terms": "pista di atletica,decathlon,gara podistica,distanza,maratona,sprint,camminata,camminare,pista"
@@ -7319,6 +7398,9 @@
                    "name": "Ometto di pietra",
                    "terms": "ometto di palestra"
                },
+                "man_made/charge_point": {
+                    "name": "Colonnina per la ricarica elettrica"
+                },
                "man_made/chimney": {
                    "name": "Ciminiera",
                    "terms": "torre,camino"
@@ -7468,6 +7550,9 @@
                "man_made/reservoir_covered": {
                    "name": "Serbatoio Coperto"
                },
+                "man_made/satellite_dish": {
+                    "name": "Disco satellitare"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "silos,cisterna,botte"
@@ -7494,6 +7579,15 @@
                    "name": "Punto geodetico",
                    "terms": "punto geodetico o altra stazione fissa"
                },
+                "man_made/telescope": {
+                    "name": "Telescopio"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Telescopio ottico"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radiotelescopio"
+                },
                "man_made/torii": {
                    "name": "Torii"
                },
@@ -7679,6 +7773,9 @@
                    "name": "Picco",
                    "terms": "picco,cresta,corona,montagna,collina,pinnacolo,sommità"
                },
+                "natural/peninsula": {
+                    "name": "Penisola"
+                },
                "natural/reef": {
                    "name": "Scogliera",
                    "terms": "barriera,corallo,coralli,barriera corallina,reef,scogli,sommerso,subacqueo"
@@ -7731,6 +7828,24 @@
                    "name": "Albero",
                    "terms": "albero"
                },
+                "natural/tree/broadleaved": {
+                    "name": "Latifoglia"
+                },
+                "natural/tree/broadleaved/deciduous": {
+                    "name": "Latifoglia decidua"
+                },
+                "natural/tree/broadleaved/evergreen": {
+                    "name": "Latifoglia sempreverde"
+                },
+                "natural/tree/needleleaved": {
+                    "name": "Aghifoglia"
+                },
+                "natural/tree/needleleaved/deciduous": {
+                    "name": "Aghifoglia decidua"
+                },
+                "natural/tree/needleleaved/evergreen": {
+                    "name": "Aghifoglia sempreverde"
+                },
                "natural/tree_row": {
                    "name": "Filare di alberi",
                    "terms": "alberi,filare,fila,cipressi,viale alberato"
@@ -7799,6 +7914,19 @@
                    "terms": "cariceto,torbiera,area umida,palude,acquitrino",
                    "aliases": "Torbiera\nArea umida"
                },
+                "natural/wetland/mangrove": {
+                    "name": "Mangrovia"
+                },
+                "natural/wetland/marsh": {
+                    "name": "Palude",
+                    "terms": "acquitrino"
+                },
+                "natural/wetland/saltmarsh": {
+                    "name": "Palude salina costiera"
+                },
+                "natural/wetland/swamp": {
+                    "name": "Acquitrino"
+                },
                "natural/wood": {
                    "name": "Bosco naturale",
                    "terms": "alberi,albero,bosco,boscaglia,foresta,arboreo,boreale,taiga,selva,macchia,fratta"
@@ -7871,6 +7999,9 @@
                    "name": "Ufficio azienda fornitrice di energia",
                    "terms": "elettricità,compagnia energetica,servizi energia,servizi gas"
                },
+                "office/engineer": {
+                    "name": "Ufficio di ingegneria"
+                },
                "office/estate_agent": {
                    "name": "Agenzia immobiliare",
                    "terms": "agenzia immobiliare,immobiliare"
@@ -7905,6 +8036,9 @@
                "office/government/tax": {
                    "name": "Agenzia delle entrate"
                },
+                "office/graphic_design": {
+                    "name": "Ufficio di progettazione grafica"
+                },
                "office/guide": {
                    "name": "Ufficio guide turistiche"
                },
@@ -7975,12 +8109,24 @@
                "office/travel_agent": {
                    "name": "Agenzia di viaggi"
                },
+                "office/union": {
+                    "name": "Ufficio del sindacato"
+                },
                "office/water_utility": {
                    "name": "Ufficio azienda di fornitura dell'acqua"
                },
                "office/yes": {
                    "name": "Ufficio (Tipo non specificato)"
                },
+                "pipeline": {
+                    "name": "Elemento di una conduttura"
+                },
+                "pipeline/substation": {
+                    "name": "Sottostazione di una conduttura"
+                },
+                "pipeline/valve": {
+                    "name": "Valvola di una conduttura"
+                },
                "piste/downhill": {
                    "name": "Pista da sci alpino",
                    "terms": "pista di discesa per lo sci"
@@ -8119,6 +8265,9 @@
                    "name": "Palo Tetherball",
                    "terms": "palo,sport"
                },
+                "playground/trampoline": {
+                    "name": "Trampolino"
+                },
                "playground/zipwire": {
                    "name": "Teleferica"
                },
@@ -8126,6 +8275,9 @@
                    "name": "Punto",
                    "terms": "punto"
                },
+                "police/checkpoint": {
+                    "name": "Posto di blocco della Polizia"
+                },
                "polling_station": {
                    "name": "Seggio elettorale temporaneo"
                },
@@ -8189,12 +8341,18 @@
                "power/plant/source/hydro": {
                    "name": "Centrale idroelettrica"
                },
+                "power/plant/source/method/photovoltaic": {
+                    "name": "Impianto solare"
+                },
                "power/plant/source/nuclear": {
                    "name": "Centrale nucleare"
                },
                "power/plant/source/oil": {
                    "name": "Centrale ad olio combustibile"
                },
+                "power/plant/source/solar": {
+                    "name": "Centrale solare"
+                },
                "power/plant/source/waste": {
                    "name": "Impianto di generazione da incenerimento dei rifiuti"
                },
@@ -8205,6 +8363,9 @@
                    "name": "Palo",
                    "terms": "palo elettricità,palo elettrico,pilone elettricità,pilone elettrico"
                },
+                "power/portal": {
+                    "name": "Portale linea elettrica"
+                },
                "power/substation": {
                    "name": "Sottostazione",
                    "terms": "sottostazione"
@@ -8460,6 +8621,9 @@
                "railway/tram_stop": {
                    "name": "Fermata del tram"
                },
+                "railway/turntable": {
+                    "name": "Piattaforma girevole ferroviaria"
+                },
                "railway/yard": {
                    "name": "Cantiere ferroviario"
                },
@@ -8545,8 +8709,8 @@
                    "terms": "salone,bellezza,spa,abbronzatura,solare,unghie,smalto,sopracciglia,ciglia,shiatsu,trattamento,viso,corpo,depilazione,epilazione,laser,tatoo,peeling,tatuaggio"
                },
                "shop/beauty/nails": {
-                    "name": "Estetista",
-                    "terms": "estetista,salone per unghie,centro estetico"
+                    "name": "Onicotecnica",
+                    "terms": "unghie,salone per unghie,manicure,pedicure"
                },
                "shop/beauty/tanning": {
                    "name": "Centro abbronzatura",
@@ -8604,11 +8768,11 @@
                },
                "shop/car_parts": {
                    "name": "Negozio di autoricambi",
-                    "terms": "negozio autoricambi"
+                    "terms": "autoricambi"
                },
                "shop/car_repair": {
                    "name": "Autofficina",
-                    "terms": "officina"
+                    "terms": "officina,meccanico,elettrauto,riparazioni,revisioni"
                },
                "shop/caravan": {
                    "name": "Concessionario caravan",
@@ -8644,6 +8808,9 @@
                "shop/clothes/second_hand": {
                    "name": "Negozio di abiti usati"
                },
+                "shop/clothes/suits": {
+                    "name": "Negozio di abiti eleganti"
+                },
                "shop/clothes/underwear": {
                    "name": "Negozio di intimo",
                    "terms": "boutique,negozio,reggiseni,boxer,mutande,fashion,lingerie,slip,calzini,intimo,body,pigiama,pijama,perizoma,camicia da notte"
@@ -8651,6 +8818,9 @@
                "shop/clothes/wedding": {
                    "name": "Negozio di abiti per matrimonio"
                },
+                "shop/clothes/workwear": {
+                    "name": "Negozio di abbigliamento da lavoro"
+                },
                "shop/coffee": {
                    "name": "Negozio di caffè",
                    "terms": "bottega del caffè,caffetteria"
@@ -8822,7 +8992,7 @@
                },
                "shop/hearing_aids": {
                    "name": "Negozio di apparecchi acustici",
-                    "terms": "apparecchi acustici,negozio di apparecchi acustici"
+                    "terms": "apparecchi acustici,negozio di apparecchi acustici,udito,perdita dell'udito,sordo,sordità,suono,suoni,rumore,rumori,sentire,audiometrico,orecchi"
                },
                "shop/herbalist": {
                    "name": "Erboristeria",
@@ -8835,6 +9005,9 @@
                "shop/hobby": {
                    "name": "Negozio di hobbystica"
                },
+                "shop/honey": {
+                    "name": "Negozio di miele"
+                },
                "shop/household_linen": {
                    "name": "Negozio di biancheria per la casa",
                    "terms": "lenzuola,coperte,tende"
@@ -8937,6 +9110,9 @@
                    "name": "Negozio di integratori alimentari",
                    "terms": "negozio di integratori"
                },
+                "shop/nuts": {
+                    "name": "Negozio di noci"
+                },
                "shop/optician": {
                    "name": "Ottico",
                    "terms": "ottico"
@@ -8955,10 +9131,16 @@
                "shop/party": {
                    "name": "Negozio di articoli per le feste"
                },
+                "shop/pasta": {
+                    "name": "Negozio di pasta"
+                },
                "shop/pastry": {
                    "name": "Pasticceria",
                    "terms": "patisserie,torteria,torte,paste,pasticcini"
                },
+                "shop/pawnbroker": {
+                    "name": "Banco dei pegni"
+                },
                "shop/perfumery": {
                    "name": "Profumeria",
                    "terms": "profumi,profumo,profumeria"
@@ -8967,6 +9149,9 @@
                    "name": "Negozio per animali",
                    "terms": "negozio di animali"
                },
+                "shop/pet_grooming": {
+                    "name": "Tolettatura per animali"
+                },
                "shop/photo": {
                    "name": "Fotografo",
                    "terms": "fotografia,fotografico,fotografo,foto,diapositive,rullini,macchine fotografiche"
@@ -9000,6 +9185,9 @@
                    "name": "Bottega di riparazioni",
                    "terms": "riparatutto"
                },
+                "shop/rice": {
+                    "name": "Negozio di riso"
+                },
                "shop/scuba_diving": {
                    "name": "Negozio di attrezzatura per subacquei",
                    "terms": "sub,accessori sub"
@@ -9251,7 +9439,7 @@
                },
                "tourism/information/guidepost": {
                    "name": "Cartello segnavia",
-                    "terms": "segnale,segnaletica,turismo,turistico,indicazione,cartello"
+                    "terms": "segnale,segnaletica,turismo,turistico,indicazione,cartello,luogo di posa,segnavia,palina"
                },
                "tourism/information/map": {
                    "name": "Cartina",
@@ -9360,12 +9548,15 @@
                "traffic_sign/maxspeed": {
                    "name": "Cartello di limite di velocità"
                },
+                "traffic_sign/variable_message": {
+                    "name": "Segnale a messaggio variabile"
+                },
                "type/boundary": {
                    "name": "Confine",
                    "terms": "confine"
                },
                "type/boundary/administrative": {
-                    "name": "Confine Amministrativo",
+                    "name": "Confine amministrativo",
                    "terms": "confine amministrativo"
                },
                "type/connectivity": {
@@ -537,8 +537,8 @@
                    "terms": "ブランド,系列"
                },
                "brewery": {
-                    "label": "ドラフトビール",
-                    "terms": "ドラフトビール,ビール"
+                    "label": "取り扱いビールブランド",
+                    "terms": "ビールブランド,ドラフトビール,ビール"
                },
                "bridge": {
                    "label": "種類",
@@ -599,6 +599,7 @@
                        "public": "公共建築物",
                        "residential": "住居全般（建物）",
                        "retail": "店舗用の建物",
+                        "riding_hall": "屋内馬場",
                        "roof": "屋根",
                        "ruins": "廃墟（建物）",
                        "school": "学校（建物）",
@@ -1062,7 +1063,7 @@
                        "lebanese": "レバノン料理",
                        "malaysian": "マレーシア料理",
                        "mexican": "メキシコ料理",
-                        "pankcake": "パンケーキ",
+                        "pancake": "パンケーキ",
                        "pasta": "パスタ",
                        "peruvian": "ペルー料理",
                        "pizza": "ピザ",
@@ -1309,6 +1310,14 @@
                        "tidal": "荷役用ドック"
                    }
                },
+                "dock/height": {
+                    "label": "ドック高さ",
+                    "terms": "ドック高さ,プラットホーム高さ,床高さ,バース高さ"
+                },
+                "dock/width": {
+                    "label": "ドック幅",
+                    "terms": "ドック幅"
+                },
                "dog": {
                    "label": "犬の同行許可",
                    "options": {
@@ -1321,6 +1330,14 @@
                "door": {
                    "label": "ドア"
                },
+                "door/height": {
+                    "label": "ドア高さ",
+                    "terms": "ドア高さ,搬出入口高さ"
+                },
+                "door/width": {
+                    "label": "ドア幅",
+                    "terms": "ドア幅,搬出入口幅"
+                },
                "door_type": {
                    "label": "ドアの種類"
                },
@@ -1923,15 +1940,8 @@
                    "label": "輪の数",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "馬場馬術乗馬",
-                    "options": {
-                        "equestrian": "あり",
-                        "undefined": "なし"
-                    }
-                },
                "horse_riding": {
-                    "label": "乗馬",
+                    "label": "乗馬施設",
                    "options": {
                        "horse_riding": "あり",
                        "undefined": "なし"
@@ -1950,13 +1960,6 @@
                    "placeholder": "困難, 危険...",
                    "terms": "乗馬の難易度,乗馬,難易度"
                },
-                "horse_stables": {
-                    "label": "乗馬施設",
-                    "options": {
-                        "stables": "Yes",
-                        "undefined": "No"
-                    }
-                },
                "hot_water": {
                    "label": "温水"
                },
@@ -3146,7 +3149,7 @@
                "route_master": {
                    "label": "種類"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "ロイヤル・サイファー",
                    "options": {
                        "CIIIR": "CIIIR （チャールズ3世）",
@@ -3826,6 +3829,13 @@
                "telecom/medium": {
                    "label": "通信線の素材"
                },
+                "telescope/type": {
+                    "label": "望遠鏡の種別",
+                    "options": {
+                        "optical": "光学望遠鏡",
+                        "radio": "電波望遠鏡"
+                    }
+                },
                "tents": {
                    "label": "テント"
                },
@@ -4465,6 +4475,10 @@
                    "name": "ATM",
                    "terms": "atm,cd,現金自動預払機,お金,金融"
                },
+                "amenity/baking_oven": {
+                    "name": "公共オーブン",
+                    "terms": "パン焼き窯"
+                },
                "amenity/bank": {
                    "name": "銀行",
                    "terms": "銀行,信用金庫,信用組合,お金,金融,バンク,地銀,都銀,信金"
@@ -4623,7 +4637,7 @@
                },
                "amenity/conference_centre": {
                    "name": "コンベンションセンター",
-                    "terms": "コンベンションセンター,会議施設,見本市,展示会,展示会場,会場"
+                    "terms": "コンベンションセンター,カンファレンスセンター,会議場,国際会議場,会議施設,会議センター,展示場,国際展示場,展示会場,展示センター,見本市会場,エキシビションセンター,エキシビジョンセンター,mice,会場"
                },
                "amenity/courthouse": {
                    "name": "裁判所",
@@ -4785,11 +4799,11 @@
                },
                "amenity/events_venue": {
                    "name": "イベント施設",
-                    "terms": "イベント施設,イベント会場,会場,催事,催事場,結婚式場,多目的ホール"
+                    "terms": "イベント施設,イベント会場,催事場,結婚式場,多目的ホール,会場"
                },
                "amenity/exhibition_centre": {
                    "name": "展示場",
-                    "terms": "展示場,エキシビジョンセンター,会場,展示会場,見本市"
+                    "terms": "展示場,国際展示場,展示会場,展示センター,見本市会場,エキシビションセンター,エキシビジョンセンター,コンベンションセンター,カンファレンスセンター,会議場,国際会議場,会議施設,会議センター,mice,会場"
                },
                "amenity/fast_food": {
                    "name": "ファストフード全般",
@@ -4869,6 +4883,10 @@
                    "name": "ガソリンスタンド",
                    "terms": "ガソリンスタンド,ガス,ガスステーション,自動車,バイク,燃料"
                },
+                "amenity/funeral_hall": {
+                    "name": "葬儀場",
+                    "terms": "葬儀場,メモリアルホール,斎場,葬祭会館"
+                },
                "amenity/gambling": {
                    "name": "ギャンブル場",
                    "terms": "ギャンブル場,賭博場,カジノ"
@@ -5870,6 +5888,10 @@
                    "name": "集合住宅（個々の建物）",
                    "terms": "アパート,マンション,集合住宅,住宅"
                },
+                "building/bakehouse": {
+                    "name": "オーブン小屋",
+                    "terms": "パン焼き小屋"
+                },
                "building/barn": {
                    "name": "納屋",
                    "terms": "納屋,小屋"
@@ -6034,6 +6056,10 @@
                    "name": "店舗用の建物",
                    "terms": "商業施設,店舗,商業ビル,店,お店,ショッピング,小売"
                },
+                "building/riding_hall": {
+                    "name": "屋内馬場",
+                    "terms": "屋内馬場,屋内馬術場,屋内乗馬場"
+                },
                "building/roof": {
                    "name": "屋根",
                    "terms": "屋根,屋根付きテラス"
@@ -7028,6 +7054,10 @@
                    "name": "銘板",
                    "terms": "銘板,プレート,銘"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "ストルパーシュタイン",
+                    "terms": "ストルパーシュタイン,シュトルパーシュタイン,つまずきの石"
+                },
                "historic/monument": {
                    "name": "記念堂",
                    "terms": "記念堂,記念建造物,歴史"
@@ -7140,7 +7170,7 @@
                },
                "landuse/farmland": {
                    "name": "耕作地",
-                    "terms": "農地,畑,田,茶畑,田んぼ,田畑,耕作地,農業"
+                    "terms": "農地,畑,田,田んぼ,水田,田畑,耕作地,農業"
                },
                "landuse/farmyard": {
                    "name": "農家（敷地）",
@@ -7694,6 +7724,10 @@
                    "name": "クライミングジム",
                    "terms": "クライミングジム,クライミング,スポーツ,ボルダリング,トレーニング"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "アドベンチャーパーク",
+                    "terms": "アスレチック,フィールドアスレチック,ロープクライミング,ジップライン"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "競馬場",
                    "terms": "競馬コース,馬場"
@@ -8003,6 +8037,10 @@
                    "name": "地下の貯水槽",
                    "terms": "地下の貯水槽,貯水槽,貯水池"
                },
+                "man_made/satellite_dish": {
+                    "name": "衛星アンテナ",
+                    "terms": "衛星アンテナ,パラボラアンテナ,衛星通信"
+                },
                "man_made/silo": {
                    "name": "サイロ",
                    "terms": "サイロ,貯蔵タンク"
@@ -8055,6 +8093,18 @@
                    "name": "尾鉱池",
                    "terms": "尾鉱池"
                },
+                "man_made/telescope": {
+                    "name": "望遠鏡",
+                    "terms": "望遠鏡,天体望遠鏡"
+                },
+                "man_made/telescope/optical": {
+                    "name": "光学望遠鏡",
+                    "terms": "光学望遠鏡,屈折望遠鏡,反射望遠鏡,天体望遠鏡,望遠鏡"
+                },
+                "man_made/telescope/radio": {
+                    "name": "電波望遠鏡",
+                    "terms": "電波望遠鏡,天体望遠鏡,望遠鏡,パラボラアンテナ,アンテナ"
+                },
                "man_made/torii": {
                    "name": "鳥居",
                    "terms": "鳥居,神社"
@@ -8998,6 +9048,10 @@
                    "name": "電源スイッチ",
                    "terms": "電源スイッチ"
                },
+                "power/switchgear": {
+                    "name": "スイッチギア",
+                    "terms": "スイッチギア"
+                },
                "power/tower": {
                    "name": "送電塔",
                    "terms": "送電塔,鉄塔"
@@ -9527,7 +9581,7 @@
                },
                "shop/copyshop": {
                    "name": "コピー店",
-                    "terms": "コピー店"
+                    "terms": "コピー店,印刷"
                },
                "shop/cosmetics": {
                    "name": "化粧品店",
@@ -161,12 +161,14 @@
                        "housenumber": "123",
                        "housenumber!jp": "주거 번호<br>",
                        "neighbourhood": "동",
+                        "neighbourhood!jp": "마치/초메/아자/코아자",
                        "place": "장소",
                        "postcode": "우편번호",
                        "province": "도",
                        "province!cn": "성/직할시/자치구/특별행정구",
                        "province!jp": "도도부현",
                        "quarter": "지구",
+                        "quarter!jp": "오아자",
                        "state": "주",
                        "street": "도로명",
                        "subdistrict": "하위 지구",
@@ -245,11 +247,18 @@
                    "options": {
                        "baths": "목욕탕",
                        "city": "옛 도시",
-                        "petroglyph": "석조각상"
+                        "crannog": "크라노그",
+                        "necropolis": "네크로폴리스",
+                        "petroglyph": "석조각상",
+                        "roman_circus": "고대 로마 전차경기장",
+                        "roman_villa": "고대 로마 빌라",
+                        "settlement": "옛 정착지",
+                        "tumulus": "고분"
                    }
                },
                "architect": {
-                    "label": "건축가"
+                    "label": "건축가",
+                    "terms": "건축한 사람,지은이,지은 사람,설계자"
                },
                "area/highway": {
                    "label": "유형"
@@ -409,7 +418,11 @@
                    }
                },
                "bicycle_road": {
-                    "label": "자전거 도로"
+                    "label": "자전거 도로",
+                    "options": {
+                        "undefined": "아니오",
+                        "yes": "예"
+                    }
                },
                "bin": {
                    "label": "쓰레기통"
@@ -459,9 +472,6 @@
                "brand": {
                    "label": "상표"
                },
-                "brewery": {
-                    "label": "생맥주"
-                },
                "bridge": {
                    "label": "유형",
                    "placeholder": "보통"
@@ -491,6 +501,7 @@
                        "farm": "농가",
                        "farm_auxiliary": "농장 건물",
                        "fire_station": "소방서 건물",
+                        "ger": "유르트",
                        "greenhouse": "온실",
                        "hospital": "병원 건물",
                        "hotel": "호텔 건물",
@@ -507,12 +518,18 @@
                        "ruins": "건물 폐허",
                        "school": "학교 건물",
                        "service": "서비스 건물",
+                        "stadium": "스타디움 건물",
                        "synagogue": "시너고그 건물",
                        "temple": "사원 건물",
                        "train_station": "철도역 건물",
                        "transportation": "교통 건물",
                        "university": "종합대학 건물"
-                    }
+                    },
+                    "terms": "건물,빌딩,건축물"
+                },
+                "building/colour": {
+                    "label": "외벽 색상",
+                    "terms": "파사드 색상,외부 색상,건물 색상,건물색,외부색"
                },
                "building/flats": {
                    "placeholder": "2, 4, 6, 8..."
@@ -544,6 +561,18 @@
                    "label": "케이블 수",
                    "placeholder": "1, 2, 3..."
                },
+                "cai_scale-IT": {
+                    "label": "등산 경로 난이도 (이탈리아 알파인 클럽 기준)",
+                    "options": {
+                        "E": "E: 일반 등산객용",
+                        "EAI": "EAI: 일반 등산객용 (설원 지대 포함)",
+                        "EE": "EE: 전문 산악인용",
+                        "EEA": "EEA: 전문 산악인용 (등산 장비 필요)",
+                        "T": "T: 관광용"
+                    },
+                    "placeholder": "T, E, EE, …",
+                    "terms": "등산 경로 난이도 (이탈리아 알파인 클럽),하이킹 경로 난이도 (이탈리아 알파인 클럽),하이킹 루트 난이도 (이탈리아 알파인 클럽)"
+                },
                "camera/direction": {
                    "label": "방향(시계 방향 각도)",
                    "placeholder": "45, 90, 180, 270"
@@ -610,8 +639,13 @@
                    "options": {
                        "babies": "유아복",
                        "children": "아동복",
+                        "denim": "청바지류",
+                        "fur": "모피류",
                        "hats": "모자",
+                        "maternity": "임부복",
                        "men": "남성복",
+                        "motorcycle": "바이크 의류",
+                        "oversize": "빅 사이즈 의류",
                        "socks": "양말",
                        "sports": "운동복",
                        "suits": "정장",
@@ -619,8 +653,10 @@
                        "traditional": "전통의상",
                        "underwear": "속옷",
                        "wedding": "혼례복",
-                        "women": "여성복"
-                    }
+                        "women": "여성복",
+                        "workwear": "작업복"
+                    },
+                    "terms": "옷,의류,의복"
                },
                "club": {
                    "label": "유형"
@@ -635,7 +671,8 @@
                    }
                },
                "colour": {
-                    "label": "색"
+                    "label": "색",
+                    "terms": "색상,색깔,색"
                },
                "comment": {
                    "label": "바뀜집합 댓글",
@@ -651,10 +688,19 @@
                    "label": "유형"
                },
                "consulate": {
-                    "label": "유형"
+                    "label": "유형",
+                    "options": {
+                        "consular_agency": "영사민원국",
+                        "consular_office": "영사민원 사무소",
+                        "consulate_general": "총영사관",
+                        "honorary_consul": "명예영사관",
+                        "residence": "영사공관",
+                        "yes": "영사관"
+                    }
                },
                "contact/facebook": {
-                    "label": "Facebook 사용자명 혹은 URL"
+                    "label": "Facebook 사용자명 혹은 URL",
+                    "placeholder": "https://www.facebook.com/LocalBusiness"
                },
                "contact/webcam": {
                    "label": "웹캠 URL",
@@ -777,7 +823,7 @@
                    "label": "경고등"
                },
                "crossing/markings": {
-                    "label": "횡단보도 표시",
+                    "label": "횡단보도 표시 형태",
                    "options": {
                        "no": "표시 없음",
                        "yes": "표시 있음",
@@ -786,10 +832,10 @@
                    }
                },
                "crossing_raised": {
-                    "label": "과속방지턱",
+                    "label": "고원식 횡단보도",
                    "options": {
                        "table": "예",
-                        "undefined": "아니오"
+                        "undefined": "아니오로 간주"
                    }
                },
                "cuisine": {
@@ -822,7 +868,6 @@
                        "lebanese": "레바논 요리",
                        "malaysian": "말레이시아 요리",
                        "mexican": "멕시코 요리",
-                        "pankcake": "팬케이크",
                        "pasta": "파스타",
                        "peruvian": "페루 요리",
                        "pizza": "피자",
@@ -837,6 +882,7 @@
                        "steak_house": "스테이크하우스",
                        "sushi": "초밥",
                        "taiwanese": "대만 요리",
+                        "tex-mex": "텍스멕스",
                        "thai": "태국 요리",
                        "turkish": "터키 요리",
                        "ukrainian": "우크라이나 요리",
@@ -1026,6 +1072,7 @@
                    "label": "유형"
                },
                "dog": {
+                    "label": "개",
                    "options": {
                        "leashed": "애완동물 목줄 착용 필수",
                        "no": "허용되지 않음",
@@ -1348,6 +1395,7 @@
                "healthcare": {
                    "label": "유형",
                    "options": {
+                        "alternative": "대체의학",
                        "blood_bank": "혈액원",
                        "blood_donation": "헌혈의 집",
                        "clinic": "의원",
@@ -1357,7 +1405,10 @@
                        "hospice": "호스피스",
                        "hospital": "병원",
                        "laboratory": "의학 연구소",
-                        "pharmacy": "약국"
+                        "midwife": "조산사",
+                        "nurse": "간호사",
+                        "pharmacy": "약국",
+                        "psychotherapist": "심리치료사"
                    }
                },
                "healthcare/speciality": {
@@ -1386,6 +1437,7 @@
                        "infectious_diseases": "감염내과",
                        "internal": "내과",
                        "naturopathy": "세포병리학",
+                        "neonatology": "신생아학",
                        "nephrology": "신장내과",
                        "neurology": "신경내과",
                        "neuropsychiatry": "신경정신과",
@@ -1396,8 +1448,11 @@
                        "ophthalmology": "안과",
                        "orthodontics": "치과교정과",
                        "orthopaedics": "정형외과",
+                        "osteopathy": "정골의학과",
+                        "otolaryngology": "이비인후과",
                        "paediatric_surgery": "소아외과",
                        "paediatrics": "소아청소년과",
+                        "palliative": "완화 치료",
                        "pathology": "병리과",
                        "physiatry": "재활의학과",
                        "plastic_surgery": "성형외과",
@@ -1406,11 +1461,20 @@
                        "psychiatry": "정신건강의학과",
                        "pulmonology": "호흡기내과",
                        "radiology": "영상의학과",
+                        "radiotherapy": "방사선 요법",
+                        "reflexology": "반사학",
+                        "reiki": "레이키",
                        "rheumatology": "류마티스내과",
+                        "shiatsu": "시아추",
                        "stomatology": "구강과",
                        "surgery": "외과",
+                        "systemic": "전신요법",
+                        "traditional_chinese_medicine": "한의학",
                        "transplant": "이식외과",
                        "trauma": "외상외과",
+                        "tropical": "열대의학과",
+                        "tuina": "추나요법",
+                        "unani": "유나니 의학",
                        "urology": "비뇨의학과",
                        "vaccination": "백신 접종",
                        "vascular_surgery": "혈관외과"
@@ -1450,7 +1514,7 @@
                        "mine": "광산",
                        "railway": "철도",
                        "ruins": "폐허",
-                        "tomb": "무덤"
+                        "tomb": "무덤 (역사적 지물)"
                    }
                },
                "historic/civilization": {
@@ -1476,15 +1540,7 @@
                    "label": "후프",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "기마술",
-                    "options": {
-                        "equestrian": "예",
-                        "undefined": "아니오"
-                    }
-                },
                "horse_riding": {
-                    "label": "승마",
                    "options": {
                        "horse_riding": "예",
                        "undefined": "아니오"
@@ -1497,12 +1553,6 @@
                        "critical": "경계선: 숙련된 라이더와 말만 통행할 수 있습니다. 주요 장애물. 교량을주의 깊게 검사해야합니다."
                    }
                },
-                "horse_stables": {
-                    "options": {
-                        "stables": "예",
-                        "undefined": "아니오"
-                    }
-                },
                "hot_water": {
                    "label": "온수"
                },
@@ -2067,6 +2117,18 @@
                        "skating": "스케이팅"
                    }
                },
+                "piste/grooming_downhill": {
+                    "options": {
+                        "classic": "클래식",
+                        "mogul": "모굴"
+                    }
+                },
+                "piste/grooming_nordic": {
+                    "options": {
+                        "scooter": "스쿠터/스노모빌",
+                        "skating": "스케이팅"
+                    }
+                },
                "piste/type": {
                    "label": "유형",
                    "options": {
@@ -2111,6 +2173,9 @@
                "population": {
                    "label": "인구"
                },
+                "population/date": {
+                    "placeholder": "YYYY-MM-DD"
+                },
                "power": {
                    "label": "유형"
                },
@@ -2225,6 +2290,7 @@
                "religion": {
                    "label": "종교",
                    "options": {
+                        "bahai": "바하이교",
                        "buddhist": "불교",
                        "caodaism": "까오다이교",
                        "chinese_folk": "중국 토속신앙",
@@ -2238,7 +2304,8 @@
                        "sikh": "시크교",
                        "taoist": "도교",
                        "tenrikyo": "천리교",
-                        "vietnamese_folk": "베트남 토속신앙"
+                        "vietnamese_folk": "베트남 토속신앙",
+                        "voodoo": "부두교"
                    }
                },
                "reservation": {
@@ -3351,6 +3418,9 @@
                    "name": "낙태 클리닉",
                    "terms": "미숙아 클리닉"
                },
+                "amenity/clinic/dialysis": {
+                    "name": "투석 센터"
+                },
                "amenity/clinic/fertility": {
                    "name": "불임 클리닉",
                    "terms": "불임 클리닉"
@@ -3410,12 +3480,18 @@
                "amenity/doctors/cardiology": {
                    "name": "순환기내과 의사"
                },
+                "amenity/doctors/child_psychiatry": {
+                    "name": "아동청소년 정신의학과 의사"
+                },
                "amenity/doctors/dermatology": {
                    "name": "피부과 의사"
                },
                "amenity/doctors/gastroenterology": {
                    "name": "소화기내과 의사"
                },
+                "amenity/doctors/general": {
+                    "name": "주치의"
+                },
                "amenity/doctors/gynaecology": {
                    "name": "산부인과 의사"
                },
@@ -3570,7 +3646,7 @@
                    "name": "도박장"
                },
                "amenity/grave_yard": {
-                    "name": "묘지",
+                    "name": "묘역 (종교시설 내부)",
                    "terms": "묘지,묘역,산소"
                },
                "amenity/grit_bin": {
@@ -4044,6 +4120,9 @@
                    "name": "주차권 발권기",
                    "terms": "주차권 발권기,주차발권기"
                },
+                "amenity/vending_machine/pizza": {
+                    "name": "피자 자판기"
+                },
                "amenity/vending_machine/public_transport_tickets": {
                    "name": "대중교통 승차권 발매기",
                    "terms": "대중교통 승차권 발매기,1회용 승차권 발매기"
@@ -4062,6 +4141,9 @@
                "amenity/waste/dog_excrement": {
                    "name": "개 배설물 쓰레기통"
                },
+                "amenity/waste_basket": {
+                    "name": "쓰레기통"
+                },
                "amenity/waste_disposal": {
                    "name": "쓰레기 수거함",
                    "terms": "쓰레기통"
@@ -4099,6 +4181,9 @@
                "attraction/animal": {
                    "name": "동물 우리"
                },
+                "attraction/big_wheel": {
+                    "name": "회전관람차"
+                },
                "attraction/bumper_car": {
                    "name": "범퍼카"
                },
@@ -4460,7 +4545,7 @@
                    "terms": "묘지,묘,산소"
                },
                "cemetery/sector": {
-                    "name": "묘소",
+                    "name": "묘역 (묘지 내부)",
                    "terms": "묘소,묘역"
                },
                "club": {
@@ -4715,7 +4800,8 @@
                    "terms": "소화전"
                },
                "emergency/fire_service_inlet": {
-                    "name": "관할 소방서"
+                    "name": "소방 송수구",
+                    "terms": "송수구"
                },
                "emergency/first_aid_kit": {
                    "name": "구급상자"
@@ -4827,10 +4913,28 @@
                "healthcare/alternative": {
                    "name": "대체의학"
                },
+                "healthcare/alternative/acupuncture": {
+                    "name": "침사"
+                },
+                "healthcare/alternative/ayurveda": {
+                    "name": "아유르베다"
+                },
                "healthcare/alternative/chiropractic": {
-                    "name": "카이로프랙틱",
+                    "name": "카이로프랙터",
                    "terms": "허리,요통,척추"
                },
+                "healthcare/alternative/homeopathy": {
+                    "name": "동종요법사"
+                },
+                "healthcare/alternative/naturopathy": {
+                    "name": "자연요법사"
+                },
+                "healthcare/alternative/osteopathy": {
+                    "name": "정골의학 의사"
+                },
+                "healthcare/alternative/traditional_chinese_medicine": {
+                    "name": "한의사"
+                },
                "healthcare/audiologist": {
                    "name": "청능사",
                    "terms": "귀,청력,소리"
@@ -4886,6 +4990,9 @@
                "healthcare/speech_therapist": {
                    "name": "언어치료사"
                },
+                "healthcare/yes": {
+                    "name": "의료 시설(기타)"
+                },
                "highway": {
                    "name": "도로 지물"
                },
@@ -4894,14 +5001,15 @@
                    "terms": "승마 도로"
                },
                "highway/bus_guideway": {
-                    "name": "독립된 버스전용차로",
-                    "terms": "brt"
+                    "name": "버스 가이드웨이",
+                    "terms": "버스 가이드웨이"
                },
                "highway/bus_stop": {
                    "name": "버스 정류소"
                },
                "highway/busway": {
-                    "name": "버스전용차로"
+                    "name": "분리된 버스 전용로",
+                    "terms": "brt,버스전용도로,간선급행버스체계"
                },
                "highway/construction": {
                    "name": "공사 중인 도로"
@@ -4982,7 +5090,7 @@
                },
                "highway/living_street": {
                    "name": "주택가 거리",
-                    "terms": "주택가 거리"
+                    "terms": "생활도로,이면도로"
                },
                "highway/milestone": {
                    "name": "도로 거리표"
@@ -5046,8 +5154,8 @@
                    "terms": "주거 도로,골목길"
                },
                "highway/rest_area": {
-                    "name": "휴게소",
-                    "terms": "졸음쉼터"
+                    "name": "졸음쉼터",
+                    "terms": "소풍 휴게소,임시 휴게소"
                },
                "highway/road": {
                    "name": "미확인 도로",
@@ -5089,14 +5197,20 @@
                    "name": "주차장 통로",
                    "terms": "주차장 통로"
                },
+                "highway/service_area": {
+                    "name": "서비스 도로"
+                },
                "highway/services": {
-                    "name": "서비스 지역",
-                    "terms": "휴게소"
+                    "name": "휴게소",
+                    "terms": "간이 휴게소"
                },
                "highway/speed_camera": {
                    "name": "과속단속 카메라",
                    "terms": "과속 카메라,속도 카메라"
                },
+                "highway/speed_display": {
+                    "name": "가변속도표출기"
+                },
                "highway/steps": {
                    "name": "계단",
                    "terms": "계단"
@@ -5120,12 +5234,17 @@
                    "name": "3차 도로 연결로",
                    "terms": "3차 도로 연결로"
                },
+                "highway/toll_gantry": {
+                    "name": "통행료 무인수납장치",
+                    "terms": "스마트톨링,원톨링"
+                },
                "highway/track": {
-                    "name": "트랙 / 육로 접근 도로"
+                    "name": "트랙 / 토지 접근 도로",
+                    "terms": "농도,임도"
                },
                "highway/traffic_mirror": {
-                    "name": "차량 거울",
-                    "terms": "차량 거울"
+                    "name": "도로 반사경",
+                    "terms": "도로 거울,도로 반사경"
                },
                "highway/traffic_signals": {
                    "name": "신호등",
@@ -5148,7 +5267,7 @@
                    "terms": "루프선 (교통섬)"
                },
                "highway/unclassified": {
-                    "name": "미분류 도로",
+                    "name": "미분류 도로(4차 도로)",
                    "terms": "4차 도로,미분류 도로,미등급 도로"
                },
                "historic": {
@@ -5201,7 +5320,7 @@
                    "terms": "폐허"
                },
                "historic/tomb": {
-                    "name": "무덤",
+                    "name": "무덤 (역사적 지물)",
                    "terms": "무덤"
                },
                "historic/wayside_cross": {
@@ -5263,11 +5382,11 @@
                    "name": "재개발 부지"
                },
                "landuse/cemetery": {
-                    "name": "산소",
+                    "name": "묘역",
                    "terms": "산소,묘지"
                },
                "landuse/churchyard": {
-                    "name": "묘지"
+                    "name": "교회 부지"
                },
                "landuse/commercial": {
                    "name": "상업 지역",
@@ -635,24 +635,12 @@
                    "label": "Ratlankiai",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Taip",
-                        "undefined": "Ne"
-                    }
-                },
                "horse_riding": {
                    "options": {
                        "horse_riding": "Taip",
                        "undefined": "Ne"
                    }
                },
-                "horse_stables": {
-                    "options": {
-                        "stables": "Taip",
-                        "undefined": "Ne"
-                    }
-                },
                "hot_water": {
                    "label": "Karštas vanduo"
                },
@@ -507,14 +507,7 @@
                "hoops": {
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Jā",
-                        "undefined": "Nē"
-                    }
-                },
                "horse_riding": {
-                    "label": "Zirgu izjāde",
                    "options": {
                        "horse_riding": "Jā",
                        "undefined": "Nē"
@@ -531,13 +524,6 @@
                    },
                    "placeholder": "Grūts, Bīstams..."
                },
-                "horse_stables": {
-                    "label": "Zirgu Stallis",
-                    "options": {
-                        "stables": "Jā",
-                        "undefined": "Nē"
-                    }
-                },
                "incline": {
                    "label": "Slīpums"
                },
@@ -2023,6 +2009,10 @@
                "man_made/mast": {
                    "name": "Masts"
                },
+                "man_made/milk_churn_stand": {
+                    "name": "piena galds",
+                    "aliases": "piena steķis\npīna golds"
+                },
                "man_made/observatory": {
                    "name": "Observatorija"
                },
@@ -1,3 +1,80 @@
 {
-    "mi": {}
+    "mi": {
+        "presets": {
+            "fields": {
+                "aerialway/access": {
+                    "options": {
+                        "exit": "Putanga"
+                    }
+                },
+                "aerialway/summer/access": {
+                    "options": {
+                        "exit": "Putanga"
+                    }
+                },
+                "atm": {
+                    "label": "Pūrere Pūtea"
+                },
+                "entrance": {
+                    "options": {
+                        "emergency": "Putanga Ohotata Anake",
+                        "service": "Tomokanga ratonga"
+                    }
+                },
+                "park_ride": {
+                    "label": "Papawaka me te kake pahi"
+                }
+            },
+            "presets": {
+                "amenity/atm": {
+                    "name": "Pūrere Pūtea"
+                },
+                "amenity/bicycle_parking": {
+                    "name": "Tūnga pahikara"
+                },
+                "amenity/bus_station": {
+                    "name": "Teihana Pahi"
+                },
+                "amenity/cinema": {
+                    "name": "Whare Pikitia"
+                },
+                "amenity/ferry_terminal": {
+                    "name": "Taunga Waka Kōpiko"
+                },
+                "amenity/theatre": {
+                    "name": "Whare Tapere"
+                },
+                "building/entrance": {
+                    "name": "Putanga"
+                },
+                "entrance": {
+                    "name": "Putanga"
+                },
+                "entrance/emergency": {
+                    "name": "Putanga Ohotata Anake"
+                },
+                "landuse/harbour": {
+                    "name": "Te Taunga"
+                },
+                "landuse/retail": {
+                    "name": "Ngā Toa"
+                },
+                "public_transport/station_bus": {
+                    "name": "Teihana Pahi"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Taunga Waka Kōpiko"
+                },
+                "public_transport/station_train": {
+                    "name": "Teihana Rerewē"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Wāpu Waka Kōpiko"
+                },
+                "railway/station": {
+                    "name": "Teihana Rerewē"
+                }
+            }
+        }
+    }
 }
@@ -1 +1 @@
-{"mi":{}}
+{"mi":{"presets":{"fields":{"aerialway/access":{"options":{"exit":"Putanga"}},"aerialway/summer/access":{"options":{"exit":"Putanga"}},"atm":{"label":"Pūrere Pūtea"},"entrance":{"options":{"emergency":"Putanga Ohotata Anake","service":"Tomokanga ratonga"}},"park_ride":{"label":"Papawaka me te kake pahi"}},"presets":{"amenity/atm":{"name":"Pūrere Pūtea"},"amenity/bicycle_parking":{"name":"Tūnga pahikara"},"amenity/bus_station":{"name":"Teihana Pahi"},"amenity/cinema":{"name":"Whare Pikitia"},"amenity/ferry_terminal":{"name":"Taunga Waka Kōpiko"},"amenity/theatre":{"name":"Whare Tapere"},"building/entrance":{"name":"Putanga"},"entrance":{"name":"Putanga"},"entrance/emergency":{"name":"Putanga Ohotata Anake"},"landuse/harbour":{"name":"Te Taunga"},"landuse/retail":{"name":"Ngā Toa"},"public_transport/station_bus":{"name":"Teihana Pahi"},"public_transport/station_ferry":{"name":"Taunga Waka Kōpiko"},"public_transport/station_train":{"name":"Teihana Rerewē"},"public_transport/stop_position_ferry":{"name":"Wāpu Waka Kōpiko"},"railway/station":{"name":"Teihana Rerewē"}}}}}
@@ -522,7 +522,7 @@
                    "label": "Марка"
                },
                "brewery": {
-                    "label": "Точено пиво"
+                    "label": "Се продаваат пивата"
                },
                "bridge": {
                    "label": "Вид",
@@ -582,6 +582,7 @@
                        "public": "Општествена градба",
                        "residential": "Станбена градба",
                        "retail": "Проджен објект",
+                        "riding_hall": "Јавачка арена",
                        "roof": "Покрив",
                        "ruins": "Разрушена градба",
                        "school": "Училиште",
@@ -1027,7 +1028,7 @@
                        "lebanese": "либански",
                        "malaysian": "Малезиски",
                        "mexican": "Мексиканска",
-                        "pankcake": "Палачинки",
+                        "pancake": "Палачинки",
                        "pasta": "Тестенини",
                        "peruvian": "перуанска",
                        "pizza": "Пицерија",
@@ -1262,6 +1263,12 @@
                        "tidal": "Регулиран пловечки док"
                    }
                },
+                "dock/height": {
+                    "label": "Висина на докот (метри)"
+                },
+                "dock/width": {
+                    "label": "Ширина на докот (метри)"
+                },
                "dog": {
                    "label": "Кучиња",
                    "options": {
@@ -1273,6 +1280,12 @@
                "door": {
                    "label": "Врата"
                },
+                "door/height": {
+                    "label": "Висина на вратата (метри)"
+                },
+                "door/width": {
+                    "label": "Ширина на вратата (метри)"
+                },
                "door_type": {
                    "label": "Вид"
                },
@@ -1851,15 +1864,8 @@
                    "label": "Обрачи",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Дресурно јавање",
-                    "options": {
-                        "equestrian": "Да",
-                        "undefined": "Не"
-                    }
-                },
                "horse_riding": {
-                    "label": "Јавање",
+                    "label": "Јавачки центар",
                    "options": {
                        "horse_riding": "Да",
                        "undefined": "Не"
@@ -1877,13 +1883,6 @@
                    },
                    "placeholder": "Тешко, Опасно..."
                },
-                "horse_stables": {
-                    "label": "Покриена јавачница",
-                    "options": {
-                        "stables": "Да",
-                        "undefined": "Не"
-                    }
-                },
                "hot_water": {
                    "label": "Топла вода"
                },
@@ -2219,6 +2218,9 @@
                        "war_memorial": "Воен паметник"
                    }
                },
+                "memorial/addr": {
+                    "label": "Адреса на најблиската зграда"
+                },
                "message": {
                    "label": "Порака",
                    "terms": "<преведете со истозначници или сродни поими на „порака“,одделени со запирки>"
@@ -3000,17 +3002,17 @@
                "route_master": {
                    "label": "Вид"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Кралски монограм",
                    "options": {
                        "CIIIR": "CIIIR (Чарлс III)",
                        "EIIR": "EIIR (Елизабета II)",
-                        "EVIIIR": "EVIIIR (Есвард VIII)",
+                        "EVIIIR": "EVIIIR (Едвард VIII)",
                        "EVIIR": "EVIIR (Едвард VII)",
                        "GR": "GR (Џорџ V)",
                        "GVIR": "GVIR (Џорџ VI)",
                        "VR": "VR (Викторија)",
-                        "no": "Нема",
+                        "no": "Не",
                        "scottish_crown": "Шкотска круна"
                    }
                },
@@ -3652,6 +3654,13 @@
                "telecom/medium": {
                    "label": "Медиум"
                },
+                "telescope/type": {
+                    "label": "Вид",
+                    "options": {
+                        "optical": "Оптички телескоп",
+                        "radio": "Радиотелескоп"
+                    }
+                },
                "tents": {
                    "label": "Шатори"
                },
@@ -4143,7 +4152,7 @@
                    "name": "Товарна жичница"
                },
                "aerialway/j-bar": {
-                    "name": "Влечна скижичница"
+                    "name": "Чинија"
                },
                "aerialway/magic_carpet": {
                    "name": "Волшебен килим"
@@ -4161,7 +4170,7 @@
                    "name": "Влекач со појас"
                },
                "aerialway/t-bar": {
-                    "name": "Влекач „Т“"
+                    "name": "Сидро"
                },
                "aerialway/zip_line": {
                    "name": "Жичена спушталка"
@@ -4229,6 +4238,9 @@
                "amenity/atm": {
                    "name": "Банкомат"
                },
+                "amenity/baking_oven": {
+                    "name": "Рерна"
+                },
                "amenity/bank": {
                    "name": "Банка"
                },
@@ -4537,6 +4549,9 @@
                "amenity/fuel": {
                    "name": "Бензинска станица"
                },
+                "amenity/funeral_hall": {
+                    "name": "Сала за погребни свечености"
+                },
                "amenity/gambling": {
                    "name": "Сала за коцкање"
                },
@@ -5300,6 +5315,9 @@
                "building/apartments": {
                    "name": "Станбена зграда"
                },
+                "building/bakehouse": {
+                    "name": "Фурна"
+                },
                "building/barn": {
                    "name": "Амбар"
                },
@@ -5426,6 +5444,10 @@
                "building/retail": {
                    "name": "Проджен објект"
                },
+                "building/riding_hall": {
+                    "name": "Јавачка арена на затворено",
+                    "terms": "[преведете со истозначници и сродни поими на „јавачка арена на затворено“,одделени со запирки]"
+                },
                "building/roof": {
                    "name": "Покрив"
                },
@@ -6190,6 +6212,9 @@
                "historic/memorial/plaque": {
                    "name": "Спомен-плоча"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Спомен-камен на сопнување"
+                },
                "historic/monument": {
                    "name": "Споменик"
                },
@@ -6702,6 +6727,9 @@
                "leisure/sports_centre/climbing": {
                    "name": "Вежбалница за искачување"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Авантуристички парк"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Хиподром"
                },
@@ -6939,6 +6967,9 @@
                "man_made/reservoir_covered": {
                    "name": "Покриен водозборник"
                },
+                "man_made/satellite_dish": {
+                    "name": "Сателитска чинија"
+                },
                "man_made/silo": {
                    "name": "Силос"
                },
@@ -6978,6 +7009,15 @@
                "man_made/tailings_pond": {
                    "name": "Јаловиште"
                },
+                "man_made/telescope": {
+                    "name": "Телескоп"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Оптички телескоп"
+                },
+                "man_made/telescope/radio": {
+                    "name": "<преведете со истозначници или сродни поими на „Радиотелескоп“, одделени со запирки>"
+                },
                "man_made/torii": {
                    "name": "тории"
                },
@@ -7698,6 +7738,9 @@
                "power/switch": {
                    "name": "Прекинувач"
                },
+                "power/switchgear": {
+                    "name": "Разводен уред"
+                },
                "power/tower": {
                    "name": "Високонапонски далновод"
                },
@@ -534,10 +534,6 @@
                    "label": "Merk",
                    "terms": "merk,handelsmerk"
                },
-                "brewery": {
-                    "label": "Brouwerijen waarvan bier beschikbaar",
-                    "terms": "brouwerijen"
-                },
                "bridge": {
                    "label": "Type",
                    "placeholder": "Standaard"
@@ -1053,7 +1049,6 @@
                        "lebanese": "Libanees",
                        "malaysian": "Maleisisch",
                        "mexican": "Mexicaans",
-                        "pankcake": "Pannenkoek",
                        "pasta": "Pasta",
                        "peruvian": "Peruaans",
                        "pizza": "Pizza",
@@ -1603,7 +1598,7 @@
                "generator/method": {
                    "label": "Methode",
                    "options": {
-                        "anaerobic_digestion": "Anaërobe vergisting",
+                        "anaerobic_digestion": "Anaerobe vergisting",
                        "barrage": "Getijdenstuwdam",
                        "combustion": "Verbranding",
                        "fission": "Kernsplijting",
@@ -1650,7 +1645,7 @@
                "genus": {
                    "label": "Geslacht",
                    "placeholder": "Acer, Platanus, Quercus …",
-                    "terms": "gelacht,soort"
+                    "terms": "geslacht,soort"
                },
                "geyser/height": {
                    "label": "Uitbarstingshoogte"
@@ -1694,7 +1689,7 @@
                        "birthing_centre": "Geboortecentrum",
                        "blood_bank": "Bloedbank",
                        "blood_donation": "Centrum voor bloeddonatie",
-                        "clinic": "Dagbehandelcentrum",
+                        "clinic": "Dagbehandelingscentrum",
                        "community_health_worker": "Gemeenschapsgezondheidswerker",
                        "counselling": "Adviescentrum",
                        "dentist": "Tandarts",
@@ -1857,15 +1852,7 @@
                    "label": "Lussen",
                    "placeholder": "1, 2, 4 …"
                },
-                "horse_dressage": {
-                    "label": "Dressuur",
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nee"
-                    }
-                },
                "horse_riding": {
-                    "label": "Paardrijden",
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nee"
@@ -1884,13 +1871,6 @@
                    "placeholder": "Moeilijk, Gevaarlijk …",
                    "terms": "paarden,moeilijkheid"
                },
-                "horse_stables": {
-                    "label": "Rijstal",
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nee"
-                    }
-                },
                "hot_water": {
                    "label": "Heet water"
                },
@@ -2254,7 +2234,7 @@
                "mtb/scale/imba": {
                    "label": "IMBA-route-moeilijkheidsgraad",
                    "options": {
-                        "0": "⚪ Zeer envoudig (witte cirkel)",
+                        "0": "⚪ Zeer eenvoudig (witte cirkel)",
                        "1": "🟢 Eenvoudig (groene cirkel)",
                        "2": "🟦 Gemiddeld (blauw vierkant)",
                        "3": "◆ Moeilijk (zwarte ruit)",
@@ -2906,20 +2886,6 @@
                "route_master": {
                    "label": "Type"
                },
-                "royal_cypher": {
-                    "label": "Koninklijk monogram",
-                    "options": {
-                        "CIIIR": "CIIIR (Charles III)",
-                        "EIIR": "EIIR (Elizabeth II)",
-                        "EVIIIR": "EVIIIR (Edward VIII)",
-                        "EVIIR": "EVIIR (Edward VII)",
-                        "GR": "GR (George V)",
-                        "GVIR": "GVIR (George VI)",
-                        "VR": "VR (Victoria)",
-                        "no": "Nee",
-                        "scottish_crown": "Schotse Kroon"
-                    }
-                },
                "ruins": {
                    "label": "Type"
                },
@@ -3057,7 +3023,7 @@
                },
                "seamark/type": {
                    "label": "Scheepvaartobject",
-                    "terms": "zee,herkennispunt,scheepvaart"
+                    "terms": "zee,herkenningspunt,scheepvaart"
                },
                "seamark/wreck/category": {
                    "label": "Categorie"
@@ -3126,7 +3092,7 @@
                },
                "shower": {
                    "label": "Douches",
-                    "terms": "douche,sanitair,wassen,storbad,kraan"
+                    "terms": "douche,sanitair,wassen,stortbad,kraan"
                },
                "siren/purpose": {
                    "label": "Doel"
@@ -3153,7 +3119,7 @@
                        "yes": "Overal toegestaan"
                    },
                    "placeholder": "Nee, Gescheiden, Ja …",
-                    "terms": "roken,sigaret,pijp,vapen,rook,sigaar,tabac,waterpijp"
+                    "terms": "roken,sigaret,pijp,vapen,rook,sigaar,tabak,waterpijp"
                },
                "smoothness": {
                    "label": "Effenheid",
@@ -3212,7 +3178,7 @@
                        "streetlevel imagery": "Foto's op straatniveau",
                        "survey": "Bekeken"
                    },
-                    "terms": "bronnen,refrentie,opzoeking"
+                    "terms": "bronnen,referentie,opzoeking"
                },
                "species": {
                    "label": "Soort",
@@ -3301,7 +3267,7 @@
                },
                "step_count": {
                    "label": "Aantal treden",
-                    "terms": "aantal,treden,hoeveelheid,opstap,tredes,trede"
+                    "terms": "aantal,hoeveelheid,opstap,afstap,traptrede,trede,traptree,tree,plank"
                },
                "stile": {
                    "label": "Type"
@@ -3361,7 +3327,7 @@
                },
                "supervised": {
                    "label": "Onder toezicht",
-                    "terms": "bawaakt,bewaking"
+                    "terms": "bewaakt,bewaking"
                },
                "support": {
                    "label": "Bevestiging",
@@ -3398,7 +3364,7 @@
                "surveillance/type": {
                    "label": "Type bewaking",
                    "options": {
-                        "ALPR": "Automatische kentekenplaat herkening",
+                        "ALPR": "Automatische kentekenplaat herkenning",
                        "camera": "Camera",
                        "guard": "Wachter"
                    }
@@ -3998,7 +3964,7 @@
                },
                "aeroway/spaceport": {
                    "name": "Ruimtehaven",
-                    "terms": "ruimtevaart,ruimteschip,lanceerinstallatie,rakketinstallatie,lanceerbasis"
+                    "terms": "ruimtevaart,ruimteschip,lanceerinstallatie,raketinstallatie,lanceerbasis"
                },
                "aeroway/taxiway": {
                    "name": "Taxibaan",
@@ -4057,7 +4023,7 @@
                },
                "amenity/bench": {
                    "name": "Zitbank",
-                    "terms": "bank,bankje,picnictafel"
+                    "terms": "bank,bankje,picnicktafel"
                },
                "amenity/bicycle_parking": {
                    "name": "Fietsenstalling",
@@ -4151,8 +4117,8 @@
                    "terms": "cinema,film,theater"
                },
                "amenity/clinic": {
-                    "name": "Dagkliniek",
-                    "terms": "dagkliniek"
+                    "name": "Dagbehandelingscentrum",
+                    "terms": "dagbehandelcentrum,dagkliniek,dagziekenhuis,dagbehandeling,dagverpleging,daghospitalisatie"
                },
                "amenity/clinic/abortion": {
                    "name": "Abortiecentrum",
@@ -4333,7 +4299,7 @@
                },
                "amenity/fuel": {
                    "name": "Tankstation",
-                    "terms": "benzinestation,auto,diesel,nafte,biodiesel,tanken"
+                    "terms": "benzinestation,auto,diesel,nafta,biodiesel,tanken"
                },
                "amenity/gambling": {
                    "name": "Gokhal",
@@ -4393,7 +4359,7 @@
                },
                "amenity/library": {
                    "name": "Bibliotheek",
-                    "terms": "boeken,lenen,lezen,literatuuur"
+                    "terms": "boeken,lenen,lezen,literatuur"
                },
                "amenity/loading_dock": {
                    "name": "Laadkaai"
@@ -4595,7 +4561,7 @@
                },
                "amenity/public_bookcase": {
                    "name": "Openbare boekenkast",
-                    "terms": "boeken,literatuur,bibliotheek,publieke boekenkast"
+                    "terms": "publieke boekenkast,boekenruilkast,ruilboekenkast,boekenuitleenkast,straatboekenkast,buurtboekenkast,wijkboekenkast,boekenkast,boekenhuisje,boeknruilhuisje,boekentil,boekenruilbox,leeskast,kabinet,zwerfboek,boek,literatuur,mini-bibliotheek,ruilbibliotheek,straatbibliotheek,buurtbibliotheek,wijkbibliotheek,bibliotheek,minibieb,minibib,mini-bieb,mini bieb,biebbieb,ruilbib,zwerfbib,bieb bieb,straatbieb,buurtbieb,wijkbieb,bieb,bib,boekenruilboom,ruilen,boekwissel,wisselen,leen,lenen,geef,geven,lees,lezen,hergebruiken,tweedehands,boekenbank,lfl"
                },
                "amenity/ranger_station": {
                    "name": "Boswachtershut",
@@ -5207,7 +5173,7 @@
                },
                "barrier/stile": {
                    "name": "Overstaphek",
-                    "terms": "paal"
+                    "terms": "opstap,afstap,traptrede,trede,traptree,tree,trap,plank,doorgang,paal,schrikkeldraad,schrikdraad,elektrisch draad,electrisch hek,touwdraadhek,touw,draad,afrastering,afscheiding,omheining,hek,hekwerk,omrastering,raster,heining,hekkens,muur,heg,haag"
                },
                "barrier/swing_gate": {
                    "name": "Draaipoort",
@@ -117,13 +117,22 @@
                    "label": "Artist"
                },
                "artwork_type": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "sculpture": "Skulptur"
+                    }
+                },
+                "athletics_pitch": {
+                    "label": "Hending"
                },
                "atm": {
                    "label": "MInibank"
                },
                "attraction": {
-                    "label": "Type"
+                    "label": "Type",
+                    "options": {
+                        "carousel": "Karusell"
+                    }
                },
                "automated": {
                    "label": "Automatisert"
@@ -136,12 +145,36 @@
                "bar": {
                    "label": "Bar"
                },
+                "barrier": {
+                    "options": {
+                        "entrance": "Inngang",
+                        "wall": "Vegg"
+                    }
+                },
+                "barrier_planter": {
+                    "options": {
+                        "planter": "Ja",
+                        "undefined": "Nei"
+                    }
+                },
+                "basin": {
+                    "label": "Type"
+                },
                "bath/open_air": {
                    "label": "Utandørs"
                },
+                "beauty": {
+                    "label": "Tenester"
+                },
                "bench": {
                    "label": "Benk"
                },
+                "bicycle_road": {
+                    "options": {
+                        "undefined": "Nei",
+                        "yes": "Ja"
+                    }
+                },
                "bin": {
                    "label": "Søppeldunk"
                },
@@ -152,14 +185,22 @@
                        "yes": "Ja"
                    }
                },
-                "brewery": {
-                    "label": "Fatøl"
+                "board_type": {
+                    "options": {
+                        "astronomy": "Astronomi",
+                        "geology": "Geologi",
+                        "history": "Historie",
+                        "nature": "Natur"
+                    }
                },
                "bridge": {
                    "placeholder": "Standard"
                },
                "building": {
-                    "label": "Bygning"
+                    "label": "Bygning",
+                    "options": {
+                        "school": "Skulebugning"
+                    }
                },
                "cables": {
                    "label": "Kablar",
@@ -171,6 +212,11 @@
                "colour": {
                    "label": "Farge"
                },
+                "consulate": {
+                    "options": {
+                        "yes": "Konsulat"
+                    }
+                },
                "contact/webcam": {
                    "label": "Nettkamera-URL",
                    "placeholder": "http://example.com/"
@@ -193,8 +239,37 @@
                    "label": "Samankoplingar",
                    "placeholder": "1, 2, 3..."
                },
+                "covered_no": {
+                    "options": {
+                        "yes": "Ja"
+                    }
+                },
+                "craft": {
+                    "options": {
+                        "tailor": "Skreddar",
+                        "watchmaker": "Klokkemakar",
+                        "winery": "Vinprodusent"
+                    }
+                },
                "crop": {
-                    "label": "Avlingar"
+                    "label": "Avlingar",
+                    "options": {
+                        "coffee": "Kaffi",
+                        "tea": "Te",
+                        "vegetable": "Grønsaker",
+                        "wheat": "Kveite"
+                    }
+                },
+                "cuisine": {
+                    "options": {
+                        "chocolate": "Sjokolade",
+                        "fish": "Fisk",
+                        "french": "Fransk",
+                        "georgian": "Georgisk",
+                        "german": "Tysk",
+                        "greek": "Gresk",
+                        "juice": "Jus"
+                    }
                },
                "cutting": {
                    "placeholder": "Standard"
@@ -280,6 +355,11 @@
                "emergency": {
                    "label": "Krisesituasjon"
                },
+                "entrance": {
+                    "options": {
+                        "emergency": "Naudutgang"
+                    }
+                },
                "except": {
                    "label": "Unntak"
                },
@@ -348,14 +428,7 @@
                "highspeed": {
                    "label": "Høgfart"
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nei"
-                    }
-                },
                "horse_riding": {
-                    "label": "Riding",
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nei"
@@ -364,12 +437,6 @@
                "horse_scale": {
                    "placeholder": "Vanskeleg, farleg…"
                },
-                "horse_stables": {
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nei"
-                    }
-                },
                "incline_steps": {
                    "options": {
                        "down": "ned",
@@ -397,6 +464,9 @@
                "kerb/height": {
                    "label": "Høgde"
                },
+                "kitchen": {
+                    "label": "Kjøkken"
+                },
                "lanes": {
                    "label": "Køyrefelt",
                    "placeholder": "1, 2, 3..."
@@ -428,6 +498,12 @@
                "maxspeed/advisory": {
                    "placeholder": "40, 50, 60..."
                },
+                "mooring": {
+                    "options": {
+                        "guest": "Gjestar",
+                        "private": "Privat"
+                    }
+                },
                "name": {
                    "label": "Namn"
                },
@@ -665,9 +741,18 @@
                "amenity/dentist": {
                    "name": "Tannlege"
                },
+                "amenity/driving_school": {
+                    "name": "Køyreskule"
+                },
+                "amenity/language_school": {
+                    "name": "Språkskule"
+                },
                "attraction/carousel": {
                    "name": "Karusell"
                },
+                "leisure/dancing_school": {
+                    "name": "Danseskule"
+                },
                "waterway/river": {
                    "name": "Elv"
                }
@@ -493,9 +493,6 @@
                "brand": {
                    "label": "Merke"
                },
-                "brewery": {
-                    "label": "Fatøl"
-                },
                "bridge": {
                    "label": "Type",
                    "placeholder": "Standard"
@@ -929,7 +926,6 @@
                        "lebanese": "Libanesisk",
                        "malaysian": "Malaysisk",
                        "mexican": "Meksikansk",
-                        "pankcake": "Pannekake",
                        "pasta": "Pasta",
                        "pizza": "Pizza",
                        "polish": "Polsk",
@@ -1551,15 +1547,7 @@
                    "label": "Bøyler",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Dressurridning",
-                    "options": {
-                        "equestrian": "Ja",
-                        "undefined": "Nei"
-                    }
-                },
                "horse_riding": {
-                    "label": "Hesteridning",
                    "options": {
                        "horse_riding": "Ja",
                        "undefined": "Nei"
@@ -1576,13 +1564,6 @@
                    },
                    "placeholder": "Vanskelig, Farlig ..."
                },
-                "horse_stables": {
-                    "label": "Ridestall",
-                    "options": {
-                        "stables": "Ja",
-                        "undefined": "Nei"
-                    }
-                },
                "hot_water": {
                    "label": "Varmtvann"
                },
@@ -501,24 +501,12 @@
                "holding_position/type": {
                    "label": "قِسم"
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "ہاں",
-                        "undefined": "نہیں"
-                    }
-                },
                "horse_riding": {
                    "options": {
                        "horse_riding": "ہاں",
                        "undefined": "نہیں"
                    }
                },
-                "horse_stables": {
-                    "options": {
-                        "stables": "ہاں",
-                        "undefined": "نہیں"
-                    }
-                },
                "image": {
                    "label": "تصویر"
                },
@@ -537,8 +537,8 @@
                    "terms": "marka,sieć"
                },
                "brewery": {
-                    "label": "Piwo z beczki",
-                    "terms": "piwo z beczki,piwo lane"
+                    "label": "Marki piwa",
+                    "terms": "marki piwa,piwo lane,piwo z beczki,piwo z nalewaka"
                },
                "bridge": {
                    "label": "Rodzaj",
@@ -599,6 +599,7 @@
                        "public": "Użyteczności publicznej",
                        "residential": "Mieszkalny",
                        "retail": "Handlowy",
+                        "riding_hall": "Ujeżdżalnia",
                        "roof": "Zadaszenie",
                        "ruins": "Ruiny",
                        "school": "Szkolny",
@@ -1062,7 +1063,7 @@
                        "lebanese": "Libańska",
                        "malaysian": "Malezyjska",
                        "mexican": "Meksykańska",
-                        "pankcake": "Naleśniki",
+                        "pancake": "Naleśniki (amerykańskie)",
                        "pasta": "Makarony",
                        "peruvian": "Peruwiańska",
                        "pizza": "Pizza",
@@ -1309,6 +1310,14 @@
                        "tidal": "Portowy"
                    }
                },
+                "dock/height": {
+                    "label": "Wysokość rampy (metry)",
+                    "terms": "wysokość rampy"
+                },
+                "dock/width": {
+                    "label": "Szerokość rampy (metry)",
+                    "terms": "szerokość rampy"
+                },
                "dog": {
                    "label": "Psy",
                    "options": {
@@ -1321,6 +1330,14 @@
                "door": {
                    "label": "Drzwi"
                },
+                "door/height": {
+                    "label": "Wysokość bramy (metry)",
+                    "terms": "wysokość bramy,wysokość wrót,wysokość drzwi"
+                },
+                "door/width": {
+                    "label": "Szerokość bramy (metry)",
+                    "terms": "szerokość bramy,szerokość wrót,szerokość drzwi"
+                },
                "door_type": {
                    "label": "Rodzaj"
                },
@@ -1923,15 +1940,8 @@
                    "label": "Liczba koszy",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Ujeżdżenie",
-                    "options": {
-                        "equestrian": "Tak",
-                        "undefined": "Nie"
-                    }
-                },
                "horse_riding": {
-                    "label": "Jeździectwo",
+                    "label": "Ośrodek jeździecki",
                    "options": {
                        "horse_riding": "Tak",
                        "undefined": "Nie"
@@ -1950,13 +1960,6 @@
                    "placeholder": "Niski, Średni...",
                    "terms": "stopień trudności jazdy konnej"
                },
-                "horse_stables": {
-                    "label": "Stajnia",
-                    "options": {
-                        "stables": "Tak",
-                        "undefined": "Nie"
-                    }
-                },
                "hot_water": {
                    "label": "Ciepła woda"
                },
@@ -2232,7 +2235,7 @@
                            "title": "Słupek (w ziemi)"
                        },
                        "stone": {
-                            "description": "Oznaczania wykute lub namalowane na kamieniu.",
+                            "description": "Oznaczenia wykute lub namalowane na kamieniu.",
                            "title": "Kamień"
                        }
                    }
@@ -2328,6 +2331,10 @@
                        "war_memorial": "Pomnik wojenny"
                    }
                },
+                "memorial/addr": {
+                    "label": "Adres najbliższego budynku",
+                    "terms": "adres najbliższego budynku"
+                },
                "message": {
                    "label": "Treść",
                    "terms": "treść,komunikat,wiadomość,przekaz"
@@ -3146,13 +3153,13 @@
                "route_master": {
                    "label": "Rodzaj"
                },
-                "royal_cypher": {
+                "royal_cypher-GB": {
                    "label": "Monogram królewski",
                    "options": {
                        "CIIIR": "CIIIR (Karol III)",
                        "EIIR": "EIIR (Elżbieta II)",
                        "EVIIIR": "EVIIIR (Edward VIII)",
-                        "EVIIR": "EVIIIR (Edward VII)",
+                        "EVIIR": "EVIIR (Edward VII)",
                        "GR": "GR (Jerzy V)",
                        "GVIR": "GVIR (Jerzy VI)",
                        "VR": "VR (Wiktoria)",
@@ -3826,6 +3833,13 @@
                "telecom/medium": {
                    "label": "Przewód"
                },
+                "telescope/type": {
+                    "label": "Rodzaj",
+                    "options": {
+                        "optical": "Teleskop optyczny",
+                        "radio": "Radioteleskop"
+                    }
+                },
                "tents": {
                    "label": "Namioty"
                },
@@ -4320,7 +4334,7 @@
                },
                "advertising/column": {
                    "name": "Słup ogłoszeniowy",
-                    "terms": "słup ogłoszeniowy,słup z ogłoszeniami"
+                    "terms": "słup ogłoszeniowy,słup z ogłoszeniami,kolumna reklamowa"
                },
                "advertising/poster_box": {
                    "name": "Skrzynka plakatowa",
@@ -4468,6 +4482,10 @@
                    "name": "Bankomat",
                    "terms": "bankomat,wpłatomat,atm,wypłacanie pieniędzy,pieniądze"
                },
+                "amenity/baking_oven": {
+                    "name": "Piec chlebowy",
+                    "terms": "piec chlebowy,piec do wypieku chleba"
+                },
                "amenity/bank": {
                    "name": "Bank",
                    "terms": "bank,kasa,skok,bankowość"
@@ -4876,6 +4894,10 @@
                    "name": "Stacja paliw",
                    "terms": "stacja paliw,stacja benzynowa,stacja lpg"
                },
+                "amenity/funeral_hall": {
+                    "name": "Dom przedpogrzebowy",
+                    "terms": "dom przedpogrzebowy,dom pogrzebowy"
+                },
                "amenity/gambling": {
                    "name": "Salon pachinko/bingo",
                    "terms": "salon pachinko,salon bingo,keno,hazard"
@@ -5738,7 +5760,7 @@
                },
                "barrier/fence/railing": {
                    "name": "Barierka",
-                    "terms": "poręcz"
+                    "terms": "barierka,poręcz"
                },
                "barrier/full-height_turnstile": {
                    "name": "Bramka obrotowa (wysoka)",
@@ -5893,6 +5915,10 @@
                    "name": "Budynek wielorodzinny",
                    "terms": "budynek wielorodzinny,dom wielorodzinny,blok,kamienica,apartamentowiec"
                },
+                "building/bakehouse": {
+                    "name": "Piekarnia",
+                    "terms": "piekarnia,budynek piekarni"
+                },
                "building/barn": {
                    "name": "Stodoła",
                    "terms": "stodoła"
@@ -6057,6 +6083,10 @@
                    "name": "Budynek handlowy",
                    "terms": "budynek handlowy,budynek handlu detalicznego,pawilon handlowy,handel detaliczny,sklepy"
                },
+                "building/riding_hall": {
+                    "name": "Ujeżdżalnia kryta",
+                    "terms": "ujeżdżalnia kryta,arena jeździecka kryta,maneż"
+                },
                "building/roof": {
                    "name": "Zadaszenie (do 2 ścian)",
                    "terms": "zadaszenie,dach,wiata,pawilon ogrodowy"
@@ -7064,6 +7094,10 @@
                    "name": "Tablica pamiątkowa",
                    "terms": "tablica pamiątkowa,tabliczka pamiątkowa,dedykacja,pamięć"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Stolperstein",
+                    "terms": "stolperstein"
+                },
                "historic/monument": {
                    "name": "Monument (duży pomnik)",
                    "terms": "monument,pomnik"
@@ -7740,6 +7774,10 @@
                    "terms": "centrum wspinaczkowe,boulderownia,bulderownia,ścianka wspinaczkowa,ściana wspinaczkowa,wspinaczka,wspinanie",
                    "aliases": "Boulderownia\nBulderownia"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Park linowy",
+                    "terms": "park linowy,wspinaczka,zjazd linowy,tyrolka"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Tor wyścigów konnych (ośrodek sportowy)",
                    "terms": "tor wyścigów konnych,hipodrom",
@@ -7997,7 +8035,8 @@
                },
                "man_made/milk_churn_stand": {
                    "name": "Ława na bańki z mlekiem",
-                    "terms": "ława na bańki z mlekiem,ława na mleko,stojak na bańki z mlekiem,stojak na mleko"
+                    "terms": "ława na bańki z mlekiem,ława na mleko,stojak na bańki z mlekiem,stojak na mleko",
+                    "aliases": "stojak na kany"
                },
                "man_made/mineshaft": {
                    "name": "Szyb",
@@ -8054,6 +8093,10 @@
                    "name": "Podziemny zbiornik wody",
                    "terms": "podziemny zbiornik wody,zakryty zbiornik wody,zbiornik wody"
                },
+                "man_made/satellite_dish": {
+                    "name": "Antena satelitarna",
+                    "terms": "antena satelitarna"
+                },
                "man_made/silo": {
                    "name": "Silos (wieżowy)",
                    "terms": "silos wieżowy,silos zbożowy,elewator,zboże,kukurydza,pszenica",
@@ -8110,6 +8153,18 @@
                    "terms": "osadnik,odstojnik,kopania,szlam",
                    "aliases": "Odstojnik"
                },
+                "man_made/telescope": {
+                    "name": "Teleskop",
+                    "terms": "teleskop"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Teleskop optyczny",
+                    "terms": "teleskop optyczny"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radioteleskop",
+                    "terms": "radioteleskop"
+                },
                "man_made/torii": {
                    "name": "Torii",
                    "terms": "torii,brama,świątynia,shinto"
@@ -8589,7 +8644,7 @@
                },
                "office/forestry": {
                    "name": "Leśnictwo",
-                    "terms": "leśnictwo,podleśnictwo,biuro leśniczego,leśniczy,las"
+                    "terms": "leśnictwo,nadleśnictwo,biuro leśniczego,leśniczy,las"
                },
                "office/foundation": {
                    "name": "Fundacja",
@@ -9061,6 +9116,10 @@
                    "name": "Przełącznik wysokiego napięcia",
                    "terms": "przełącznik wysokiego napięcia,wyłącznik zasilania,energetyka,elektroenergetyka,prąd"
                },
+                "power/switchgear": {
+                    "name": "Aparatura rozdzielcza",
+                    "terms": "aparatura rozdzielcza"
+                },
                "power/tower": {
                    "name": "Słup wysokiego napięcia",
                    "terms": "słup wysokiego napięcia,wieża wysokiego napięcia,energetyka,elektroenergetyka,prąd"
@@ -161,17 +161,20 @@
                        "housenumber": "123",
                        "housenumber!jp": "Nº do edifício/lote",
                        "neighbourhood": "Vizinhança/bairro pequeno",
+                        "neighbourhood!jp": "Vila",
                        "place": "Local",
                        "postcode": "CEP",
                        "province": "Província",
                        "province!cn": "Província/Municipalidade/AR/SAR",
                        "province!jp": "Prefeitura",
                        "quarter": "Quadra",
+                        "quarter!jp": "Bloco",
                        "state": "Estado",
                        "street": "Rua",
                        "subdistrict": "Sub-Bairro",
                        "subdistrict!vn": "Ward/Comuna/Vila",
                        "suburb": "Bairro",
+                        "suburb!jp": "Cidade designada",
                        "unit": "Unidade"
                    }
                },
@@ -327,7 +330,10 @@
                        "log_flume": "Splash (parque de diversão)",
                        "maze": "Labirinto",
                        "pirate_ship": "Navio pirata (parque de diversões)",
+                        "river_rafting": "Rio Loco",
                        "roller_coaster": "Montanha Russa",
+                        "summer_toboggan": "Tobogã de verão",
+                        "swing_carousel": "Chapéu Mexicano",
                        "train": "Trem turístico",
                        "water_slide": "Toboágua"
                    }
@@ -411,6 +417,7 @@
                        "hammam": "Banho turco",
                        "hot_spring": "Fonte termal",
                        "lake": "Lago",
+                        "onsen": "Fontes Termais",
                        "thermal": "Banho termal"
                    }
                },
@@ -445,7 +452,8 @@
                    "options": {
                        "undefined": "Não",
                        "yes": "Sim"
-                    }
+                    },
+                    "terms": "bicicletas,biclas,binas,bicycle,arruamento,estrada,caminho,avenida,ciclismo,cycle"
                },
                "bike_ride": {
                    "label": "Estacionamento de bicicleta integrado",
@@ -518,15 +526,16 @@
                    "terms": "marca,franquia"
                },
                "brewery": {
-                    "label": "Chopes",
-                    "terms": "cerveja,chopp,chope,fino,imperial,pressão"
+                    "label": "Marca(s) de cerveja vendida(s)",
+                    "terms": "beer,cerveja,ceva,breja,birra,long neck,chope,marca,brand,produtor"
                },
                "bridge": {
                    "label": "Tipo",
                    "placeholder": "Padrão"
                },
                "bridge/ref": {
-                    "label": "Número de referência da ponte"
+                    "label": "Número de referência da ponte",
+                    "terms": "ponte,número,valor,ref,bridge,viaduto"
                },
                "bridge/support": {
                    "label": "Tipo"
@@ -579,6 +588,7 @@
                        "public": "Edifício público",
                        "residential": "Edifício Residencial",
                        "retail": "Edifício de comércio varejista",
+                        "riding_hall": "Arena de equitação",
                        "roof": "Telhado ou cobertura",
                        "ruins": "Ruinas decorativas/cênicas",
                        "school": "Edifício escolar",
@@ -600,21 +610,22 @@
                    "terms": "prédio,edificação,construção,estrutura"
                },
                "building/colour": {
-                    "label": "Cor da fachada"
+                    "label": "Cor da fachada",
+                    "terms": "fachada,frente,fronte,coloração,pintura,paint,color,colour"
                },
                "building/flats": {
                    "label": "Unidades",
                    "placeholder": "2, 4, 6, 8..."
                },
                "building/levels": {
-                    "label": "Pavimentos",
+                    "label": "Andares",
                    "placeholder": "2, 4, 6...",
                    "terms": "número de andares,pavimentos,pisos,andares"
                },
                "building/levels/underground": {
-                    "label": "Pavimentos subterrâneos",
+                    "label": "Andares subterrâneos",
                    "placeholder": "2, 4, 6...",
-                    "terms": "subsolo,pavimentos abaixo do solo,abaixo do solo,subterrâneo,andares"
+                    "terms": "pavimentos subterrâneos,subsolo,pavimentos abaixo do solo,abaixo do solo,subterrâneo,andares"
                },
                "building/material": {
                    "label": "Material",
@@ -670,6 +681,7 @@
                    "terms": "capacidade,lotação,número máximo,total de capacidade,total de pessoas,número de pessoas"
                },
                "capacity/caravans": {
+                    "label": "Capacidade",
                    "placeholder": "10, 20, 50..."
                },
                "capacity/disabled_parking": {
@@ -692,6 +704,10 @@
                    "label": "Capacidade (em metros cúbicos)",
                    "placeholder": "50, 100, 200..."
                },
+                "caravans": {
+                    "label": "Caravanas",
+                    "terms": "camper,camper trailer,caravan,tourer,campismo,caravanismo,caravana,autocaravana,rouloute,roullote,rulote"
+                },
                "cash_in": {
                    "label": "Depósitos"
                },
@@ -724,7 +740,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 (na altura do peito)",
@@ -789,6 +806,7 @@
                "consulate": {
                    "label": "Tipo",
                    "options": {
+                        "consular_office": "Escritório Consular",
                        "consulate_general": "Consulado geral",
                        "honorary_consul": "Cônsul honorário",
                        "residence": "Residência oficial de um embaixador",
@@ -869,6 +887,7 @@
                        "grinding_mill": "Moinho",
                        "handicraft": "Artesanato",
                        "hvac": "Técnico de ar condicionado",
+                        "insulation": "Técnico de isolamento térmico",
                        "jeweller": "Joalheiro",
                        "joiner": "Marceneiro",
                        "key_cutter": "Chaveiro",
@@ -881,6 +900,7 @@
                        "plasterer": "Estucador",
                        "plumber": "Encanador",
                        "pottery": "Olaria",
+                        "rigger": "Armador",
                        "roofer": "Telhadista",
                        "saddler": "Selaria ",
                        "sailmaker": "Fabricante de velas náuticas",
@@ -889,7 +909,7 @@
                        "sculptor": "Escultor",
                        "shoemaker": "Sapateiro",
                        "signmaker": "Criador de Placas",
-                        "stonemason": "Pedreiro",
+                        "stonemason": " Marmoraria",
                        "tailor": "Alfaiate",
                        "tiler": "Azulejista/Ladrilhador",
                        "tinsmith": "Funileiro",
@@ -1009,8 +1029,10 @@
                        "coffee_shop": "Cafeteria",
                        "dessert": "Sobremesa",
                        "donut": "Donut",
+                        "filipino": "Filipina",
                        "fish": "Peixe",
                        "french": "Francês",
+                        "georgian": "Georgiana",
                        "german": "Alemão",
                        "greek": "Grego",
                        "hot_dog": "Cachorro-quente/hot dog",
@@ -1025,8 +1047,8 @@
                        "lebanese": "Libanesa",
                        "malaysian": "Malaia",
                        "mexican": "Mexicano",
-                        "pankcake": "Panqueca",
                        "pasta": "Macarrão",
+                        "peruvian": "Peruana",
                        "pizza": "Pizza",
                        "polish": "Polonesa",
                        "portuguese": "Portuguesa",
@@ -1036,11 +1058,13 @@
                        "sandwich": "Sanduíche",
                        "seafood": "Frutos do mar",
                        "spanish": "Espanhola",
-                        "steak_house": "Churrascaria",
+                        "steak_house": "Steak House",
                        "sushi": "Sushi",
                        "taiwanese": "Taiwanesa",
+                        "tex-mex": "Tex-Mex",
                        "thai": "Tailandês",
                        "turkish": "Turco",
+                        "ukrainian": "Ucraniana",
                        "vietnamese": "Vietnamita"
                    },
                    "terms": "gastronomias,pratos,tipos de comida,culinárias"
@@ -1188,7 +1212,8 @@
                    "label": "Tipo",
                    "options": {
                        "consulate": "Consulado",
-                        "embassy": "Embaixada"
+                        "embassy": "Embaixada",
+                        "liaison": "Gabinete de ligação"
                    }
                },
                "diplomatic/services": {
@@ -1252,7 +1277,10 @@
                    "label": "Tipo"
                },
                "dock": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "drydock": "Doca seca"
+                    }
                },
                "dog": {
                    "label": "Cães",
@@ -1419,6 +1447,7 @@
                    }
                },
                "fire_sprinkler": {
+                    "label": "Ligação de aspersor de incêndio",
                    "options": {
                        "no": "Não",
                        "yes": "Tipo desconhecido"
@@ -1499,6 +1528,7 @@
                        "GTL_diesel": "GPL",
                        "HGV_diesel": "Diesel para veículos pesados",
                        "LH2": "Hidrogênio líquido",
+                        "adblue": "AdBlue / AUS 32",
                        "biodiesel": "Biodiesel",
                        "cng": "Gás Natural Veicular (GNV)",
                        "diesel": "Diesel",
@@ -1548,6 +1578,7 @@
                        "gasification": "Gasificação",
                        "photovoltaic": "Fotovoltaico",
                        "run-of-the-river": "A fio d'água",
+                        "stream": "Fluxo mareal",
                        "thermal": "Térmico solar",
                        "water-pumped-storage": "Usina hidrelétrica reversível",
                        "water-storage": "Reservatório",
@@ -1624,16 +1655,37 @@
                    "label": "Perigo",
                    "options": {
                        "archery_range": "Tiro com arco",
+                        "biohazard": "Risco biológico",
+                        "contamination": "Contaminação química",
+                        "hole": "Buraco",
+                        "minefield": "Campo de minas",
+                        "nuclear": "Radioatividade",
+                        "quicksand": "Areias movediças",
                        "shooting_range": "Campo de tiro"
                    }
                },
                "healthcare": {
                    "label": "Tipo",
                    "options": {
+                        "alternative": "Medicina alternativa",
+                        "audiologist": "Audiologista",
+                        "birthing_centre": "Centro de parto",
                        "blood_bank": "Banco de sangue",
                        "blood_donation": "Centro de doação de sangue",
                        "clinic": "Clínica",
-                        "dentist": "Dentista"
+                        "counselling": "Centro de aconselhamento",
+                        "dentist": "Dentista",
+                        "dialysis": "Centro de diálise",
+                        "doctor": "Médico",
+                        "hospice": "Unidades de cuidados paliativos",
+                        "hospital": "Hospital",
+                        "laboratory": "Laboratório médico",
+                        "midwife": "Obstetriz",
+                        "nurse": "Enfermeira",
+                        "occupational_therapist": "Terapeuta ocupacional",
+                        "optometrist": "Optometrista",
+                        "pharmacy": "Farmácia",
+                        "physiotherapist": "Fisioterapeuta"
                    }
                },
                "healthcare/speciality": {
@@ -1801,15 +1853,7 @@
                    "label": "Aros de tabela",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Equitação de adestramento",
-                    "options": {
-                        "equestrian": "Sim",
-                        "undefined": "Não"
-                    }
-                },
                "horse_riding": {
-                    "label": "Hipismo",
                    "options": {
                        "horse_riding": "Sim",
                        "undefined": "Não"
@@ -1827,13 +1871,6 @@
                    "placeholder": "Difícil, Perigoso...",
                    "terms": "grau de dificuldade,cavalos,equestre"
                },
-                "horse_stables": {
-                    "label": "Hipismo estável",
-                    "options": {
-                        "stables": "Sim",
-                        "undefined": "Não"
-                    }
-                },
                "hot_water": {
                    "label": "Água quente"
                },
@@ -1992,7 +2029,8 @@
                    "terms": "piso do edifício,área coberta,andar,história"
                },
                "level_semi": {
-                    "label": "Pavimentos"
+                    "label": "Andar",
+                    "terms": "número do andar,número do pavimento,pavimento"
                },
                "liaison": {
                    "label": "Tipo"
@@ -2054,10 +2092,37 @@
                    "label": "Tipo"
                },
                "mapillary": {
-                    "label": "ID da imagem do Mapillary"
+                    "label": "ID da imagem do Mapillary",
+                    "terms": "mapillary"
                },
                "marker": {
-                    "label": "Tipo"
+                    "label": "Tipo",
+                    "options": {
+                        "aerial": {
+                            "description": "Feito para ser visível do ar.",
+                            "title": "Aéreo"
+                        },
+                        "ground": {
+                            "description": "Marcador plano no chão.",
+                            "title": "Chão"
+                        },
+                        "pedestal": {
+                            "description": "Marcador elevado montado numa pequena base.",
+                            "title": "Pedestal"
+                        },
+                        "plate": {
+                            "description": "Marcador plano montado em uma parede ou similar.",
+                            "title": "Placa"
+                        },
+                        "post": {
+                            "description": "Marcador elevado montado num pequeno poste ou mastro.",
+                            "title": "Poste"
+                        },
+                        "stone": {
+                            "description": "Marcador gravado ou pintado em pedra.",
+                            "title": "Pedra"
+                        }
+                    }
                },
                "material": {
                    "label": "Material",
@@ -2068,6 +2133,7 @@
                        "brick": "Tijolo",
                        "bronze": "Bronze",
                        "concrete": "Concreto",
+                        "dry_stone": "Pedras soltas (sem argamassa)",
                        "glass": "Vidros",
                        "granite": "Granito",
                        "iron": "Ferro",
@@ -2083,20 +2149,24 @@
                        "steel": "Aço",
                        "stone": "Rocha",
                        "wood": "Madeira"
-                    }
+                    },
+                    "terms": "material,matéria-prima"
                },
                "mattress": {
-                    "label": "Colchões"
+                    "label": "Colchões",
+                    "terms": "colchões,colchão"
                },
                "max_age": {
                    "label": "Idade máxima",
                    "terms": "idade máxima"
                },
                "maxaxleload_bridge": {
-                    "label": "Limite de peso por eixo"
+                    "label": "Limite de peso por eixo",
+                    "terms": "axle,máx,max,limite,kg,tonelada,tonelagem,eixos,weight"
                },
                "maxheight": {
-                    "label": "Limite de altura"
+                    "label": "Limite de altura",
+                    "terms": "altura,máx.,max.,máximo,altitude,espaço,ponte,viaduto,limite"
                },
                "maxlength": {
                    "label": "Limite de comprimento"
@@ -2108,40 +2178,67 @@
                },
                "maxspeed/advisory": {
                    "label": "Limite de velocidade recomendado",
-                    "placeholder": "40, 50, 60..."
+                    "placeholder": "40, 50, 60...",
+                    "terms": "limite de velocidade aconselhado"
                },
                "maxspeed/hgv": {
                    "label": "Velocidade máxima de caminhões",
-                    "placeholder": "40, 50, 60..."
+                    "placeholder": "40, 50, 60...",
+                    "terms": "velocidade,máxima,limite,máximo"
+                },
+                "maxstay": {
+                    "label": "Permanência máxima",
+                    "terms": "tempo,max,máx,stay,limite,limit,time,minutos,horas,duração,estadia,estada"
                },
                "maxweight": {
-                    "label": "Limite de peso"
+                    "label": "Limite de peso",
+                    "terms": "peso,máx.,max.,máximo,kg,tonelada,carga,weight,limite"
                },
                "maxwidth": {
-                    "label": "Limite de largura"
+                    "label": "Limite de largura",
+                    "terms": "largura,largo,máx.,max.,máximo,metros,cm,width,limite"
                },
                "memorial": {
                    "label": "Tipo",
                    "options": {
+                        "blue_plaque": "Placa azul (UK)",
                        "bust": "Busto",
+                        "cross": "Cruz",
                        "obelisk": "Obelisco",
                        "plaque": "Placa comemorativa",
                        "sculpture": "Escultura",
-                        "stele": "Estela"
+                        "statue": "Estátua",
+                        "stele": "Estela",
+                        "stolperstein": "Stolperstein",
+                        "stone": "Pedra",
+                        "war_memorial": "Memorial de guerra"
                    }
                },
+                "memorial/addr": {
+                    "label": "Endereço do edifício mais próximo",
+                    "terms": "morada,endereço,localização,número,porta,rua"
+                },
                "message": {
-                    "label": "Mensagem"
+                    "label": "Mensagem",
+                    "terms": "message,intuito,objetivo,tema,assunto,tópico,motivo"
                },
                "microbrewery": {
                    "label": "Microcervejaria",
                    "terms": "cerveja artesanal,cervejaria,micro cervejaria"
                },
                "military_service": {
-                    "label": "Serviço militar"
+                    "label": "Serviço militar",
+                    "options": {
+                        "air_force": "Força aérea",
+                        "army": "Exército",
+                        "coast_guard": "Guarda costeira",
+                        "marines": "Fuzileiros",
+                        "navy": "Marinha"
+                    }
                },
                "mimics": {
-                    "label": "Imita"
+                    "label": "Imita",
+                    "terms": "camuflada,camuflagem,disfarçada,disfarce,telecomunicação,comunicações,telefónica,telefones,torre,mastro"
                },
                "min_age": {
                    "label": "Idade mínima",
@@ -2156,7 +2253,9 @@
                    "terms": "velocidade mínima"
                },
                "mobile": {
-                    "placeholder": "+55 99 12345-6789"
+                    "label": "Celular",
+                    "placeholder": "+55 99 12345-6789",
+                    "terms": "mobile,celular,telemóvel,phone,fone,número,numero"
                },
                "model": {
                    "label": "Modelo",
@@ -2166,7 +2265,10 @@
                    "label": "Tipo de monitoramento"
                },
                "mooring": {
+                    "label": "Amarração",
                    "options": {
+                        "commercial": "Comercial",
+                        "guest": "Visitantes",
                        "no": "Não",
                        "private": "Privado",
                        "yes": "Sim"
@@ -2183,7 +2285,8 @@
                        "5": "5: Dificuldade máxima, pedreira, deslizamentos de terra",
                        "6": "6: Não transitável exceto pelos melhores mountain bikers"
                    },
-                    "placeholder": "0, 1, 2, 3..."
+                    "placeholder": "0, 1, 2, 3...",
+                    "terms": "grau de dificuldade,dificuldade para btt,btt,nível de dificuldade"
                },
                "mtb/scale/imba": {
                    "label": "Trilha de baixa dificuldade",
@@ -2194,7 +2297,8 @@
                        "3": "◆ Difícil (diamante preto)",
                        "4": "◆◆ Extremamente difícil (duplo diamante preto)"
                    },
-                    "placeholder": "Fácil, Médio, Difícil..."
+                    "placeholder": "Fácil, Médio, Difícil...",
+                    "terms": "imba,dificuldade,nível de dificuldade,grau de dificuldade,btt"
                },
                "mtb/scale/uphill": {
                    "label": "Dificuldade do aclive do Mountain Biking",
@@ -2206,20 +2310,23 @@
                        "4": "4: Inclinação média <30%, condição ruim, pedras/galhos grandes",
                        "5": "5: Muito íngreme, geralmente a bicicleta precisa ser empurrada ou carregada"
                    },
-                    "placeholder": "0, 1, 2, 3..."
+                    "placeholder": "0, 1, 2, 3...",
+                    "terms": "imba,dificuldade,nível de dificuldade,grau de dificuldade,btt"
                },
                "museum": {
                    "label": "Tipo"
                },
                "name": {
                    "label": "Nome",
-                    "placeholder": "Nome (se houver)"
+                    "placeholder": "Nome (se houver)",
+                    "terms": "nome,definição,título,denominação"
                },
                "natural": {
                    "label": "Natural"
                },
                "network": {
-                    "label": "Rede"
+                    "label": "Rede",
+                    "terms": "rede"
                },
                "network/type": {
                    "label": "Tipo de rede"
@@ -2258,21 +2365,69 @@
                    "label": "Rede"
                },
                "not/name": {
-                    "label": "Nomes incorretos"
+                    "label": "Nomes incorretos",
+                    "terms": "designação errada,nomes trocados,nome escritos incorretamente"
                },
                "note": {
                    "label": "Nota",
                    "terms": "nota,comentário"
                },
+                "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",
                    "options": {
+                        "accountant": "Escritório de contabilidade",
+                        "adoption_agency": "Agência de adoção",
+                        "advertising_agency": "Agência de publicidade",
+                        "architect": "Escritório de arquitetura",
+                        "association": "Escritório de organização sem fins lucrativos",
+                        "charity": "Escritório de instituição de caridade",
+                        "company": "Escritório de empresa",
+                        "construction_company": "Escritório de construtora",
+                        "consulting": "Escritório de consultoria",
+                        "courier": "Empresa de entregas",
                        "diplomatic": "Escritório diplomático",
+                        "energy_supplier": "Escritório de fornecedor de energia",
+                        "engineer": "Escritório de engenharia",
+                        "estate_agent": "Imobiliária",
+                        "financial": "Instituição financeira",
+                        "forestry": "Escritório de gestão florestal",
+                        "foundation": "Escritório de fundação",
                        "government": "Órgão governamental",
+                        "graphic_design": "Empresa de design gráfico",
+                        "guide": "Escritório de guia turístico",
+                        "insurance": "Seguradora",
+                        "it": "Empresa de TI",
                        "lawyer": "Escritório de advocacia",
+                        "moving_company": "Empresa de mudanças",
+                        "newspaper": "Escritório de jornal",
+                        "ngo": "Escritório de ONG",
+                        "notary": "Cartório",
                        "physician": "Médico",
                        "political_party": "Escritório de partido político",
-                        "therapist": "Escritório de terapeuta"
+                        "private_investigator": "Escritório de detetive particular",
+                        "property_management": "Empresa de gestão de condomínios",
+                        "quango": "Escritório de autarquia autônoma",
+                        "religion": "Escritório religioso",
+                        "research": "Centro de pesquisa",
+                        "security": "Empresa de segurança privada",
+                        "surveyor": "Empresa de peritagem",
+                        "tax_advisor": "Empresa de assessoria fiscal",
+                        "telecommunication": "Empresa de telecomunicações",
+                        "therapist": "Escritório de terapeuta",
+                        "union": "Sindicato",
+                        "water_utility": "Escritório de fornecedor de água"
                    }
                },
                "oneway": {
@@ -2367,7 +2522,7 @@
                    }
                },
                "parking/side/orientation": {
-                    "label": "Orientação",
+                    "label": "Orientação de estacionamento",
                    "options": {
                        "diagonal": "Diagonal à rua",
                        "parallel": "Paralelo à rua",
@@ -2662,7 +2817,13 @@
                    }
                },
                "ramp": {
-                    "label": "Rampa embutida"
+                    "label": "Rampa embutida",
+                    "options": {
+                        "no": "Não",
+                        "separate": "Mapeada em separado",
+                        "yes": "Sim"
+                    },
+                    "terms": "rampas,acesso,cadeirantes,cadeira de rodas,cadeira-de-rodas,deficientes,deficiência"
                },
                "rating": {
                    "label": "Potência nominal"
@@ -2847,20 +3008,6 @@
                "route_master": {
                    "label": "Tipo"
                },
-                "royal_cypher": {
-                    "label": "Monograma real",
-                    "options": {
-                        "CIIIR": "CIIIR (Charles III)",
-                        "EIIR": "EIIR (Elizabeth II)",
-                        "EVIIIR": "EVIIIR (Eduardo VIII)",
-                        "EVIIR": "EVIIR (Eduardo VII)",
-                        "GR": "GR (George V)",
-                        "GVIR": "GVIR (George VI)",
-                        "VR": "VR (Vitória)",
-                        "no": "Não",
-                        "scottish_crown": "Coroa da Escócia"
-                    }
-                },
                "ruins": {
                    "label": "Tipo"
                },
@@ -3664,7 +3811,29 @@
                "vending": {
                    "label": "Tipos de produtos",
                    "options": {
-                        "fuel": "Combustível"
+                        "bicycle_tube": "Câmaras de ar para bicicletas",
+                        "bread": "Pão",
+                        "cigarettes": "Cigarros",
+                        "coffee": "Café",
+                        "condoms": "Preservativos",
+                        "drinks": "Bebidas",
+                        "eggs": "Ovos",
+                        "electronics": "Eletrônicos",
+                        "elongated_coin": "Moedas turísticas",
+                        "excrement_bags": "Sacos para excrementos",
+                        "feminine_hygiene": "Artigos de higiene feminina",
+                        "food": "Comida",
+                        "fuel": "Combustível",
+                        "ice_cream": "Sorvete",
+                        "ice_cubes": "Cubos de gelo",
+                        "milk": "Leite",
+                        "newspapers": "Jornais",
+                        "parking_tickets": "Tíquetes de estacionamento",
+                        "pizza": "Pizza",
+                        "public_transport_tickets": "Bilhetes de transporte público",
+                        "stamps": "Selos postais",
+                        "sweets": "Doces",
+                        "water": "Água potável"
                    }
                },
                "vhf": {
@@ -3684,7 +3853,8 @@
                        "area": "Mais de 20m (65 pés)",
                        "house": "Até 5m (16 pés)",
                        "street": "5 a 20m (16 a 65 pés)"
-                    }
+                    },
+                    "terms": "visibilidade"
                },
                "volcano/status": {
                    "label": "Estado do vulcão",
@@ -3721,6 +3891,8 @@
                    "label": "Resíduos",
                    "options": {
                        "cigarettes": "Cigarros",
+                        "dog_excrement": "Excrementos de cães",
+                        "organic": "Lixo orgânico",
                        "trash": "Lixo"
                    }
                },
@@ -3742,7 +3914,8 @@
                },
                "water_tank/volume": {
                    "label": "Volume (em litros)",
-                    "placeholder": "10000, 20000, 30000…"
+                    "placeholder": "10000, 20000, 30000…",
+                    "terms": "volume,litros,quantidade"
                },
                "waterway": {
                    "label": "Tipo"
@@ -3752,6 +3925,7 @@
                    "placeholder": "https://exemplo.com"
                },
                "website/menu": {
+                    "label": "Link do cardápio",
                    "placeholder": "http://exemplo.com.br/",
                    "terms": "website,link,ligação,http,url,menu,ementa,cardápio,online,on-line,internet"
                },
@@ -4625,6 +4799,10 @@
                    "name": "Centro de reciclagem",
                    "terms": "material reciclável,dejetos,material sólido,reciclagem,resíduos,lixo,vidro,garrafa,lata"
                },
+                "amenity/recycling_container": {
+                    "name": "Contêiner de reciclagem",
+                    "terms": "ecoponto,reciclar,reciclagem,resíduos,lixo,vidro,plástico,papel,metal,garrafas,embalagens,latas,óleo,roupa"
+                },
                "amenity/refugee_site": {
                    "name": "Campo de refugiados",
                    "terms": "campo de refugiados"
@@ -4645,6 +4823,9 @@
                    "name": "Restaurante asiático",
                    "terms": "asiático,comida asiática,restaurante,ásia"
                },
+                "amenity/restaurant/barbecue": {
+                    "name": "Churrascaria"
+                },
                "amenity/restaurant/chinese": {
                    "name": "Restaurante chinês",
                    "terms": "comida chinesa,yakisoba,lamen"
@@ -4693,8 +4874,9 @@
                    "terms": "pescados,alimentação,frutos do mar,peixes"
                },
                "amenity/restaurant/steakhouse": {
-                    "name": "Churrascaria",
-                    "terms": "churrascaria"
+                    "name": "Steak house",
+                    "terms": "churrasco,gado,carne",
+                    "aliases": "Casa de carnes"
                },
                "amenity/restaurant/sushi": {
                    "name": "Restaurante de sushi",
@@ -5654,8 +5836,9 @@
                    "terms": "criador de sinais"
                },
                "craft/stonemason": {
-                    "name": "Pedreiro",
-                    "terms": "pedreiro"
+                    "name": "Marmoraria",
+                    "terms": "marmoreiro,mármores e granitos,cantaria,canteiro,pedras",
+                    "aliases": "Marmoreiro\nMármores e granitos\nCantaria\nCanteiro\nPedras"
                },
                "craft/tailor": {
                    "name": "Alfaiate"
@@ -7363,7 +7546,7 @@
                    "terms": "local de explosão nuclear"
                },
                "military/office": {
-                    "name": "Escritório militar",
+                    "name": "Militar",
                    "terms": "escritório militar"
                },
                "military/trench": {
@@ -7603,11 +7786,11 @@
                    "terms": "escritório,gabinete,banca,estúdio,repartição,sala,seção"
                },
                "office/accountant": {
-                    "name": "Escritório de contabilidade",
+                    "name": "Contabilidade",
                    "terms": "escritório contábil"
                },
                "office/administrative": {
-                    "name": "Escritório administrativo"
+                    "name": "Administrativo"
                },
                "office/adoption_agency": {
                    "name": "Agência de Adoção",
@@ -7618,26 +7801,26 @@
                    "terms": "publicidade,propaganda,agência de propaganda,marketing"
                },
                "office/architect": {
-                    "name": "Escritório de arquitetura",
+                    "name": "Arquitetura",
                    "terms": "arquiteto,arquiteta,urbanismo"
                },
                "office/association": {
-                    "name": "Escritório de organização sem fins lucrativos",
+                    "name": "Organização sem fins lucrativos",
                    "terms": "entidade sem fins lucrativos,escritório de associação,associação de profissionais,associação de moradores,instituição beneficente,sem lucro"
                },
                "office/bail_bond_agent-US-PH": {
                    "name": "Agente de fiança"
                },
                "office/charity": {
-                    "name": "Escritório de caridade",
+                    "name": "Caridade",
                    "terms": "beneficência,instituição beneficente"
                },
                "office/company": {
-                    "name": "Escritório de empresa",
+                    "name": "Empresa (não especificada)",
                    "terms": "escritório empresarial,escritório corporativo"
                },
                "office/consulting": {
-                    "name": "Gabinete de consultoria",
+                    "name": "Consultoria",
                    "terms": "gabinete de consultoria"
                },
                "office/coworking": {
@@ -7645,7 +7828,7 @@
                    "terms": "escritório compartilhado,coworking,lugar de coworking"
                },
                "office/diplomatic": {
-                    "name": "Escritório diplomático",
+                    "name": "Diplomático",
                    "terms": "escritório diplomático"
                },
                "office/diplomatic/consulate": {
@@ -7669,18 +7852,19 @@
                    "terms": "agência,sine,emprego,empregos,desempregado"
                },
                "office/energy_supplier": {
-                    "name": "Escritório de fornecedor de energia",
+                    "name": "Fornecedor de energia",
                    "terms": "eletricidade,empresa de energia,gás"
                },
                "office/engineer": {
-                    "name": "Escritório de engenharia"
+                    "name": "Engenharia",
+                    "terms": "engineer,engenheria,engenheiro,engenheira,estruturas,obras,firma,técnico"
                },
                "office/estate_agent": {
                    "name": "Imobiliária",
                    "terms": "aluguel,casas,apartamentos,corretora de imóveis,venda de imóveis,imóveis"
                },
                "office/financial": {
-                    "name": "Escritório financeiro",
+                    "name": "Instituição financeira",
                    "terms": "escritório financeiro,financeira"
                },
                "office/financial_advisor": {
@@ -7688,12 +7872,12 @@
                    "terms": "conselheiro financeiro"
                },
                "office/forestry": {
-                    "name": "Escritório de gestão florestal",
+                    "name": "Gestão florestal",
                    "terms": "guarda florestal,floresta,reserva",
-                    "aliases": "Escritório de administração florestal"
+                    "aliases": "Administração florestal"
                },
                "office/foundation": {
-                    "name": "Escritório de fundação",
+                    "name": "Fundação",
                    "terms": "escritório de fundação"
                },
                "office/government": {
@@ -7709,14 +7893,15 @@
                    "terms": "tabelionato,registro civil,registro de imóveis"
                },
                "office/government/tax": {
-                    "name": "Escritório tributário",
+                    "name": "Tributário",
                    "terms": "autoridade fiscal,receita,fazenda,taxas,impostos"
                },
                "office/graphic_design": {
-                    "name": "Escritório de design gráfico"
+                    "name": "Design gráfico",
+                    "terms": "designer,designer gráfico,gabinete de design gráfico,visual,ilustração"
                },
                "office/guide": {
-                    "name": "Escritório de guia turístico",
+                    "name": "Guia turístico",
                    "terms": "turismo,tour"
                },
                "office/insurance": {
@@ -7724,23 +7909,23 @@
                    "terms": "seguro,seguradora,apólice,corretora"
                },
                "office/it": {
-                    "name": "Escritório de empresa de tecnologia da informação",
+                    "name": "Empresa de TI",
                    "terms": "informática,computadores,software,tecnologia",
-                    "aliases": "Escritório de TI"
+                    "aliases": "Empresa de tecnologia da informação"
                },
                "office/lawyer": {
-                    "name": "Escritório de advocacia",
+                    "name": "Advocacia",
                    "terms": "advocacia,advogado,advogada,justiça,direito,lei"
                },
                "office/lawyer/notary": {
                    "name": "Tabelião"
                },
                "office/moving_company": {
-                    "name": "Escritório de companhia de mudanças",
-                    "terms": "empresa de mudanças,relocação,mudança"
+                    "name": "Empresa de mudanças",
+                    "terms": "companhia de mudanças,relocação,mudança"
                },
                "office/newspaper": {
-                    "name": "Escritório de jornal",
+                    "name": "Jornal",
                    "terms": "escritório de jornal"
                },
                "office/ngo": {
@@ -7755,59 +7940,62 @@
                    "name": "Médico"
                },
                "office/political_party": {
-                    "name": "Escritório de partido político",
+                    "name": "Partido político",
                    "terms": "escritório de partido político"
                },
                "office/private_investigator": {
-                    "name": "Escritório de detetive particular",
+                    "name": "Detetive particular",
                    "terms": "detetive particular,investigador privado"
                },
                "office/property_management": {
-                    "name": "Administradora imobiliária ou escritório de locação"
+                    "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",
+                    "aliases": "Administradora imobiliária\nEscritório de locação"
                },
                "office/quango": {
-                    "name": "Escritório de autarquia autônoma",
+                    "name": "Autarquia autônoma",
                    "terms": "ong,não governamental,quase-autônoma,organização",
-                    "aliases": "Autarquia autônoma\nAutoridade administrativa independente\nOrganização não governamental quase autônoma\nQuango"
+                    "aliases": "Autoridade administrativa independente\nOrganização não governamental quase autônoma\nQuango"
                },
                "office/religion": {
-                    "name": "Escritório religioso",
+                    "name": "Religioso",
                    "terms": "escritório religioso"
                },
                "office/research": {
-                    "name": "Escritório de pesquisa",
+                    "name": "Pesquisa",
                    "terms": "pesquisa,pesquisas,pesquisador,escritório"
                },
                "office/security": {
-                    "name": "Escritório de segurança",
+                    "name": "Segurança privada",
                    "terms": "escritório de segurança"
                },
                "office/surveyor": {
-                    "name": "Escritório de pesquisas ou inspeções",
+                    "name": "Peritagem",
                    "terms": "agrimensura,análise de riscos,ibge,estatística,opinião"
                },
                "office/tax_advisor": {
-                    "name": "Escritório de assessoria fiscal",
+                    "name": "Assessoria fiscal",
                    "terms": "assessoria fiscal"
                },
                "office/telecommunication": {
-                    "name": "Escritório de telecomunicações",
+                    "name": "Telecomunicações",
                    "terms": "escritório de telecomunicações,departamento de telecomunicações"
                },
                "office/therapist": {
-                    "name": "Escritório de terapeuta",
+                    "name": "Terapeuta",
                    "terms": "terapia,holístico,terapias alternativas,saúde"
                },
                "office/travel_agent": {
                    "name": "Agência de Viagens"
                },
                "office/union": {
-                    "name": "Escritório de sindicato"
+                    "name": "Sindicato",
+                    "terms": "union,labor,sindicalismo"
                },
                "office/water_utility": {
-                    "name": "Escritório de companhia de água",
+                    "name": "Fornecedor de água",
                    "terms": "águas e esgoto",
-                    "aliases": "Escritório de empresa de saneamento"
+                    "aliases": "Empresa de água\nCompanhia de água\nEmpresa de saneamento"
                },
                "office/yes": {
                    "name": "Escritório (tipo não especificado)"
@@ -312,7 +312,7 @@
                    }
                },
                "atm": {
-                    "label": "Multibanco"
+                    "label": "Terminal bancário"
                },
                "attraction": {
                    "label": "Tipo",
@@ -531,8 +531,8 @@
                    "terms": "marca,empresa"
                },
                "brewery": {
-                    "label": "Cerveja de pressão",
-                    "terms": "cerveja,chopp,chope,fino,imperial,pressão"
+                    "label": "Marca(s) de cerveja vendida(s)",
+                    "terms": "beer,cerveja,fino,imperial,marca,brand,produtor"
                },
                "bridge": {
                    "label": "Tipo",
@@ -592,8 +592,8 @@
                        "public": "Público",
                        "residential": "Residencial",
                        "retail": "Retalho",
+                        "riding_hall": "Arena de equitação",
                        "roof": "Telhado / cobertura",
-                        "ruins": "Ruínas",
                        "school": "Escolar",
                        "semidetached_house": "Casa semi-isolada",
                        "service": "Serviço",
@@ -1055,7 +1055,7 @@
                        "lebanese": "Libanesa",
                        "malaysian": "Malaia",
                        "mexican": "Mexicana",
-                        "pankcake": "Panquecas",
+                        "pancake": "Panquecas",
                        "pasta": "Massas",
                        "peruvian": "Peruana",
                        "pizza": "Piza",
@@ -1302,6 +1302,14 @@
                        "tidal": "Doca de maré"
                    }
                },
+                "dock/height": {
+                    "label": "Altura da doca (metros)",
+                    "terms": "dock,doca"
+                },
+                "dock/width": {
+                    "label": "Largura da doca (metros)",
+                    "terms": "dock,doca"
+                },
                "dog": {
                    "label": "Cães",
                    "options": {
@@ -1314,6 +1322,14 @@
                "door": {
                    "label": "Porta"
                },
+                "door/height": {
+                    "label": "Altura da porta (metros)",
+                    "terms": "porta,altura,height"
+                },
+                "door/width": {
+                    "label": "Largura da porta (metros)",
+                    "terms": "porta,largura,metros.width"
+                },
                "door_type": {
                    "label": "Tipo"
                },
@@ -1752,7 +1768,7 @@
                        "blood_check": "Análises sanguíneas",
                        "body": "Psicoterapia corporal",
                        "cardiology": "Cardiologia",
-                        "cardiothoracic_surgery": "Cirurgia cardiotóracica",
+                        "cardiothoracic_surgery": "Cirurgia cardiotorácica",
                        "child_psychiatry": "Psiquiatria pediátrica",
                        "chiropractic": "Quiropraxia",
                        "clinical_pathology": "Patologia clínica",
@@ -1877,7 +1893,7 @@
                        "monument": "Memorial monumental",
                        "pillory": "Pelourinho",
                        "railway": "Ferrovia",
-                        "ruins": "Ruínas",
+                        "ruins": "Ruínas históricas",
                        "shieling": "Shieling",
                        "tomb": "Túmulo",
                        "wayside_cross": "Cruzeiro",
@@ -1909,15 +1925,7 @@
                    "label": "Cestos",
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "label": "Equitação de adestramento",
-                    "options": {
-                        "equestrian": "Sim",
-                        "undefined": "Não"
-                    }
-                },
                "horse_riding": {
-                    "label": "Cavalgada",
                    "options": {
                        "horse_riding": "Sim",
                        "undefined": "Não"
@@ -1936,13 +1944,6 @@
                    "placeholder": "Difícil, perigoso...",
                    "terms": "grau de dificuldade,cavalos,equestre"
                },
-                "horse_stables": {
-                    "label": "Estábulo de equitação",
-                    "options": {
-                        "stables": "Sim",
-                        "undefined": "Não"
-                    }
-                },
                "hot_water": {
                    "label": "Água quente"
                },
@@ -2314,6 +2315,10 @@
                        "war_memorial": "Memorial de guerra"
                    }
                },
+                "memorial/addr": {
+                    "label": "Endereço do edifício mais próximo",
+                    "terms": "morada,endereço,localização,número,porta,polícia,rua"
+                },
                "message": {
                    "label": "Tipo de mensagem",
                    "terms": "message,intuito,objetivo,tema,assunto,tópico,motivo"
@@ -3132,20 +3137,6 @@
                "route_master": {
                    "label": "Tipo"
                },
-                "royal_cypher": {
-                    "label": "Royal Cypher",
-                    "options": {
-                        "CIIIR": "CIIIR (Charles III)",
-                        "EIIR": "EIIR (Elizabeth II)",
-                        "EVIIIR": "EVIIIR (Edward VIII)",
-                        "EVIIR": "EVIIR (Edward VII)",
-                        "GR": "GR (George V)",
-                        "GVIR": "GVIR (George VI)",
-                        "VR": "VR (Victoria)",
-                        "no": "Não",
-                        "scottish_crown": "Scottish Crown"
-                    }
-                },
                "ruins": {
                    "label": "Tipo"
                },
@@ -3470,12 +3461,15 @@
                "sport": {
                    "label": "Desportos",
                    "options": {
+                        "10pin": "Bólingue de 10 pinos",
+                        "9pin": "Bólingue de 9 pinos",
                        "american_football": "Futebol americano",
                        "athletics": "Atletismo",
                        "badminton": "Badminton",
                        "baseball": "Beisebol",
                        "basketball": "Basquetebol",
                        "beachvolleyball": "Voleibol de praia",
+                        "billiards": "Bilhar",
                        "bmx": "BMX",
                        "boules": "Boccia",
                        "bowls": "Bowls",
@@ -3781,6 +3775,7 @@
                            "title": "Carro motorizado"
                        },
                        "motorcycle": {
+                            "description": "mototaxi, moto,motocilceta,motociclo,mota,mototáxi,táxi,taxi",
                            "title": "Motociclo"
                        }
                    },
@@ -3805,6 +3800,13 @@
                "telecom/medium": {
                    "label": "Condutor"
                },
+                "telescope/type": {
+                    "label": "Tipo",
+                    "options": {
+                        "optical": "Telescópio ótico",
+                        "radio": "Radiotelescópio"
+                    }
+                },
                "tents": {
                    "label": "Tendas"
                },
@@ -4440,9 +4442,13 @@
                    "terms": "galeria,atelier,centro artístico,artes,arte,artistas,artista"
                },
                "amenity/atm": {
-                    "name": "Multibanco",
+                    "name": "Terminal bancário",
                    "terms": "caixa multibanco,caixa de multibanco,mb,caixa de mb,caixa eletrónica,caixa automática,multicaixa,terminal bancário,terminal,atm"
                },
+                "amenity/baking_oven": {
+                    "name": "Forno de pão",
+                    "terms": "bake,bread,pão,cozer,cozedura,comunitário,fogão,brasas,piza,barro,tijolo"
+                },
                "amenity/bank": {
                    "name": "Banco",
                    "terms": "agência bancária,agência financeira,agência de investimentos,cofre,depósito,levantamentos,firma de investimentos,dinheiro,bancária,banqueiro,banca"
@@ -4743,8 +4749,8 @@
                    "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"
                },
                "amenity/dressing_room": {
-                    "name": "Cabine de provas",
-                    "terms": "changing room,cabine de provas,sala de provas,troca de roupa,trocar de roupa,mudar de roupa"
+                    "name": "Vestiário",
+                    "terms": "changing room,cabine de provas,sala de provas,troca de roupa,trocar de roupa,mudar de roupa,vestir,cabina,despir,roupa,indumentária,traje,praia"
                },
                "amenity/drinking_water": {
                    "name": "Fonte de água potável",
@@ -4824,7 +4830,7 @@
                    "name": "Terminal de ferry"
                },
                "amenity/fire_station": {
-                    "name": "Quartel de bombeiros",
+                    "name": "Quartel dos bombeiros",
                    "terms": "bombeiros,quartel,quartel dos bombeiros,bombeiros voluntários,bv,sapadores"
                },
                "amenity/food_court": {
@@ -4839,6 +4845,10 @@
                    "name": "Posto de combustível",
                    "terms": "bombas de abastecimento,bombas de gasolina,bombas de combustível,gasolineira,bombas,posto de gasolina,gasolina,combustível,diesel,gasóleo"
                },
+                "amenity/funeral_hall": {
+                    "name": "Casa mortuária",
+                    "terms": "funeral,fúnebre,cemitério,mortos,cadáveres,velório,velar,luto"
+                },
                "amenity/gambling": {
                    "name": "Sala de bingo",
                    "terms": "jogo,bingo,pachinko"
@@ -5818,6 +5828,10 @@
                    "name": "Edifício de apartamentos",
                    "terms": "edifício,apartamento,prédio,habitações,edificação,edificado,arranha céu,arranha-céu"
                },
+                "building/bakehouse": {
+                    "name": "Edifício de cozer pão",
+                    "terms": "pão,panadaria,cozer,forno,fogão,lenha,carvão,padeiro,padeira,bread,bake,cozimento,cozedura"
+                },
                "building/barn": {
                    "name": "Barracão agrícola",
                    "terms": "barn,estábulo,celeiro,edifício"
@@ -5981,12 +5995,15 @@
                    "name": "Edifício de retalho",
                    "terms": "retail building,retalho,varejo,lojas de retalho,retalhista"
                },
+                "building/riding_hall": {
+                    "name": "Arena de equitação interior",
+                    "terms": "arena,pista,equitação,hipismo,cavalos,equestre,cavalgar,dressage,picadeiro,interno,interna,riding,horse"
+                },
                "building/roof": {
                    "name": "Cobertura",
                    "terms": "roof,telheiro,telhado,alpendre"
                },
                "building/ruins": {
-                    "name": "Edifício em ruínas",
                    "terms": "ruínas,urbex,escombros,abandono,abandonado"
                },
                "building/school": {
@@ -6029,6 +6046,10 @@
                    "name": "Edifício de templo",
                    "terms": "edifício,templo,religioso,oração,religião"
                },
+                "building/terrace": {
+                    "name": "Fileira de casas geminadas",
+                    "terms": "geminado,geminada,germinada,linha de casas,habitação,house,casa,residência,residence,dwelling,brownstone"
+                },
                "building/train_station": {
                    "name": "Edifício de estação de comboios"
                },
@@ -6347,7 +6368,7 @@
                },
                "emergency/fire_hydrant": {
                    "name": "Boca de incêndio",
-                    "terms": "hidrante,marco de água,marco de incêndio,fogo,chamas,extintor"
+                    "terms": "hidrante,marco de água,marco de incêndio,fogo,chamas,extintor,hydrant,fire,incêndio,labaredas,bombeiros"
                },
                "emergency/fire_service_inlet": {
                    "name": "Válvula para bombeiros",
@@ -6960,6 +6981,10 @@
                    "name": "Placa comemorativa",
                    "terms": "placa comemorativa,dedicatória,epitáfio,blue plaque,placa azul,placa,inscrição,inauguração,inaugurar,placa inaugurativa,placa de inauguração,comemoração"
                },
+                "historic/memorial/stolperstein-EU": {
+                    "name": "Placa memorial stolperstein",
+                    "terms": "memorial,stolperstein,holocausto"
+                },
                "historic/monument": {
                    "name": "Memorial monumental",
                    "terms": "monumento,histórico,história,homenagem,memorial,marco,arco,obelisco,monumental"
@@ -7035,7 +7060,7 @@
                },
                "landuse/allotments": {
                    "name": "Horta urbana",
-                    "terms": "community garden,horta comunitária,agricultura urbana,campo,agrícola,comunitário"
+                    "terms": "community garden,horta comunitária,agricultura urbana,campo,agrícola,comunitário,horto,legumes,garden,quintal"
                },
                "landuse/aquaculture": {
                    "name": "Aquacultura",
@@ -7622,6 +7647,10 @@
                    "name": "Local de escalada",
                    "terms": "escalada artificial,escalada,parede de escalada,boulder,bouldering,ginásio escalada,cordas,rappel,rapel"
                },
+                "leisure/sports_centre/climbing_adventure": {
+                    "name": "Parque de arborismo",
+                    "terms": "aventura,árvores,arvorismo,park,cordas,tirolesa,zip line,trepar,obstáculos"
+                },
                "leisure/sports_centre/horse_racing": {
                    "name": "Hipódromo",
                    "terms": "equestre,equino,cavalos,cavalo,corridas,racing,race,apostas,hipismo"
@@ -7874,6 +7903,10 @@
                    "name": "Torre de iluminação",
                    "terms": "luz,iluminar,estádio,recinto,complexo,holofotes,mastro"
                },
+                "man_made/milk_churn_stand": {
+                    "name": "Banca de vasilhas de leite",
+                    "terms": "leite,leiteira,leiteiro,milk,stand,bilhas,garrafas,canado"
+                },
                "man_made/mineshaft": {
                    "name": "Poço de mina",
                    "terms": "mina,entrada de mina,poço de extração,poço mineiro,poço de mina"
@@ -7926,6 +7959,10 @@
                    "name": "Reservatório de água coberto",
                    "terms": "tanque,água potável,água doce,retenção"
                },
+                "man_made/satellite_dish": {
+                    "name": "Prato de satélite",
+                    "terms": "satellite,satélite,parabólica,antena"
+                },
                "man_made/silo": {
                    "name": "Silo",
                    "terms": "silo,depósito,armazenamento,estrutura,edifício,cereais,cereal,trigo,soja,milho,cevada,canola,centeio"
@@ -7942,6 +7979,26 @@
                    "name": "Caixa de serviços",
                    "terms": "street cabinet,gabinete,caixa,caixa de distribuição,armário,distribuição de telecomunicações,distribuição de sinal de cabo,distribuição de sinal telefónico"
                },
+                "man_made/street_cabinet/postal_service": {
+                    "name": "Armário de distribuição postal",
+                    "terms": "postal,correio,correios,serviço,caixa,depósito,cartas,encomendas,carteiro"
+                },
+                "man_made/street_cabinet/traffic_control": {
+                    "name": "Caixa de controlo de tráfego",
+                    "terms": "traffic,tráfico,trânsito,controle,control,armário,veículos,semáforo,sinaleira"
+                },
+                "man_made/street_cabinet/traffic_monitoring": {
+                    "name": "Caixa de contagem de veículos",
+                    "terms": "traffic,tráfico,trânsito,controle,control,veículos,gestão,monitorar,monitorização,count,armário"
+                },
+                "man_made/street_cabinet/transport_management": {
+                    "name": "Caixa de gestão de transportes públicos",
+                    "terms": "traffic,tráfico,trânsito,controle,control,veículos,gestão,automatizar,automatização,armário"
+                },
+                "man_made/street_cabinet/waste": {
+                    "name": "Armário de resíduos privados",
+                    "terms": "lixo,resíduos,waste,recolha,caixa,lixeira"
+                },
                "man_made/surveillance": {
                    "name": "Vigilância",
                    "terms": "surveillance,cctv,vigilância,câmara,câmera,filmar,reconhecimento,webcam,matrícula"
@@ -7958,6 +8015,18 @@
                    "name": "Bacia de rejeitos",
                    "terms": "rejeitos,decantação,lagoa,estéreis,tailings,resíduos,escória,refugo"
                },
+                "man_made/telescope": {
+                    "name": "Telescópio",
+                    "terms": "telescope,estrelas,estelar,céu,planetas,planetário,telescopio,rádio"
+                },
+                "man_made/telescope/optical": {
+                    "name": "Telescópio ótico",
+                    "terms": "telescope,estrelas,estelar,céu,planetas,planetário,telescopio,ótico,otico,óptico,optico"
+                },
+                "man_made/telescope/radio": {
+                    "name": "Radiotelescópio",
+                    "terms": "telescope,estrelas,estelar,céu,planetas,planetário,telescopio,rádio,radio"
+                },
                "man_made/torii": {
                    "name": "Torii",
                    "terms": "torii,tori,tóri,kasagi,portão,japão,japonês,xintoísta,xinto,xintoísmo,xintoismo"
@@ -8129,8 +8198,8 @@
                    "terms": "gelo,neve,geleira,glacial"
                },
                "natural/grassland": {
-                    "name": "Pradaria",
-                    "terms": "grassland,verdes,terra verde,prado,pastoreio,gado,savana,área,zona,vegetação rasteira,gramíneas,erva,pasto"
+                    "name": "Vegetação rasteira",
+                    "terms": "grassland,verdes,terra verde,pradaria,savana,gramíneas,erva,pasto,grama"
                },
                "natural/heath": {
                    "name": "Charneca",
@@ -8,97 +8,152 @@
                "category-building": {
                    "name": "Clădiri"
                },
+                "category-golf": {
+                    "name": "Golf"
+                },
                "category-landuse": {
-                    "name": "Utilizări de Teren"
+                    "name": "Utilizarea terenului"
+                },
+                "category-natural": {
+                    "name": "Natură"
+                },
+                "category-path": {
+                    "name": "Căi"
                },
                "category-playground": {
                    "name": "Echipament de loc de joacă"
                },
+                "category-rail": {
+                    "name": "Șine"
+                },
                "category-restriction": {
                    "name": "Restricții"
                },
+                "category-road_major": {
+                    "name": "Drumuri de importanță majoră"
+                },
+                "category-road_minor": {
+                    "name": "Drumuri de importanță minoră"
+                },
+                "category-road_service": {
+                    "name": "Drumuri de serviciu"
+                },
                "category-route": {
                    "name": "Rute"
+                },
+                "category-utility": {
+                    "name": "Utilități"
+                },
+                "category-water": {
+                    "name": "Corpuri de apă"
+                },
+                "category-waterway": {
+                    "name": "Căi maritime"
                }
            },
            "fields": {
                "access": {
-                    "label": "Acces Permis",
+                    "label": "Acces permis",
                    "options": {
                        "customers": {
                            "description": "Restricționat clienților la destinație",
                            "title": "Clienți"
                        },
                        "designated": {
-                            "description": "Acces permis după semne și legi locale specifice.",
+                            "description": "Acces permis după semne și legi locale specifice",
                            "title": "Desemnat"
                        },
                        "destination": {
-                            "description": "Acces permis doar pentru a ajunge la o destinație.",
+                            "description": "Acces permis doar pentru a ajunge la o destinație",
                            "title": "Destinație"
                        },
                        "dismount": {
+                            "description": "Acces permis, dar călărețul trebuie să descalece",
                            "title": "Descăleca"
                        },
                        "no": {
-                            "description": "Nu este permis accesul publicului general.",
+                            "description": "Nu este permis accesul publicului general",
                            "title": "Interzis"
                        },
                        "permissive": {
-                            "description": "Acces permis până când proprietarul revocă permisiunea. ",
+                            "description": "Acces permis până când proprietarul revocă permisiunea",
                            "title": "Permisiv"
                        },
                        "permit": {
-                            "description": "Acces permis doar cu un permis valid sau licență.",
+                            "description": "Acces permis doar cu un permis sau licență validă",
                            "title": "Permis"
                        },
                        "private": {
+                            "description": "Acces permis cu acordul proprietarului, dat în mod specific",
                            "title": "Privat"
                        },
                        "unknown": {
-                            "description": "Condițiile de acces sunt necunoscute sau neclare.",
+                            "description": "Condițiile de acces sunt necunoscute sau neclare",
                            "title": "Necunoscut"
                        },
                        "yes": {
+                            "description": "Acces permis prin lege; drept de trecere",
                            "title": "Permis"
                        }
                    },
                    "placeholder": "Nespecificat",
                    "types": {
-                        "access": "Tot",
+                        "access": "Toate",
                        "bicycle": "Biciclete",
-                        "foot": "Pe Jos",
+                        "foot": "Pe jos",
                        "horse": "Cai",
-                        "motor_vehicle": "Vehicule cu Motor"
+                        "motor_vehicle": "Vehicule cu motor"
                    }
                },
                "access_aisle": {
                    "label": "Tip"
                },
                "access_simple": {
-                    "label": "Acces Permis",
+                    "label": "Acces permis",
                    "options": {
                        "customers": "Doar clienți",
                        "no": "Niciunul",
                        "permissive": "Permisiv",
-                        "permit": "Doar cu permis"
+                        "permit": "Doar cu permis",
+                        "private": "Privat",
+                        "unknown": "Necunoscut",
+                        "yes": "Public"
+                    }
+                },
+                "activity": {
+                    "label": "Activitate",
+                    "options": {
+                        "bicycle": "Ciclism",
+                        "hiking": "Drumeție",
+                        "horse": "Călărit",
+                        "mtb": "Mountain bike",
+                        "ski": "Schiat"
+                    }
+                },
+                "addr/interpolation": {
+                    "label": "Tip",
+                    "options": {
+                        "all": "Toate",
+                        "alphabetic": "Alfabetic",
+                        "even": "Pare",
+                        "odd": "Impare"
                    }
                },
                "address": {
                    "label": "Adresă",
                    "placeholders": {
-                        "block_number": "Număr Bloc",
-                        "block_number!jp": "Nr. Bloc",
+                        "block_number": "Număr bloc",
+                        "block_number!jp": "Nr. bloc",
                        "city": "Oraș",
-                        "city!vn": "Oraș/Sat",
+                        "city!vn": "Municipiu/Oraș",
                        "conscriptionnumber": "123",
                        "country": "Țară",
                        "county": "Județ",
                        "county!jp": "District",
                        "district": "District",
                        "floor": "Etaj",
-                        "hamlet": "Hamlet",
-                        "housename": "Nume de Casă",
+                        "hamlet": "Cătun",
+                        "housename": "Nume de casă",
                        "housenumber": "123",
                        "neighbourhood": "Cartier",
                        "place": "Loc",
@@ -113,7 +168,10 @@
                    }
                },
                "admin_level": {
-                    "label": "Nivel Administrativ"
+                    "label": "Nivel administrativ"
+                },
+                "advertising": {
+                    "label": "Tip"
                },
                "aerialway": {
                    "label": "Tip"
@@ -122,7 +180,7 @@
                    "label": "Acces",
                    "options": {
                        "both": "Amândouă",
-                        "entry": "IIntrare",
+                        "entry": "Intrare",
                        "exit": "Ieșire"
                    }
                },
@@ -152,17 +210,39 @@
                "aeroway": {
                    "label": "Tip"
                },
+                "agrarian": {
+                    "label": "Produse"
+                },
+                "air_conditioning": {
+                    "label": "Aer condiționat"
+                },
                "amenity": {
                    "label": "Tip"
                },
                "animal_boarding": {
-                    "label": "Pentru Animale"
+                    "label": "Pentru animale"
                },
                "animal_breeding": {
-                    "label": "Pentru Animale"
+                    "label": "Pentru animale"
                },
                "animal_shelter": {
-                    "label": "Pentru Animale"
+                    "label": "Pentru animale"
+                },
+                "archaeological_site": {
+                    "label": "Tip",
+                    "options": {
+                        "baths": "Băi",
+                        "city": "Oraș istoric",
+                        "fortification": "Fortificație",
+                        "megalith": "Megalit",
+                        "necropolis": "Necropolă",
+                        "petroglyph": "Piatră cioplită",
+                        "settlement": "Așezare istorică",
+                        "tumulus": "Tumul"
+                    }
+                },
+                "architect": {
+                    "label": "Arhitect"
                },
                "area/highway": {
                    "label": "Tip"
@@ -171,31 +251,159 @@
                    "label": "Artist"
                },
                "artwork_type": {
-                    "label": "Tip"
+                    "label": "Tip",
+                    "options": {
+                        "bust": "Bust",
+                        "graffiti": "Grafitti",
+                        "mosaic": "Mozaic",
+                        "painting": "Tablou",
+                        "sculpture": "Sculptură",
+                        "statue": "Statuie"
+                    }
+                },
+                "ascent": {
+                    "label": "Urcuș total"
+                },
+                "athletics_pitch": {
+                    "label": "Eveniment",
+                    "options": {
+                        "discus_throw": "Aruncare disc",
+                        "hammer_throw": "Aruncare ciocan",
+                        "high_jump": "Săritură în înălțime",
+                        "javelin_throw": "Aruncare cu sulița",
+                        "long_jump": "Săritură în lungime",
+                        "pole_vault": "Săritură cu prăjina",
+                        "shot_put": "Aruncarea greutății",
+                        "triple_jump": "Triplu salt"
+                    }
+                },
+                "athletics_track": {
+                    "label": "Probă",
+                    "options": {
+                        "javelin_throw": "Suliță",
+                        "long_jump": "Săritură în lungime",
+                        "pole_vault": "Săritură cu prăjina",
+                        "running": "Alergare",
+                        "sprint": "Sprint",
+                        "steeplechase": "Cursă cu obstacole",
+                        "triple_jump": "Triplu salt"
+                    }
                },
                "atm": {
                    "label": "ATM"
                },
+                "attraction": {
+                    "label": "Tip",
+                    "options": {
+                        "animal": "Țarc animale",
+                        "carousel": "Carusel",
+                        "maze": "Labirint",
+                        "roller_coaster": "Roller coaster",
+                        "water_slide": "Tobogan cu apă"
+                    }
+                },
+                "automated": {
+                    "label": "Automat"
+                },
+                "baby_feeding": {
+                    "label": "Zonă alăptare",
+                    "options": {
+                        "no": "Niciuna",
+                        "room": "Cameră dedicată",
+                        "yes": "Spațiu marcat"
+                    }
+                },
+                "baby_seat": {
+                    "label": "Scaun copil"
+                },
+                "backrest": {
+                    "label": "Spătar"
+                },
+                "bar": {
+                    "label": "Bar"
+                },
                "barrier": {
-                    "label": "Tip"
+                    "label": "Tip",
+                    "options": {
+                        "block": "Bloc mare",
+                        "bollard": "Bolard",
+                        "chain": "Lanț",
+                        "city_wall": "Zid de apărare",
+                        "ditch": "Șanț",
+                        "entrance": "Intrare",
+                        "fence": "Gard",
+                        "gate": "Poartă",
+                        "guard_rail": "Parapet",
+                        "hedge": "Gard viu",
+                        "height_restrictor": "Limitator de înălțime",
+                        "kerb": "Bordură",
+                        "stile": "Pârleaz",
+                        "wall": "Zid"
+                    }
+                },
+                "barrier_planter": {
+                    "label": "Barieră",
+                    "options": {
+                        "planter": "Da",
+                        "undefined": "Nu"
+                    }
+                },
+                "basin": {
+                    "label": "Tip",
+                    "options": {
+                        "evaporation": "Evaporare",
+                        "infiltration": "Infiltrare",
+                        "retention": "Retenție"
+                    }
                },
                "bath/open_air": {
-                    "label": "Aer Liber"
+                    "label": "Aer liber"
                },
                "bath/type": {
-                    "label": "Specialitate"
+                    "label": "Specialitate",
+                    "options": {
+                        "lake": "Lac",
+                        "thermal": "Baie termală"
+                    }
+                },
+                "beauty": {
+                    "options": {
+                        "cosmetics": "Cosmetică",
+                        "hair_removal": "Îndepărtare păr",
+                        "nails": "Manichiură / Pedichiură",
+                        "skin_care": "Îngrijirea pielii",
+                        "tanning": "Bronzare",
+                        "waxing": "Epilare cu ceară"
+                    }
                },
                "bench": {
                    "label": "Bancă"
                },
                "bicycle_parking": {
-                    "label": "Tip"
+                    "label": "Tip",
+                    "options": {
+                        "building": "Într-o clădire",
+                        "lockers": "Dulapuri individuale"
+                    }
+                },
+                "bicycle_road": {
+                    "options": {
+                        "undefined": "Nu",
+                        "yes": "Da"
+                    }
                },
                "bin": {
-                    "label": "Gunoi"
+                    "label": "Coș gunoi"
+                },
+                "blind": {
+                    "options": {
+                        "limited": "Limitat",
+                        "no": "Nu",
+                        "yes": "Da"
+                    }
                },
                "blood_components": {
-                    "label": "Componente de Sânge",
+                    "label": "Componente sangvine",
                    "options": {
                        "plasma": "plasmă",
                        "platelets": "trombocite",
@@ -204,7 +412,29 @@
                    }
                },
                "board_type": {
-                    "label": "Tip"
+                    "label": "Tip",
+                    "options": {
+                        "art": "Artă",
+                        "astronomy": "Astronomie",
+                        "geology": "Geologie",
+                        "history": "Istorie",
+                        "nature": "Natură",
+                        "notice": "Avizier",
+                        "plants": "Plante"
+                    }
+                },
+                "bollard": {
+                    "label": "Tip",
+                    "options": {
+                        "fixed": "Bolard fix",
+                        "flexible": "Bolard flexibil",
+                        "foldable": "Bolard pliabil",
+                        "removable": "Bolard îndepărtabil",
+                        "rising": "Bolard ce se ridică"
+                    }
+                },
+                "booth": {
+                    "label": "Cabină"
                },
                "boules": {
                    "label": "Tip"
@@ -212,11 +442,56 @@
                "boundary": {
                    "label": "Tip"
                },
+                "branch_brand": {
+                    "label": "Sucursală"
+                },
                "brand": {
                    "label": "Brand"
                },
+                "bridge": {
+                    "label": "Tip",
+                    "placeholder": "Implicit"
+                },
+                "bridge/ref": {
+                    "label": "Numărul podului"
+                },
+                "bridge/support": {
+                    "label": "Tip"
+                },
+                "bridge_combo": {
+                    "label": "Tip"
+                },
                "building": {
-                    "label": "Clădire"
+                    "label": "Clădire",
+                    "options": {
+                        "apartments": "Bloc",
+                        "barn": "Hambar",
+                        "bunker": "Buncăr",
+                        "cabin": "Cabană",
+                        "cathedral": "Catedrală",
+                        "chapel": "Capelă",
+                        "church": "Biserică",
+                        "civic": "Clădire civică",
+                        "construction": "Clădire în construcție",
+                        "cowshed": "Grajd",
+                        "detached": "Casă separată",
+                        "dormitory": "Dormitor",
+                        "farm": "Casă la fermă",
+                        "farm_auxiliary": "Clădire a fermei",
+                        "fire_station": "Stație pompieri",
+                        "garage": "Garaj",
+                        "garages": "Garaje",
+                        "ger": "Iurtă",
+                        "grandstand": "Tribună",
+                        "greenhouse": "Seră",
+                        "hangar": "Hangar",
+                        "hospital": "Spital",
+                        "hotel": "Hotel",
+                        "house": "Casă",
+                        "houseboat": "Casă plutitoare",
+                        "hut": "Colibă",
+                        "industrial": "Clădire industrială"
+                    }
                },
                "bunker_type": {
                    "label": "Tip"
@@ -415,12 +690,6 @@
                "hoops": {
                    "placeholder": "1, 2, 4..."
                },
-                "horse_dressage": {
-                    "options": {
-                        "equestrian": "Da",
-                        "undefined": "Nu"
-                    }
-                },
                "incline": {
                    "label": "Înclinare"
                },
@@ -1779,7 +2048,8 @@
                    "name": "Magazin de Biciclete"
                },
                "shop/bookmaker": {
-                    "name": "Atelier de Cărți"
+                    "name": "Casă de pariuri",
+                    "terms": "pariuri"
                },
                "shop/boutique": {
                    "name": "Boutique"
--- a/Show More
+++ b/Show More