]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Rename user#view to user#show
[rails.git] / config / wiki_pages.yml
index 5b305f825088b806b212f52dd4fb749a88c8d091..ccf8744af04a38547217313016349112627f28aa 100644 (file)
@@ -263,7 +263,6 @@ cs:
     drive_in: Cs:Key:drive in
     drive_through: Cs:Key:drive through
     driving_side: Cs:Key:driving side
-    drying:room: Cs:Key:drying:room
     duration: Cs:Key:duration
     ele: Cs:Key:ele
     electrified: Cs:Key:electrified
@@ -473,11 +472,6 @@ cs:
     motorcar: Cs:Key:motorcar
     motorcycle: Cs:Key:motorcycle
     motorcycle:conditional: Cs:Key:motorcycle:conditional
-    motorcycle:parking: Cs:Key:motorcycle:parking
-    motorcycle:theme: Cs:Key:motorcycle:theme
-    motorcycle:tools: Cs:Key:motorcycle:tools
-    motorcycle:tours: Cs:Key:motorcycle:tours
-    motorcycle_friendly: Cs:Key:motorcycle friendly
     motorhome: Cs:Key:motorhome
     motorroad: Cs:Key:motorroad
     mountain_pass: Cs:Key:mountain pass
@@ -639,6 +633,7 @@ cs:
     self_service: Cs:Key:self service
     sells:tobacco: Cs:Key:sells:tobacco
     service: Cs:Key:service
+    service:bicycle:repair: Cs:Key:service:bicycle:repair
     service_times: Cs:Key:service times
     share_taxi: Cs:Key:share taxi
     shelter: Cs:Key:shelter
@@ -1704,6 +1699,7 @@ cs:
     office=therapist: Cs:Tag:office=therapist
     office=travel_agent: Cs:Tag:office=travel agent
     office=water_utility: Cs:Tag:office=water utility
+    office=yes: Cs:Tag:office=yes
     oneway=alternating: Cs:Tag:oneway=alternating
     oneway=reversible: Cs:Tag:oneway=reversible
     operator=Cambio: Cs:Tag:operator=Cambio
@@ -2158,6 +2154,7 @@ cs:
     vending=umbrellas: Cs:Tag:vending=umbrellas
     vending=water: Cs:Tag:vending=water
     water=intermittent: Cs:Tag:water=intermittent
+    water=lake: Cs:Tag:water=lake
     water=lock: Cs:Tag:water=lock
     waterway=boatyard: Cs:Tag:waterway=boatyard
     waterway=brook: Cs:Tag:waterway=brook
@@ -2219,6 +2216,7 @@ da:
     highway=road: Da:Tag:highway=road
     highway=tertiary: Da:Tag:highway=tertiary
     highway=track: Da:Tag:highway=track
+    highway=unclassified: Da:Tag:highway=unclassified
     leisure=dog_park: Da:Tag:leisure=dog park
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
@@ -2260,6 +2258,7 @@ de:
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
     ascent: DE:Key:ascent
+    authentication: DE:Key:authentication
     automated: DE:Key:automated
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
@@ -2282,6 +2281,7 @@ de:
     books: DE:Key:books
     both: DE:Key:both
     boundary: DE:Key:boundary
+    brand: DE:Key:brand
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
@@ -2309,6 +2309,7 @@ de:
     castle_type: DE:Key:castle type
     cemetery: DE:Key:cemetery
     circuits: DE:Key:circuits
+    circumference: DE:Key:circumference
     city_limit: DE:Key:city limit
     class:bicycle: DE:Key:class:bicycle
     clothes: DE:Key:clothes
@@ -2360,6 +2361,7 @@ de:
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
+    delivery: DE:Key:delivery
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     description: DE:Key:description
@@ -2409,6 +2411,7 @@ de:
     ford: DE:Key:ford
     fortification_type: DE:Key:fortification type
     frequency: DE:Key:frequency
+    from: DE:Key:from
     fuel: DE:Key:fuel
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
@@ -2423,6 +2426,7 @@ de:
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
     geological: DE:Key:geological
+    golf:course: DE:Key:golf:course
     government: DE:Key:government
     guest_house: DE:Key:guest house
     hazard: DE:Key:hazard
@@ -2439,6 +2443,7 @@ de:
     horse: DE:Key:horse
     horse_scale: DE:Key:horse scale
     ice_road: DE:Key:ice road
+    image: DE:Key:image
     importance: DE:Key:importance
     incline: DE:Key:incline
     indoor_seating: DE:Key:indoor seating
@@ -2481,6 +2486,7 @@ de:
     love_locks: DE:Key:love locks
     man_made: DE:Key:man made
     manhole: DE:Key:manhole
+    manufacturer: DE:Key:manufacturer
     manufacturer:type: DE:Key:manufacturer:type
     material: DE:Key:material
     max_age: DE:Key:max age
@@ -2496,6 +2502,7 @@ de:
     memorial:type: DE:Key:memorial:type
     military: DE:Key:military
     min_age: DE:Key:min age
+    mineshaft_type: DE:Key:mineshaft type
     minspeed: DE:Key:minspeed
     minspeed:lanes: DE:Key:minspeed:lanes
     mofa: DE:Key:mofa
@@ -2525,7 +2532,6 @@ de:
     motorcycle:sales: DE:Key:motorcycle:sales
     motorcycle:type: DE:Key:motorcycle:type
     motorcycle:tyres: DE:Key:motorcycle:tyres
-    motorcycle_friendly: DE:Key:motorcycle friendly
     motorroad: DE:Key:motorroad
     mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
@@ -2544,8 +2550,9 @@ de:
     nudism: DE:Key:nudism
     nursery: DE:Key:nursery
     office: DE:Key:office
-    old_name: DE:Key:old name
+    offshore: DE:Key:offshore
     oneway: DE:Key:oneway
+    oneway:bicycle: DE:Key:oneway:bicycle
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
@@ -2562,15 +2569,20 @@ de:
     parking: DE:Key:parking
     parking:lane: DE:Key:parking:lane
     parking:lane:hgv: DE:Key:parking:lane:hgv
+    passenger_information_display: DE:Key:passenger information display
+    payment: DE:Key:payment
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
     piste:difficulty: DE:Key:piste:difficulty
     piste:type: DE:Key:piste:type
     place: DE:Key:place
+    placement: DE:Key:placement
     plant: DE:Key:plant
     plant:output: DE:Key:plant:output
     playground: DE:Key:playground
+    'playground:': 'DE:Key:playground:'
     population: DE:Key:population
+    post_office: DE:Key:post office
     post_office:type: DE:Key:post office:type
     postal_code: DE:Key:postal code
     power: DE:Key:power
@@ -2618,6 +2630,7 @@ de:
     segregated: DE:Key:segregated
     self_service: DE:Key:self service
     service: DE:Key:service
+    service:bicycle:repair: DE:Key:service:bicycle:repair
     service_times: DE:Key:service times
     shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
@@ -2630,6 +2643,7 @@ de:
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
     social_facility:for: DE:Key:social facility:for
+    socket: DE:Key:socket
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
     species: DE:Key:species
@@ -2654,8 +2668,10 @@ de:
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
     tactile_writing: DE:Key:tactile writing
+    takeaway: DE:Key:takeaway
     target: DE:Key:target
     tidal: DE:Key:tidal
+    to: DE:Key:to
     todo: DE:Key:todo
     toilets: DE:Key:toilets
     toilets:wheelchair: DE:Key:toilets:wheelchair
@@ -2667,6 +2683,7 @@ de:
     tracktype: DE:Key:tracktype
     traffic_calming: DE:Key:traffic calming
     traffic_sign: DE:Key:traffic sign
+    traffic_signals:arrow: DE:Key:traffic signals:arrow
     traffic_signals:direction: DE:Key:traffic signals:direction
     traffic_signals:sound: DE:Key:traffic signals:sound
     trail_visibility: DE:Key:trail visibility
@@ -2680,6 +2697,7 @@ de:
     usage: DE:Key:usage
     vehicle: DE:Key:vehicle
     verbindung: DE:Key:verbindung
+    viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
     voltage: DE:Key:voltage
     waste: DE:Key:waste
@@ -2726,6 +2744,7 @@ de:
     aeroway=heliport: DE:Tag:aeroway=heliport
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
     aeroway=runway: DE:Tag:aeroway=runway
+    aeroway=spaceport: DE:Tag:aeroway=spaceport
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
     airmark=beacon: DE:Tag:airmark=beacon
@@ -2733,6 +2752,7 @@ de:
     amenity=animal_boarding: DE:Tag:amenity=animal boarding
     amenity=animal_breeding: DE:Tag:amenity=animal breeding
     amenity=animal_shelter: DE:Tag:amenity=animal shelter
+    amenity=archive: DE:Tag:amenity=archive
     amenity=arts_centre: DE:Tag:amenity=arts centre
     amenity=atm: DE:Tag:amenity=atm
     amenity=baby_hatch: DE:Tag:amenity=baby hatch
@@ -2786,6 +2806,7 @@ de:
     amenity=fuel: DE:Tag:amenity=fuel
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
+    amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
     amenity=ice_cream: DE:Tag:amenity=ice cream
@@ -2814,6 +2835,7 @@ de:
     amenity=prison: DE:Tag:amenity=prison
     amenity=prison_camp: DE:Tag:amenity=prison camp
     amenity=pub: DE:Tag:amenity=pub
+    amenity=public_bath: DE:Tag:amenity=public bath
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
     amenity=ranger_station: DE:Tag:amenity=ranger station
     amenity=recycling: DE:Tag:amenity=recycling
@@ -2832,6 +2854,7 @@ de:
     amenity=taxi: DE:Tag:amenity=taxi
     amenity=telephone: DE:Tag:amenity=telephone
     amenity=theatre: DE:Tag:amenity=theatre
+    amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
@@ -2846,6 +2869,8 @@ de:
     amenity=weighbridge: DE:Tag:amenity=weighbridge
     amenity=youth_centre: DE:Tag:amenity=youth centre
     animal=school: DE:Tag:animal=school
+    artwork_type=sculpture: DE:Tag:artwork type=sculpture
+    artwork_type=statue: DE:Tag:artwork type=statue
     atm=yes: DE:Tag:atm=yes
     attraction=animal: DE:Tag:attraction=animal
     attraction=train: DE:Tag:attraction=train
@@ -2903,8 +2928,10 @@ de:
     building=detached: DE:Tag:building=detached
     building=dormitory: DE:Tag:building=dormitory
     building=entrance: DE:Tag:building=entrance
+    building=farm: DE:Tag:building=farm
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
+    building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
     building=hospital: DE:Tag:building=hospital
     building=hotel: DE:Tag:building=hotel
@@ -2913,15 +2940,18 @@ de:
     building=hut: DE:Tag:building=hut
     building=industrial: DE:Tag:building=industrial
     building=kiosk: DE:Tag:building=kiosk
+    building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=parking: DE:Tag:building=parking
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
+    building=riding_hall: DE:Tag:building=riding hall
     building=roof: DE:Tag:building=roof
     building=ruins: DE:Tag:building=ruins
     building=school: DE:Tag:building=school
     building=shed: DE:Tag:building=shed
+    building=shrine: DE:Tag:building=shrine
     building=slurry_tank: DE:Tag:building=slurry tank
     building=stable: DE:Tag:building=stable
     building=static_caravan: DE:Tag:building=static caravan
@@ -2931,6 +2961,8 @@ de:
     building=terrace: DE:Tag:building=terrace
     building=train_station: DE:Tag:building=train station
     building=university: DE:Tag:building=university
+    building=warehouse: DE:Tag:building=warehouse
+    building=water_tower: DE:Tag:building=water tower
     bunker_type=hardened_aircraft_shelter: DE:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: DE:Tag:bunker type=munitions
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
@@ -2948,6 +2980,7 @@ de:
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=basket_maker: DE:Tag:craft=basket maker
     craft=beekeeper: DE:Tag:craft=beekeeper
+    craft=blacksmith: DE:Tag:craft=blacksmith
     craft=boatbuilder: DE:Tag:craft=boatbuilder
     craft=bookbinder: DE:Tag:craft=bookbinder
     craft=car_repair: DE:Tag:craft=car repair
@@ -2983,6 +3016,7 @@ de:
     craft=stonemason: DE:Tag:craft=stonemason
     craft=tiler: DE:Tag:craft=tiler
     craft=tinsmith: DE:Tag:craft=tinsmith
+    craft=toolmaker: DE:Tag:craft=toolmaker
     craft=turner: DE:Tag:craft=turner
     craft=upholsterer: DE:Tag:craft=upholsterer
     craft=watchmaker: DE:Tag:craft=watchmaker
@@ -3026,6 +3060,8 @@ de:
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
     emergency_service=technical: DE:Tag:emergency service=technical
+    entrance=main: DE:Tag:entrance=main
+    entrance=yes: DE:Tag:entrance=yes
     food=gourmet: DE:Tag:food=gourmet
     foot=designated: DE:Tag:foot=designated
     footway=sidewalk: DE:Tag:footway=sidewalk
@@ -3100,7 +3136,6 @@ de:
     highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
-    highway=centre_line: DE:Tag:highway=centre line
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -3126,6 +3161,7 @@ de:
     highway=platform: DE:Tag:highway=platform
     highway=primary: DE:Tag:highway=primary
     highway=primary_link: DE:Tag:highway=primary link
+    highway=proposed: DE:Tag:highway=proposed
     highway=raceway: DE:Tag:highway=raceway
     highway=razed: DE:Tag:highway=razed
     highway=residential: DE:Tag:highway=residential
@@ -3138,6 +3174,7 @@ de:
     highway=services: DE:Tag:highway=services
     highway=speed_camera: DE:Tag:highway=speed camera
     highway=steps: DE:Tag:highway=steps
+    highway=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
     highway=street_light: DE:Tag:highway=street light
     highway=tertiary: DE:Tag:highway=tertiary
@@ -3155,6 +3192,7 @@ de:
     historic=aircraft: DE:Tag:historic=aircraft
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
+    historic=bomb_crater: DE:Tag:historic=bomb crater
     historic=boundary_stone: DE:Tag:historic=boundary stone
     historic=castle: DE:Tag:historic=castle
     historic=charcoal_pile: DE:Tag:historic=charcoal pile
@@ -3214,6 +3252,7 @@ de:
     landuse=military: DE:Tag:landuse=military
     landuse=orchard: DE:Tag:landuse=orchard
     landuse=plant_nursery: DE:Tag:landuse=plant nursery
+    landuse=pond: DE:Tag:landuse=pond
     landuse=quarry: DE:Tag:landuse=quarry
     landuse=railway: DE:Tag:landuse=railway
     landuse=recreation_ground: DE:Tag:landuse=recreation ground
@@ -3235,6 +3274,7 @@ de:
     leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=bird_hide: DE:Tag:leisure=bird hide
     leisure=bowling_alley: DE:Tag:leisure=bowling alley
+    leisure=common: DE:Tag:leisure=common
     leisure=dance: DE:Tag:leisure=dance
     leisure=disc_golf_course: DE:Tag:leisure=disc golf course
     leisure=dog_park: DE:Tag:leisure=dog park
@@ -3277,6 +3317,7 @@ de:
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
     man_made=beacon: DE:Tag:man made=beacon
+    man_made=beehive: DE:Tag:man made=beehive
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
@@ -3293,6 +3334,7 @@ de:
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
     man_made=groyne: DE:Tag:man made=groyne
     man_made=hot_water_tank: DE:Tag:man made=hot water tank
+    man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=mast: DE:Tag:man made=mast
@@ -3318,6 +3360,7 @@ de:
     man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tank: DE:Tag:man made=water tank
+    man_made=water_tap: DE:Tag:man made=water tap
     man_made=water_tower: DE:Tag:man made=water tower
     man_made=water_well: DE:Tag:man made=water well
     man_made=water_works: DE:Tag:man made=water works
@@ -3336,6 +3379,7 @@ de:
     megalith_type=stone_circle: DE:Tag:megalith type=stone circle
     megalith_type=stone_ship: DE:Tag:megalith type=stone ship
     megalith_type=tholos: DE:Tag:megalith type=tholos
+    memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
     memorial=bust: DE:Tag:memorial=bust
     memorial=obelisk: DE:Tag:memorial=obelisk
     memorial=plaque: DE:Tag:memorial=plaque
@@ -3353,6 +3397,7 @@ de:
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    natural=anthill: DE:Tag:natural=anthill
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
@@ -3360,6 +3405,7 @@ de:
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=coastline: DE:Tag:natural=coastline
+    natural=earth_bank: DE:Tag:natural=earth bank
     natural=fell: DE:Tag:natural=fell
     natural=geyser: DE:Tag:natural=geyser
     natural=glacier: DE:Tag:natural=glacier
