Merge branch 'master' into terms

[rails.git] / config / wiki_pages.yml

diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 92856e0ab5ad6868ea59479d04e0323d973f5c3b..37973766b1fed9088ae5d9097ace55f299fd80d4 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -9,6 +9,8 @@ cz:
   tag:
     route=trolleybus: Cz:Tag:route=trolleybus
 da:
   tag:
     route=trolleybus: Cz:Tag:route=trolleybus
 da:

+  key:
+    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


@@ -559,6 +561,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


@@ -899,24 +902,36 @@ 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
     railway=subway_entrance: FR:Tag:railway=subway entrance
     shop=bakery: FR:Tag:shop=bakery
     power=generator: FR:Tag:power=generator
     power=line: FR:Tag:power=line
     power=tower: FR:Tag:power=tower
     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
 hr:
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
 hr:


@@ -1203,6 +1218,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


@@ -1388,6 +1404,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