Merge branch 'master' into openstreetbugs

[rails.git] / config / wiki_pages.yml
diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml

index 92856e0ab5ad6868ea59479d04e0323d973f5c3b..0cb7d28f0abca2687cdedf9dde6724cd3d71cec4 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -6,9 +6,15 @@ cz:
    key:
      historic: Cz:Key:historic
      railway: Cz:Key:railway
    key:
      historic: Cz:Key:historic
      railway: Cz:Key:railway
+    tracktype: Cz:Key:tracktype
    tag:
      route=trolleybus: Cz:Tag:route=trolleybus
  da:
    tag:
      route=trolleybus: Cz:Tag:route=trolleybus
  da:
+  key:
+    access: Da:Key:access
+    fee: Da:Key:fee
+    lit: Da:Key:lit
+    maxheight: Da:Key:maxheight
    tag:
      highway=tertiary: Da:Tag:highway=tertiary
      highway=track: Da:Tag:highway=track
    tag:
      highway=tertiary: Da:Tag:highway=tertiary
      highway=track: Da:Tag:highway=track
@@ -30,9 +36,11 @@ de:
      cycleway: DE:Key:cycleway
      denomination: DE:Key:denomination
      description: DE:Key:description
      cycleway: DE:Key:cycleway
      denomination: DE:Key:denomination
      description: DE:Key:description
+    destination: DE:Key:destination
      disused: DE:Key:disused
      drink: DE:Key:drink
      embankment: DE:Key:embankment
      disused: DE:Key:disused
      drink: DE:Key:drink
      embankment: DE:Key:embankment
+    emergency: DE:Key:emergency
      fixme: DE:Key:fixme
      geological: DE:Key:geological
      hazmat: DE:Key:hazmat
      fixme: DE:Key:fixme
      geological: DE:Key:geological
      hazmat: DE:Key:hazmat
@@ -65,6 +73,7 @@ de:
      sac_scale: DE:Key:sac scale
      service: DE:Key:service
      shop: DE:Key:shop
      sac_scale: DE:Key:sac scale
      service: DE:Key:service
      shop: DE:Key:shop
+    smoking: DE:Key:smoking
      smoothness: DE:Key:smoothness
      sport: DE:Key:sport
      step_count: DE:Key:step count
      smoothness: DE:Key:smoothness
      sport: DE:Key:sport
      step_count: DE:Key:step count
@@ -83,6 +92,7 @@ de:
      amenity=baby_hatch: DE:Tag:amenity=baby hatch
      amenity=bank: DE:Tag:amenity=bank
      amenity=bench: DE:Tag:amenity=bench
      amenity=baby_hatch: DE:Tag:amenity=baby hatch
      amenity=bank: DE:Tag:amenity=bank
      amenity=bench: DE:Tag:amenity=bench
+    amenity=biergarten: DE:Tag:amenity=biergarten
      amenity=bus_station: DE:Tag:amenity=bus station
      amenity=clock: DE:Tag:amenity=clock
      amenity=compressed_air: DE:Tag:amenity=compressed air
      amenity=bus_station: DE:Tag:amenity=bus station
      amenity=clock: DE:Tag:amenity=clock
      amenity=compressed_air: DE:Tag:amenity=compressed air
@@ -99,10 +109,12 @@ de:
      amenity=recycling: DE:Tag:amenity=recycling
      amenity=register_office: DE:Tag:amenity=register office
      amenity=school: DE:Tag:amenity=school
      amenity=recycling: DE:Tag:amenity=recycling
      amenity=register_office: DE:Tag:amenity=register office
      amenity=school: DE:Tag:amenity=school
+    amenity=telephone: DE:Tag:amenity=telephone
      amenity=toilets: DE:Tag:amenity=toilets
      amenity=vending_machine: DE:Tag:amenity=vending machine
      amenity=waste_basket: DE:Tag:amenity=waste basket
      barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
      amenity=toilets: DE:Tag:amenity=toilets
      amenity=vending_machine: DE:Tag:amenity=vending machine
      amenity=waste_basket: DE:Tag:amenity=waste basket
      barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=lift_gate: DE:Tag:barrier=lift gate
      boundary=water_protection_area: DE:Tag:boundary=water protection area
      club-mate=yes: DE:Tag:club-mate=yes
      highway=bus_stop: DE:Tag:highway=bus stop
      boundary=water_protection_area: DE:Tag:boundary=water protection area
      club-mate=yes: DE:Tag:club-mate=yes
      highway=bus_stop: DE:Tag:highway=bus stop
@@ -139,6 +151,10 @@ de:
      landuse=farm: DE:Tag:landuse=farm
      landuse=farmyard: DE:Tag:landuse=farmyard
      landuse=forest: DE:Tag:landuse=forest
      landuse=farm: DE:Tag:landuse=farm
      landuse=farmyard: DE:Tag:landuse=farmyard
      landuse=forest: DE:Tag:landuse=forest
+    landuse=meadow: DE:Tag:landuse=meadow
+    landuse=orchard: DE:Tag:landuse=orchard
+    landuse=quarry: DE:Tag:landuse=quarry
+    landuse=village_green: DE:Tag:landuse=village green
      leisure=dog_park: DE:Tag:leisure=dog park
      leisure=playground: DE:Tag:leisure=playground
      leisure=slipway: DE:Tag:leisure=slipway
      leisure=dog_park: DE:Tag:leisure=dog park
      leisure=playground: DE:Tag:leisure=playground
      leisure=slipway: DE:Tag:leisure=slipway
@@ -154,6 +170,7 @@ de:
      natural=water: DE:Tag:natural=water
      natural=wetland: DE:Tag:natural=wetland
      natural=wood: DE:Tag:natural=wood
      natural=water: DE:Tag:natural=water
      natural=wetland: DE:Tag:natural=wetland
      natural=wood: DE:Tag:natural=wood
+    pipeline=marker: DE:Tag:pipeline=marker
      power=cable: DE:Tag:power=cable
      power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
      power=generator: DE:Tag:power=generator
      power=cable: DE:Tag:power=cable
      power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
      power=generator: DE:Tag:power=generator