@@ -3381,6 +3427,7 @@ de:
     natural=sinkhole: DE:Tag:natural=sinkhole
     natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
+    natural=termite_mound: DE:Tag:natural=termite mound
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
@@ -3439,6 +3486,7 @@ de:
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
     pipeline=valve: DE:Tag:pipeline=valve
+    piste:type=nordic: DE:Tag:piste:type=nordic
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=continent: DE:Tag:place=continent
@@ -3455,6 +3503,7 @@ de:
     place=suburb: DE:Tag:place=suburb
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
+    placement=transition: DE:Tag:placement=transition
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=converter: DE:Tag:power=converter
@@ -3547,9 +3596,11 @@ de:
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
     shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
     shop=art: DE:Tag:shop=art
+    shop=atv: DE:Tag:shop=atv
     shop=baby_goods: DE:Tag:shop=baby goods
     shop=bag: DE:Tag:shop=bag
     shop=bakery: DE:Tag:shop=bakery
@@ -3593,6 +3644,7 @@ de:
     shop=fashion: DE:Tag:shop=fashion
     shop=fireplace: DE:Tag:shop=fireplace
     shop=fishing: DE:Tag:shop=fishing
+    shop=flooring: DE:Tag:shop=flooring
     shop=florist: DE:Tag:shop=florist
     shop=frame: DE:Tag:shop=frame
     shop=funeral_directors: DE:Tag:shop=funeral directors
@@ -3647,6 +3699,7 @@ de:
     shop=spices: DE:Tag:shop=spices
     shop=sports: DE:Tag:shop=sports
     shop=stationery: DE:Tag:shop=stationery
+    shop=storage_rental: DE:Tag:shop=storage rental
     shop=supermarket: DE:Tag:shop=supermarket
     shop=swimming_pool: DE:Tag:shop=swimming pool
     shop=tattoo: DE:Tag:shop=tattoo
@@ -3684,6 +3737,7 @@ de:
     social_facility=day_care: DE:Tag:social facility=day care
     social_facility=food_bank: DE:Tag:social facility=food bank
     social_facility=group_home: DE:Tag:social facility=group home
+    social_facility=hospice: DE:Tag:social facility=hospice
     social_facility=nursing_home: DE:Tag:social facility=nursing home
     social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
     social_facility=workshop: DE:Tag:social facility=workshop
@@ -3770,6 +3824,7 @@ de:
     tunnel=culvert: DE:Tag:tunnel=culvert
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=bottle_return: DE:Tag:vending=bottle return
     vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
     vending=chewing_gums: DE:Tag:vending=chewing gums
@@ -3790,6 +3845,7 @@ de:
     vending=stamps: DE:Tag:vending=stamps
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
+    vending_machine=fuel: DE:Tag:vending machine=fuel
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
     water=reservoir: DE:Tag:water=reservoir
@@ -3868,11 +3924,15 @@ en:
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     DGPS_correction: Key:DGPS correction
+    EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
     Fetish: Key:Fetish
     Finance_agent: Key:Finance agent
     HE_ref: Key:HE ref
+    HU:hu-go:length: Key:HU:hu-go:length
+    HU:hu-go:milestone: Key:HU:hu-go:milestone
+    HU:hu-go:road: Key:HU:hu-go:road
     IBGE:CD_ADMINIS: Key:IBGE:CD ADMINIS
     IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
     IBGE:tipo: Key:IBGE:tipo
@@ -3913,9 +3973,11 @@ en:
     access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
     addr:alternatenumber: Key:addr:alternatenumber
+    addr:block: Key:addr:block
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
     addr:city:de: Key:addr:city:de
+    addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
@@ -3941,6 +4003,7 @@ en:
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:de: Key:addr:street:de
+    addr:street:en: Key:addr:street:en
     addr:street:it: Key:addr:street:it
     addr:street:name: Key:addr:street:name
     addr:street:prefix: Key:addr:street:prefix
@@ -3959,10 +4022,13 @@ en:
     aeroway: Key:aeroway
     after_school: Key:after school
     agricultural: Key:agricultural
+    air_conditioning: Key:air conditioning
     alt_name: Key:alt name
+    alt_name:ar: Key:alt name:ar
     alt_name:en: Key:alt name:en
     alt_name:ko: Key:alt name:ko
     alt_name:mg: Key:alt name:mg
+    alt_name:th: Key:alt name:th
     alt_name_1: Key:alt name 1
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
@@ -3981,6 +4047,8 @@ en:
     assisted_trail: Key:assisted trail
     attribution: Key:attribution
     atv: Key:atv
+    atv:sales: Key:atv:sales
+    authentication: Key:authentication
     automated: Key:automated
     automatic_door: Key:automatic door
     backcountry: Key:backcountry
@@ -4022,6 +4090,8 @@ en:
     boundary_type: Key:boundary type
     branch: Key:branch
     brand: Key:brand
+    brand:wikidata: Key:brand:wikidata
+    brand:wikipedia: Key:brand:wikipedia
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
@@ -4075,12 +4145,14 @@ en:
     capacity: Key:capacity
     capacity:disabled: Key:capacity:disabled
     capital: Key:capital
+    capital_city: Key:capital city
     car_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
+    casemate: Key:casemate
     castle_type: Key:castle type
     castle_type:cs: Key:castle type:cs
     castle_type:de: Key:castle type:de
@@ -4093,6 +4165,7 @@ en:
     centre_turn_lane: Key:centre turn lane
     cep: Key:cep
     change: Key:change
+    changesets_count: Key:changesets count
     charge: Key:charge
     charity: Key:charity
     check_date: Key:check date
@@ -4141,9 +4214,11 @@ en:
     contact:facebook: Key:contact:facebook
     contact:fax: Key:contact:fax
     contact:flickr: Key:contact:flickr
+    contact:gnusocial: Key:contact:gnusocial
     contact:google_plus: Key:contact:google plus
     contact:instagram: Key:contact:instagram
     contact:linkedin: Key:contact:linkedin
+    contact:mastodon: Key:contact:mastodon
     contact:phone: Key:contact:phone
     contact:skype: Key:contact:skype
     contact:twitter: Key:contact:twitter
@@ -4254,6 +4329,7 @@ en:
     disused:amenity: Key:disused:amenity
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
+    dog: Key:dog
     dominant_taxon: Key:dominant taxon
     donation:compensation: Key:donation:compensation
     donation:compensation:payment: Key:donation:compensation:payment
@@ -4277,7 +4353,6 @@ en:
     drive_through: Key:drive through
     drive_thru: Key:drive thru
     driving_side: Key:driving side
-    drying:room: Key:drying:room
     duration: Key:duration
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
@@ -4298,6 +4373,7 @@ en:
     etymology: Key:etymology
     european_cultural_path: Key:european cultural path
     evacuation_route: Key:evacuation route
+    exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
     expressway: Key:expressway
@@ -4346,6 +4422,8 @@ en:
     fortification_type: Key:fortification type
     forward: Key:forward
     frequency: Key:frequency
+    fridge: Key:fridge
+    from: Key:from
     fruit: Key:fruit
     fuel: Key:fuel
     fuel:1_25: Key:fuel:1 25
@@ -4353,13 +4431,13 @@ en:
     fuel:E10: Key:fuel:E10
     fuel:GTL_diesel: Key:fuel:GTL diesel
     fuel:HGV_diesel: Key:fuel:HGV diesel
-    fuel:LH2: Key:fuel:LH2
     fuel:adblue: Key:fuel:adblue
     fuel:alcohol: Key:fuel:alcohol
     fuel:biodiesel: Key:fuel:biodiesel
     fuel:biogas: Key:fuel:biogas
     fuel:cng: Key:fuel:cng
     fuel:diesel: Key:fuel:diesel
+    fuel:diesel_G2: Key:fuel:diesel G2
     fuel:discount: Key:fuel:discount
     fuel:e10: Key:fuel:e10
     fuel:e20: Key:fuel:e20
@@ -4412,15 +4490,20 @@ en:
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
     golf: Key:golf
+    golf:course: Key:golf:course
     golf_cart: Key:golf cart
     goods: Key:goods
     government: Key:government
+    grades: Key:grades
     grape_variety: Key:grape variety
     grassland: Key:grassland
     gritting: Key:gritting
     group_only: Key:group only
     guest_house: Key:guest house
     guidepost: Key:guidepost
+    guidepost:hiking: Key:guidepost:hiking
+    gun_emplacement_type: Key:gun emplacement type
+    gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
     handrail: Key:handrail
     happy_hours: Key:happy hours
@@ -4485,7 +4568,9 @@ en:
     inscription: Key:inscription
     inscription:url: Key:inscription:url
     int_name: Key:int name
+    int_name:ar: Key:int name:ar
     int_ref: Key:int ref
+    int_ref:ar: Key:int ref:ar
     intermittent: Key:intermittent
     internet: Key:internet
     internet_access: Key:internet access
@@ -4502,11 +4587,13 @@ en:
     is_in:municipality: Key:is in:municipality
     is_in:ocean: Key:is in:ocean
     is_in:province: Key:is in:province
+    is_in:region: Key:is in:region
     is_in:sea: Key:is in:sea
     is_in:state: Key:is in:state
     is_in:ward: Key:is in:ward
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     jel: Key:jel
+    jetski:sales: Key:jetski:sales
     junction: Key:junction
     junction:ref: Key:junction:ref
     junction_number: Key:junction number
@@ -4545,6 +4632,7 @@ en:
     lane_hint: Key:lane hint
     lanes: Key:lanes
     lanes:backward: Key:lanes:backward
+    lanes:both_ways: Key:lanes:both ways
     lanes:bus: Key:lanes:bus
     lanes:forward: Key:lanes:forward
     lanes:psv: Key:lanes:psv
@@ -4569,17 +4657,22 @@ en:
     lit: Key:lit
     lit:perceived: Key:lit:perceived
     living_street: Key:living street
+    loading_gauge: Key:loading gauge
     loc_name: Key:loc name
+    loc_name:ar: Key:loc name:ar
     loc_ref: Key:loc ref
     local_ref: Key:local ref
+    locale: Key:locale
     location: Key:location
     lock: Key:lock
     lock_name: Key:lock name
     lock_ref: Key:lock ref
     lockable: Key:lockable
+    long_name:ar: Key:long name:ar
     lottery: Key:lottery
     love_locks: Key:love locks
     lunch: Key:lunch
+    lunch:specials: Key:lunch:specials
     maintained: Key:maintained
     maintenance: Key:maintenance
     male: Key:male
@@ -4622,6 +4715,7 @@ en:
     min_age: Key:min age
     min_height: Key:min height
     minage: Key:minage
+    mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
@@ -4651,17 +4745,12 @@ en:
     motorcycle: Key:motorcycle
     motorcycle:clothes: Key:motorcycle:clothes
     motorcycle:conditional: Key:motorcycle:conditional
-    motorcycle:parking: Key:motorcycle:parking
     motorcycle:parts: Key:motorcycle:parts
     motorcycle:rental: Key:motorcycle:rental
     motorcycle:repair: Key:motorcycle:repair
     motorcycle:sales: Key:motorcycle:sales
-    motorcycle:theme: Key:motorcycle:theme
-    motorcycle:tools: Key:motorcycle:tools
-    motorcycle:tours: Key:motorcycle:tours
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
-    motorcycle_friendly: Key:motorcycle friendly
     motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
@@ -4675,6 +4764,7 @@ en:
     mtb_scale: Key:mtb scale
     museum: Key:museum
     museum_type: Key:museum type
+    musical_instrument: Key:musical instrument
     name: Key:name
     name:ar: Key:name:ar
     name:be: Key:name:be
@@ -4686,6 +4776,7 @@ en:
     name:cs: Key:name:cs
     name:cy: Key:name:cy
     name:de: Key:name:de
+    name:dv: Key:name:dv
     name:el: Key:name:el
     name:en: Key:name:en
     name:eo: Key:name:eo
@@ -4698,6 +4789,7 @@ en:
     name:fy: Key:name:fy
     name:ga: Key:name:ga
     name:gd: Key:name:gd
+    name:he: Key:name:he
     name:hi: Key:name:hi
     name:hu: Key:name:hu
     name:io: Key:name:io
@@ -4712,9 +4804,13 @@ en:
     name:ko_rm: Key:name:ko rm
     name:ku: Key:name:ku
     name:left: Key:name:left
+    name:left:ar: Key:name:left:ar
     name:left:fr: Key:name:left:fr
     name:lg: Key:name:lg
     name:mg: Key:name:mg
+    name:mk: Key:name:mk
+    name:ml: Key:name:ml
+    name:mr: Key:name:mr
     name:nds-nl: Key:name:nds-nl
     name:nl: Key:name:nl
     name:nn: Key:name:nn
@@ -4722,8 +4818,10 @@ en:
     name:nov: Key:name:nov
     name:pl: Key:name:pl
     name:prefix: Key:name:prefix
+    name:pronunciation: Key:name:pronunciation
     name:pt: Key:name:pt
     name:right: Key:name:right
+    name:right:ar: Key:name:right:ar
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:sc: Key:name:sc
@@ -4732,15 +4830,18 @@ en:
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
     name:ta: Key:name:ta
+    name:te: Key:name:te
     name:th: Key:name:th
     name:tok: Key:name:tok
     name:tr: Key:name:tr
     name:tzl: Key:name:tzl
     name:uk: Key:name:uk
     name:vo: Key:name:vo
+    name:zh: Key:name:zh
     name_1: Key:name 1
     narrow: Key:narrow
     nat_name: Key:nat name
+    nat_name:ar: Key:nat name:ar
     nat_ref: Key:nat ref
     natural: Key:natural
     naturbase: Key:naturbase
@@ -4762,6 +4863,7 @@ en:
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
+    non_existent_levels: Key:non existent levels
     noname: Key:noname
     noref: Key:noref
     not:nccod: Key:not:nccod
@@ -4781,10 +4883,13 @@ en:
     occurrence: Key:occurrence
     office: Key:office
     official_name: Key:official name
+    official_name:ar: Key:official name:ar
     official_ref: Key:official ref
     offshore: Key:offshore
     ois:fixme: Key:ois:fixme
     old_name: Key:old name
+    old_name:ar: Key:old name:ar
+    old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
     old_ref_legislative: Key:old ref legislative
@@ -4793,6 +4898,7 @@ en:
     oneway:bicycle: Key:oneway:bicycle
     oneway:moped: Key:oneway:moped
     onkz: Key:onkz
+    openbenches:id: Key:openbenches:id
     openfire: Key:openfire
     opening_date: Key:opening date
     opening_hours: Key:opening hours
@@ -4803,6 +4909,7 @@ en:
     operator: Key:operator
     operator:MNC: Key:operator:MNC
     operator:type: Key:operator:type
+    operator:wikipedia: Key:operator:wikipedia
     organic: Key:organic
     orientation: Key:orientation
     orienteering: Key:orienteering
@@ -4827,6 +4934,7 @@ en:
     owner: Key:owner
     ownership: Key:ownership
     par: Key:par
+    parish: Key:parish
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
@@ -4841,6 +4949,7 @@ en:
     parking:lane:right: Key:parking:lane:right
     parking:lane:side: Key:parking:lane:side
     passenger: Key:passenger
+    passenger_information_display: Key:passenger information display
     passenger_lines: Key:passenger lines
     passing_places: Key:passing places
     paved: Key:paved
@@ -4852,9 +4961,13 @@ en:
     payment:credit_cards: Key:payment:credit cards
     payment:electronic_purses: Key:payment:electronic purses
     payment:foo: Key:payment:foo
+    payment:mastercard: Key:payment:mastercard
+    payment:mir: Key:payment:mir
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
+    payment:pro100: Key:payment:pro100
     payment:u-key: Key:payment:u-key
+    payment:visa: Key:payment:visa
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
     photo: Key:photo
@@ -4869,6 +4982,7 @@ en:
     piste:type: Key:piste:type
     pk: Key:pk
     place: Key:place
+    place:PH: Key:place:PH
     place:fr: Key:place:fr
     place:ph: Key:place:ph
     place_name: Key:place name
@@ -4884,13 +4998,16 @@ en:
     plant:output:hot_water: Key:plant:output:hot water
     plant:output:steam: Key:plant:output:steam
     plant:output:vacuum: Key:plant:output:vacuum
+    plant:source: Key:plant:source
     plant_community: Key:plant community
     platforms: Key:platforms
     playground: Key:playground
