Notes: show first comment as marker tooltip

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bb3f542b78a4b63f64aecebe052a24627e2440c1..63f0c0e783ccbb6f3048d6de64592ac00c803fdd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -79,7 +79,7 @@ en:
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"
   printable_name:
     with_id: "%{id}"
     with_version: "%{id}, v%{version}"

-    with_name: "%{name} (%{id})"
+    with_name_html: "%{name} (%{id})"

   editor:
     default: "Default (currently %{name})"
     potlatch:
   editor:
     default: "Default (currently %{name})"
     potlatch:


@@ -121,11 +121,16 @@ en:
       way_paginated: "Ways (%{x}-%{y} of %{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"
       way_paginated: "Ways (%{x}-%{y} of %{count})"
       relation: "Relations (%{count})"
       relation_paginated: "Relations (%{x}-%{y} of %{count})"

+      comment: "Comments (%{count})"
+      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"

+      join_discussion: "Log in to join the discussion"
+      discussion: Discussion

     node:
       title: "Node: %{name}"
       history_title: "Node History: %{name}"
     node:
       title: "Node: %{name}"
       history_title: "Node History: %{name}"


@@ -157,6 +162,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
         way: way
         relation: relation
         changeset: changeset

+        note: note

     timeout:
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:
     timeout:
       sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
       type:


@@ -164,6 +170,7 @@ en:
         way: way
         relation: relation
         changeset: changeset
         way: way
         relation: relation
         changeset: changeset

+        note: note

     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
     redacted:
       redaction: "Redaction %{id}"
       message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."


@@ -180,10 +187,13 @@ en:
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"

+      wikidata_link: "The %{page} item on Wikidata"

       wikipedia_link: "The %{page} article on Wikipedia"
       wikipedia_link: "The %{page} article on Wikipedia"

+      telephone_link: "Call %{phone_number}"

     note:
       title: "Note: %{id}"
       new_note: "New Note"
     note:
       title: "Note: %{id}"
       new_note: "New Note"

+      description: "Description"

       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"


@@ -196,6 +206,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>"
       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}"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -225,6 +240,13 @@ en:
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
       load_more: "Load more"
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."

+    rss:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+      comment: "New comment on changeset #%{changeset_id} by %{author}"
+      commented_at_html: "Updated %{when} ago"
+      commented_at_by_html: "Updated %{when} ago by %{user}"
+      full: Full discussion

   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry


@@ -355,8 +377,10 @@ en:
       prefix_format: "%{name}"
       prefix:
         aerialway:
       prefix_format: "%{name}"
       prefix:
         aerialway:

+          cable_car: "Cable Car"

           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"

+          gondola: "Gondola Lift"

           station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"
           station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"


@@ -367,11 +391,9 @@ en:
           taxiway: "Taxiway"
           terminal: "Terminal"
         amenity:
           taxiway: "Taxiway"
           terminal: "Terminal"
         amenity:

-          airport: "Airport"
+          animal_shelter: "Animal Shelter"

           arts_centre: "Arts Centre"
           arts_centre: "Arts Centre"

-          artwork: "Artwork"

           atm: "ATM"
           atm: "ATM"

-          auditorium: "Auditorium"

           bank: "Bank"
           bar: "Bar"
           bbq: "BBQ"
           bank: "Bank"
           bar: "Bar"
           bbq: "BBQ"


@@ -379,6 +401,7 @@ en:
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
           biergarten: "Beer Garden"
           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"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"


@@ -388,9 +411,10 @@ en:
           car_wash: "Car Wash"
           casino: "Casino"
           charging_station: "Charging Station"
           car_wash: "Car Wash"
           casino: "Casino"
           charging_station: "Charging Station"

+          childcare: "Childcare"

           cinema: "Cinema"
           clinic: "Clinic"
           cinema: "Cinema"
           clinic: "Clinic"

-          club: "Club"
+          clock: "Clock"

           college: "College"
           community_centre: "Community Centre"
           courthouse: "Courthouse"
           college: "College"
           community_centre: "Community Centre"
           courthouse: "Courthouse"


@@ -409,25 +433,25 @@ en:
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"

+          gambling: "Gambling"

           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"

-          hall: "Hall"

           health_centre: "Health Centre"
           hospital: "Hospital"
           health_centre: "Health Centre"
           hospital: "Hospital"