@@ -198,6 +215,7 @@ en:
      aerialway: Key:aerialway
      aeroway: Key:aeroway
      amenity: Key:amenity
      aerialway: Key:aerialway
      aeroway: Key:aeroway
      amenity: Key:amenity
+    architect: Key:architect
      area: Key:area
      atv: Key:atv
      barrier: Key:barrier
      area: Key:area
      atv: Key:atv
      barrier: Key:barrier
@@ -222,8 +240,10 @@ en:
      cutting: Key:cutting
      cycleway: Key:cycleway
      denomination: Key:denomination
      cutting: Key:cutting
      cycleway: Key:cycleway
      denomination: Key:denomination
+    depth: Key:depth
      description: Key:description
      designation: Key:designation
      description: Key:description
      designation: Key:designation
+    destination: Key:destination
      direction: Key:direction
      dispensing: Key:dispensing
      disused: Key:disused
      direction: Key:direction
      dispensing: Key:dispensing
      disused: Key:disused
@@ -239,7 +259,10 @@ en:
      fence_type: Key:fence type
      fenced: Key:fenced
      fixme: Key:fixme
      fence_type: Key:fence type
      fenced: Key:fenced
      fixme: Key:fixme
+    flood_prone: Key:flood prone
      foot: Key:foot
      foot: Key:foot
+    ford: Key:ford
+    fuel:discount: Key:fuel:discount
      gauge: Key:gauge
      geological: Key:geological
      hazmat: Key:hazmat
      gauge: Key:gauge
      geological: Key:geological
      hazmat: Key:hazmat
@@ -258,10 +281,12 @@ en:
      layer: Key:layer
      lcn_ref: Key:lcn ref
      leisure: Key:leisure
      layer: Key:layer
      lcn_ref: Key:lcn ref
      leisure: Key:leisure
+    length: Key:length
      lit: Key:lit
      lit:perceived: Key:lit:perceived
      lock: Key:lock
      man_made: Key:man made
      lit: Key:lit
      lit:perceived: Key:lit:perceived
      lock: Key:lock
      man_made: Key:man made
+    managed: Key:managed
      manhole: Key:manhole
      maxairdraft: Key:maxairdraft
      maxaxleload: Key:maxaxleload
      manhole: Key:manhole
      maxairdraft: Key:maxairdraft
      maxaxleload: Key:maxaxleload
@@ -277,6 +302,8 @@ en:
      maxwidth: Key:maxwidth
      military: Key:military
      minspeed: Key:minspeed
      maxwidth: Key:maxwidth
      military: Key:military
      minspeed: Key:minspeed
+    monitoring:glonass: Key:monitoring:glonass
+    monitoring:gps: Key:monitoring:gps
      mooring: Key:mooring
      motorcar: Key:motorcar
      motorcycle: Key:motorcycle
      mooring: Key:mooring
      motorcar: Key:motorcar
      motorcycle: Key:motorcycle
@@ -292,6 +319,7 @@ en:
      noexit: Key:noexit
      noname: Key:noname
      note: Key:note
      noexit: Key:noexit
      noname: Key:noname
      note: Key:note
+    office: Key:office
      oneway: Key:oneway
      opening_hours: Key:opening hours
      operator: Key:operator
      oneway: Key:oneway
      opening_hours: Key:opening hours
      operator: Key:operator
@@ -387,6 +415,7 @@ en:
      amenity=baby_hatch: Tag:amenity=baby hatch
      amenity=bank: Tag:amenity=bank
      amenity=bar: Tag:amenity=bar
      amenity=baby_hatch: Tag:amenity=baby hatch
      amenity=bank: Tag:amenity=bank
      amenity=bar: Tag:amenity=bar
+    amenity=bbq: Tag:amenity=bbq
      amenity=bench: Tag:amenity=bench
      amenity=bicycle_parking: Tag:amenity=bicycle parking
      amenity=bicycle_rental: Tag:amenity=bicycle rental
      amenity=bench: Tag:amenity=bench
      amenity=bicycle_parking: Tag:amenity=bicycle parking
      amenity=bicycle_rental: Tag:amenity=bicycle rental
@@ -405,6 +434,8 @@ en:
      amenity=compressed_air: Tag:amenity=compressed air
      amenity=courthouse: Tag:amenity=courthouse
      amenity=crematorium: Tag:amenity=crematorium
      amenity=compressed_air: Tag:amenity=compressed air
      amenity=courthouse: Tag:amenity=courthouse
      amenity=crematorium: Tag:amenity=crematorium
+    amenity=dentist: Tag:amenity=dentist
+    amenity=doctors: Tag:amenity=doctors
      amenity=drinking_water: Tag:amenity=drinking water
      amenity=embassy: Tag:amenity=embassy
      amenity=emergency_phone: Tag:amenity=emergency phone
      amenity=drinking_water: Tag:amenity=drinking water
      amenity=embassy: Tag:amenity=embassy
      amenity=emergency_phone: Tag:amenity=emergency phone
@@ -463,6 +494,8 @@ en:
      barrier=fence: Tag:barrier=fence
      barrier=gate: Tag:barrier=gate
      barrier=hedge: Tag:barrier=hedge
      barrier=fence: Tag:barrier=fence
      barrier=gate: Tag:barrier=gate
      barrier=hedge: Tag:barrier=hedge
+    barrier=horse_stile: Tag:barrier=horse stile
+    barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
      barrier=kissing_gate: Tag:barrier=kissing gate
      barrier=lift_gate: Tag:barrier=lift gate
      barrier=retaining_wall: Tag:barrier=retaining wall
      barrier=kissing_gate: Tag:barrier=kissing gate
      barrier=lift_gate: Tag:barrier=lift gate
      barrier=retaining_wall: Tag:barrier=retaining wall
@@ -476,6 +509,7 @@ en:
      boundary=national: Tag:boundary=national
      boundary=national_park: Tag:boundary=national park
      boundary=political: Tag:boundary=political
      boundary=national: Tag:boundary=national
      boundary=national_park: Tag:boundary=national park
      boundary=political: Tag:boundary=political