+    'playground:': 'Key:playground:'
     playground:theme: Key:playground:theme
     point: Key:point
     police: Key:police
     population: Key:population
+    population_rank: Key:population rank
     post_box:type: Key:post box:type
     post_office:type: Key:post office:type
     postal_code: Key:postal code
@@ -4910,7 +5027,6 @@ en:
     produce: Key:produce
     product: Key:product
     proposed: Key:proposed
-    proprietor:motorcyclist: Key:proprietor:motorcyclist
     protect_class: Key:protect class
     protect_id: Key:protect id
     protected: Key:protected
@@ -4962,6 +5078,7 @@ en:
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:FR:42C: Key:ref:FR:42C
+    ref:FR:ARCEP: Key:ref:FR:ARCEP
     ref:FR:CEF: Key:ref:FR:CEF
     ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left
     ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
@@ -4970,6 +5087,7 @@ en:
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
+    ref:FR:Orange: Key:ref:FR:Orange
     ref:FR:PTT: Key:ref:FR:PTT
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
@@ -4977,6 +5095,7 @@ en:
     ref:FR:SIRET: Key:ref:FR:SIRET
     ref:FR:fantoir: Key:ref:FR:fantoir
     ref:FR:prix-carburants: Key:ref:FR:prix-carburants
+    ref:HU:edid: Key:ref:HU:edid
     ref:IFOPT: Key:ref:IFOPT
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
@@ -4989,6 +5108,7 @@ en:
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
     ref:UrbIS: Key:ref:UrbIS
+    ref:ar: Key:ref:ar
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
     ref:bag: Key:ref:bag
@@ -5002,11 +5122,13 @@ en:
     ref:edubase: Key:ref:edubase
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
+    ref:lor: Key:ref:lor
     ref:mhs: Key:ref:mhs
     ref:miaaddr: Key:ref:miaaddr
     ref:miabldg: Key:ref:miabldg
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:penndot: Key:ref:penndot
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
@@ -5026,7 +5148,9 @@ en:
     reference: Key:reference
     reference_point: Key:reference point
     reg_name: Key:reg name
+    reg_name:ar: Key:reg name:ar
     reg_ref: Key:reg ref
+    regelbau: Key:regelbau
     religion: Key:religion
     removed: Key:removed
     'removed:': 'Key:removed:'
@@ -5064,6 +5188,7 @@ en:
     route_ref:TECN: Key:route ref:TECN
     route_ref:TECX: Key:route ref:TECX
     royal_cypher: Key:royal cypher
+    royal_cypher:wikidata: Key:royal cypher:wikidata
     rtc_rate: Key:rtc rate
     rtsa_scale: Key:rtsa scale
     ruined: Key:ruined
@@ -5118,6 +5243,7 @@ en:
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
     seamark:light:exhibition: Key:seamark:light:exhibition
+    seamark:light:range: Key:seamark:light:range
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
@@ -5158,6 +5284,11 @@ en:
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle:diy: Key:service:bicycle:diy
+    service:bicycle:rental: Key:service:bicycle:rental
+    service:bicycle:repair: Key:service:bicycle:repair
+    service:bicycle:retail: Key:service:bicycle:retail
+    service:bicycle:second_hand: Key:service:bicycle:second hand
     service_times: Key:service times
     shade: Key:shade
     share_taxi: Key:share taxi
@@ -5167,6 +5298,7 @@ en:
     shooting: Key:shooting
     shop: Key:shop
     short_name: Key:short name
+    short_name:ar: Key:short name:ar
     shoulder: Key:shoulder
     shower: Key:shower
     side_road: Key:side road
@@ -5186,12 +5318,15 @@ en:
     smoking_hours: Key:smoking hours
     smoothness: Key:smoothness
     snowmobile: Key:snowmobile
+    snowmobile:sales: Key:snowmobile:sales
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     snowplowing:operator: Key:snowplowing:operator
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
+    socket: Key:socket
     sorting_name: Key:sorting name
+    sorting_name:ar: Key:sorting name:ar
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
@@ -5212,6 +5347,7 @@ en:
     species:FR: Key:species:FR
     species:cs: Key:species:cs
     species:de: Key:species:de
+    species:en: Key:species:en
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
@@ -5227,7 +5363,9 @@ en:
     start_date: Key:start date
     station: Key:station
     status: Key:status
+    step:contrast: Key:step:contrast
     step_count: Key:step count
+    steps: Key:steps
     stile: Key:stile
     stone_type: Key:stone type
     stop: Key:stop
@@ -5250,6 +5388,7 @@ en:
     surveillance:zone: Key:surveillance:zone
     survey:date: Key:survey:date
     sustrans_ref: Key:sustrans ref
+    swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
     tactile_map: Key:tactile map
@@ -5270,12 +5409,15 @@ en:
     target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
+    technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
     teryt: Key:teryt
+    teryt:simc: Key:teryt:simc
+    teryt:terc: Key:teryt:terc
     theme: Key:theme
     tickets:public_transport: Key:tickets:public transport
     tickets:public_transport_subscription: Key:tickets:public transport subscription
@@ -5289,6 +5431,7 @@ en:
     tiger:tlid: Key:tiger:tlid
     tiger:upload_uuid: Key:tiger:upload uuid
     timezone: Key:timezone
+    to: Key:to
     tobacco: Key:tobacco
     todo: Key:todo
     toilets: Key:toilets
@@ -5328,8 +5471,12 @@ en:
     tsunami:damage: Key:tsunami:damage
     tunnel: Key:tunnel
     turn: Key:turn
+    turn:backward: Key:turn:backward
+    turn:both_ways: Key:turn:both ways
+    turn:forward: Key:turn:forward
     turn:lanes: Key:turn:lanes
     turn:lanes:backward: Key:turn:lanes:backward
+    turn:lanes:both_ways: Key:turn:lanes:both ways
     turn:lanes:forward: Key:turn:lanes:forward
     turning_radius: Key:turning radius
     twitter: Key:twitter
@@ -5345,14 +5492,18 @@ en:
     url: Key:url
     url:restrictions: Key:url:restrictions
     usage: Key:usage
+    user_defined_other: Key:user defined other
+    utahagrc:parcelid: Key:utahagrc:parcelid
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
     verge: Key:verge
+    viewpoint: Key:viewpoint
     vine_row_orientation: Key:vine row orientation
     visibility: Key:visibility
     voltage: Key:voltage
+    wall:material: Key:wall:material
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
@@ -5370,6 +5521,7 @@ en:
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
+    wikipedia:ar: Key:wikipedia:ar
     wikipedia:en: Key:wikipedia:en
     winter_road: Key:winter road
     wires: Key:wires
@@ -5427,6 +5579,9 @@ en:
     advertising=tarp: Tag:advertising=tarp
     advertising=totem: Tag:advertising=totem
     advertising=wall_painting: Tag:advertising=wall painting
+    aerialway:drag_lift=j-bar: Tag:aerialway:drag lift=j-bar
+    aerialway:drag_lift=platter: Tag:aerialway:drag lift=platter
+    aerialway:drag_lift=t-bar: Tag:aerialway:drag lift=t-bar
     aerialway=cable_car: Tag:aerialway=cable car
     aerialway=canopy: Tag:aerialway=canopy
     aerialway=chair_lift: Tag:aerialway=chair lift
@@ -5474,6 +5629,7 @@ en:
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=architect_office: Tag:amenity=architect office
+    amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=artwork: Tag:amenity=artwork
     amenity=atm: Tag:amenity=atm
@@ -5541,6 +5697,7 @@ en:
     amenity=dojo: Tag:amenity=dojo
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driving_school: Tag:amenity=driving school
+    amenity=dryer: Tag:amenity=dryer
     amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
@@ -5562,6 +5719,7 @@ en:
     amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
+    amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=gambling: Tag:amenity=gambling
     amenity=game_feeding: Tag:amenity=game feeding
@@ -5571,6 +5729,7 @@ en:
     amenity=gym: Tag:amenity=gym
     amenity=gym_(Don't_use): Tag:amenity=gym (Don't use)
     amenity=harbourmaster: Tag:amenity=harbourmaster
+    amenity=hookah_lounge: Tag:amenity=hookah lounge
     amenity=hospice: Tag:amenity=hospice
     amenity=hospital: Tag:amenity=hospital
     amenity=hotel: Tag:amenity=hotel
@@ -5584,6 +5743,7 @@ en:
     amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=language_school: Tag:amenity=language school
     amenity=lavoir: Tag:amenity=lavoir
+    amenity=letter_box: Tag:amenity=letter box
     amenity=library: Tag:amenity=library
     amenity=life_ring: Tag:amenity=life ring
     amenity=lifeboat_station: Tag:amenity=lifeboat station
@@ -5591,6 +5751,7 @@ en:
     amenity=love_hotel: Tag:amenity=love hotel
     amenity=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
+    amenity=microwave: Tag:amenity=microwave
     amenity=milk_dispenser: Tag:amenity=milk dispenser
     amenity=mobile_library: Tag:amenity=mobile library
     amenity=monastery: Tag:amenity=monastery
@@ -5600,7 +5761,6 @@ en:
     amenity=motorcycle_rental: Tag:amenity=motorcycle rental
     amenity=music_school: Tag:amenity=music school
     amenity=music_venue: Tag:amenity=music venue
-    amenity=nameplate: Tag:amenity=nameplate
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursery: Tag:amenity=nursery
     amenity=nursing_home: Tag:amenity=nursing home
@@ -5609,11 +5769,13 @@ en:
     amenity=parking_entrance: Tag:amenity=parking entrance
     amenity=parking_space: Tag:amenity=parking space
     amenity=parkink: Tag:amenity=parkink
+    amenity=payment_centre: Tag:amenity=payment centre
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
+    amenity=polling_station: Tag:amenity=polling station
     amenity=post_box: Tag:amenity=post box
     amenity=post_office: Tag:amenity=post office
     amenity=preschool: Tag:amenity=preschool
@@ -5641,17 +5803,19 @@ en:
     amenity=sauna: Tag:amenity=sauna
     amenity=sceptic_tank: Tag:amenity=sceptic tank
     amenity=school: Tag:amenity=school
-    amenity=scout_hut: Tag:amenity=scout hut
+    amenity=seat: Tag:amenity=seat
     amenity=septic_tank: Tag:amenity=septic tank
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
+    amenity=ski_rental: Tag:amenity=ski rental
     amenity=ski_school: Tag:amenity=ski school
     amenity=smoking_area: Tag:amenity=smoking area
     amenity=social_centre: Tag:amenity=social centre
     amenity=social_facility: Tag:amenity=social facility
     amenity=spa: Tag:amenity=spa
     amenity=stables: Tag:amenity=stables
+    amenity=stool: Tag:amenity=stool
     amenity=street_lamp: Tag:amenity=street lamp
     amenity=street_light: Tag:amenity=street light
     amenity=stripclub: Tag:amenity=stripclub
@@ -5662,19 +5826,23 @@ en:
     amenity=taxi: Tag:amenity=taxi
     amenity=taxi_point: Tag:amenity=taxi point
     amenity=telephone: Tag:amenity=telephone
+    amenity=television: Tag:amenity=television
     amenity=theatre: Tag:amenity=theatre
     amenity=ticket_booth: Tag:amenity=ticket booth
     amenity=ticket_validator: Tag:amenity=ticket validator
+    amenity=toilet: Tag:amenity=toilet
     amenity=toilets: Tag:amenity=toilets
     amenity=townhall: Tag:amenity=townhall
     amenity=trolley_bay: Tag:amenity=trolley bay
     amenity=university: Tag:amenity=university
     amenity=vacuum_cleaner: Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: Tag:amenity=vehicle ramp
     amenity=vending_machine: Tag:amenity=vending machine
     amenity=veterinary: Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: Tag:amenity=veterinary pharmacy
     amenity=vivarium: Tag:amenity=vivarium
-    amenity=wash_center: Tag:amenity=wash center
+    amenity=washing_machine: Tag:amenity=washing machine
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
@@ -5689,6 +5857,8 @@ en:
     animal=school: Tag:animal=school
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
+    artwork_type=sculpture: Tag:artwork type=sculpture
+    artwork_type=statue: Tag:artwork type=statue
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=animal: Tag:attraction=animal
@@ -5747,7 +5917,6 @@ en:
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
     baseball=softball: Tag:baseball=softball
-    bath:type=onsen: Tag:bath:type=onsen
     bay=fjord: Tag:bay=fjord
     bicycle=designated: Tag:bicycle=designated
     bicycle=official: Tag:bicycle=official
@@ -5763,6 +5932,7 @@ en:
     boundary=historic: Tag:boundary=historic
     boundary=local_authority: Tag:boundary=local authority
     boundary=maritime: Tag:boundary=maritime
+    boundary=marker: Tag:boundary=marker
     boundary=military_district: Tag:boundary=military district
     boundary=national: Tag:boundary=national
     boundary=national_park: Tag:boundary=national park
@@ -5774,6 +5944,7 @@ en:
     boundary=vice_county: Tag:boundary=vice county
     boundary=water_protection_area: Tag:boundary=water protection area
     brand=KTM: Tag:brand=KTM
+    brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
     bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
     bridge:movable=lift: Tag:bridge:movable=lift
@@ -5830,6 +6001,7 @@ en:
     building=font: Tag:building=font
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
+    building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
     building=hangar: Tag:building=hangar
@@ -5842,6 +6014,7 @@ en:
     building=kindergarten: Tag:building=kindergarten
     building=kiosk: Tag:building=kiosk
     building=manufacture: Tag:building=manufacture
+    building=marquee: Tag:building=marquee
     building=mosque: Tag:building=mosque
     building=office: Tag:building=office
     building=parking: Tag:building=parking
@@ -5850,9 +6023,11 @@ en:
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
     building=retail: Tag:building=retail
+    building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
+    building=semi: Tag:building=semi
     building=service: Tag:building=service
     building=shed: Tag:building=shed
     building=shrine: Tag:building=shrine
@@ -5872,6 +6047,7 @@ en:
     building=transportation: Tag:building=transportation
     building=university: Tag:building=university
     building=warehouse: Tag:building=warehouse
+    building=water_tower: Tag:building=water tower
     building=yes: Tag:building=yes
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Tag:bunker type=munitions
@@ -5924,6 +6100,7 @@ en:
     craft=electrican: Tag:craft=electrican
     craft=electrician: Tag:craft=electrician
     craft=electronics_repair: Tag:craft=electronics repair
+    craft=engraver: Tag:craft=engraver
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
     craft=glaziery: Tag:craft=glaziery
@@ -5937,6 +6114,7 @@ en:
     craft=key_cutter: Tag:craft=key cutter
     craft=locksmith: Tag:craft=locksmith
     craft=metal_construction: Tag:craft=metal construction
+    craft=musical_instrument: Tag:craft=musical instrument
     craft=oil_mill: Tag:craft=oil mill
     craft=optician: Tag:craft=optician
     craft=organ_builder: Tag:craft=organ builder
@@ -5965,6 +6143,7 @@ en:
     craft=tailor: Tag:craft=tailor
     craft=tiler: Tag:craft=tiler
     craft=tinsmith: Tag:craft=tinsmith
+    craft=toolmaker: Tag:craft=toolmaker
     craft=turner: Tag:craft=turner
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
@@ -6049,6 +6228,8 @@ en:
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=dry_riser: Tag:emergency=dry riser
+    emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
@@ -6065,13 +6246,20 @@ en:
     emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=phone: Tag:emergency=phone
     emergency=ses_station: Tag:emergency=ses station
+    emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
     emergency=slipway: Tag:emergency=slipway
+    emergency=sprinkler: Tag:emergency=sprinkler
+    emergency=sprinkler_connection: Tag:emergency=sprinkler connection
+    emergency=standpipe: Tag:emergency=standpipe
     emergency=suction_point: Tag:emergency=suction point
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
+    emergency=wet_riser: Tag:emergency=wet riser
     emergency_service=technical: Tag:emergency service=technical
+    entrance=main: Tag:entrance=main
     entrance=staircase: Tag:entrance=staircase
+    entrance=yes: Tag:entrance=yes
     esperanto=esperanto: Tag:esperanto=esperanto
     estuary=yes: Tag:estuary=yes
     fast_food=cafeteria: Tag:fast food=cafeteria
@@ -6117,6 +6305,7 @@ en:
     generator:source=waste: Tag:generator:source=waste
     generator:source=wave: Tag:generator:source=wave
     generator:source=wind: Tag:generator:source=wind