-          hotel: "Hotel"

           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
           market: "Market"
           marketplace: "Marketplace"
           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"
           nightclub: "Night Club"
           nursery: "Nursery"
           nursing_home: "Nursing Home"
           office: "Office"

-          park: "Park"

           parking: "Parking"
           parking: "Parking"

+          parking_entrance: "Parking Entrance"

           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"


@@ -437,7 +461,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"

-          public_market: "Public Market"

           reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
           reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"


@@ -446,13 +469,11 @@ en:
           school: "School"
           shelter: "Shelter"
           shop: "Shop"
           school: "School"
           shelter: "Shelter"
           shop: "Shop"

-          shopping: "Shopping"

           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
           social_facility: "Social Facility"
           studio: "Studio"
           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"
           swimming_pool: "Swimming Pool"
           taxi: "Taxi"
           telephone: "Public Telephone"


@@ -464,8 +485,7 @@ en:
           veterinary: "Veterinary Surgery"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           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"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"


@@ -480,22 +500,35 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
           "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:
         emergency:

-          fire_hydrant: "Fire Hydrant"
+          ambulance_station: "Ambulance Station"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"

           phone: "Emergency Phone"
         highway:
           phone: "Emergency Phone"
         highway:

+          abandoned: "Abandoned Highway"

           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"

-          byway: "Byway"

           construction: "Highway under Construction"
           cycleway: "Cycle Path"
           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"
           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"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"


@@ -506,7 +539,7 @@ en:
           primary_link: "Primary Road"
           proposed: "Proposed Road"
           raceway: "Raceway"
           primary_link: "Primary Road"
           proposed: "Proposed Road"
           raceway: "Raceway"

-          residential: "Residential"
+          residential: "Residential Road"

           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
           rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"


@@ -516,37 +549,44 @@ en:
           speed_camera: "Speed Camera"
           steps: "Steps"
           street_lamp: "Street Lamp"
           speed_camera: "Speed Camera"
           steps: "Steps"
           street_lamp: "Street Lamp"

-          stile: "Stile"

           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           track: "Track"
           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"
           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"
         historic:
           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"

-          building: "Building"
+          building: "Historic Building"
+          bunker: "Bunker"

           castle: "Castle"
           church: "Church"
           castle: "Castle"
           church: "Church"

+          city_gate: "City Gate"

           citywalls: "City Walls"
           fort: "Fort"
           citywalls: "City Walls"
           fort: "Fort"

+          heritage: "Heritage Site"

           house: "House"
           icon: "Icon"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           monument: "Monument"
           house: "House"
           icon: "Icon"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           monument: "Monument"

-          museum: "Museum"
+          roman_road: "Roman Road"

           ruins: "Ruins"
           ruins: "Ruins"

+          stone: "Stone"

           tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"

+        junction:
+          "yes": "Junction"

         landuse:
           allotments: "Allotments"
           basin: "Basin"
         landuse:
           allotments: "Allotments"
           basin: "Basin"


@@ -568,9 +608,6 @@ en:
           military: "Military Area"
           mine: "Mine"
           orchard: "Orchard"
           military: "Military Area"
           mine: "Mine"
           orchard: "Orchard"

-          nature_reserve: "Nature Reserve"
-          park: "Park"
-          piste: "Piste"

           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"


@@ -581,16 +618,19 @@ en:
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
           road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"

-          wetland: "Wetland"
-          wood: "Wood"
+          "yes": "Landuse"

         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"

+          club: "Club"

           common: "Common Land"
           common: "Common Land"

+          dog_park: "Dog Park"

           fishing: "Fishing Area"
           fishing: "Fishing Area"

+          fitness_centre: "Fitness Centre"

           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
           fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"

+          horse_riding: "Horse Riding"

           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"


@@ -599,6 +639,7 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"

+          resort: "Resort"

           sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
           sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"


@@ -606,6 +647,13 @@ en:
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"
           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"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"


@@ -617,16 +665,15 @@ en:
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"

-          channel: "Channel"

           cliff: "Cliff"
           crater: "Crater"
           dune: "Dune"
           cliff: "Cliff"
           crater: "Crater"
           dune: "Dune"

-          feature: "Feature"

           fell: "Fell"
           fjord: "Fjord"
           forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"
           fell: "Fell"
           fjord: "Fjord"
           forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"