+    boundary=protected_area: Tag:boundary=protected area
      building=dormitory: Tag:building=dormitory
      building=entrance: Tag:building=entrance
      building=parliament: Tag:building=parliament
      building=dormitory: Tag:building=dormitory
      building=entrance: Tag:building=entrance
      building=parliament: Tag:building=parliament
@@ -494,6 +528,7 @@ en:
      highway=emergency_access_point: Tag:highway=emergency access point
      highway=footway: Tag:highway=footway
      highway=ford: Tag:highway=ford
      highway=emergency_access_point: Tag:highway=emergency access point
      highway=footway: Tag:highway=footway
      highway=ford: Tag:highway=ford
+    highway=give_way: Tag:highway=give way
      highway=living_street: Tag:highway=living street
      highway=mini_roundabout: Tag:highway=mini roundabout
      highway=motorway: Tag:highway=motorway
      highway=living_street: Tag:highway=living street
      highway=mini_roundabout: Tag:highway=mini roundabout
      highway=motorway: Tag:highway=motorway
@@ -508,6 +543,7 @@ en:
      highway=proposed: Tag:highway=proposed
      highway=raceway: Tag:highway=raceway
      highway=residential: Tag:highway=residential
      highway=proposed: Tag:highway=proposed
      highway=raceway: Tag:highway=raceway
      highway=residential: Tag:highway=residential
+    highway=rest_area: Tag:highway=rest area
      highway=road: Tag:highway=road
      highway=secondary: Tag:highway=secondary
      highway=secondary_link: Tag:highway=secondary link
      highway=road: Tag:highway=road
      highway=secondary: Tag:highway=secondary
      highway=secondary_link: Tag:highway=secondary link
@@ -559,6 +595,7 @@ en:
      landuse=military: Tag:landuse=military
      landuse=orchard: Tag:landuse=orchard
      landuse=peat_cutting: Tag:landuse=peat cutting
      landuse=military: Tag:landuse=military
      landuse=orchard: Tag:landuse=orchard
      landuse=peat_cutting: Tag:landuse=peat cutting
+    landuse=pond: Tag:landuse=pond
      landuse=quarry: Tag:landuse=quarry
      landuse=railway: Tag:landuse=railway
      landuse=recreation_ground: Tag:landuse=recreation ground
      landuse=quarry: Tag:landuse=quarry
      landuse=railway: Tag:landuse=railway
      landuse=recreation_ground: Tag:landuse=recreation ground
@@ -566,6 +603,7 @@ en:
      landuse=residential: Tag:landuse=residential
      landuse=retail: Tag:landuse=retail
      landuse=salt_pond: Tag:landuse=salt pond
      landuse=residential: Tag:landuse=residential
      landuse=retail: Tag:landuse=retail
      landuse=salt_pond: Tag:landuse=salt pond
+    landuse=street: Tag:landuse=street
      landuse=village_green: Tag:landuse=village green
      landuse=vineyard: Tag:landuse=vineyard
      landuse=wood: Tag:landuse=wood
      landuse=village_green: Tag:landuse=village green
      landuse=vineyard: Tag:landuse=vineyard
      landuse=wood: Tag:landuse=wood
@@ -582,27 +620,35 @@ en:
      leisure=miniature_golf: Tag:leisure=miniature golf
      leisure=nature_reserve: Tag:leisure=nature reserve
      leisure=park: Tag:leisure=park
      leisure=miniature_golf: Tag:leisure=miniature golf
      leisure=nature_reserve: Tag:leisure=nature reserve
      leisure=park: Tag:leisure=park
+    leisure=picnic_table: Tag:leisure=picnic table
      leisure=pitch: Tag:leisure=pitch
      leisure=playground: Tag:leisure=playground
      leisure=slipway: Tag:leisure=slipway
      leisure=sports_centre: Tag:leisure=sports centre
      leisure=track: Tag:leisure=track
      leisure=water_park: Tag:leisure=water park
      leisure=pitch: Tag:leisure=pitch
      leisure=playground: Tag:leisure=playground
      leisure=slipway: Tag:leisure=slipway
      leisure=sports_centre: Tag:leisure=sports centre
      leisure=track: Tag:leisure=track
      leisure=water_park: Tag:leisure=water park
+    man_made=beacon: Tag:man made=beacon
+    man_made=compass_rose: Tag:man made=compass rose
      man_made=crane: Tag:man made=crane
      man_made=cutline: Tag:man made=cutline
      man_made=dyke: Tag:man made=dyke
      man_made=crane: Tag:man made=crane
      man_made=cutline: Tag:man made=cutline
      man_made=dyke: Tag:man made=dyke
+    man_made=flagpole: Tag:man made=flagpole
      man_made=ground_station: Tag:man made=ground station
      man_made=ground_station: Tag:man made=ground station
+    man_made=groyne: Tag:man made=groyne
      man_made=jetty: Tag:man made=jetty
      man_made=lighthouse: Tag:man made=lighthouse
      man_made=mineshaft: Tag:man made=mineshaft
      man_made=jetty: Tag:man made=jetty
      man_made=lighthouse: Tag:man made=lighthouse
      man_made=mineshaft: Tag:man made=mineshaft
+    man_made=monitoring_station: Tag:man made=monitoring station
      man_made=pier: Tag:man made=pier
      man_made=pipeline: Tag:man made=pipeline
      man_made=pumping_rig: Tag:man made=pumping rig
      man_made=reservoir_covered: Tag:man made=reservoir covered
      man_made=surveillance: Tag:man made=surveillance
      man_made=survey_point: Tag:man made=survey point
      man_made=pier: Tag:man made=pier
      man_made=pipeline: Tag:man made=pipeline
      man_made=pumping_rig: Tag:man made=pumping rig
      man_made=reservoir_covered: Tag:man made=reservoir covered
      man_made=surveillance: Tag:man made=surveillance
      man_made=survey_point: Tag:man made=survey point