+    generator:type=boiler: Tag:generator:type=boiler
     generator:type=combined_cycle: Tag:generator:type=combined cycle
     generator:type=francis_turbine: Tag:generator:type=francis turbine
     generator:type=gas_turbine: Tag:generator:type=gas turbine
@@ -6177,6 +6366,7 @@ en:
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
     healthcare=blood_donation: Tag:healthcare=blood donation
+    healthcare=laboratory: Tag:healthcare=laboratory
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
@@ -6186,7 +6376,6 @@ en:
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
     highway=cattle_grid: Tag:highway=cattle grid
-    highway=centre_line: Tag:highway=centre line
     highway=corridor: Tag:highway=corridor
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
@@ -6238,6 +6427,7 @@ en:
     highway=traffic_signals: Tag:highway=traffic signals
     highway=trail: Tag:highway=trail
     highway=trunk: Tag:highway=trunk
+    highway=trunk_link: Tag:highway=trunk link
     highway=turning_circle: Tag:highway=turning circle
     highway=turning_loop: Tag:highway=turning loop
     highway=unclassified: Tag:highway=unclassified
@@ -6409,6 +6599,7 @@ en:
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
+    landuse=turbary: Tag:landuse=turbary
     landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
@@ -6528,6 +6719,7 @@ en:
     man_made=dike: Tag:man made=dike
     man_made=dolphin: Tag:man made=dolphin
     man_made=dovecote: Tag:man made=dovecote
+    man_made=drinking_fountain: Tag:man made=drinking fountain
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=flagpole: Tag:man made=flagpole
@@ -6539,6 +6731,7 @@ en:
     man_made=goods_conveyor: Tag:man made=goods conveyor
     man_made=ground_station: Tag:man made=ground station
     man_made=groyne: Tag:man made=groyne
+    man_made=guy: Tag:man made=guy
     man_made=hot_water_tank: Tag:man made=hot water tank
     man_made=insect_hotel: Tag:man made=insect hotel
     man_made=jetty: Tag:man made=jetty
@@ -6595,6 +6788,8 @@ en:
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    manhole=drain: Tag:manhole=drain
+    manhole=telecom: Tag:manhole=telecom
     maxheight=default: Tag:maxheight=default
     medical=aed: Tag:medical=aed
     medical=witchdoctor: Tag:medical=witchdoctor
@@ -6650,22 +6845,33 @@ en:
     mooring=sbm: Tag:mooring=sbm
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
+    motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
+    motorcycle_friendly: Tag:motorcycle friendly
     name=7-Eleven: Tag:name=7-Eleven
+    name=BMO: Tag:name=BMO
     name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
     name=Bank_of_Montreal: Tag:name=Bank of Montreal
     name=Burger_King: Tag:name=Burger King
+    name=CIBC_Banking_Centre: Tag:name=CIBC Banking Centre
+    name=Costco: Tag:name=Costco
+    name=Dollarama: Tag:name=Dollarama
+    name=Domino's_Pizza: Tag:name=Domino's Pizza
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
+    name=Walmart: Tag:name=Walmart
+    name=Продукты: Tag:name=Продукты
+    natural=anthill: Tag:natural=anthill
     natural=arete: Tag:natural=arete
     natural=avalanche_dam: Tag:natural=avalanche dam
     natural=bare_rock: Tag:natural=bare rock
     natural=bay: Tag:natural=bay
     natural=beach: Tag:natural=beach
     natural=bedrock: Tag:natural=bedrock
+    natural=blowhole: Tag:natural=blowhole
     natural=breaker: Tag:natural=breaker
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
@@ -6681,7 +6887,6 @@ en:
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=fjord: Tag:natural=fjord
-    natural=fungus: Tag:natural=fungus
     natural=geothermal: Tag:natural=geothermal
     natural=geothermal_area: Tag:natural=geothermal area
     natural=geothermal_field: Tag:natural=geothermal field
@@ -6690,6 +6895,7 @@ en:
     natural=grassland: Tag:natural=grassland
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
+    natural=herb: Tag:natural=herb
     natural=hot_spring: Tag:natural=hot spring
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
@@ -6700,10 +6906,12 @@ en:
     natural=meadow: Tag:natural=meadow
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
+    natural=moss: Tag:natural=moss
     natural=mud: Tag:natural=mud
     natural=naled: Tag:natural=naled
     natural=palaeontological_site: Tag:natural=palaeontological site
     natural=peak: Tag:natural=peak
+    natural=plant: Tag:natural=plant
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
     natural=riverbed: Tag:natural=riverbed
@@ -6715,10 +6923,12 @@ en:
     natural=scrub: Tag:natural=scrub
     natural=shingle: Tag:natural=shingle
     natural=shoal: Tag:natural=shoal
+    natural=shrub: Tag:natural=shrub
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
     natural=strait: Tag:natural=strait
+    natural=termite_mound: Tag:natural=termite mound
     natural=tree: Tag:natural=tree
     natural=tree_row: Tag:natural=tree row
     natural=tundra: Tag:natural=tundra
@@ -6958,6 +7168,7 @@ en:
     office=therapist: Tag:office=therapist
     office=travel_agent: Tag:office=travel agent
     office=water_utility: Tag:office=water utility
+    office=yes: Tag:office=yes
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
     operator=Cambio: Tag:operator=Cambio
@@ -6970,6 +7181,7 @@ en:
     operator=independent: Tag:operator=independent
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
+    organ: Tag:organ
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking=surface: Tag:parking=surface
     passenger=international: Tag:passenger=international
@@ -6986,6 +7198,9 @@ en:
     pipeline=marker: Tag:pipeline=marker
     pipeline=substation: Tag:pipeline=substation
     pipeline=valve: Tag:pipeline=valve
+    piste:type=connection: Tag:piste:type=connection
+    piste:type=downhill: Tag:piste:type=downhill
+    piste:type=nordic: Tag:piste:type=nordic
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
     place=borough: Tag:place=borough
@@ -7024,6 +7239,7 @@ en:
     power=insulator: Tag:power=insulator
     power=line: Tag:power=line
     power=minor_line: Tag:power=minor line
+    power=outlet: Tag:power=outlet
     power=plant: Tag:power=plant
     power=pole: Tag:power=pole
     power=portal: Tag:power=portal
@@ -7079,6 +7295,7 @@ en:
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
+    railway=junction: Tag:railway=junction
     railway=level_crossing: Tag:railway=level crossing
     railway=light_rail: Tag:railway=light rail
     railway=milestone: Tag:railway=milestone
@@ -7112,12 +7329,14 @@ en:
     religion=hindu: Tag:religion=hindu
     religion=jain: Tag:religion=jain
     religion=jewish: Tag:religion=jewish
+    religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
     religion=pagan: Tag:religion=pagan
     religion=shinto: Tag:religion=shinto
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
+    rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
     residential=rural: Tag:residential=rural
     residential=university: Tag:residential=university
@@ -7487,13 +7706,13 @@ en:
     shop=*: Tag:shop=*
     shop=Alko: Tag:shop=Alko
     shop=_business_machines: Tag:shop= business machines
-    shop=accessories: Tag:shop=accessories
+    shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
     shop=antique: Tag:shop=antique
     shop=antiques: Tag:shop=antiques
-    shop=appliance: Tag:shop=appliance
     shop=art: Tag:shop=art
+    shop=atv: Tag:shop=atv
     shop=audiologist: Tag:shop=audiologist
     shop=auto_parts: Tag:shop=auto parts
     shop=baby_care: Tag:shop=baby care
@@ -7548,10 +7767,11 @@ en:
     shop=dive: Tag:shop=dive
     shop=diy: Tag:shop=diy
     shop=doityourself: Tag:shop=doityourself
+    shop=doors: Tag:shop=doors
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=e-cigarette: Tag:shop=e-cigarette
+    shop=edible_seeds: Tag:shop=edible seeds
     shop=electrical: Tag:shop=electrical
-    shop=electronic_cigarette: Tag:shop=electronic cigarette
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
     shop=erotic: Tag:shop=erotic
@@ -7612,6 +7832,7 @@ en:
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
+    shop=jetski: Tag:shop=jetski
     shop=jewellery: Tag:shop=jewellery
     shop=jewelry: Tag:shop=jewelry
     shop=junk_yard: Tag:shop=junk yard
@@ -7625,6 +7846,7 @@ en:
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
+    shop=marine: Tag:shop=marine
     shop=massage: Tag:shop=massage
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
@@ -7653,18 +7875,21 @@ en:
     shop=perfume: Tag:shop=perfume
     shop=perfumery: Tag:shop=perfumery
     shop=pet: Tag:shop=pet
+    shop=pet_grooming: Tag:shop=pet grooming
     shop=pharmacy: Tag:shop=pharmacy
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
     shop=piercing: Tag:shop=piercing
     shop=pottery: Tag:shop=pottery
+    shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
     shop=pyrotechnics: Tag:shop=pyrotechnics
     shop=pépinière: Tag:shop=pépinière
     shop=radiotechnics: Tag:shop=radiotechnics
     shop=religion: Tag:shop=religion
     shop=rental: Tag:shop=rental
+    shop=robot: Tag:shop=robot
     shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
@@ -7673,12 +7898,15 @@ en:
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=ski: Tag:shop=ski
+    shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
     shop=souvenir: Tag:shop=souvenir
     shop=spare_parts: Tag:shop=spare parts
     shop=spices: Tag:shop=spices
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
+    shop=storage_rental: Tag:shop=storage rental
     shop=supermarket: Tag:shop=supermarket
     shop=swimming_pool: Tag:shop=swimming pool
     shop=systembolaget: Tag:shop=systembolaget
@@ -7698,6 +7926,7 @@ en:
     shop=vacant: Tag:shop=vacant
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
+    shop=vehicles: Tag:shop=vehicles
     shop=video: Tag:shop=video
     shop=video_games: Tag:shop=video games
     shop=watches: Tag:shop=watches
@@ -7716,7 +7945,6 @@ en:
     sign=yes: Tag:sign=yes
     signal_station=bridge: Tag:signal station=bridge
     signal_station=control: Tag:signal station=control
-    signal_station=danger: Tag:signal station=danger
     signal_station=distress: Tag:signal station=distress
     signal_station=firing: Tag:signal station=firing
     signal_station=ice: Tag:signal station=ice
@@ -7749,6 +7977,7 @@ en:
     social_facility=day_care: Tag:social facility=day care
     social_facility=food_bank: Tag:social facility=food bank
     social_facility=group_home: Tag:social facility=group home
+    social_facility=hospice: Tag:social facility=hospice
     social_facility=nursing_home: Tag:social facility=nursing home
     social_facility=outreach: Tag:social facility=outreach
     social_facility=shelter: Tag:social facility=shelter
@@ -7762,6 +7991,7 @@ en:
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
     source=ACT2016: Tag:source=ACT2016
     source=ACTMapiRoads: Tag:source=ACTMapiRoads
@@ -7774,6 +8004,7 @@ en:
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
@@ -7861,6 +8092,7 @@ en:
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
     sport=racquet: Tag:sport=racquet
+    sport=rc_car: Tag:sport=rc car
     sport=roller_skating: Tag:sport=roller skating
     sport=rowing: Tag:sport=rowing
     sport=rugby: Tag:sport=rugby
@@ -7981,6 +8213,7 @@ en:
     tunnel=culvert: Tag:tunnel=culvert
     two_sided=yes: Tag:two sided=yes
     type=AutoPASS: Tag:type=AutoPASS
+    type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
     type=defaults: Tag:type=defaults
     type=fixed_point: Tag:type=fixed point
@@ -8039,13 +8272,17 @@ en:
     vending=umbrellas: Tag:vending=umbrellas
     vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
+    vending_machine=fuel: Tag:vending machine=fuel
     wall=dry_stone: Tag:wall=dry stone
     wall=no: Tag:wall=no
+    wall=noise_barrier: Tag:wall=noise barrier
     wall=seawall: Tag:wall=seawall
     wall=training_wall: Tag:wall=training wall
+    waste=dog_excrement: Tag:waste=dog excrement
     water=intermittent: Tag:water=intermittent
     water=lake: Tag:water=lake
     water=lock: Tag:water=lock
+    water=reservoir: Tag:water=reservoir
     water=tidal: Tag:water=tidal
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
@@ -8084,6 +8321,7 @@ en:
     wetland=fen: Tag:wetland=fen
     wetland=mangrove: Tag:wetland=mangrove
     wetland=marsh: Tag:wetland=marsh
+    wetland=mud: Tag:wetland=mud
     wetland=reedbed: Tag:wetland=reedbed
     wetland=saltern: Tag:wetland=saltern
     wetland=saltmarsh: Tag:wetland=saltmarsh
@@ -8105,12 +8343,31 @@ en:
 eo:
   key:
     esperanto: Eo:Key:esperanto
+    esperanto=yes: Eo:Key:esperanto=yes
 es:
   key:
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
+    abandoned:railway: ES:Key:abandoned:railway
     abutters: ES:Key:abutters
     addr: ES:Key:addr
+    addr:city: ES:Key:addr:city
+    addr:country: ES:Key:addr:country
+    addr:district: ES:Key:addr:district
+    addr:flats: ES:Key:addr:flats
+    addr:full: ES:Key:addr:full
+    addr:hamlet: ES:Key:addr:hamlet
+    addr:housename: ES:Key:addr:housename
+    addr:housenumber: ES:Key:addr:housenumber
+    addr:inclusion: ES:Key:addr:inclusion
+    addr:interpolation: ES:Key:addr:interpolation
+    addr:place: ES:Key:addr:place
+    addr:postcode: ES:Key:addr:postcode
+    addr:province: ES:Key:addr:province
+    addr:state: ES:Key:addr:state
+    addr:street: ES:Key:addr:street
+    addr:subdistrict: ES:Key:addr:subdistrict
+    addr:suburb: ES:Key:addr:suburb
     aerialway: ES:Key:aerialway
     amenity: ES:Key:amenity
     artist_name: ES:Key:artist name
@@ -8136,6 +8393,8 @@ es:
     cuisine: ES:Key:cuisine
     cutting: ES:Key:cutting
     cycleway: ES:Key:cycleway
+    cycleway:left: ES:Key:cycleway:left
+    cycleway:right: ES:Key:cycleway:right
     denotation: ES:Key:denotation
     description: ES:Key:description
     destination: ES:Key:destination
@@ -8143,6 +8402,7 @@ es:
     diet:*: ES:Key:diet:*
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
+    disused:railway: ES:Key:disused:railway
     embankment: ES:Key:embankment
     emergency: ES:Key:emergency
     end_date: ES:Key:end date
@@ -8154,6 +8414,9 @@ es:
     fixme: ES:Key:fixme
     footway: ES:Key:footway
     ford: ES:Key:ford
+    fuel:diesel_G2: ES:Key:fuel:diesel G2
+    generator:output: ES:Key:generator:output
+    generator:source: ES:Key:generator:source
     geological: ES:Key:geological
     government: ES:Key:government
     grassland: ES:Key:grassland
@@ -8162,6 +8425,7 @@ es:
     heritage: ES:Key:heritage
     highway: ES:Key:highway
     historic: ES:Key:historic
+    historic:civilization: ES:Key:historic:civilization
     image: ES:Key:image
     indoor: ES:Key:indoor
     intermittent: ES:Key:intermittent
@@ -8174,10 +8438,12 @@ es:
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
     local_ref: ES:Key:local ref
+    locale: ES:Key:locale
     man_made: ES:Key:man made
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
     material: ES:Key:material
+    maxheight: ES:Key:maxheight
     maxspeed: ES:Key:maxspeed
     memorial: ES:Key:memorial
     monitoring:galileo: ES:Key:monitoring:galileo
@@ -8191,11 +8457,13 @@ es:
     noexit: ES:Key:noexit
     note: ES:Key:note
     office: ES:Key:office
+    oneway: ES:Key:oneway
     opening_hours: ES:Key:opening hours
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
     origin: ES:Key:origin
+    osmc:symbol: ES:Key:osmc:symbol
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     parking: ES:Key:parking
@@ -8205,8 +8473,11 @@ es:
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
+    population: ES:Key:population
+    power: ES:Key:power
     prepayment: ES:Key:prepayment
     prepayment:*: ES:Key:prepayment:*
+    priority: ES:Key:priority
     product: ES:Key:product
     proposed: ES:Key:proposed
     public_bookcase:type: ES:Key:public bookcase:type
@@ -8218,6 +8489,7 @@ es:
     ref:bic: ES:Key:ref:bic
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
+    ref:isil: ES:Key:ref:isil
     religion: ES:Key:religion
     resource: ES:Key:resource
     roof:direction: ES:Key:roof:direction
