X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8..ab24163f45a0899b204a687398b51e500439bf8e:/config/locales/en.yml?ds=sidebyside

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7548833d8..3e3905298 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -204,6 +204,11 @@ en:
       reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+    query:
+      title: "Query Features"
+      introduction: "Click on the map to find nearby features."
+      nearby: "Nearby features"
+      enclosing: "Enclosing features"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
@@ -370,8 +375,10 @@ en:
       prefix_format: "%{name}"
       prefix:
         aerialway:
+          cable_car: "Cable Car"
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
+          gondola: "Gondola Lift"
           station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"
@@ -382,11 +389,9 @@ en:
           taxiway: "Taxiway"
           terminal: "Terminal"
         amenity:
-          airport: "Airport"
+          animal_shelter: "Animal Shelter"
           arts_centre: "Arts Centre"
-          artwork: "Artwork"
           atm: "ATM"
-          auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
           bbq: "BBQ"
@@ -394,6 +399,7 @@ en:
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
           biergarten: "Beer Garden"
+          boat_rental: "Boat Rental"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"
@@ -403,9 +409,10 @@ en:
           car_wash: "Car Wash"
           casino: "Casino"
           charging_station: "Charging Station"
+          childcare: "Childcare"
           cinema: "Cinema"
           clinic: "Clinic"
-          club: "Club"
+          clock: "Clock"
           college: "College"
           community_centre: "Community Centre"
           courthouse: "Courthouse"
@@ -424,25 +431,25 @@ en:
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
+          gambling: "Gambling"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
-          hall: "Hall"
           health_centre: "Health Centre"
           hospital: "Hospital"
-          hotel: "Hotel"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
           market: "Market"
           marketplace: "Marketplace"
-          mountain_rescue: "Mountain Rescue"
+          monastery: "Monastery"
+          motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
           nursery: "Nursery"
           nursing_home: "Nursing Home"
           office: "Office"
-          park: "Park"
           parking: "Parking"
+          parking_entrance: "Parking Entrance"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
@@ -452,7 +459,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
-          public_market: "Public Market"
           reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
@@ -461,13 +467,11 @@ en:
           school: "School"
           shelter: "Shelter"
           shop: "Shop"
-          shopping: "Shopping"
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
           social_facility: "Social Facility"
           studio: "Studio"
-          supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"
           taxi: "Taxi"
           telephone: "Public Telephone"
@@ -479,8 +483,7 @@ en:
           veterinary: "Veterinary Surgery"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
-          wifi: "WiFi Access"
-          WLAN: "WiFi Access"
+          waste_disposal: "Waste Disposal"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
@@ -495,22 +498,35 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
+        craft:
+          brewery: "Brewery"
+          carpenter: "Carpenter"
+          electrician: "Electrician"
+          gardener: "Gardener"
+          painter: "Painter"
+          photographer: "Photographer"
+          plumber: "Plumber"
+          shoemaker: "Shoemaker"
+          tailor: "Tailor"
+          "yes": "Craft Shop"
         emergency:
-          fire_hydrant: "Fire Hydrant"
+          ambulance_station: "Ambulance Station"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
         highway:
+          abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
+          elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           living_street: "Living Street"
           milestone: "Milestone"
-          minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
@@ -521,7 +537,7 @@ en:
           primary_link: "Primary Road"
           proposed: "Proposed Road"
           raceway: "Raceway"
-          residential: "Residential"
+          residential: "Residential Road"
           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
@@ -531,37 +547,44 @@ en:
           speed_camera: "Speed Camera"
           steps: "Steps"
           street_lamp: "Street Lamp"
-          stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           track: "Track"
+          traffic_signals: "Traffic Signals"
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"
+          "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"
-          building: "Building"
+          building: "Historic Building"
+          bunker: "Bunker"
           castle: "Castle"
           church: "Church"
+          city_gate: "City Gate"
           citywalls: "City Walls"
           fort: "Fort"
+          heritage: "Heritage Site"
           house: "House"
           icon: "Icon"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           monument: "Monument"
-          museum: "Museum"
+          roman_road: "Roman Road"
           ruins: "Ruins"
+          stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
+        junction:
+          "yes": "Junction"
         landuse:
           allotments: "Allotments"
           basin: "Basin"
@@ -583,9 +606,6 @@ en:
           military: "Military Area"
           mine: "Mine"
           orchard: "Orchard"