+    man_made=tower: Tag:man made=tower
      man_made=wastewater_plant: Tag:man made=wastewater plant
      man_made=water_tower: Tag:man made=water tower
      man_made=wastewater_plant: Tag:man made=wastewater plant
      man_made=water_tower: Tag:man made=water tower
+    man_made=water_well: Tag:man made=water well
      man_made=water_works: Tag:man made=water works
      man_made=watermill: Tag:man made=watermill
      man_made=windmill: Tag:man made=windmill
      man_made=water_works: Tag:man made=water works
      man_made=watermill: Tag:man made=watermill
      man_made=windmill: Tag:man made=windmill
@@ -622,6 +668,7 @@ en:
      natural=land: Tag:natural=land
      natural=meadow: Tag:natural=meadow
      natural=peak: Tag:natural=peak
      natural=land: Tag:natural=land
      natural=meadow: Tag:natural=meadow
      natural=peak: Tag:natural=peak
+    natural=scrub: Tag:natural=scrub
      natural=spring: Tag:natural=spring
      natural=stone: Tag:natural=stone
      natural=tree: Tag:natural=tree
      natural=spring: Tag:natural=spring
      natural=stone: Tag:natural=stone
      natural=tree: Tag:natural=tree
@@ -629,15 +676,29 @@ en:
      natural=water: Tag:natural=water
      natural=wetland: Tag:natural=wetland
      natural=wood: Tag:natural=wood
      natural=water: Tag:natural=water
      natural=wetland: Tag:natural=wetland
      natural=wood: Tag:natural=wood
+    office=accountant: Tag:office=accountant
+    office=architect: Tag:office=architect
+    office=company: Tag:office=company
+    office=employment_agency: Tag:office=employment agency
+    office=estate_agent: Tag:office=estate agent
+    office=government: Tag:office=government
+    office=insurance: Tag:office=insurance
+    office=lawyer: Tag:office=lawyer
+    office=newspaper: Tag:office=newspaper
+    office=ngo: Tag:office=ngo
+    office=quango: Tag:office=quango
+    office=travel_agent: Tag:office=travel agent
      pipeline=marker: Tag:pipeline=marker
      pipeline=valve: Tag:pipeline=valve
      place=city: Tag:place=city
      place=continent: Tag:place=continent
      place=country: Tag:place=country
      place=county: Tag:place=county
      pipeline=marker: Tag:pipeline=marker
      pipeline=valve: Tag:pipeline=valve
      place=city: Tag:place=city
      place=continent: Tag:place=continent
      place=country: Tag:place=country
      place=county: Tag:place=county
+    place=farm: Tag:place=farm
      place=hamlet: Tag:place=hamlet
      place=island: Tag:place=island
      place=islet: Tag:place=islet
      place=hamlet: Tag:place=hamlet
      place=island: Tag:place=island
      place=islet: Tag:place=islet
+    place=isolated_dwelling: Tag:place=isolated dwelling
      place=locality: Tag:place=locality
      place=region: Tag:place=region
      place=state: Tag:place=state
      place=locality: Tag:place=locality
      place=region: Tag:place=region
      place=state: Tag:place=state
@@ -657,6 +718,7 @@ en:
      railway=crossing: Tag:railway=crossing
      railway=halt: Tag:railway=halt
      railway=level_crossing: Tag:railway=level crossing
      railway=crossing: Tag:railway=crossing
      railway=halt: Tag:railway=halt
      railway=level_crossing: Tag:railway=level crossing
+    railway=miniature: Tag:railway=miniature
      railway=monorail: Tag:railway=monorail
      railway=platform: Tag:railway=platform
      railway=rail: Tag:railway=rail
      railway=monorail: Tag:railway=monorail
      railway=platform: Tag:railway=platform
      railway=rail: Tag:railway=rail
@@ -667,6 +729,7 @@ en:
      railway=tram: Tag:railway=tram
      railway=tram_stop: Tag:railway=tram stop
      railway=turntable: Tag:railway=turntable
      railway=tram: Tag:railway=tram
      railway=tram_stop: Tag:railway=tram stop
      railway=turntable: Tag:railway=turntable
+    religion=pagan: Tag:religion=pagan
      route=bus: Tag:route=bus
      route=canal: Tag:route=canal
      route=detour: Tag:route=detour
      route=bus: Tag:route=bus
      route=canal: Tag:route=canal
      route=detour: Tag:route=detour
@@ -686,11 +749,14 @@ en:
      service=siding: Tag:service=siding
      service=spur: Tag:service=spur
      service=yard: Tag:service=yard
      service=siding: Tag:service=siding
      service=spur: Tag:service=spur
      service=yard: Tag:service=yard
+    shop=SpotColor: Tag:shop=SpotColor
      shop=alcohol: Tag:shop=alcohol
      shop=bakery: Tag:shop=bakery
      shop=alcohol: Tag:shop=alcohol
      shop=bakery: Tag:shop=bakery
+    shop=beauty: Tag:shop=beauty
      shop=beverages: Tag:shop=beverages
      shop=bicycle: Tag:shop=bicycle
      shop=books: Tag:shop=books
      shop=beverages: Tag:shop=beverages
      shop=bicycle: Tag:shop=bicycle
      shop=books: Tag:shop=books
+    shop=boutique: Tag:shop=boutique
      shop=butcher: Tag:shop=butcher
      shop=car: Tag:shop=car
      shop=car_repair: Tag:shop=car repair
      shop=butcher: Tag:shop=butcher
      shop=car: Tag:shop=car
      shop=car_repair: Tag:shop=car repair
@@ -719,17 +785,22 @@ en:
      shop=hairdresser: Tag:shop=hairdresser
      shop=hearing_aids: Tag:shop=hearing aids
      shop=hifi: Tag:shop=hifi
      shop=hairdresser: Tag:shop=hairdresser
      shop=hearing_aids: Tag:shop=hearing aids
      shop=hifi: Tag:shop=hifi