@@ -8228,13 +8500,16 @@ es:
     rungs: ES:Key:rungs
     sac_scale: ES:Key:sac scale
     safety_rope: ES:Key:safety rope
+    seasonal: ES:Key:seasonal
     shop: ES:Key:shop
     sidewalk: ES:Key:sidewalk
+    site_type: ES:Key:site type
     social_facility: ES:Key:social facility
     source: ES:Key:source
     species: ES:Key:species
     sport: ES:Key:sport
     stars: ES:Key:stars
+    support: ES:Key:support
     surface: ES:Key:surface
     symbol: ES:Key:symbol
     takeaway: ES:Key:takeaway
@@ -8244,8 +8519,12 @@ es:
     traffic_calming: ES:Key:traffic calming
     traffic_sign: ES:Key:traffic sign
     traffic_signals: ES:Key:traffic signals
+    traffic_signals:direction: ES:Key:traffic signals:direction
+    trolley_wire: ES:Key:trolley wire
+    trolleybus: ES:Key:trolleybus
     tunnel: ES:Key:tunnel
     turn: ES:Key:turn
+    type: ES:Key:type
     url: ES:Key:url
     water: ES:Key:water
     waterway: ES:Key:waterway
@@ -8254,16 +8533,21 @@ es:
     wholesale: ES:Key:wholesale
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
+    wikipedia: ES:Key:wikipedia
   tag:
+    abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
     access=customers: ES:Tag:access=customers
     aerialway=cable_car: ES:Tag:aerialway=cable car
     aerialway=gondola: ES:Tag:aerialway=gondola
     aerialway=station: ES:Tag:aerialway=station
+    aeroway=apron: ES:Tag:aeroway=apron
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
+    airmark=beacon: ES:Tag:airmark=beacon
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
+    amenity=archive: ES:Tag:amenity=archive
     amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
     amenity=bank: ES:Tag:amenity=bank
@@ -8284,6 +8568,7 @@ es:
     amenity=crematorium: ES:Tag:amenity=crematorium
     amenity=crypt: ES:Tag:amenity=crypt
     amenity=dentist: ES:Tag:amenity=dentist
+    amenity=device_charging_station: ES:Tag:amenity=device charging station
     amenity=doctors: ES:Tag:amenity=doctors
     amenity=drinking_water: ES:Tag:amenity=drinking water
     amenity=driving_school: ES:Tag:amenity=driving school
@@ -8291,6 +8576,7 @@ es:
     amenity=events_venue: ES:Tag:amenity=events venue
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
+    amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
     amenity=grave_yard: ES:Tag:amenity=grave yard
@@ -8306,12 +8592,15 @@ es:
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=parking: ES:Tag:amenity=parking
+    amenity=parking_space: ES:Tag:amenity=parking space
+    amenity=payment_centre: ES:Tag:amenity=payment centre
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=pharmacy: ES:Tag:amenity=pharmacy
     amenity=photo_booth: ES:Tag:amenity=photo booth
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=police: ES:Tag:amenity=police
     amenity=prison_camp: ES:Tag:amenity=prison camp
+    amenity=pub: ES:Tag:amenity=pub
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
     amenity=recycling: ES:Tag:amenity=recycling
@@ -8319,11 +8608,13 @@ es:
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=school: ES:Tag:amenity=school
     amenity=shelter: ES:Tag:amenity=shelter
+    amenity=shower: ES:Tag:amenity=shower
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=taxi: ES:Tag:amenity=taxi
     amenity=theatre: ES:Tag:amenity=theatre
     amenity=townhall: ES:Tag:amenity=townhall
     amenity=university: ES:Tag:amenity=university
+    amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
     amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
     amenity=waste_basket: ES:Tag:amenity=waste basket
@@ -8347,11 +8638,14 @@ es:
     barrier=rope: ES:Tag:barrier=rope
     barrier=swing_gate: ES:Tag:barrier=swing gate
     barrier=wall: ES:Tag:barrier=wall
+    bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     boundary=national_park: ES:Tag:boundary=national park
     boundary=political: ES:Tag:boundary=political
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
     bridge=aqueduct: ES:Tag:bridge=aqueduct
+    building=apartments: ES:Tag:building=apartments
+    building=barn: ES:Tag:building=barn
     building=brewery: ES:Tag:building=brewery
     building=bungalow: ES:Tag:building=bungalow
     building=cathedral: ES:Tag:building=cathedral
@@ -8361,6 +8655,9 @@ es:
     building=commercial: ES:Tag:building=commercial
     building=construction: ES:Tag:building=construction
     building=farm: ES:Tag:building=farm
+    building=garage: ES:Tag:building=garage
+    building=garages: ES:Tag:building=garages
+    building=grandstand: ES:Tag:building=grandstand
     building=greenhouse: ES:Tag:building=greenhouse
     building=hospital: ES:Tag:building=hospital
     building=house: ES:Tag:building=house
@@ -8386,10 +8683,12 @@ es:
     craft=clockmaker: ES:Tag:craft=clockmaker
     craft=electrician: ES:Tag:craft=electrician
     craft=handicraft: ES:Tag:craft=handicraft
+    craft=jeweller: ES:Tag:craft=jeweller
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
     craft=photographer: ES:Tag:craft=photographer
     craft=plumber: ES:Tag:craft=plumber
+    craft=tiler: ES:Tag:craft=tiler
     craft=watchmaker: ES:Tag:craft=watchmaker
     cycleway=lane: ES:Tag:cycleway=lane
     cycleway=share_busway: ES:Tag:cycleway=share busway
@@ -8403,18 +8702,31 @@ es:
     emergency=ses_station: ES:Tag:emergency=ses station
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
+    generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
+    generator:method=thermal: ES:Tag:generator:method=thermal
+    generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
+    generator:source=nuclear: ES:Tag:generator:source=nuclear
+    generator:source=solar: ES:Tag:generator:source=solar
+    generator:source=wind: ES:Tag:generator:source=wind
+    generator:type=horizontal_axis: ES:Tag:generator:type=horizontal axis
+    generator:type=solar_photovoltaic_panel: ES:Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
+    generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
     geological=moraine: ES:Tag:geological=moraine
     government=register_office: ES:Tag:government=register office
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
     highway=byway: ES:Tag:highway=byway
+    highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
     highway=elevator: ES:Tag:highway=elevator
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
     highway=living_street: ES:Tag:highway=living street
+    highway=milestone: ES:Tag:highway=milestone
     highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
@@ -8442,32 +8754,42 @@ es:
     historic=heritage: ES:Tag:historic=heritage
     historic=memorial: ES:Tag:historic=memorial
     historic=milestone: ES:Tag:historic=milestone
+    historic=pillory: ES:Tag:historic=pillory
     historic=ruins: ES:Tag:historic=ruins
     historic=tomb: ES:Tag:historic=tomb
+    historic=wayside_shrine: ES:Tag:historic=wayside shrine
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
     information=tactile_map: ES:Tag:information=tactile map
     internet_access=wlan: ES:Tag:internet access=wlan
     junction=roundabout: ES:Tag:junction=roundabout
+    landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
     landuse=apiary: ES:Tag:landuse=apiary
+    landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
     landuse=construction: ES:Tag:landuse=construction
+    landuse=depot: ES:Tag:landuse=depot
     landuse=farmland: ES:Tag:landuse=farmland
+    landuse=farmyard: ES:Tag:landuse=farmyard
     landuse=forest: ES:Tag:landuse=forest
+    landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
     landuse=greenfield: ES:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
     landuse=industrial: ES:Tag:landuse=industrial
+    landuse=landfill: ES:Tag:landuse=landfill
+    landuse=meadow: ES:Tag:landuse=meadow
     landuse=orchard: ES:Tag:landuse=orchard
     landuse=quarry: ES:Tag:landuse=quarry
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
     landuse=reservoir: ES:Tag:landuse=reservoir
     landuse=residential: ES:Tag:landuse=residential
     landuse=salt_pond: ES:Tag:landuse=salt pond
+    landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
     leaf_type=broadleaved: ES:Tag:leaf type=broadleaved
@@ -8494,22 +8816,32 @@ es:
     leisure=playground: ES:Tag:leisure=playground
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=water_park: ES:Tag:leisure=water park
+    man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
     man_made=beehive: ES:Tag:man made=beehive
     man_made=bridge: ES:Tag:man made=bridge
+    man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
     man_made=embankment: ES:Tag:man made=embankment
+    man_made=flagpole: ES:Tag:man made=flagpole
     man_made=mast: ES:Tag:man made=mast
+    man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
     man_made=pier: ES:Tag:man made=pier
+    man_made=power_wind: ES:Tag:man made=power wind
+    man_made=pumping_rig: ES:Tag:man made=pumping rig
+    man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=storage_tank: ES:Tag:man made=storage tank
+    man_made=survey_point: ES:Tag:man made=survey point
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
     man_made=water_well: ES:Tag:man made=water well
     man_made=water_works: ES:Tag:man made=water works
     man_made=watermill: ES:Tag:man made=watermill
+    man_made=wildlife_opening: ES:Tag:man made=wildlife opening
+    man_made=windpump: ES:Tag:man made=windpump
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
     memorial=obelisk: ES:Tag:memorial=obelisk
@@ -8519,6 +8851,9 @@ es:
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=naval_base: ES:Tag:military=naval base
+    military=training_area: ES:Tag:military=training area
+    name=Dollarama: ES:Tag:name=Dollarama
     natural=arete: ES:Tag:natural=arete
     natural=bare_rock: ES:Tag:natural=bare rock
     natural=bay: ES:Tag:natural=bay
@@ -8527,6 +8862,7 @@ es:
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
     natural=fell: ES:Tag:natural=fell
+    natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
     natural=grassland: ES:Tag:natural=grassland
     natural=heath: ES:Tag:natural=heath
@@ -8550,7 +8886,9 @@ es:
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    office=advertising_agency: ES:Tag:office=advertising agency
     office=association: ES:Tag:office=association
+    office=company: ES:Tag:office=company
     office=foundation: ES:Tag:office=foundation
     office=government: ES:Tag:office=government
     office=insurance: ES:Tag:office=insurance
@@ -8558,23 +8896,30 @@ es:
     office=logistics: ES:Tag:office=logistics
     office=moving_company: ES:Tag:office=moving company
     office=newspaper: ES:Tag:office=newspaper
+    office=ngo: ES:Tag:office=ngo
+    office=notary: ES:Tag:office=notary
     office=occupational_safety: ES:Tag:office=occupational safety
     office=private_investigator: ES:Tag:office=private investigator
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
     office=tax: ES:Tag:office=tax
+    office=therapist: ES:Tag:office=therapist
     passenger=yes: ES:Tag:passenger=yes
     place=borough: ES:Tag:place=borough
+    place=city: ES:Tag:place=city
     place=city_block: ES:Tag:place=city block
     place=hamlet: ES:Tag:place=hamlet
     place=island: ES:Tag:place=island
     place=islet: ES:Tag:place=islet
+    place=isolated_dwelling: ES:Tag:place=isolated dwelling
     place=neighbourhood: ES:Tag:place=neighbourhood
     place=plot: ES:Tag:place=plot
     place=square: ES:Tag:place=square
     place=suburb: ES:Tag:place=suburb
     place=village: ES:Tag:place=village
+    power=generator: ES:Tag:power=generator
+    power=heliostat: ES:Tag:power=heliostat
     power=pole: ES:Tag:power=pole
     power=tower: ES:Tag:power=tower
     public_transport=platform: ES:Tag:public transport=platform
@@ -8589,15 +8934,22 @@ es:
     railway=level_crossing: ES:Tag:railway=level crossing
     railway=milestone: ES:Tag:railway=milestone
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
+    railway=subway: ES:Tag:railway=subway
+    railway=subway_entrance: ES:Tag:railway=subway entrance
     railway=yard: ES:Tag:railway=yard
     route=bus: ES:Tag:route=bus
+    service=crossover: ES:Tag:service=crossover
     service=parking_aisle: ES:Tag:service=parking aisle
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=baby_goods: ES:Tag:shop=baby goods
     shop=bakery: ES:Tag:shop=bakery
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
+    shop=bicycle: ES:Tag:shop=bicycle
+    shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
     shop=butcher: ES:Tag:shop=butcher
+    shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
@@ -8606,6 +8958,7 @@ es:
     shop=confectionery: ES:Tag:shop=confectionery
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
+    shop=craft: ES:Tag:shop=craft
     shop=doityourself: ES:Tag:shop=doityourself
     shop=electrical: ES:Tag:shop=electrical
     shop=florist: ES:Tag:shop=florist
@@ -8614,10 +8967,12 @@ es:
     shop=garden_centre: ES:Tag:shop=garden centre
     shop=gift: ES:Tag:shop=gift
     shop=greengrocer: ES:Tag:shop=greengrocer
+    shop=hairdresser: ES:Tag:shop=hairdresser
     shop=hardware: ES:Tag:shop=hardware
     shop=hearing_aids: ES:Tag:shop=hearing aids
     shop=houseware: ES:Tag:shop=houseware
     shop=ice_cream: ES:Tag:shop=ice cream
+    shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
     shop=laundry: ES:Tag:shop=laundry
     shop=locksmith: ES:Tag:shop=locksmith
@@ -8629,23 +8984,31 @@ es:
     shop=paint: ES:Tag:shop=paint
     shop=party: ES:Tag:shop=party
     shop=pastry: ES:Tag:shop=pastry
+    shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=pet: ES:Tag:shop=pet
     shop=seafood: ES:Tag:shop=seafood
+    shop=shoes: ES:Tag:shop=shoes
     shop=sports: ES:Tag:shop=sports
     shop=stationery: ES:Tag:shop=stationery
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
     shop=ticket: ES:Tag:shop=ticket
+    shop=tiles: ES:Tag:shop=tiles
     shop=toys: ES:Tag:shop=toys
     shop=trade: ES:Tag:shop=trade
     shop=tyres: ES:Tag:shop=tyres
+    shop=variety_store: ES:Tag:shop=variety store
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
+    shop=water: ES:Tag:shop=water
+    shop=window_blind: ES:Tag:shop=window blind
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     source:geometry=Bing: ES:Tag:source:geometry=Bing
+    sport=boules: ES:Tag:sport=boules
     sport=cycling: ES:Tag:sport=cycling
     sport=equestrian: ES:Tag:sport=equestrian
     sport=futsal: ES:Tag:sport=futsal
+    sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=shooting: ES:Tag:sport=shooting
     sport=soccer: ES:Tag:sport=soccer
@@ -8659,6 +9022,7 @@ es:
     tourism=picnic_site: ES:Tag:tourism=picnic site
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
+    traffic_calming=island: ES:Tag:traffic calming=island
     tunnel=culvert: ES:Tag:tunnel=culvert
     type=public_transport: ES:Tag:type=public transport
     vending=bread: ES:Tag:vending=bread
@@ -8666,7 +9030,9 @@ es:
     vending=flowers: ES:Tag:vending=flowers
     vending=ice_cream: ES:Tag:vending=ice cream
     vending=milk: ES:Tag:vending=milk
+    vending=parking_tickets: ES:Tag:vending=parking tickets
     wall=dry_stone: ES:Tag:wall=dry stone
+    water=reservoir: ES:Tag:water=reservoir
     waterway=dam: ES:Tag:waterway=dam
     waterway=ditch: ES:Tag:waterway=ditch
     waterway=milestone: ES:Tag:waterway=milestone
@@ -8692,6 +9058,7 @@ et:
 fa:
   key:
     highway: Fa:Key:highway
+    level: Fa:Key:level
     name: FA:Key:name
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
@@ -8825,6 +9192,7 @@ fr:
     books: FR:Key:books
     boundary: FR:Key:boundary
     brand: FR:Key:brand
+    brewery: FR:Key:brewery
     bridge: FR:Key:bridge
     bridge:movable: FR:Key:bridge:movable
     building: FR:Key:building
@@ -8837,6 +9205,7 @@ fr:
     capacity:disabled: FR:Key:capacity:disabled
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
+    club: FR:Key:club
     collection_times: FR:Key:collection times
     color: FR:Key:color
     colour: FR:Key:colour
@@ -8887,6 +9256,8 @@ fr:
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
+    garden:style: FR:Key:garden:style
+    garden:type: FR:Key:garden:type
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:battery_charging: FR:Key:generator:output:battery charging
@@ -8902,6 +9273,7 @@ fr:
     generator:plant: FR:Key:generator:plant
     generator:source: FR:Key:generator:source
     geological: FR:Key:geological
+    healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
     high_water_mark: FR:Key:high water mark