+          grassland: "Grassland"

           heath: "Heath"
           hill: "Hill"
           island: "Island"
           heath: "Heath"
           hill: "Hill"
           island: "Island"


@@ -638,11 +685,11 @@ en:
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"

-          river: "River"

           rock: "Rock"
           rock: "Rock"

+          saddle: "Saddle"
+          sand: "Sand"

           scree: "Scree"
           scrub: "Scrub"
           scree: "Scree"
           scrub: "Scrub"

-          shoal: "Shoal"

           spring: "Spring"
           stone: "Stone"
           strait: "Strait"
           spring: "Spring"
           stone: "Stone"
           strait: "Strait"


@@ -651,10 +698,10 @@ en:
           volcano: "Volcano"
           water: "Water"
           wetland: "Wetland"
           volcano: "Volcano"
           water: "Water"
           wetland: "Wetland"

-          wetlands: "Wetlands"

           wood: "Wood"
         office:
           accountant: "Accountant"
           wood: "Wood"
         office:
           accountant: "Accountant"

+          administrative: "Administration"

           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"
           architect: "Architect"
           company: "Company"
           employment_agency: "Employment Agency"


@@ -667,6 +714,8 @@ en:
           travel_agent: "Travel Agency"
           "yes": "Office"
         place:
           travel_agent: "Travel Agency"
           "yes": "Office"
         place:

+          allotments: "Allotments"
+          block: "Block"

           airport: "Airport"
           city: "City"
           country: "Country"
           airport: "Airport"
           city: "City"
           country: "Country"


@@ -691,6 +740,7 @@ en:
           town: "Town"
           unincorporated_area: "Unincorporated Area"
           village: "Village"
           town: "Town"
           unincorporated_area: "Unincorporated Area"
           village: "Village"

+          "yes": "Place"

         railway:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
         railway:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"


@@ -711,12 +761,11 @@ en:
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"
           spur: "Railway Spur"
           station: "Railway Station"
           stop: "Railway Stop"

-          subway: "Subway Station"
+          subway: "Subway"

           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"

-          yard: "Railway Yard"

         shop:
           alcohol: "Off License"
           antiques: "Antiques"
         shop:
           alcohol: "Off License"
           antiques: "Antiques"


@@ -795,6 +844,7 @@ en:
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"

+          apartment: "Apartment"

           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"


@@ -802,16 +852,15 @@ en:
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"

+          gallery: "Gallery"

           guest_house: "Guest House"
           hostel: "Hostel"
           hotel: "Hotel"
           information: "Information"
           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"
           motel: "Motel"
           museum: "Museum"
           picnic_site: "Picnic Site"
           theme_park: "Theme Park"

-          valley: "Valley"

           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:


@@ -821,7 +870,6 @@ en:
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"
           artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"

-          connector: "Waterway Connector"

           dam: "Dam"
           derelict_canal: "Derelict Canal"
           ditch: "Ditch"
           dam: "Dam"
           derelict_canal: "Derelict Canal"
           ditch: "Ditch"


@@ -829,16 +877,14 @@ en:
           drain: "Drain"
           lock: "Lock"
           lock_gate: "Lock Gate"
           drain: "Drain"
           lock: "Lock"
           lock_gate: "Lock Gate"

-          mineral_spring: "Mineral Spring"

           mooring: "Mooring"
           rapids: "Rapids"
           river: "River"
           mooring: "Mooring"
           rapids: "Rapids"
           river: "River"

-          riverbank: "Riverbank"

           stream: "Stream"
           wadi: "Wadi"
           waterfall: "Waterfall"
           stream: "Stream"
           wadi: "Wadi"
           waterfall: "Waterfall"

-          water_point: "Water Point"

           weir: "Weir"
           weir: "Weir"

+          "yes": "Waterway"

       admin_levels:
         level2: "Country Boundary"
         level4: "State Boundary"
       admin_levels:
         level2: "Country Boundary"
         level4: "State Boundary"


@@ -858,19 +904,6 @@ en:
     results:
       no_results: "No results found"
       more_results: "More results"
     results:
       no_results: "No results found"
       more_results: "More results"