-          nature_reserve: "Nature Reserve"
-          park: "Park"
-          piste: "Piste"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
@@ -596,16 +616,19 @@ en:
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
-          wetland: "Wetland"
-          wood: "Wood"
+          "yes": "Landuse"
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
+          club: "Club"
           common: "Common Land"
+          dog_park: "Dog Park"
           fishing: "Fishing Area"
+          fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
+          horse_riding: "Horse Riding"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"
@@ -614,6 +637,7 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
+          resort: "Resort"
           sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
@@ -621,6 +645,13 @@ en:
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"
+          "yes": "Leisure"
+        man_made:
+          lighthouse: "Lighthouse"
+          pipeline: "Pipeline"
+          tower: "Tower"
+          works: "Factory"
+          "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
@@ -632,16 +663,15 @@ en:
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
-          channel: "Channel"
           cliff: "Cliff"
           crater: "Crater"
           dune: "Dune"
-          feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"
           forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"
+          grassland: "Grassland"
           heath: "Heath"
           hill: "Hill"
           island: "Island"
@@ -653,11 +683,11 @@ en:
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
-          river: "River"
           rock: "Rock"
+          saddle: "Saddle"
+          sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
-          shoal: "Shoal"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
@@ -666,10 +696,10 @@ en:
           volcano: "Volcano"
           water: "Water"
           wetland: "Wetland"
-          wetlands: "Wetlands"
           wood: "Wood"
         office:
           accountant: "Accountant"
+          administrative: "Administration"
           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"
@@ -682,6 +712,8 @@ en:
           travel_agent: "Travel Agency"
           "yes": "Office"
         place:
+          allotments: "Allotments"
+          block: "Block"
           airport: "Airport"
           city: "City"
           country: "Country"
@@ -706,6 +738,7 @@ en:
           town: "Town"
           unincorporated_area: "Unincorporated Area"
           village: "Village"
+          "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
@@ -731,7 +764,6 @@ en:
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
-          yard: "Railway Yard"
         shop:
           alcohol: "Off License"
           antiques: "Antiques"
@@ -810,6 +842,7 @@ en:
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
+          apartment: "Apartment"
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
@@ -817,16 +850,15 @@ en:
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"
+          gallery: "Gallery"
           guest_house: "Guest House"
           hostel: "Hostel"
           hotel: "Hotel"
           information: "Information"
-          lean_to: "Lean To"
           motel: "Motel"
           museum: "Museum"
           picnic_site: "Picnic Site"
           theme_park: "Theme Park"
-          valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
@@ -836,7 +868,6 @@ en:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"
-          connector: "Waterway Connector"
           dam: "Dam"
           derelict_canal: "Derelict Canal"
           ditch: "Ditch"
@@ -844,16 +875,14 @@ en:
           drain: "Drain"
           lock: "Lock"
           lock_gate: "Lock Gate"
-          mineral_spring: "Mineral Spring"
           mooring: "Mooring"
           rapids: "Rapids"
           river: "River"
-          riverbank: "Riverbank"
           stream: "Stream"
           wadi: "Wadi"
           waterfall: "Waterfall"
-          water_point: "Water Point"
           weir: "Weir"
+          "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
         level4: "State Boundary"
@@ -937,10 +966,6 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
-    sotm_header: State of the Map 2014
-    sotm_line_1: 8th Annual Conference
-    sotm_line_2: November 7th-9th 2014
-    sotm_line_3: Buenos Aires, Argentina
   license_page:
     foreign:
       title: About this translation
@@ -2132,6 +2157,8 @@ en:
       createnote_disabled_tooltip: Zoom in to add a note to the map
       map_notes_zoom_in_tooltip: Zoom in to see map notes
       map_data_zoom_in_tooltip: Zoom in to see map data
+      queryfeature_tooltip: Query features
+      queryfeature_disabled_tooltip: Zoom in to query features
     changesets:
       show:
         comment: "Comment"
@@ -2185,6 +2212,13 @@ en:
         unnamed: "(unnamed)"
         courtesy: "Directions courtesy of %{link}"
       time: "Time"
+    query:
+      node: Node
+      way: Way
+      relation: Relation
+      nothing_found: No features found
+      error: "Error contacting %{server}: %{error}"
+      timeout: "Timeout contacting %{server}"
   redaction:
     edit:
       description: "Description"