@@ -8951,7 +9323,6 @@ fr:
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
-    motorcycle_friendly: FR:Key:motorcycle friendly
     mountain_pass: FR:Key:mountain pass
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
@@ -8998,11 +9369,13 @@ fr:
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
+    ref:FR:Orange: FR:Key:ref:FR:Orange
     ref:FR:PTT: FR:Key:ref:FR:PTT
     ref:FR:RTE: FR:Key:ref:FR:RTE
     ref:FR:RTE_nom: FR:Key:ref:FR:RTE nom
@@ -9022,6 +9395,7 @@ fr:
     roof:material: FR:Key:roof:material
     ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
+    salt: FR:Key:salt
     sanitary_dump_station: FR:Key:sanitary dump station
     seamark:fixme: FR:Key:seamark:fixme
     second_hand: FR:Key:second hand
@@ -9031,6 +9405,7 @@ fr:
     shop: FR:Key:shop
     short_name: FR:Key:short name
     sides: FR:Key:sides
+    sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
     social_facility: FR:Key:social facility
@@ -9040,6 +9415,9 @@ fr:
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     sport: FR:Key:sport
+    step:condition: FR:Key:step:condition
+    step:contrast: FR:Key:step:contrast
+    step_count: FR:Key:step count
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
     switch: FR:Key:switch
@@ -9047,6 +9425,7 @@ fr:
     takeaway: FR:Key:takeaway
     tidal: FR:Key:tidal
     timezone: FR:Key:timezone
+    toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
     tracktype: FR:Key:tracktype
@@ -9077,6 +9456,7 @@ fr:
     wikipedia: FR:Key:wikipedia
     xmas:feature: FR:Key:xmas:feature
   tag:
+    Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
     abandoned=yes: FR:Tag:abandoned=yes
     access=private: FR:Tag:access=private
@@ -9097,7 +9477,6 @@ fr:
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
     amenity=bank: FR:Tag:amenity=bank
-    amenity=bar: FR:Tag:amenity=bar
     amenity=bench: FR:Tag:amenity=bench
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
@@ -9119,6 +9498,7 @@ fr:
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=doctors: FR:Tag:amenity=doctors
     amenity=drinking_water: FR:Tag:amenity=drinking water
+    amenity=driving_school: FR:Tag:amenity=driving school
     amenity=embassy: FR:Tag:amenity=embassy
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=fire_station: FR:Tag:amenity=fire station
@@ -9129,6 +9509,7 @@ fr:
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=kindergarten: FR:Tag:amenity=kindergarten
+    amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
     amenity=marketplace: FR:Tag:amenity=marketplace
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
@@ -9163,6 +9544,7 @@ fr:
     amenity=veterinary: FR:Tag:amenity=veterinary
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
+    amenity=weighbridge: FR:Tag:amenity=weighbridge
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=city_wall: FR:Tag:barrier=city wall
@@ -9173,6 +9555,7 @@ fr:
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
     barrier=select_acces: FR:Tag:barrier=select acces
     barrier=wall: FR:Tag:barrier=wall
+    brand=Trilib': FR:Tag:brand=Trilib'
     building=apartments: FR:Tag:building=apartments
     building=barn: FR:Tag:building=barn
     building=cabin: FR:Tag:building=cabin
@@ -9191,15 +9574,24 @@ fr:
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
     building=shed: FR:Tag:building=shed
+    building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
     building=sty: FR:Tag:building=sty
+    building=terrace: FR:Tag:building=terrace
+    building=warehouse: FR:Tag:building=warehouse
+    club=sport: FR:Tag:club=sport
+    construction=yes: FR:Tag:construction=yes
     craft=beekeeper: FR:Tag:craft=beekeeper
     craft=brewery: FR:Tag:craft=brewery
     craft=builder: FR:Tag:craft=builder
+    craft=cabinet_maker: FR:Tag:craft=cabinet maker
     craft=car_repair: FR:Tag:craft=car repair
+    craft=joiner: FR:Tag:craft=joiner
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
+    cycleway=opposite: FR:Tag:cycleway=opposite
+    cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     disused=yes: FR:Tag:disused=yes
     emergency=aed: FR:Tag:emergency=aed
     emergency=defibrillator: FR:Tag:emergency=defibrillator
@@ -9315,6 +9707,8 @@ fr:
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=fishing: FR:Tag:leisure=fishing
+    leisure=fitness_centre: FR:Tag:leisure=fitness centre
+    leisure=garden: FR:Tag:leisure=garden
     leisure=golf_course: FR:Tag:leisure=golf course
     leisure=hackerspace: FR:Tag:leisure=hackerspace
     leisure=horse_riding: FR:Tag:leisure=horse riding
@@ -9365,6 +9759,7 @@ fr:
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
+    natural=sinkhole: FR:Tag:natural=sinkhole
     natural=spring: FR:Tag:natural=spring
     natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
@@ -9382,10 +9777,13 @@ fr:
     place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
     place=neighbourhood: FR:Tag:place=neighbourhood
+    place=square: FR:Tag:place=square
     place=suburb: FR:Tag:place=suburb
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
     power=cable: FR:Tag:power=cable
+    power=compensator: FR:Tag:power=compensator
+    power=converter: FR:Tag:power=converter
     power=generator: FR:Tag:power=generator
     power=heliostat: FR:Tag:power=heliostat
     power=insulator: FR:Tag:power=insulator
@@ -9432,6 +9830,7 @@ fr:
     route=coach: FR:Tag:route=coach
     route=piste: FR:Tag:route=piste
     service=alley: FR:Tag:service=alley
+    service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
     shop=alcohol: FR:Tag:shop=alcohol
@@ -9447,6 +9846,7 @@ fr:
     shop=boutique: FR:Tag:shop=boutique
     shop=butcher: FR:Tag:shop=butcher
     shop=car: FR:Tag:shop=car
+    shop=car_parts: FR:Tag:shop=car parts
     shop=car_repair: FR:Tag:shop=car repair
     shop=carpet: FR:Tag:shop=carpet
     shop=charity: FR:Tag:shop=charity
@@ -9462,7 +9862,6 @@ fr:
     shop=doityourself: FR:Tag:shop=doityourself
     shop=electronics: FR:Tag:shop=electronics
     shop=farm: FR:Tag:shop=farm
-    shop=fashion: FR:Tag:shop=fashion
     shop=florist: FR:Tag:shop=florist
     shop=frame: FR:Tag:shop=frame
     shop=frozen_food: FR:Tag:shop=frozen food
@@ -9500,6 +9899,7 @@ fr:
     sport=climbing: FR:Tag:sport=climbing
     sport=free_flying: FR:Tag:sport=free flying
     sport=shooting: FR:Tag:sport=shooting
+    sport=soccer: FR:Tag:sport=soccer
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
@@ -9573,6 +9973,9 @@ ht:
     pump: Ht:Key:pump
 hu:
   key:
+    HU:hu-go:length: Hu:Key:HU:hu-go:length
+    HU:hu-go:milestone: Hu:Key:HU:hu-go:milestone
+    HU:hu-go:road: Hu:Key:HU:hu-go:road
     aerialway: Hu:Key:aerialway
     aeroway: Hu:Key:aeroway
     amenity: Hu:Key:amenity
@@ -9595,6 +9998,7 @@ hu:
     office: Hu:Key:office
     place: Hu:Key:place
     railway: Hu:Key:railway
+    ref:HU:edid: Hu:Key:ref:HU:edid
     shop: Hu:Key:shop
     surface: Hu:Key:surface
     symbol: Hu:Key:symbol
@@ -9627,12 +10031,14 @@ it:
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
     building: IT:Key:building
+    building:levels: IT:Key:building:levels
     cables: IT:Key:cables
     circuits: IT:Key:circuits
     communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
     construction: IT:Key:construction
     contact:facebook: IT:Key:contact:facebook
     craft: IT:Key:craft
+    crossing: IT:Key:crossing
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
@@ -9648,6 +10054,7 @@ it:
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
     ford: IT:Key:ford
+    garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
     highway: IT:Key:highway
@@ -9691,6 +10098,7 @@ it:
     ref: IT:Key:ref
     ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
+    residential: IT:Key:residential
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
@@ -9750,10 +10158,12 @@ it:
     barrier=retaining_wall: IT:Tag:barrier=retaining wall
     barrier=toll_booth: IT:Tag:barrier=toll booth
     building=residential: IT:Tag:building=residential
+    building=train_station: IT:Tag:building=train station
     emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
+    highway=crossing: IT:Tag:highway=crossing
     highway=cycleway: IT:Tag:highway=cycleway
     highway=footway: IT:Tag:highway=footway
     highway=ford: IT:Tag:highway=ford
@@ -9814,11 +10224,15 @@ it:
     power=tower: IT:Tag:power=tower
     power=transformer: IT:Tag:power=transformer
     railway=level_crossing: IT:Tag:railway=level crossing
+    residential=rural: IT:Tag:residential=rural
+    residential=urban: IT:Tag:residential=urban
     route=bus: IT:Tag:route=bus
+    route=railway: IT:Tag:route=railway
     shop=alcohol: IT:Tag:shop=alcohol
     shop=bakery: IT:Tag:shop=bakery
     shop=beauty: IT:Tag:shop=beauty
     shop=beverages: IT:Tag:shop=beverages
+    shop=bicycle: IT:Tag:shop=bicycle
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
     shop=chemist: IT:Tag:shop=chemist
@@ -9833,6 +10247,7 @@ it:
     shop=hifi: IT:Tag:shop=hifi
     shop=kiosk: IT:Tag:shop=kiosk
     shop=mall: IT:Tag:shop=mall
+    shop=motorcycle: IT:Tag:shop=motorcycle
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=seafood: IT:Tag:shop=seafood
@@ -10025,6 +10440,7 @@ ja:
     distance: JA:Key:distance
     disused: JA:Key:disused
     'disused:': 'JA:Key:disused:'
+    dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
     drink: JA:Key:drink
     drinking_water: JA:Key:drinking water
@@ -10046,6 +10462,7 @@ ja:
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
     facebook: JA:Key:facebook
+    fair_trade: JA:Key:fair trade
     fax: JA:Key:fax
     fee: JA:Key:fee
     fence_type: JA:Key:fence type
@@ -10233,6 +10650,7 @@ ja:
     old_ref: JA:Key:old ref
     oneway: JA:Key:oneway
     oneway:bicycle: JA:Key:oneway:bicycle
+    openfire: JA:Key:openfire
     opening_date: JA:Key:opening date
     opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
@@ -10290,6 +10708,7 @@ ja:
     religion: JA:Key:religion
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
+    reservation: JA:Key:reservation
     residential: JA:Key:residential
     resource: JA:Key:resource
     right: JA:Key:right
@@ -10309,6 +10728,7 @@ ja:
     seamark:type: JA:Key:seamark:type
     second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
+    self_service: JA:Key:self service
     service: JA:Key:service
     service_times: JA:Key:service times
     shelter: JA:Key:shelter
@@ -10339,6 +10759,7 @@ ja:
     source:ref: JA:Key:source:ref
     source_ref: JA:Key:source ref
     species: JA:Key:species
+    speech_output: JA:Key:speech output
     sport: JA:Key:sport
     stars: JA:Key:stars
     start_date: JA:Key:start date
@@ -10892,6 +11313,7 @@ ja:
     highway=street_lamp: JA:Tag:highway=street lamp
     highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
+    highway=traffic_mirror: JA:Tag:highway=traffic mirror
     highway=traffic_signals: JA:Tag:highway=traffic signals
     highway=trunk: JA:Tag:highway=trunk
     highway=turning_circle: JA:Tag:highway=turning circle
@@ -10957,6 +11379,7 @@ ja:
     information=map: JA:Tag:information=map
     information=tactile_map: JA:Tag:information=tactile map
     information=tactile_model: JA:Tag:information=tactile model
+    junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
     landuse=allotments: JA:Tag:landuse=allotments
@@ -11180,6 +11603,7 @@ ja:
     place=isolated_dwelling: JA:Tag:place=isolated dwelling
     place=locality: JA:Tag:place=locality
     place=neighbourhood: JA:Tag:place=neighbourhood
+    place=quarter: JA:Tag:place=quarter
     place=square: JA:Tag:place=square
     place=state: JA:Tag:place=state
     place=suburb: JA:Tag:place=suburb
@@ -11336,6 +11760,7 @@ ja:
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
     shop=health: JA:Tag:shop=health
+    shop=health_food: JA:Tag:shop=health food
     shop=hearing_aids: JA:Tag:shop=hearing aids
     shop=herbalist: JA:Tag:shop=herbalist
     shop=hifi: JA:Tag:shop=hifi
@@ -11434,6 +11859,7 @@ ja:
     sport=billiards: JA:Tag:sport=billiards
     sport=golf: JA:Tag:sport=golf
     sport=judo: JA:Tag:sport=judo
+    sport=motocross: JA:Tag:sport=motocross
     sport=multi: JA:Tag:sport=multi
     sport=sailing: JA:Tag:sport=sailing
     sport=shooting: JA:Tag:sport=shooting
@@ -11470,6 +11896,7 @@ ja:
     tourism=wine_cellar: JA:Tag:tourism=wine cellar
     tourism=zoo: JA:Tag:tourism=zoo
     traffic_calming=island: JA:Tag:traffic calming=island
+    traffic_calming=table: JA:Tag:traffic calming=table
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
     tunnel=culvert: JA:Tag:tunnel=culvert
     type=public_transport: JA:Tag:type=public transport
@@ -11523,6 +11950,7 @@ ko:
     amenity: Ko:Key:amenity
     ele: Ko:Key:ele
     highway: Ko:Key:highway
+    name: Ko:Key:name
     wikipedia: Ko:Key:wikipedia
   tag:
     aerialway=cable_car: Ko:Tag:aerialway=cable car
@@ -11548,6 +11976,10 @@ ms:
     highway=tertiary: Ms:Tag:highway=tertiary
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
+ne:
+  tag:
+    landuse=meadow: Ne:Tag:landuse=meadow
+    natural=scrub: Ne:Tag:natural=scrub
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
@@ -11562,7 +11994,9 @@ nl:
     backrest: NL:Key:backrest
     barrier: NL:Key:barrier
     bench: NL:Key:bench
+    bicycle_road: NL:Key:bicycle road
     building: NL:Key:building
+    circumference: NL:Key:circumference
     color: NL:Key:color
     colour: NL:Key:colour
     craft: NL:Key:craft
@@ -11574,12 +12008,14 @@ nl:
     fenced: NL:Key:fenced
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
+    leaf_cycle: NL:Key:leaf cycle
     leisure: NL:Key:leisure
     man_made: NL:Key:man made
     military: NL:Key:military
     name: NL:Key:name
     natural: NL:Key:natural
     office: NL:Key:office
+    place: NL:Key:place
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
     religion: NL:Key:religion
@@ -11609,7 +12045,9 @@ nl:
     barrier=hedge: NL:Tag:barrier=hedge
     barrier=sump_buster: NL:Tag:barrier=sump buster
     building=entrance: NL:Tag:building=entrance
+    footway=sidewalk: NL:Tag:footway=sidewalk
     healthcare=blood_donation: NL:Tag:healthcare=blood donation
+    highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
@@ -11620,6 +12058,7 @@ nl:
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
     man_made=windmill: NL:Tag:man made=windmill
+    natural=tree: NL:Tag:natural=tree
     public_transport=platform: NL:Tag:public transport=platform
     public_transport=station: NL:Tag:public transport=station
     public_transport=stop_area: NL:Tag:public transport=stop area
@@ -11745,6 +12184,7 @@ pl:
     end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
     est_width: Pl:Key:est width
+    fair_trade: Pl:Key:fair trade
     fee: Pl:Key:fee
     fence_type: Pl:Key:fence type
     fire_boundary: Pl:Key:fire boundary
@@ -11832,6 +12272,7 @@ pl:
     oneway: Pl:Key:oneway
     opening_hours: Pl:Key:opening hours
     operator: Pl:Key:operator
+    organic: Pl:Key:organic
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
@@ -11951,6 +12392,7 @@ pl:
     amenity=drinking_water: Pl:Tag:amenity=drinking water
     amenity=driving_school: Pl:Tag:amenity=driving school
     amenity=events_venue: Pl:Tag:amenity=events venue
+    amenity=fast_food: Pl:Tag:amenity=fast food
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
@@ -11961,6 +12403,7 @@ pl:
     amenity=ice_cream: Pl:Tag:amenity=ice cream
     amenity=marketplace: Pl:Tag:amenity=marketplace
     amenity=mortuary: Pl:Tag:amenity=mortuary