-    distance:
-      zero: "less than 1km"
-      one: "about 1km"
-      other: "about %{count}km"
-    direction:
-      south_west: "south-west"
-      south: "south"
-      south_east: "south-east"
-      east: "east"
-      north_east: "north-east"
-      north: "north"
-      north_west: "north-west"
-      west: "west"

   layouts:
     project_name:
       # in <title>
   layouts:
     project_name:
       # in <title>


@@ -935,9 +968,10 @@ en:
     legal_babble:
       title_html: Copyright and License
       intro_1_html: |
     legal_babble:
       title_html: Copyright and License
       intro_1_html: |

-        OpenStreetMap is <i>open data</i>, licensed under the <a
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a

         href="http://opendatacommons.org/licenses/odbl/">Open Data
         href="http://opendatacommons.org/licenses/odbl/">Open Data

-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) by the  <a
+        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).

       intro_2_html: |
         You are free to copy, distribute, transmit and adapt our data,
         as long as you credit OpenStreetMap and its
       intro_2_html: |
         You are free to copy, distribute, transmit and adapt our data,
         as long as you credit OpenStreetMap and its


@@ -973,6 +1007,7 @@ en:
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a

+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a

         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: |
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
       more_2_html: |


@@ -1012,6 +1047,11 @@ en:
       contributors_nz_html: |
         <strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.
       contributors_nz_html: |
         <strong>New Zealand</strong>: Contains data sourced from
         Land Information New Zealand. Crown Copyright reserved.

+      contributors_si_html: |
+        <strong>Slovenia</strong>: Contains data from the
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (public information of Slovenia).

       contributors_za_html: |
         <strong>South Africa</strong>: Contains data sourced from
         <a href="http://www.ngi.gov.za/">Chief Directorate:
       contributors_za_html: |
         <strong>South Africa</strong>: Contains data sourced from
         <a href="http://www.ngi.gov.za/">Chief Directorate:


@@ -1040,6 +1080,9 @@ en:
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.

+      trademarks_title_html: <span id="trademarks"></span>Trademarks
+      trademarks_1_html: |
+        OpenStreetMap and the looking glass logo are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.

   welcome_page:
     title: Welcome!
     introduction_html: |
   welcome_page:
     title: Welcome!
     introduction_html: |


@@ -1069,6 +1112,14 @@ en:
       tag_html: |
         A <strong>tag</strong> is a bit of data about a node or way, like a
         restaurant's name or a road's speed limit.
       tag_html: |
         A <strong>tag</strong> is a bit of data about a node or way, like a
         restaurant's name or a road's speed limit.

+    rules:
+      title: Rules!
+      paragraph_1_html: |
+        OpenStreetMap has few formal rules but we expect all participants to collaborate
+        with, and communicate with, the community. If you are considering
+        any activities other than editing by hand, please read and follow the guidelines on 
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.

     questions:
       title: Any questions?
       paragraph_1_html: |
     questions:
       title: Any questions?
       paragraph_1_html: |


@@ -1114,10 +1165,30 @@ en:
       url: /welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
       url: /welcome
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.

+    beginners_guide:
+      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Beginners' Guide
+      description: Community maintained guide for beginners.

     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Ask a question or look up answers on OSM's question-and-answer site.
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
       description: Ask a question or look up answers on OSM's question-and-answer site.

+    mailing_lists:
+      url: http://lists.openstreetmap.org/
+      title: Mailing Lists
+      description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+    forums:
+      url: http://forum.openstreetmap.org/
+      title: Forums
+      description: Questions and discussions for those that prefer a bulletin board style interface.
+    irc:
+      url: http://irc.openstreetmap.org/
+      title: IRC
+      description: Interactive chat in many different languages and on many topics.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Help for companies and organisations switching to OpenStreetMap based maps and other services.

     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org
     wiki:
       url: http://wiki.openstreetmap.org/
       title: wiki.openstreetmap.org


@@ -1150,6 +1221,14 @@ en:
       build upon the data in certain ways, you may distribute the result only
       under the same licence. See the <a href='%{copyright_path}'>Copyright and
       License page</a> for details.
       build upon the data in certain ways, you may distribute the result only
       under the same licence. See the <a href='%{copyright_path}'>Copyright and
       License page</a> for details.