+    shop=ice_cream: Tag:shop=ice cream
      shop=jewelry: Tag:shop=jewelry
      shop=kiosk: Tag:shop=kiosk
      shop=laundry: Tag:shop=laundry
      shop=locksmith: Tag:shop=locksmith
      shop=mall: Tag:shop=mall
      shop=massage: Tag:shop=massage
      shop=jewelry: Tag:shop=jewelry
      shop=kiosk: Tag:shop=kiosk
      shop=laundry: Tag:shop=laundry
      shop=locksmith: Tag:shop=locksmith
      shop=mall: Tag:shop=mall
      shop=massage: Tag:shop=massage
+    shop=money_lender: Tag:shop=money lender
      shop=motorcycle: Tag:shop=motorcycle
      shop=motorcycle: Tag:shop=motorcycle
+    shop=motorcycle_repair: Tag:shop=motorcycle repair
      shop=newsagent: Tag:shop=newsagent
      shop=optician: Tag:shop=optician
      shop=organic: Tag:shop=organic
      shop=outdoor: Tag:shop=outdoor
      shop=newsagent: Tag:shop=newsagent
      shop=optician: Tag:shop=optician
      shop=organic: Tag:shop=organic
      shop=outdoor: Tag:shop=outdoor
+    shop=pawnbroker: Tag:shop=pawnbroker
+    shop=seafood: Tag:shop=seafood
      shop=second_hand: Tag:shop=second hand
      shop=shoes: Tag:shop=shoes
      shop=sports: Tag:shop=sports
      shop=second_hand: Tag:shop=second hand
      shop=shoes: Tag:shop=shoes
      shop=sports: Tag:shop=sports
@@ -738,10 +809,15 @@ en:
      shop=systembolaget: Tag:shop=systembolaget
      shop=toys: Tag:shop=toys
      shop=travel_agency: Tag:shop=travel agency
      shop=systembolaget: Tag:shop=systembolaget
      shop=toys: Tag:shop=toys
      shop=travel_agency: Tag:shop=travel agency
+    shop=variety_store: Tag:shop=variety store
      shop=video: Tag:shop=video
      source:ele=barometric: Tag:source:ele=barometric
      source=GURS: Tag:source=GURS
      source=IBGE: Tag:source=IBGE
      shop=video: Tag:shop=video
      source:ele=barometric: Tag:source:ele=barometric
      source=GURS: Tag:source=GURS
      source=IBGE: Tag:source=IBGE
+    source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
+      1:25000 map (2007)
+    source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
+      aerial imagery (2001)
      sport=9pin: Tag:sport=9pin
      sport=australian_football: Tag:sport=australian football
      sport=boules: Tag:sport=boules
      sport=9pin: Tag:sport=9pin
      sport=australian_football: Tag:sport=australian football
      sport=boules: Tag:sport=boules
@@ -892,6 +968,7 @@ fr:
      name: FR:Key:name
      noname: FR:Key:noname
      opening_hours: FR:Key:opening hours
      name: FR:Key:name
      noname: FR:Key:noname
      opening_hours: FR:Key:opening hours
+    place: FR:Key:place
      power: FR:Key:power
      sac_scale: FR:Key:sac scale
      shop: FR:Key:shop
      power: FR:Key:power
      sac_scale: FR:Key:sac scale
      shop: FR:Key:shop
@@ -899,26 +976,40 @@ fr:
      waterway: FR:Key:waterway
    tag:
      aeroway=runway: FR:Tag:aeroway=runway
      waterway: FR:Key:waterway
    tag:
      aeroway=runway: FR:Tag:aeroway=runway
+    amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
      amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
      amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=fire_station: FR:Tag:amenity=fire station
      amenity=pharmacy: FR:Tag:amenity=pharmacy
      amenity=recycling: FR:Tag:amenity=recycling
      amenity=pharmacy: FR:Tag:amenity=pharmacy
      amenity=recycling: FR:Tag:amenity=recycling
+    amenity=townhall: FR:Tag:amenity=townhall
+    barrier=bollard: FR:Tag:barrier=bollard
      barrier=gate: FR:Tag:barrier=gate
      cycleway=bike_box: FR:Tag:cycleway=bike box
      highway=bus_stop: FR:Tag:highway=bus stop
      highway=crossing: FR:Tag:highway=crossing
      highway=cycleway: FR:Tag:highway=cycleway
      highway=motorway: FR:Tag:highway=motorway
      barrier=gate: FR:Tag:barrier=gate
      cycleway=bike_box: FR:Tag:cycleway=bike box
      highway=bus_stop: FR:Tag:highway=bus stop
      highway=crossing: FR:Tag:highway=crossing
      highway=cycleway: FR:Tag:highway=cycleway
      highway=motorway: FR:Tag:highway=motorway
+    highway=motorway_link: FR:Tag:highway=motorway link
      landuse=farmyard: FR:Tag:landuse=farmyard
      landuse=forest: FR:Tag:landuse=forest
      leisure=playground: FR:Tag:leisure=playground
      landuse=farmyard: FR:Tag:landuse=farmyard
      landuse=forest: FR:Tag:landuse=forest
      leisure=playground: FR:Tag:leisure=playground
+    man_made=water_works: FR:Tag:man made=water works
      natural=tree: FR:Tag:natural=tree
      natural=tree: FR:Tag:natural=tree
+    place=city: FR:Tag:place=city
+    place=hamlet: FR:Tag:place=hamlet
+    place=locality: FR:Tag:place=locality
+    place=town: FR:Tag:place=town
+    place=village: FR:Tag:place=village
      power=generator: FR:Tag:power=generator
      power=line: FR:Tag:power=line
      power=tower: FR:Tag:power=tower
      power=generator: FR:Tag:power=generator
      power=line: FR:Tag:power=line
      power=tower: FR:Tag:power=tower
+    railway=station: FR:Tag:railway=station
      railway=subway_entrance: FR:Tag:railway=subway entrance
      shop=bakery: FR:Tag:shop=bakery
      railway=subway_entrance: FR:Tag:railway=subway entrance
      shop=bakery: FR:Tag:shop=bakery