+    amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
@@ -11969,10 +12412,12 @@ pl:
     amenity=post_box: Pl:Tag:amenity=post box
     amenity=post_office: Pl:Tag:amenity=post office
     amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=restaurant: Pl:Tag:amenity=restaurant
     amenity=school: Pl:Tag:amenity=school
     amenity=shelter: Pl:Tag:amenity=shelter
     amenity=social_facility: Pl:Tag:amenity=social facility
     amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=vehicle_ramp: Pl:Tag:amenity=vehicle ramp
     amenity=vending_machine: Pl:Tag:amenity=vending machine
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
     amenity=water_point: Pl:Tag:amenity=water point
@@ -12101,6 +12546,7 @@ pl:
     craft=brewery: Pl:Tag:craft=brewery
     craft=builder: Pl:Tag:craft=builder
     craft=cabinet_maker: Pl:Tag:craft=cabinet maker
+    craft=engraver: Pl:Tag:craft=engraver
     craft=grinding_mill: Pl:Tag:craft=grinding mill
     craft=oil_mill: Pl:Tag:craft=oil mill
     craft=sawmill: Pl:Tag:craft=sawmill
@@ -12124,6 +12570,7 @@ pl:
     footway=sidewalk: Pl:Tag:footway=sidewalk
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
+    healthcare=laboratory: Pl:Tag:healthcare=laboratory
     highway=bridleway: Pl:Tag:highway=bridleway
     highway=bus_stop: Pl:Tag:highway=bus stop
     highway=crossing: Pl:Tag:highway=crossing
@@ -12144,6 +12591,7 @@ pl:
     highway=road: Pl:Tag:highway=road
     highway=secondary: Pl:Tag:highway=secondary
     highway=service: Pl:Tag:highway=service
+    highway=services: Pl:Tag:highway=services
     highway=speed_camera: Pl:Tag:highway=speed camera
     highway=steps: Pl:Tag:highway=steps
     highway=stop: Pl:Tag:highway=stop
@@ -12263,6 +12711,7 @@ pl:
     leisure=water_park: Pl:Tag:leisure=water park
     leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
     man_made=adit: Pl:Tag:man made=adit
+    man_made=beacon: Pl:Tag:man made=beacon
     man_made=beehive: Pl:Tag:man made=beehive
     man_made=bunker_silo: Pl:Tag:man made=bunker silo
     man_made=chimney: Pl:Tag:man made=chimney
@@ -12272,7 +12721,11 @@ pl:
     man_made=embankment: Pl:Tag:man made=embankment
     man_made=gasometer: Pl:Tag:man made=gasometer
     man_made=insect_hotel: Pl:Tag:man made=insect hotel
+    man_made=kiln: Pl:Tag:man made=kiln
+    man_made=mineshaft: Pl:Tag:man made=mineshaft
     man_made=monitoring_station: Pl:Tag:man made=monitoring station
+    man_made=petroleum_well: Pl:Tag:man made=petroleum well
+    man_made=pumping_station: Pl:Tag:man made=pumping station
     man_made=reservoir_covered: Pl:Tag:man made=reservoir covered
     man_made=silo: Pl:Tag:man made=silo
     man_made=storage_tank: Pl:Tag:man made=storage tank
@@ -12334,6 +12787,7 @@ pl:
     natural=wetland: Pl:Tag:natural=wetland
     natural=wood: Pl:Tag:natural=wood
     office=government: Pl:Tag:office=government
+    office=logistics: Pl:Tag:office=logistics
     office=religion: Pl:Tag:office=religion
     place=allotments: Pl:Tag:place=allotments
     place=city: Pl:Tag:place=city
@@ -12358,6 +12812,7 @@ pl:
     public_transport=stop_area: Pl:Tag:public transport=stop area
     public_transport=stop_position: Pl:Tag:public transport=stop position
     railway=abandoned: Pl:Tag:railway=abandoned
+    railway=buffer_stop: Pl:Tag:railway=buffer stop
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
     railway=level_crossing: Pl:Tag:railway=level crossing
@@ -12376,6 +12831,7 @@ pl:
     service=siding: Pl:Tag:service=siding
     service=spur: Pl:Tag:service=spur
     service=yard: Pl:Tag:service=yard
+    shop=agrarian: Pl:Tag:shop=agrarian
     shop=baby_goods: Pl:Tag:shop=baby goods
     shop=bakery: Pl:Tag:shop=bakery
     shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
@@ -12398,9 +12854,11 @@ pl:
     shop=funeral_directors: Pl:Tag:shop=funeral directors
     shop=furniture: Pl:Tag:shop=furniture
     shop=garden_centre: Pl:Tag:shop=garden centre
+    shop=gas: Pl:Tag:shop=gas
     shop=general: Pl:Tag:shop=general
     shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
+    shop=herbalist: Pl:Tag:shop=herbalist
     shop=houseware: Pl:Tag:shop=houseware
     shop=ice_cream: Pl:Tag:shop=ice cream
     shop=kiosk: Pl:Tag:shop=kiosk
@@ -12412,6 +12870,7 @@ pl:
     shop=tea: Pl:Tag:shop=tea
     shop=ticket: Pl:Tag:shop=ticket
     shop=travel_agency: Pl:Tag:shop=travel agency
+    shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
     shop=variety_store: Pl:Tag:shop=variety store
     shop=yes: Pl:Tag:shop=yes
@@ -12449,7 +12908,11 @@ pl:
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
+    vending=bottle_return: Pl:Tag:vending=bottle return
+    vending=candles: Pl:Tag:vending=candles
     wall=noise_barrier: Pl:Tag:wall=noise barrier
+    water=lake: Pl:Tag:water=lake
+    water=lock: Pl:Tag:water=lock
     waterway=boat_lift: Pl:Tag:waterway=boat lift
     waterway=boatyard: Pl:Tag:waterway=boatyard
     waterway=brook: Pl:Tag:waterway=brook
@@ -12482,6 +12945,7 @@ pl:
     wetland=fen: Pl:Tag:wetland=fen
     wetland=mangrove: Pl:Tag:wetland=mangrove
     wetland=marsh: Pl:Tag:wetland=marsh
+    wetland=mud: Pl:Tag:wetland=mud
     wetland=reedbed: Pl:Tag:wetland=reedbed
     wetland=saltern: Pl:Tag:wetland=saltern
     wetland=saltmarsh: Pl:Tag:wetland=saltmarsh
@@ -12516,6 +12980,10 @@ pt:
     bridge: Pt:Key:bridge
     building: Pt:Key:building
     building:levels: Pt:Key:building:levels
+    building:material: Pt:Key:building:material
+    building:min_level: Pt:Key:building:min level
+    building:part: Pt:Key:building:part
+    button_operated: Pt:Key:button operated
     cables: Pt:Key:cables
     cep: Pt:Key:cep
     construction: Pt:Key:construction
@@ -12527,8 +12995,10 @@ pt:
     cuisine: Pt:Key:cuisine
     cutting: Pt:Key:cutting
     cycleway: Pt:Key:cycleway
+    denomination: Pt:Key:denomination
     diet:*: Pt:Key:diet:*
     dispensing: Pt:Key:dispensing
+    display: Pt:Key:display
     driving_side: Pt:Key:driving side
     ele: Pt:Key:ele
     electrified: Pt:Key:electrified
@@ -12540,6 +13010,8 @@ pt:
     frequency: Pt:Key:frequency
     generator:method: Pt:Key:generator:method
     geological: Pt:Key:geological
+    happy_hours: Pt:Key:happy hours
+    height: Pt:Key:height
     heritage: Pt:Key:heritage
     hgv: Pt:Key:hgv
     highway: Pt:Key:highway
@@ -12549,9 +13021,11 @@ pt:
     icao: Pt:Key:icao
     ice_road: Pt:Key:ice road
     incline: Pt:Key:incline
+    industrial: Pt:Key:industrial
     intermittent: Pt:Key:intermittent
     internet_access: Pt:Key:internet access
     is_in: Pt:Key:is in
+    jetski:sales: Pt:Key:jetski:sales
     junction: Pt:Key:junction
     landuse: Pt:Key:landuse
     lanes: Pt:Key:lanes
@@ -12568,6 +13042,9 @@ pt:
     maxspeed: Pt:Key:maxspeed
     maxweight: Pt:Key:maxweight
     military: Pt:Key:military
+    min_height: Pt:Key:min height
+    monitoring:bicycle: Pt:Key:monitoring:bicycle
+    monitoring:traffic: Pt:Key:monitoring:traffic
     mooring: Pt:Key:mooring
     motorcar: Pt:Key:motorcar
     motorcycle: Pt:Key:motorcycle
@@ -12580,6 +13057,7 @@ pt:
     noname: Pt:Key:noname
     office: Pt:Key:office
     oneway: Pt:Key:oneway
+    opening_hours: Pt:Key:opening hours
     operator: Pt:Key:operator
     overtaking: Pt:Key:overtaking
     passing_places: Pt:Key:passing places
@@ -12589,11 +13067,14 @@ pt:
     power: Pt:Key:power
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
+    public_transport:version: Pt:Key:public transport:version
     railway: Pt:Key:railway
+    recording: Pt:Key:recording
     ref: Pt:Key:ref
     ref:bag: Pt:Key:ref:bag
     ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
+    roof:material: Pt:Key:roof:material
     route: Pt:Key:route
     sac_scale: Pt:Key:sac scale
     seamark: Pt:Key:seamark
@@ -12601,6 +13082,7 @@ pt:
     second_hand: Pt:Key:second hand
     segregated: Pt:Key:segregated
     service: Pt:Key:service
+    service_times: Pt:Key:service times
     shop: Pt:Key:shop
     sidewalk: Pt:Key:sidewalk
     ski: Pt:Key:ski
@@ -12614,12 +13096,15 @@ pt:
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
     traffic_calming: Pt:Key:traffic calming
+    traffic_signals: Pt:Key:traffic signals
     trail_visibility: Pt:Key:trail visibility
     tunnel: Pt:Key:tunnel
     type: Pt:Key:type
     usage: Pt:Key:usage
     voltage: Pt:Key:voltage
+    water: Pt:Key:water
     waterway: Pt:Key:waterway
+    wetland: Pt:Key:wetland
     wheelchair: Pt:Key:wheelchair
     wikidata: Pt:Key:wikidata
     wikipedia: Pt:Key:wikipedia
@@ -12650,7 +13135,9 @@ pt:
     amenity=bench: Pt:Tag:amenity=bench
     amenity=bicycle_parking: Pt:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Pt:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Pt:Tag:amenity=bicycle repair station
     amenity=biergarten: Pt:Tag:amenity=biergarten
+    amenity=blood_donation: Pt:Tag:amenity=blood donation
     amenity=brothel: Pt:Tag:amenity=brothel
     amenity=bureau_de_change: Pt:Tag:amenity=bureau de change
     amenity=bus_station: Pt:Tag:amenity=bus station
@@ -12658,6 +13145,8 @@ pt:
     amenity=car_rental: Pt:Tag:amenity=car rental
     amenity=car_sharing: Pt:Tag:amenity=car sharing
     amenity=car_wash: Pt:Tag:amenity=car wash
+    amenity=casino: Pt:Tag:amenity=casino
+    amenity=charging_station: Pt:Tag:amenity=charging station
     amenity=cinema: Pt:Tag:amenity=cinema
     amenity=clinic: Pt:Tag:amenity=clinic
     amenity=clock: Pt:Tag:amenity=clock
@@ -12667,7 +13156,9 @@ pt:
     amenity=crematorium: Pt:Tag:amenity=crematorium
     amenity=dentist: Pt:Tag:amenity=dentist
     amenity=doctors: Pt:Tag:amenity=doctors
+    amenity=dojo: Pt:Tag:amenity=dojo
     amenity=drinking_water: Pt:Tag:amenity=drinking water
+    amenity=driving_school: Pt:Tag:amenity=driving school
     amenity=embassy: Pt:Tag:amenity=embassy
     amenity=emergency_phone: Pt:Tag:amenity=emergency phone
     amenity=ev_charging: Pt:Tag:amenity=ev charging
@@ -12678,21 +13169,29 @@ pt:
     amenity=food_court: Pt:Tag:amenity=food court
     amenity=fountain: Pt:Tag:amenity=fountain
     amenity=fuel: Pt:Tag:amenity=fuel
+    amenity=gambling: Pt:Tag:amenity=gambling
     amenity=grave_yard: Pt:Tag:amenity=grave yard
     amenity=grit_bin: Pt:Tag:amenity=grit bin
     amenity=hospital: Pt:Tag:amenity=hospital
     amenity=hunting_stand: Pt:Tag:amenity=hunting stand
     amenity=ice_cream: Pt:Tag:amenity=ice cream
+    amenity=internet_cafe: Pt:Tag:amenity=internet cafe
     amenity=kindergarten: Pt:Tag:amenity=kindergarten
+    amenity=language_school: Pt:Tag:amenity=language school
+    amenity=letter_box: Pt:Tag:amenity=letter box
     amenity=library: Pt:Tag:amenity=library
     amenity=love_hotel: Pt:Tag:amenity=love hotel
     amenity=marketplace: Pt:Tag:amenity=marketplace
+    amenity=motorcycle_parking: Pt:Tag:amenity=motorcycle parking
+    amenity=music_school: Pt:Tag:amenity=music school
     amenity=nightclub: Pt:Tag:amenity=nightclub
     amenity=nursing_home: Pt:Tag:amenity=nursing home
     amenity=parking: Pt:Tag:amenity=parking
     amenity=parking_entrance: Pt:Tag:amenity=parking entrance
+    amenity=parking_space: Pt:Tag:amenity=parking space
     amenity=pharmacy: Pt:Tag:amenity=pharmacy
     amenity=place_of_worship: Pt:Tag:amenity=place of worship
+    amenity=planetarium: Pt:Tag:amenity=planetarium
     amenity=police: Pt:Tag:amenity=police
     amenity=post_box: Pt:Tag:amenity=post box
     amenity=post_office: Pt:Tag:amenity=post office
@@ -12709,6 +13208,7 @@ pt:
     amenity=social_facility: Pt:Tag:amenity=social facility
     amenity=stripclub: Pt:Tag:amenity=stripclub
     amenity=studio: Pt:Tag:amenity=studio
+    amenity=swingerclub: Pt:Tag:amenity=swingerclub
     amenity=taxi: Pt:Tag:amenity=taxi
     amenity=telephone: Pt:Tag:amenity=telephone
     amenity=theatre: Pt:Tag:amenity=theatre
@@ -12719,12 +13219,20 @@ pt:
     amenity=veterinary: Pt:Tag:amenity=veterinary
     amenity=waste_basket: Pt:Tag:amenity=waste basket
     amenity=waste_disposal: Pt:Tag:amenity=waste disposal
+    amenity=water_point: Pt:Tag:amenity=water point
     amenity=watering_place: Pt:Tag:amenity=watering place
+    barrier=bollard: Pt:Tag:barrier=bollard
+    barrier=cattle_grid: Pt:Tag:barrier=cattle grid
     barrier=city_wall: Pt:Tag:barrier=city wall
     barrier=ditch: Pt:Tag:barrier=ditch
     barrier=fence: Pt:Tag:barrier=fence
+    barrier=full-height_turnstile: Pt:Tag:barrier=full-height turnstile
     barrier=gate: Pt:Tag:barrier=gate
+    barrier=guard_rail: Pt:Tag:barrier=guard rail
+    barrier=hampshire_gate: Pt:Tag:barrier=hampshire gate
+    barrier=handrail: Pt:Tag:barrier=handrail
     barrier=hedge: Pt:Tag:barrier=hedge
+    barrier=kerb: Pt:Tag:barrier=kerb
     barrier=kissing_gate: Pt:Tag:barrier=kissing gate
     barrier=lift_gate: Pt:Tag:barrier=lift gate
     barrier=retaining_wall: Pt:Tag:barrier=retaining wall
@@ -12737,6 +13245,7 @@ pt:
     boundary=political: Pt:Tag:boundary=political
     boundary=protected_area: Pt:Tag:boundary=protected area
     bridge=viaduct: Pt:Tag:bridge=viaduct
+    building=church: Pt:Tag:building=church
     building=commercial: Pt:Tag:building=commercial
     building=house: Pt:Tag:building=house
     building=residential: Pt:Tag:building=residential
@@ -12799,6 +13308,7 @@ pt:
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
+    healthcare=blood_donation: Pt:Tag:healthcare=blood donation
     highway=bridleway: Pt:Tag:highway=bridleway
     highway=bus_guideway: Pt:Tag:highway=bus guideway
     highway=bus_stop: Pt:Tag:highway=bus stop