+    legal_title: Legal
+    legal_html: |
+      This site and many other related services are formally operated by the  
+      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
+      on behalf of the community.
+      <br> 
+      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
+      if you have licensing, copyright or other legal questions and issues.

     partners_title: Partners
   notifier:
     diary_comment_notification:
     partners_title: Partners
   notifier:
     diary_comment_notification:


@@ -1227,6 +1306,16 @@ en:
         your_note: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."
         your_note: "%{commenter} has reactivated one of your map notes near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
       details: "More details about the note can be found at %{url}."

+    changeset_comment_notification:
+      greeting: "Hi,"
+      commented:
+        subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
+        subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
+        your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
+        commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+        partial_changeset_with_comment: "with comment '%{changeset_comment}'"
+        partial_changeset_without_comment: "without comment"
+      details: "More details about the changeset can be found at %{url}."

   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"


@@ -1326,8 +1415,6 @@ en:
       search: Search
       get_directions: "Get directions"
       get_directions_title: "Find directions between two points"
       search: Search
       get_directions: "Get directions"
       get_directions_title: "Find directions between two points"

-      close_directions: "Close directions"
-      close_directions_title: "Close the directions panel"

       from: "From"
       to: "To"
       where_am_i: "Where am I?"
       from: "From"
       to: "To"
       where_am_i: "Where am I?"


@@ -1341,9 +1428,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

-          unsurfaced: "Unsurfaced road"

           track: "Track"
           track: "Track"

-          byway: "Byway"

           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"


@@ -1367,7 +1452,6 @@ en:
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"

-          tourist: "Tourist attraction"

           common:
             - Common
             - meadow
           common:
             - Common
             - meadow


@@ -1397,7 +1481,6 @@ en:
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"

-          permissive: "Permissive access"

           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:
           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:


@@ -1546,6 +1629,7 @@ en:
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."

+      grant_access: "Grant Access"

     oauthorize_success:
       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."
     oauthorize_success:
       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."


@@ -1627,7 +1711,7 @@ en:
       login_button: "Login"
       register now: Register now
       with username: "Already have an OpenStreetMap account? Please login with your username and password:"
       login_button: "Login"
       register now: Register now
       with username: "Already have an OpenStreetMap account? Please login with your username and password:"

-      with openid: "Alternatively, use OpenID to login:"
+      with external: "Alternatively, use a third party to login:"

       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.


@@ -1635,22 +1719,23 @@ en:
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
       account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
       auth failure: "Sorry, could not log in with those details."

-      openid missing provider: "Sorry, could not contact your OpenID provider"
-      openid invalid: "Sorry, your OpenID seems to be malformed"

       openid_logo_alt: "Log in with an OpenID"
       openid_logo_alt: "Log in with an OpenID"

-      openid_providers:
+      auth_providers:

         openid:
           title: Login with OpenID
           alt: Login with an OpenID URL
         google:
           title: Login with Google
           alt: Login with a Google OpenID
         openid:
           title: Login with OpenID
           alt: Login with an OpenID URL
         google:
           title: Login with Google
           alt: Login with a Google OpenID

+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account

         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID

-        myopenid:
-          title: Login with myOpenID
-          alt: Login with a myOpenID OpenID

         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID


@@ -1693,19 +1778,19 @@ en:
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."

-      openid: "%{logo} OpenID:"
+      external auth: "Third Party Authentication:"

       password: "Password:"
       confirm password: "Confirm Password:"
       password: "Password:"
       confirm password: "Confirm Password:"

-      use openid: "Alternatively, use %{logo} OpenID to login"
-      openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
-      openid association: |
-        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
+      use external auth: "Alternatively, use a third party to login"
+      auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
+      auth association: |
+        <p>Your ID is not associated with a OpenStreetMap account yet.</p>

         <ul>
           <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
           <li>
             If you already have an account, you can login to your account
             using your username and password and then associate the account
         <ul>
           <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
           <li>
             If you already have an account, you can login to your account
             using your username and password and then associate the account

-            with your OpenID in your user settings.
+            with your ID in your user settings.

           </li>
         </ul>
       continue: Sign Up
           </li>
         </ul>
       continue: Sign Up


@@ -1808,8 +1893,8 @@ en:
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"
       current email address: "Current Email Address:"
       new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"

+      external auth: "External Authentication:"

       openid:
       openid:

-        openid: "OpenID:"

         link: "http://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:
         link: "http://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:


@@ -1861,6 +1946,7 @@ en:
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
         Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm

+      success: "Confirmed your account, thanks for signing up!"

       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."


@@ -1871,8 +1957,9 @@ en:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm

-      success: "Confirmed your email address, thanks for signing up!"
+      success: "Confirmed your change of email address!"

       failure: "An email address has already been confirmed with this token."
       failure: "An email address has already been confirmed with this token."

+      unknown_token: "That confirmation code has expired or does not exist."

     set_home:
       flash success: "Home location saved successfully"
     go_public:
     set_home:
       flash success: "Home location saved successfully"
     go_public:


@@ -1914,6 +2001,12 @@ en:
           This decision will be reviewed by an administrator shortly, or
           you may contact the %{webmaster} if you wish to discuss this.
         </p>
           This decision will be reviewed by an administrator shortly, or
           you may contact the %{webmaster} if you wish to discuss this.
         </p>

+    auth_failure:
+      connection_failed: Connection to authentication provider failed
+      invalid_credentials: Invalid authentication credentials
+      no_authorization_code: No authorization code
+      unknown_signature_algorithm: Unknown signature algorithm
+      invalid_scope: Invalid scope

   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."


@@ -2014,6 +2107,8 @@ en:
       heading: "%{block_on} blocked by %{block_by}"
       time_future: "Ends in %{time}"
       time_past: "Ended %{time} ago"
       heading: "%{block_on} blocked by %{block_by}"
       time_future: "Ends in %{time}"
       time_past: "Ended %{time} ago"

+      created: "Created"
+      ago: "%{time} ago"

       status: "Status"
       show: "Show"
       edit: "Edit"
       status: "Status"
       show: "Show"
       edit: "Edit"


@@ -2063,6 +2158,7 @@ en:
       link: "Link or HTML"
       long_link: "Link"
       short_link: "Short Link"
       link: "Link or HTML"
       long_link: "Link"
       short_link: "Short Link"

+      geo_uri: "Geo URI"

       embed: "HTML"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       embed: "HTML"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"


@@ -2106,9 +2202,18 @@ 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
       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"
+        subscribe: "Subscribe"
+        unsubscribe: "Unsubscribe"
+        hide_comment: "hide"
+        unhide_comment: "unhide"

     notes:
       new:
     notes:
       new:

-        intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"

         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.


@@ -2132,25 +2237,34 @@ en:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       instructions:
         no_route: "Couldn't find a route between those two places."
         no_place: "Sorry - couldn't find that place."
       instructions:

-        continue_on: "Continue on "
-        slight_right: "Slight right onto "
-        turn_right: "Turn right onto "
-        sharp_right: "Sharp right onto "
-        uturn: "U-turn along "
-        sharp_left: "Sharp left onto "
-        turn_left: "Turn left onto "
-        slight_left: "Slight left onto "
-        via_point: "(via point) "
-        follow:  "Follow "
-        roundabout: "At roundabout take "
-        leave_roundabout: "Leave roundabout - "
-        stay_roundabout: "Stay on roundabout - "
-        start: "Start at end of "
-        destination: "Reach destination"
-        against_oneway: "Go against one-way on "
-        end_oneway: "End of one-way on "
-        unnamed: "(unnamed)"
+        continue_without_exit: Continue on %{name}
+        slight_right_without_exit: Slight right onto %{name}
+        turn_right_without_exit: Turn right onto %{name}
+        sharp_right_without_exit: Sharp right onto %{name}
+        uturn_without_exit: U-turn along %{name}
+        sharp_left_without_exit: Sharp left onto %{name}
+        turn_left_without_exit: Turn left onto %{name}
+        slight_left_without_exit: Slight left onto %{name}
+        via_point_without_exit: (via point)
+        follow_without_exit: Follow %{name}
+        roundabout_without_exit: At roundabout take %{name}
+        leave_roundabout_without_exit: Leave roundabout - %{name}
+        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        start_without_exit: Start at end of %{name}
+        destination_without_exit: Reach destination
+        against_oneway_without_exit: Go against one-way on %{name}
+        end_oneway_without_exit: End of one-way on %{name}
+        roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+        unnamed: "unnamed road"
+        courtesy: "Directions courtesy of %{link}"

       time: "Time"
       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"
   redaction:
     edit:
       description: "Description"