Merge branch 'master' into openstreetbugs

[rails.git] / config / wiki_pages.yml

diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index e4ecca94b00d50475abb59d45ea5c2ce634a3d74..778c58ed82edd3f0d4563805e73c0cb35f024ce4 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -10,6 +10,7 @@ cz:
     route=trolleybus: Cz:Tag:route=trolleybus
 da:
   key:
+    access: Da:Key:access
     fee: Da:Key:fee
     lit: Da:Key:lit
     maxheight: Da:Key:maxheight
@@ -87,6 +88,7 @@ de:
     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
@@ -143,6 +145,7 @@ de:
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmyard: DE:Tag:landuse=farmyard
     landuse=forest: DE:Tag:landuse=forest
+    landuse=orchard: DE:Tag:landuse=orchard
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=playground: DE:Tag:leisure=playground
     leisure=slipway: DE:Tag:leisure=slipway
@@ -296,6 +299,7 @@ en:
     noexit: Key:noexit
     noname: Key:noname
     note: Key:note
+    office: Key:office
     oneway: Key:oneway
     opening_hours: Key:opening hours
     operator: Key:operator
@@ -480,6 +484,7 @@ en:
     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
@@ -571,6 +576,7 @@ en:
     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
@@ -609,6 +615,7 @@ en:
     man_made=survey_point: Tag:man made=survey point
     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
@@ -635,6 +642,9 @@ en:
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    office=accountant: Tag:office=accountant
+    office=employment_agency: Tag:office=employment agency
+    office=lawyer: Tag:office=lawyer
     pipeline=marker: Tag:pipeline=marker
     pipeline=valve: Tag:pipeline=valve
     place=city: Tag:place=city
@@ -692,6 +702,7 @@ en:
     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=beverages: Tag:shop=beverages
@@ -1095,6 +1106,7 @@ ja:
     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
@@ -1173,6 +1185,7 @@ pt-br:
     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