@@ -12836,13 +13346,19 @@ pt:
     highway=trunk: Pt:Tag:highway=trunk
     highway=turning_circle: Pt:Tag:highway=turning circle
     highway=unclassified: Pt:Tag:highway=unclassified
+    historic=aircraft: Pt:Tag:historic=aircraft
     historic=archaeological_site: Pt:Tag:historic=archaeological site
     historic=battlefield: Pt:Tag:historic=battlefield
     historic=boundary_stone: Pt:Tag:historic=boundary stone
+    historic=cannon: Pt:Tag:historic=cannon
     historic=castle: Pt:Tag:historic=castle
     historic=city_gate: Pt:Tag:historic=city gate
+    historic=fort: Pt:Tag:historic=fort
+    historic=locomotive: Pt:Tag:historic=locomotive
     historic=memorial: Pt:Tag:historic=memorial
+    historic=milestone: Pt:Tag:historic=milestone
     historic=monument: Pt:Tag:historic=monument
+    historic=pillory: Pt:Tag:historic=pillory
     historic=ruins: Pt:Tag:historic=ruins
     historic=wayside_cross: Pt:Tag:historic=wayside cross
     historic=wayside_shrine: Pt:Tag:historic=wayside shrine
@@ -12912,6 +13428,7 @@ pt:
     man_made=petroleum_well: Pt:Tag:man made=petroleum well
     man_made=pier: Pt:Tag:man made=pier
     man_made=pipeline: Pt:Tag:man made=pipeline
+    man_made=pumping_station: Pt:Tag:man made=pumping station
     man_made=reservoir_covered: Pt:Tag:man made=reservoir covered
     man_made=surveillance: Pt:Tag:man made=surveillance
     man_made=survey_point: Pt:Tag:man made=survey point
@@ -12940,9 +13457,11 @@ pt:
     natural=heath: Pt:Tag:natural=heath
     natural=mud: Pt:Tag:natural=mud
     natural=peak: Pt:Tag:natural=peak
+    natural=reef: Pt:Tag:natural=reef
     natural=sand: Pt:Tag:natural=sand
     natural=scree: Pt:Tag:natural=scree
     natural=scrub: Pt:Tag:natural=scrub
+    natural=shoal: Pt:Tag:natural=shoal
     natural=spring: Pt:Tag:natural=spring
     natural=stone: Pt:Tag:natural=stone
     natural=tree: Pt:Tag:natural=tree
@@ -12966,6 +13485,7 @@ pt:
     office=ngo: Pt:Tag:office=ngo
     office=quango: Pt:Tag:office=quango
     office=research: Pt:Tag:office=research
+    office=surveyor: Pt:Tag:office=surveyor
     office=telecommunication: Pt:Tag:office=telecommunication
     office=travel_agent: Pt:Tag:office=travel agent
     place=city: Pt:Tag:place=city
@@ -12992,9 +13512,11 @@ pt:
     power=station: Pt:Tag:power=station
     power=sub_station: Pt:Tag:power=sub station
     power=tower: Pt:Tag:power=tower
+    railway=abandoned: Pt:Tag:railway=abandoned
     railway=buffer_stop: Pt:Tag:railway=buffer stop
     railway=crossing: Pt:Tag:railway=crossing
     railway=derail: Pt:Tag:railway=derail
+    railway=disused: Pt:Tag:railway=disused
     railway=funicular: Pt:Tag:railway=funicular
     railway=halt: Pt:Tag:railway=halt
     railway=level_crossing: Pt:Tag:railway=level crossing
@@ -13026,24 +13548,33 @@ pt:
     shop=art: Pt:Tag:shop=art
     shop=açaí: Pt:Tag:shop=açaí
     shop=baby_goods: Pt:Tag:shop=baby goods
+    shop=bag: Pt:Tag:shop=bag
     shop=bakery: Pt:Tag:shop=bakery
     shop=bathroom_furnishing: Pt:Tag:shop=bathroom furnishing
     shop=beauty: Pt:Tag:shop=beauty
     shop=bed: Pt:Tag:shop=bed
     shop=beverages: Pt:Tag:shop=beverages
     shop=bicycle: Pt:Tag:shop=bicycle
+    shop=bookmaker: Pt:Tag:shop=bookmaker
     shop=books: Pt:Tag:shop=books
     shop=boutique: Pt:Tag:shop=boutique
+    shop=brewing_supplies: Pt:Tag:shop=brewing supplies
     shop=butcher: Pt:Tag:shop=butcher
     shop=car: Pt:Tag:shop=car
+    shop=car_parts: Pt:Tag:shop=car parts
     shop=car_repair: Pt:Tag:shop=car repair
     shop=charity: Pt:Tag:shop=charity
+    shop=cheese: Pt:Tag:shop=cheese
     shop=chemist: Pt:Tag:shop=chemist
+    shop=chocolate: Pt:Tag:shop=chocolate
     shop=clothes: Pt:Tag:shop=clothes
+    shop=coffee: Pt:Tag:shop=coffee
+    shop=communication: Pt:Tag:shop=communication
     shop=computer: Pt:Tag:shop=computer
     shop=confectionery: Pt:Tag:shop=confectionery
     shop=convenience: Pt:Tag:shop=convenience
     shop=copyshop: Pt:Tag:shop=copyshop
+    shop=cosmetics: Pt:Tag:shop=cosmetics
     shop=curtain: Pt:Tag:shop=curtain
     shop=deli: Pt:Tag:shop=deli
     shop=department_store: Pt:Tag:shop=department store
@@ -13057,6 +13588,7 @@ pt:
     shop=fishing: Pt:Tag:shop=fishing
     shop=florist: Pt:Tag:shop=florist
     shop=frame: Pt:Tag:shop=frame
+    shop=fuel: Pt:Tag:shop=fuel
     shop=funeral_directors: Pt:Tag:shop=funeral directors
     shop=furnace: Pt:Tag:shop=furnace
     shop=furniture: Pt:Tag:shop=furniture
@@ -13067,15 +13599,19 @@ pt:
     shop=glaziery: Pt:Tag:shop=glaziery
     shop=greengrocer: Pt:Tag:shop=greengrocer
     shop=hairdresser: Pt:Tag:shop=hairdresser
+    shop=hairdresser_supply: Pt:Tag:shop=hairdresser supply
     shop=hardware: Pt:Tag:shop=hardware
     shop=hearing_aids: Pt:Tag:shop=hearing aids
     shop=hifi: Pt:Tag:shop=hifi
     shop=hunting: Pt:Tag:shop=hunting
+    shop=ice_cream: Pt:Tag:shop=ice cream
     shop=interior_decoration: Pt:Tag:shop=interior decoration
+    shop=jetski: Pt:Tag:shop=jetski
     shop=jewelry: Pt:Tag:shop=jewelry
     shop=kiosk: Pt:Tag:shop=kiosk
     shop=kitchen: Pt:Tag:shop=kitchen
     shop=laundry: Pt:Tag:shop=laundry
+    shop=leather: Pt:Tag:shop=leather
     shop=locksmith: Pt:Tag:shop=locksmith
     shop=lottery: Pt:Tag:shop=lottery
     shop=mall: Pt:Tag:shop=mall
@@ -13090,28 +13626,37 @@ pt:
     shop=organic: Pt:Tag:shop=organic
     shop=outdoor: Pt:Tag:shop=outdoor
     shop=paint: Pt:Tag:shop=paint
+    shop=pasta: Pt:Tag:shop=pasta
     shop=pastry: Pt:Tag:shop=pastry
     shop=pawnbroker: Pt:Tag:shop=pawnbroker
     shop=perfumery: Pt:Tag:shop=perfumery
     shop=pet: Pt:Tag:shop=pet
+    shop=photo: Pt:Tag:shop=photo
     shop=pyrotechnics: Pt:Tag:shop=pyrotechnics
     shop=radiotechnics: Pt:Tag:shop=radiotechnics
+    shop=scuba_diving: Pt:Tag:shop=scuba diving
     shop=seafood: Pt:Tag:shop=seafood
     shop=second_hand: Pt:Tag:shop=second hand
     shop=shoes: Pt:Tag:shop=shoes
+    shop=spices: Pt:Tag:shop=spices
     shop=sports: Pt:Tag:shop=sports
     shop=stationery: Pt:Tag:shop=stationery
     shop=supermarket: Pt:Tag:shop=supermarket
+    shop=swimming_pool: Pt:Tag:shop=swimming pool
     shop=tattoo: Pt:Tag:shop=tattoo
+    shop=tea: Pt:Tag:shop=tea
     shop=tobacco: Pt:Tag:shop=tobacco
     shop=toys: Pt:Tag:shop=toys
     shop=trade: Pt:Tag:shop=trade
+    shop=travel_agency: Pt:Tag:shop=travel agency
     shop=tyres: Pt:Tag:shop=tyres
     shop=vacant: Pt:Tag:shop=vacant
     shop=vacuum_cleaner: Pt:Tag:shop=vacuum cleaner
     shop=variety_store: Pt:Tag:shop=variety store
     shop=video: Pt:Tag:shop=video
     shop=watches: Pt:Tag:shop=watches
+    sport=10pin: Pt:Tag:sport=10pin
+    sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
     sport=soccer: Pt:Tag:sport=soccer
     tourism=alpine_hut: Pt:Tag:tourism=alpine hut
@@ -14008,6 +14553,7 @@ ru:
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
+    lit: RU:Key:lit
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
     loc_ref: RU:Key:loc ref
@@ -14032,6 +14578,8 @@ ru:
     motor_vehicle: RU:Key:motor vehicle
     motorcycle: RU:Key:motorcycle
     motorroad: RU:Key:motorroad
+    mountain_pass: RU:Key:mountain pass
+    mtb:scale: RU:Key:mtb:scale
     name: RU:Key:name
     name:ru: RU:Key:name:ru
     name:ru:word_stress: RU:Key:name:ru:word stress
@@ -14043,6 +14591,7 @@ ru:
     note: RU:Key:note
     office: RU:Key:office
     official_name: RU:Key:official name
+    official_short_type: RU:Key:official short type
     old_name: RU:Key:old name
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
@@ -14056,6 +14605,9 @@ ru:
     ownership: RU:Key:ownership
     parking: RU:Key:parking
     parking:lane: RU:Key:parking:lane
+    parking:lane:both: RU:Key:parking:lane:both
+    parking:lane:left: RU:Key:parking:lane:left
+    parking:lane:right: RU:Key:parking:lane:right
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
@@ -14076,6 +14628,8 @@ ru:
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
     psv: RU:Key:psv
+    public_bookcase:type: RU:Key:public bookcase:type
+    pump: RU:Key:pump
     railway: RU:Key:railway
     ramp: RU:Key:ramp
     recycling_type: RU:Key:recycling type
@@ -14222,11 +14776,14 @@ ru:
     amenity=fuel: RU:Tag:amenity=fuel
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=grit_bin: RU:Tag:amenity=grit bin
+    amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
     amenity=hospital: RU:Tag:amenity=hospital
     amenity=ice_cream: RU:Tag:amenity=ice cream
     amenity=kindergarten: RU:Tag:amenity=kindergarten
     amenity=kneipp_water_cure: RU:Tag:amenity=kneipp water cure
+    amenity=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
+    amenity=loading_dock: RU:Tag:amenity=loading dock
     amenity=love_hotel: RU:Tag:amenity=love hotel
     amenity=marketplace: RU:Tag:amenity=marketplace
     amenity=monastery: RU:Tag:amenity=monastery
@@ -14252,6 +14809,7 @@ ru:
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
@@ -14268,6 +14826,7 @@ ru:
     amenity=toilets: RU:Tag:amenity=toilets
     amenity=townhall: RU:Tag:amenity=townhall
     amenity=university: RU:Tag:amenity=university
+    amenity=vehicle_ramp: RU:Tag:amenity=vehicle ramp
     amenity=vending_machine: RU:Tag:amenity=vending machine
     amenity=veterinary: RU:Tag:amenity=veterinary
     amenity=waste_basket: RU:Tag:amenity=waste basket
@@ -14298,6 +14857,7 @@ ru:
     barrier=wall: RU:Tag:barrier=wall
     bicycle=designated: RU:Tag:bicycle=designated
     boundary=administrative: RU:Tag:boundary=administrative
+    boundary=forest_compartment: RU:Tag:boundary=forest compartment
     boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
@@ -14335,6 +14895,7 @@ ru:
     building=greenhouse: RU:Tag:building=greenhouse
     building=hangar: RU:Tag:building=hangar
     building=hospital: RU:Tag:building=hospital
+    building=hotel: RU:Tag:building=hotel
     building=house: RU:Tag:building=house
     building=houseboat: RU:Tag:building=houseboat
     building=hut: RU:Tag:building=hut
@@ -14376,6 +14937,7 @@ ru:
     craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
     craft=shoemaker: RU:Tag:craft=shoemaker
+    craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
     crop=grape: RU:Tag:crop=grape
@@ -14392,6 +14954,7 @@ ru:
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
+    generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
     highway=bridleway: RU:Tag:highway=bridleway
@@ -14558,7 +15121,9 @@ ru:
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
     military=airfield: RU:Tag:military=airfield
+    military=bunker: RU:Tag:military=bunker
     military=naval_base: RU:Tag:military=naval base
+    name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach
@@ -14600,6 +15165,7 @@ ru:
     office=insurance: RU:Tag:office=insurance
     office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
+    office=logistics: RU:Tag:office=logistics
     office=newspaper: RU:Tag:office=newspaper
     office=ngo: RU:Tag:office=ngo
     office=political_party: RU:Tag:office=political party
@@ -14642,6 +15208,7 @@ ru:
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
     public_transport=stop_position: RU:Tag:public transport=stop position
+    pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=level_crossing: RU:Tag:railway=level crossing
@@ -14666,12 +15233,14 @@ ru:
     service=alley: RU:Tag:service=alley
     service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
+    service=drive-through: RU:Tag:service=drive-through
     service=driveway: RU:Tag:service=driveway
     service=parking_aisle: RU:Tag:service=parking aisle
     service=parts: RU:Tag:service=parts
     service=repair: RU:Tag:service=repair
     service=tyres: RU:Tag:service=tyres
     shelter_type=public_transport: RU:Tag:shelter type=public transport
+    shop=agrarian: RU:Tag:shop=agrarian
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
     shop=antiques: RU:Tag:shop=antiques
@@ -14773,6 +15342,7 @@ ru:
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
     shop=travel_agency: RU:Tag:shop=travel agency
+    shop=tyres: RU:Tag:shop=tyres
     shop=vacant: RU:Tag:shop=vacant
     shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
     shop=variety_store: RU:Tag:shop=variety store
@@ -14783,6 +15353,7 @@ ru:
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
     sport=motocross: RU:Tag:sport=motocross
+    sport=motor: RU:Tag:sport=motor
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
@@ -14833,7 +15404,6 @@ sk:
 sq:
   key:
     highway: Sq:Key:highway
-    motorcycle_friendly: Sq:Key:motorcycle friendly
 sv:
   key:
     access: Sv:Key:access
@@ -14842,11 +15412,13 @@ sv:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
     amenity=recycling: Sv:Tag:amenity=recycling
+    amenity=townhall: Sv:Tag:amenity=townhall
     highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
     highway=track: Sv:Tag:highway=track
     junction=roundabout: Sv:Tag:junction=roundabout
     leisure=dog_park: Sv:Tag:leisure=dog park
+    leisure=fitness_station: Sv:Tag:leisure=fitness station
     railway=rail: Sv:Tag:railway=rail
 tr:
   key:
@@ -15148,6 +15720,7 @@ zh-hans:
     amenity=cafe: Zh-hans:Tag:amenity=cafe
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    highway=residential: Zh-hans:Tag:highway=residential
     highway=tertiary: Zh-hans:Tag:highway=tertiary
     railway=light_rail: Zh-hans:Tag:railway=light rail
     railway=subway: Zh-hans:Tag:railway=subway
@@ -15164,6 +15737,7 @@ zh-hant:
     diet:*: Zh-hant:Key:diet:*
     fixme: Zh-hant:Key:fixme
     fuel: Zh-hant:Key:fuel
+    name: Zh-hant:Key:name
     noexit: Zh-hant:Key:noexit
     office: Zh-hant:Key:office
     opening_hours: Zh-hant:Key:opening hours
@@ -15193,4 +15767,7 @@ zh-hant:
     shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
     shop=gas: Zh-hant:Tag:shop=gas
     tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
+·es:
+  key:
+    addr:inclusion: ·ES:Key:addr:inclusion