+    shop=supermarket: FR:Tag:shop=supermarket
      waterway=riverbank: FR:Tag:waterway=riverbank
      waterway=stream: FR:Tag:waterway=stream
      waterway=riverbank: FR:Tag:waterway=riverbank
      waterway=stream: FR:Tag:waterway=stream
+    waterway=weir: FR:Tag:waterway=weir
  hr:
    key:
      tracktype: Hr:Key:tracktype
  hr:
    key:
      tracktype: Hr:Key:tracktype
@@ -933,6 +1024,7 @@ it:
      aeroway: IT:Key:aeroway
      amenity: IT:Key:amenity
      barrier: IT:Key:barrier
      aeroway: IT:Key:aeroway
      amenity: IT:Key:amenity
      barrier: IT:Key:barrier
+    basin: IT:Key:basin
      boundary: IT:Key:boundary
      bridge: IT:Key:bridge
      building: IT:Key:building
      boundary: IT:Key:boundary
      bridge: IT:Key:bridge
      building: IT:Key:building
@@ -1009,83 +1101,95 @@ it:
      shop=florist: IT:Tag:shop=florist
  ja:
    key:
      shop=florist: IT:Tag:shop=florist
  ja:
    key:
-    abutters: Ja:Key:abutters
-    access: Ja:Key:access
-    aerialway: Ja:Key:aerialway
-    aeroway: Ja:Key:aeroway
-    amenity: Ja:Key:amenity
-    barrier: Ja:Key:barrier
-    boundary: Ja:Key:boundary
-    bridge: Ja:Key:bridge
-    building: Ja:Key:building
-    crossing: Ja:Key:crossing
-    cuisine: Ja:Key:cuisine
-    cycleway: Ja:Key:cycleway
-    fixme: Ja:Key:fixme
-    foot: Ja:Key:foot
-    highway: Ja:Key:highway
-    historic: Ja:Key:historic
-    incline: Ja:Key:incline
-    information: Ja:Key:information
-    internet_access: Ja:Key:internet access
-    landuse: Ja:Key:landuse
-    leisure: Ja:Key:leisure
-    man_made: Ja:Key:man made
-    military: Ja:Key:military
-    name: Ja:Key:name
-    natural: Ja:Key:natural
-    operator: Ja:Key:operator
-    phone: Ja:Key:phone
-    power: Ja:Key:power
-    railway: Ja:Key:railway
-    ref: Ja:Key:ref
-    route: Ja:Key:route
-    shop: Ja:Key:shop
-    step_count: Ja:Key:step count
-    surface: Ja:Key:surface
-    tactile_paving: Ja:Key:tactile paving
-    tourism: Ja:Key:tourism
-    tracktype: Ja:Key:tracktype
-    waterway: Ja:Key:waterway
-    wheelchair: Ja:Key:wheelchair
-    wood: Ja:Key:wood
+    abutters: JA:Key:abutters
+    access: JA:Key:access
+    aerialway: JA:Key:aerialway
+    aeroway: JA:Key:aeroway
+    amenity: JA:Key:amenity
+    barrier: JA:Key:barrier
+    boundary: JA:Key:boundary
+    bridge: JA:Key:bridge
+    building: JA:Key:building
+    crossing: JA:Key:crossing
+    cuisine: JA:Key:cuisine
+    cycleway: JA:Key:cycleway
+    electrified: JA:Key:electrified
+    fixme: JA:Key:fixme
+    foot: JA:Key:foot
+    highway: JA:Key:highway
+    historic: JA:Key:historic
+    incline: JA:Key:incline
+    information: JA:Key:information
+    internet_access: JA:Key:internet access
+    landuse: JA:Key:landuse
+    leisure: JA:Key:leisure
+    man_made: JA:Key:man made
+    military: JA:Key:military
+    name: JA:Key:name
+    natural: JA:Key:natural
+    operator: JA:Key:operator
+    phone: JA:Key:phone
+    power: JA:Key:power
+    power_source: JA:Key:power source
+    railway: JA:Key:railway
+    ref: JA:Key:ref
+    route: JA:Key:route
+    shop: JA:Key:shop
+    step_count: JA:Key:step count
+    surface: JA:Key:surface
+    tactile_paving: JA:Key:tactile paving
+    tourism: JA:Key:tourism
+    tracktype: JA:Key:tracktype
+    type: JA:Key:type
+    waterway: JA:Key:waterway
+    wheelchair: JA:Key:wheelchair
+    wikipedia: JA:Key:wikipedia
+    wood: JA:Key:wood
    tag:
    tag:
-    amenity=arts_centre: Ja:Tag:amenity=arts centre
-    amenity=baby_hatch: Ja:Tag:amenity=baby hatch
-    amenity=cafe: Ja:Tag:amenity=cafe
-    amenity=drinking_water: Ja:Tag:amenity=drinking water
-    amenity=fast_food: Ja:Tag:amenity=fast food
-    amenity=fire_station: Ja:Tag:amenity=fire station
-    amenity=parking: Ja:Tag:amenity=parking
-    amenity=place_of_worship: Ja:Tag:amenity=place of worship
-    amenity=pub: Ja:Tag:amenity=pub
-    amenity=restaurant: Ja:Tag:amenity=restaurant
-    amenity=toilets: Ja:Tag:amenity=toilets
-    amenity=vending_machine: Ja:Tag:amenity=vending machine
-    amenity=veterinary: Ja:Tag:amenity=veterinary
-    highway=crossing: Ja:Tag:highway=crossing
-    highway=footway: Ja:Tag:highway=footway
-    highway=pedestrian: Ja:Tag:highway=pedestrian
-    highway=residential: Ja:Tag:highway=residential
-    highway=steps: Ja:Tag:highway=steps
-    highway=track: Ja:Tag:highway=track
-    highway=traffic_signals: Ja:Tag:highway=traffic signals
-    historic=archaeological_site: Ja:Tag:historic=archaeological site
-    landuse=forest: Ja:Tag:landuse=forest
-    landuse=wood: Ja:Tag:landuse=wood
-    leisure=ice_rink: Ja:Tag:leisure=ice rink
-    man_made=lighthouse: Ja:Tag:man made=lighthouse
-    natural=coastline: Ja:Tag:natural=coastline
-    natural=wood: Ja:Tag:natural=wood
-    railway=crossing: Ja:Tag:railway=crossing
-    railway=level_crossing: Ja:Tag:railway=level crossing
-    railway=rail: Ja:Tag:railway=rail
-    shop=doityourself: Ja:Tag:shop=doityourself
-    shop=outdoor: Ja:Tag:shop=outdoor
-    tourism=hotel: Ja:Tag:tourism=hotel
-    tourism=information: Ja:Tag:tourism=information
-    waterway=riverbank: Ja:Tag:waterway=riverbank
-    waterway=water_point: Ja:Tag:waterway=water point
+    amenity=arts_centre: JA:Tag:amenity=arts centre
+    amenity=baby_hatch: JA:Tag:amenity=baby hatch
+    amenity=bus_station: JA:Tag:amenity=bus station
+    amenity=cafe: JA:Tag:amenity=cafe
+    amenity=drinking_water: JA:Tag:amenity=drinking water
+    amenity=fast_food: JA:Tag:amenity=fast food
+    amenity=fire_station: JA:Tag:amenity=fire station
+    amenity=parking: JA:Tag:amenity=parking
+    amenity=place_of_worship: JA:Tag:amenity=place of worship
+    amenity=pub: JA:Tag:amenity=pub
+    amenity=restaurant: JA:Tag:amenity=restaurant
+    amenity=toilets: JA:Tag:amenity=toilets
+    amenity=vending_machine: JA:Tag:amenity=vending machine
+    amenity=veterinary: JA:Tag:amenity=veterinary
+    barrier=lift_gate: JA:Tag:barrier=lift gate
+    highway=crossing: JA:Tag:highway=crossing
+    highway=footway: JA:Tag:highway=footway
+    highway=pedestrian: JA:Tag:highway=pedestrian
+    highway=residential: JA:Tag:highway=residential
+    highway=steps: JA:Tag:highway=steps
+    highway=track: JA:Tag:highway=track
+    highway=traffic_signals: JA:Tag:highway=traffic signals
+    historic=archaeological_site: JA:Tag:historic=archaeological site
+    landuse=forest: JA:Tag:landuse=forest
+    landuse=garages: JA:Tag:landuse=garages
+    landuse=wood: JA:Tag:landuse=wood
+    leisure=dog_park: JA:Tag:leisure=dog park
+    leisure=ice_rink: JA:Tag:leisure=ice rink
+    man_made=lighthouse: JA:Tag:man made=lighthouse
+    natural=coastline: JA:Tag:natural=coastline
+    natural=wood: JA:Tag:natural=wood
+    power=generator: JA:Tag:power=generator
+    railway=crossing: JA:Tag:railway=crossing
+    railway=level_crossing: JA:Tag:railway=level crossing
+    railway=rail: JA:Tag:railway=rail
+    railway=station: JA:Tag:railway=station
+    shop=doityourself: JA:Tag:shop=doityourself
+    shop=garden_centre: JA:Tag:shop=garden centre
+    shop=motorcycle: JA:Tag:shop=motorcycle
+    shop=outdoor: JA:Tag:shop=outdoor
+    tourism=hotel: JA:Tag:tourism=hotel
+    tourism=information: JA:Tag:tourism=information
+    waterway=riverbank: JA:Tag:waterway=riverbank
+    waterway=water_point: JA:Tag:waterway=water point
  nl:
    key:
      cycleway: NL:Key:cycleway
  nl:
    key:
      cycleway: NL:Key:cycleway
@@ -1109,6 +1213,7 @@ pl:
      oneway: Pl:Key:oneway
  pt-br:
    key:
      oneway: Pl:Key:oneway
  pt-br:
    key:
+    abutters: Pt-br:Key:abutters
      access: Pt-br:Key:access
      addr: Pt-br:Key:addr
      aeroway: Pt-br:Key:aeroway
      access: Pt-br:Key:access
      addr: Pt-br:Key:addr
      aeroway: Pt-br:Key:aeroway
@@ -1122,16 +1227,21 @@ pt-br:
      building: Pt-br:Key:building
      cep: Pt-br:Key:cep
      construction: Pt-br:Key:construction
      building: Pt-br:Key:building
      cep: Pt-br:Key:cep
      construction: Pt-br:Key:construction
+    cycleway: Pt-br:Key:cycleway
      ele: Pt-br:Key:ele
      emergency: Pt-br:Key:emergency
      fenced: Pt-br:Key:fenced
      foot: Pt-br:Key:foot
      ele: Pt-br:Key:ele
      emergency: Pt-br:Key:emergency
      fenced: Pt-br:Key:fenced
      foot: Pt-br:Key:foot
+    geological: Pt-br:Key:geological
      hgv: Pt-br:Key:hgv
      highway: Pt-br:Key:highway
      hgv: Pt-br:Key:hgv
      highway: Pt-br:Key:highway
+    historic: Pt-br:Key:historic
      horse: Pt-br:Key:horse
      horse: Pt-br:Key:horse
+    internet_access: Pt-br:Key:internet access
      landuse: Pt-br:Key:landuse
      lanes: Pt-br:Key:lanes
      leisure: Pt-br:Key:leisure
      landuse: Pt-br:Key:landuse
      lanes: Pt-br:Key:lanes
      leisure: Pt-br:Key:leisure
+    lit: Pt-br:Key:lit
      man_made: Pt-br:Key:man made
      maxdraught: Pt-br:Key:maxdraught
      maxheight: Pt-br:Key:maxheight
      man_made: Pt-br:Key:man made
      maxdraught: Pt-br:Key:maxdraught
      maxheight: Pt-br:Key:maxheight
@@ -1146,16 +1256,23 @@ pt-br:
      name: Pt-br:Key:name
      natural: Pt-br:Key:natural
      noname: Pt-br:Key:noname
      name: Pt-br:Key:name
      natural: Pt-br:Key:natural
      noname: Pt-br:Key:noname
+    office: Pt-br:Key:office
      oneway: Pt-br:Key:oneway
      operator: Pt-br:Key:operator
      psv: Pt-br:Key:psv
      oneway: Pt-br:Key:oneway
      operator: Pt-br:Key:operator
      psv: Pt-br:Key:psv
+    railway: Pt-br:Key:railway
      religion: Pt-br:Key:religion
      religion: Pt-br:Key:religion
+    route: Pt-br:Key:route
      seamark: Pt-br:Key:seamark
      seamark: Pt-br:Key:seamark
+    service: Pt-br:Key:service
      shop: Pt-br:Key:shop
      ski: Pt-br:Key:ski
      source: Pt-br:Key:source
      sport: Pt-br:Key:sport
      surface: Pt-br:Key:surface
      shop: Pt-br:Key:shop
      ski: Pt-br:Key:ski
      source: Pt-br:Key:source
      sport: Pt-br:Key:sport
      surface: Pt-br:Key:surface
+    tourism: Pt-br:Key:tourism
+    tracktype: Pt-br:Key:tracktype
+    traffic_calming: Pt-br:Key:traffic calming
      type: Pt-br:Key:type
      waterway: Pt-br:Key:waterway
    tag:
      type: Pt-br:Key:type
      waterway: Pt-br:Key:waterway
    tag:
@@ -1167,11 +1284,16 @@ pt-br:
      amenity=place_of_worship: Pt-br:Tag:amenity=place of worship
      amenity=stripclub: Pt-br:Tag:amenity=stripclub
      boundary=maritime: Pt-br:Tag:boundary=maritime
      amenity=place_of_worship: Pt-br:Tag:amenity=place of worship
      amenity=stripclub: Pt-br:Tag:amenity=stripclub
      boundary=maritime: Pt-br:Tag:boundary=maritime
+    highway=motorway: Pt-br:Tag:highway=motorway
+    highway=motorway_junction: Pt-br:Tag:highway=motorway junction
+    highway=motorway_link: Pt-br:Tag:highway=motorway link
      highway=road: Pt-br:Tag:highway=road
      highway=stop: Pt-br:Tag:highway=stop
      highway=unclassified: Pt-br:Tag:highway=unclassified
      landuse=cemetery: Pt-br:Tag:landuse=cemetery
      highway=road: Pt-br:Tag:highway=road
      highway=stop: Pt-br:Tag:highway=stop
      highway=unclassified: Pt-br:Tag:highway=unclassified
      landuse=cemetery: Pt-br:Tag:landuse=cemetery
+    landuse=meadow: Pt-br:Tag:landuse=meadow
      man_made=survey_point: Pt-br:Tag:man made=survey point
      man_made=survey_point: Pt-br:Tag:man made=survey point
+    natural=beach: Pt-br:Tag:natural=beach
      natural=wetland: Pt-br:Tag:natural=wetland
      railway=rail: Pt-br:Tag:railway=rail
      shop=mall: Pt-br:Tag:shop=mall
      natural=wetland: Pt-br:Tag:natural=wetland
      railway=rail: Pt-br:Tag:railway=rail
      shop=mall: Pt-br:Tag:shop=mall
@@ -1203,6 +1325,7 @@ ru:
      capacity: RU:Key:capacity
      comment: RU:Key:comment
      construction: RU:Key:construction
      capacity: RU:Key:capacity
      comment: RU:Key:comment
      construction: RU:Key:construction
+    covered: RU:Key:covered
      created_by: RU:Key:created by
      crossing: RU:Key:crossing
      cuisine: RU:Key:cuisine
      created_by: RU:Key:created by
      crossing: RU:Key:crossing
      cuisine: RU:Key:cuisine
@@ -1285,6 +1408,7 @@ ru:
      amenity=crematorium: RU:Tag:amenity=crematorium
      amenity=fast_food: RU:Tag:amenity=fast food
      amenity=fire_station: RU:Tag:amenity=fire station
      amenity=crematorium: RU:Tag:amenity=crematorium
      amenity=fast_food: RU:Tag:amenity=fast food
      amenity=fire_station: RU:Tag:amenity=fire station
+    amenity=fountain: RU:Tag:amenity=fountain
      amenity=fuel: RU:Tag:amenity=fuel
      amenity=grave_yard: RU:Tag:amenity=grave yard
      amenity=nightclub: RU:Tag:amenity=nightclub
      amenity=fuel: RU:Tag:amenity=fuel
      amenity=grave_yard: RU:Tag:amenity=grave yard
      amenity=nightclub: RU:Tag:amenity=nightclub
@@ -1364,6 +1488,7 @@ ru:
      natural=water: RU:Tag:natural=water
      natural=wetland: RU:Tag:natural=wetland
      natural=wood: RU:Tag:natural=wood
      natural=water: RU:Tag:natural=water
      natural=wetland: RU:Tag:natural=wetland
      natural=wood: RU:Tag:natural=wood
+    office=lawyer: RU:Tag:office=lawyer
      opening_hours=24/7: RU:Tag:opening hours=24/7
      place=island: RU:Tag:place=island
      place=town: RU:Tag:place=town
      opening_hours=24/7: RU:Tag:opening hours=24/7
      place=island: RU:Tag:place=island
      place=town: RU:Tag:place=town
@@ -1388,6 +1513,7 @@ ru:
      shop=confectionery: RU:Tag:shop=confectionery
      shop=department_store: RU:Tag:shop=department store
      shop=fabrics: RU:Tag:shop=fabrics
      shop=confectionery: RU:Tag:shop=confectionery
      shop=department_store: RU:Tag:shop=department store
      shop=fabrics: RU:Tag:shop=fabrics
+    shop=florist: RU:Tag:shop=florist
      shop=hairdresser: RU:Tag:shop=hairdresser
      shop=kiosk: RU:Tag:shop=kiosk
      shop=supermarket: RU:Tag:shop=supermarket
      shop=hairdresser: RU:Tag:shop=hairdresser
      shop=kiosk: RU:Tag:shop=kiosk
      shop=supermarket: RU:Tag:shop=supermarket