Use lazy lookups and rename keys for the about page.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d426faabe537d84026492c2f6519ff76085d42c6..01f49a9b73d9e375f3ef4e611b70606c55132a62 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -131,6 +131,7 @@ en:
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion
         title_comment: "Changeset %{id} - %{comment}"
       join_discussion: "Log in to join the discussion"
       discussion: Discussion

+      still_open: "Changeset still open - discussion will open once the changeset is closed."

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


@@ -162,6 +163,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:


@@ -169,6 +171,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."


@@ -227,7 +230,7 @@ en:
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"

-      title_friend: "Changesets by your friends"
+      title_friend: "Changesets by my friends"

       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."
       title_nearby: "Changesets by nearby users"
       empty: "No changesets found."
       empty_area: "No changesets in this area."


@@ -248,6 +251,7 @@ en:
   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry

+      publish_button: "Publish"

     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"


@@ -255,7 +259,7 @@ en:
       user_title: "%{user}'s diary"
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       user_title: "%{user}'s diary"
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry

-      new_title: Compose a new entry in your user diary
+      new_title: Compose a new entry in my user diary

       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries


@@ -329,7 +333,7 @@ en:
       map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
       map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"

-      export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+      export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'

       too_large:
         advice: "If the above export fails, please consider using one of the sources listed below:"
         body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
       too_large:
         advice: "If the above export fails, please consider using one of the sources listed below:"
         body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."


@@ -363,13 +367,11 @@ en:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
-        uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
+        ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
+        osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'

         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'

-        osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        osm_nominatim_reverse: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'

         geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_nominatim:
       prefix_format: "%{name}"
         geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_nominatim:
       prefix_format: "%{name}"


@@ -379,12 +381,19 @@ en:
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"

+          platter: "Platter Lift"
+          pylon: "Pylon"

           station: "Aerialway Station"
           station: "Aerialway Station"

+          t-bar: "T-Bar Lift"

         aeroway:
           aerodrome: "Aerodrome"
         aeroway:
           aerodrome: "Aerodrome"

+          airstrip: "Airstrip"

           apron: "Apron"
           gate: "Gate"
           apron: "Apron"
           gate: "Gate"

+          hangar: "Hangar"

           helipad: "Helipad"
           helipad: "Helipad"

+          holding_position: "Holding Position"
+          parking_position: "Parking Position"

           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"
           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"


@@ -419,37 +428,32 @@ en:
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"

-          dormitory: "Dormitory"

           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"
           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"

-          emergency_phone: "Emergency Phone"

           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"
           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"

-          fire_hydrant: "Fire Hydrant"

           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"

-          gym: "Fitness Centre / Gym"
-          health_centre: "Health Centre"
+          grit_bin: "Grit Bin"

           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"

-          market: "Market"

           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"

-          nursery: "Nursery"

           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"
           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"

+          parking_space: "Parking Space"

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


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

-          reception_area: "Reception Area"

           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"


@@ -484,6 +487,7 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"

+          water_point: "Water Point"

           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"


@@ -492,6 +496,7 @@ en:
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"

+          boardwalk: "Boardwalk"

           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"
           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"


@@ -511,25 +516,31 @@ en:
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"

+          assembly_point: "Assembly Point"

           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"

+          water_tank: "Emergency Water Tank"
+          "yes": "Emergency"

         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"

+          corridor: "Corridor"

           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"

+          give_way: "Give Way Sign"

           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"

+          passing_place: "Passing Place"

           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"


@@ -546,6 +557,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"

+          stop: "Stop Sign"

           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"


@@ -554,8 +566,8 @@ en:
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"

+          turning_loop: "Turning Loop"

           unclassified: "Unclassified Road"
           unclassified: "Unclassified Road"

-          unsurfaced: "Unsurfaced Road"

           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"


@@ -574,6 +586,7 @@ en:
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"

+          mine_shaft: "Mine Shaft"

           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"
           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"


@@ -583,6 +596,7 @@ en:
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"

+          "yes": "Historic Site"

         junction:
           "yes": "Junction"
         landuse:
         junction:
           "yes": "Junction"
         landuse:


@@ -620,9 +634,9 @@ en:
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"

-          club: "Club"

           common: "Common Land"
           dog_park: "Dog Park"
           common: "Common Land"
           dog_park: "Dog Park"

+          firepit: "Fire Pit"

           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"


@@ -647,15 +661,46 @@ en:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:

+          adit: "Adit"
+          beacon: "Beacon"
+          beehive: "Bee Hive"
+          breakwater: "Breakwater"
+          bridge: "Bridge"
+          bunker_silo: "Bunker"
+          chimney: "Chimney"
+          crane: "Crane"
+          dolphin: "Mooring Post"
+          dyke: "Dyke"
+          embankment: "Embankment"
+          flagpole: "Flagpole"
+          gasometer: "Gasometer"
+          groyne: "Groyne"
+          kiln: "Kiln"

           lighthouse: "Lighthouse"
           lighthouse: "Lighthouse"

+          mast: "Mast"
+          mine: "Mine"
+          mineshaft: "Mine Shaft"
+          monitoring_station: "Monitoring Station"
+          petroleum_well: "Petroleum Well"
+          pier: "Pier"

           pipeline: "Pipeline"
           pipeline: "Pipeline"

+          silo: "Silo"
+          storage_tank: "Storage Tank"
+          surveillance: "Surveillance"

           tower: "Tower"
           tower: "Tower"

+          wastewater_plant: "Wastewater Plant"
+          watermill: "Water Mill"
+          water_tower: "Water Tower"
+          water_well: "Well"
+          water_works: "Water Works"
+          windmill: "Wind Mill"

           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"

+          "yes": "Military"

         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:


@@ -701,11 +746,14 @@ en:
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"

+          association: "Association"

           company: "Company"
           company: "Company"

+          educational_institution: "Educational Institution"

           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"
           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"

+          it: "IT Office"

           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"
           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"


@@ -713,9 +761,8 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
           "yes": "Office"
         place:
           allotments: "Allotments"

-          block: "Block"
-          airport: "Airport"

           city: "City"
           city: "City"

+          city_block: "City Block"

           country: "Country"
           county: "County"
           farm: "Farm"
           country: "Country"
           county: "County"
           farm: "Farm"


@@ -726,12 +773,13 @@ en:
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"

-          moor: "Moor"

           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"
           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"

+          quarter: "Quarter"

           region: "Region"
           sea: "Sea"
           region: "Region"
           sea: "Sea"

+          square: "Square"

           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"
           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"


@@ -743,10 +791,8 @@ en:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"

-          disused_station: "Disused Railway Station"

           funicular: "Funicular Railway"
           halt: "Train Stop"
           funicular: "Funicular Railway"
           halt: "Train Stop"

-          historic_station: "Historic Railway Station"

           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"


@@ -772,6 +818,7 @@ en:
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"

+          bookmaker: "Bookmaker"

           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"
           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"


@@ -779,7 +826,6 @@ en:
           car_parts: "Car Parts"
           car_repair: "Car Repair"
           carpet: "Carpet Shop"
           car_parts: "Car Parts"
           car_repair: "Car Repair"
           carpet: "Carpet Shop"

-          car_repair: "Car Repair"

           charity: "Charity Shop"
           chemist: "Chemist"
           clothes: "Clothes Shop"
           charity: "Charity Shop"
           chemist: "Chemist"
           clothes: "Clothes Shop"


@@ -811,12 +857,16 @@ en:
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"

-          insurance: "Insurance"
+          houseware: "Houseware Shop"
+          interior_decoration: "Interior Decoration"

           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"

+          kitchen: "Kitchen Shop"

           laundry: "Laundry"
           laundry: "Laundry"

+          lottery: "Lottery"

           mall: "Mall"
           market: "Market"
           mall: "Mall"
           market: "Market"

+          massage: "Massage"

           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"
           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"


@@ -824,21 +874,27 @@ en:
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"

+          paint: "Paint Shop"
+          pawnbroker: "Pawnbroker"

           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"
           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"

-          salon: "Salon"
+          seafood: "Sea Food"

           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"

-          shopping_centre: "Shopping Centre"

           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"

+          ticket: "Ticket Shop"
+          tobacco: "Tobacco Shop"

           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"

+          tyres: "Tyre Shop"
+          vacant: "Vacant Shop"
+          variety_store: "Variety Store"

           video: "Video Shop"
           video: "Video Shop"

-          wine: "Off License"
+          wine: "Wine Store"

           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"


@@ -862,6 +918,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:

+          building_passage: "Building Passage"

           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:


@@ -893,7 +950,7 @@ en:
         level10: "Suburb Boundary"
     description:
       title:
         level10: "Suburb Boundary"
     description:
       title:

-        osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'

         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities


@@ -931,12 +988,11 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
-    partners_ucl: "the UCL VR Centre"
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    partners_ucl: "UCL"

     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"

-    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"

     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."


@@ -967,19 +1023,19 @@ en:
       title_html: Copyright and License
       intro_1_html: |
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
       title_html: Copyright and License
       intro_1_html: |
         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="https://opendatacommons.org/licenses/odbl/">Open Data

         Commons Open Database License</a> (ODbL) by the  <a
         Commons Open Database License</a> (ODbL) by the  <a

-        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
+        href="https://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
         contributors. If you alter or build upon our data, you
         may distribute the result only under the same licence. The
       intro_2_html: |
         You are free to copy, distribute, transmit and adapt our data,
         as long as you credit OpenStreetMap and its
         contributors. If you alter or build upon our data, you
         may distribute the result only under the same licence. The

-        full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
+        full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal

         code</a> explains your rights and responsibilities.
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are
         code</a> explains your rights and responsibilities.
       intro_3_html: |
         The cartography in our map tiles, and our documentation, are

-        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative

         Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |
         Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
       credit_title_html: How to credit OpenStreetMap
       credit_1_html: |


@@ -989,7 +1045,7 @@ en:
         You must also make it clear that the data is available under the Open
         Database License, and if using our map tiles, that the cartography is
         licensed as CC BY-SA. You may do this by linking to
         You must also make it clear that the data is available under the Open
         Database License, and if using our map tiles, that the cartography is
         licensed as CC BY-SA. You may do this by linking to

-        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+        <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.

         Alternatively, and as a requirement if you are distributing OSM in a
         data form, you can name and link directly to the license(s). In media
         where links are not possible (e.g. printed works), we suggest you
         Alternatively, and as a requirement if you are distributing OSM in a
         data form, you can name and link directly to the license(s). In media
         where links are not possible (e.g. printed works), we suggest you


@@ -1005,15 +1061,13 @@ 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>.
+        href="https://osmfoundation.org/Licence">OSMF Licence page</a>.

       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a

-        free-of-charge map API for third-party developers.
-        See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
-        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
-        and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.

       contributors_title_html: Our contributors
       contributors_intro_html: |
         Our contributors are thousands of individuals. We also include
       contributors_title_html: Our contributors
       contributors_intro_html: |
         Our contributors are thousands of individuals. We also include


@@ -1021,10 +1075,10 @@ en:
         and other sources, among them:
       contributors_at_html: |
         <strong>Austria</strong>: Contains data from
         and other sources, among them:
       contributors_at_html: |
         <strong>Austria</strong>: Contains data from

-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+        Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).

       contributors_ca_html: |
         <strong>Canada</strong>: Contains data from
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
       contributors_ca_html: |
         <strong>Canada</strong>: Contains data from
         GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -1035,13 +1089,13 @@ en:
         <strong>Finland</strong>: Contains data from the
         National Land Survey of Finland's Topographic Database
         and other datasets, under the
         <strong>Finland</strong>: Contains data from the
         National Land Survey of Finland's Topographic Database
         and other datasets, under the

-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.

       contributors_fr_html: |
         <strong>France</strong>: Contains data sourced from
         Direction Générale des Impôts.
       contributors_nl_html: |
         <strong>Netherlands</strong>: Contains &copy; AND data, 2007
       contributors_fr_html: |
         <strong>France</strong>: Contains data sourced from
         Direction Générale des Impôts.
       contributors_nl_html: |
         <strong>Netherlands</strong>: Contains &copy; AND data, 2007

-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)

       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.


@@ -1061,7 +1115,7 @@ en:
       contributors_footer_1_html: |
         For further details of these, and other sources that have been used
         to help improve OpenStreetMap, please see the <a
       contributors_footer_1_html: |
         For further details of these, and other sources that have been used
         to help improve OpenStreetMap, please see the <a

-        href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+        href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors

         page</a> on the OpenStreetMap Wiki.
       contributors_footer_2_html: |
         Inclusion of data in OpenStreetMap does not imply that the original
         page</a> on the OpenStreetMap Wiki.
       contributors_footer_2_html: |
         Inclusion of data in OpenStreetMap does not imply that the original


@@ -1075,12 +1129,12 @@ en:
       infringement_2_html: |
         If you believe that copyrighted material has been inappropriately
         added to the OpenStreetMap database or this site, please refer
       infringement_2_html: |
         If you believe that copyrighted material has been inappropriately
         added to the OpenStreetMap database or this site, please refer

-        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+        to our <a href="https://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: |
         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>.
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.

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


@@ -1110,6 +1164,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='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and
+        <a href='https://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: |


@@ -1134,7 +1196,7 @@ en:
         title: Join the community
         explanation_html: |
           If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
         title: Join the community
         explanation_html: |
           If you have noticed a problem with our map data, for example a road is missing or your address, the best way to

-          proceed is to join the OpenStreetMap community and add or repair the data yourself. 
+          proceed is to join the OpenStreetMap community and add or repair the data yourself.

       add_a_note:
         instructions_html: |
           Just click <a class='icon note'></a> or the same icon on the map display.
       add_a_note:
         instructions_html: |
           Just click <a class='icon note'></a> or the same icon on the map display.


@@ -1144,8 +1206,8 @@ en:
       title: Other concerns
       explanation_html: |
         If you have concerns about how our data is being used or about the contents please consult our
       title: Other concerns
       explanation_html: |
         If you have concerns about how our data is being used or about the contents please consult our

-        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate 
-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  
+        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.

   help_page:
     title: Getting Help
     introduction: |
   help_page:
     title: Getting Help
     introduction: |


@@ -1156,7 +1218,7 @@ en:
       title: Welcome to OSM
       description: Start with this quick guide covering the OpenStreetMap basics.
     beginners_guide:
       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
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide

       title: Beginners' Guide
       description: Community maintained guide for beginners.
     help:
       title: Beginners' Guide
       description: Community maintained guide for beginners.
     help:


@@ -1164,15 +1226,15 @@ en:
       title: help.openstreetmap.org
       description: Ask a question or look up answers on OSM's question-and-answer site.
     mailing_lists:
       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/
+      url: https://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:
       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/
+      url: https://forum.openstreetmap.org/

       title: Forums
       description: Questions and discussions for those that prefer a bulletin board style interface.
     irc:
       title: Forums
       description: Questions and discussions for those that prefer a bulletin board style interface.
     irc:

-      url: http://irc.openstreetmap.org/
+      url: https://irc.openstreetmap.org/

       title: IRC
       description: Interactive chat in many different languages and on many topics.
     switch2osm:
       title: IRC
       description: Interactive chat in many different languages and on many topics.
     switch2osm:


@@ -1180,51 +1242,14 @@ en:
       title: switch2osm
       description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
     wiki:
       title: switch2osm
       description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: Browse the wiki for in-depth OSM documentation.
       title: wiki.openstreetmap.org
       description: Browse the wiki for in-depth OSM documentation.

-  about_page:
-    next: Next
-    copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-    used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
-    lede_text: |
-      OpenStreetMap is built by a community of mappers that contribute and maintain data
-      about roads, trails, cafés, railway stations, and much more, all over the world.
-    local_knowledge_title: Local Knowledge
-    local_knowledge_html: |
-      OpenStreetMap emphasizes local knowledge. Contributors use
-      aerial imagery, GPS devices, and low-tech field maps to verify that OSM
-      is accurate and up to date.
-    community_driven_title: Community Driven
-    community_driven_html: |
-      OpenStreetMap's community is diverse, passionate, and growing every day.
-      Our contributors include enthusiast mappers, GIS professionals, engineers
-      running the OSM servers, humanitarians mapping disaster-affected areas,
-      and many more.
-      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
-      <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
-      the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
-    open_data_title: Open Data
-    open_data_html: |
-      OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
-      as long as you credit OpenStreetMap and its contributors. If you alter or
-      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:
   notifier:
     diary_comment_notification:

-      subject: "[OpenStreetMap] %{user} commented on your diary entry"
+      subject: "[OpenStreetMap] %{user} commented on a diary entry"

       hi: "Hi %{to_user},"
       hi: "Hi %{to_user},"

-      header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:"
+      header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"

       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"


@@ -1232,6 +1257,7 @@ en:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:

+      hi: "Hi %{to_user},"

       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."


@@ -1247,7 +1273,7 @@ en:
         failed_to_import: "failed to import. Here is the error:"
         more_info_1: "More information about GPX import failures and how to avoid"
         more_info_2: "them can be found at:"
         failed_to_import: "failed to import. Here is the error:"
         more_info_1: "More information about GPX import failures and how to avoid"
         more_info_2: "them can be found at:"

-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"

       success:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
       success:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.


@@ -1297,6 +1323,7 @@ en:
         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:
         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:

+      hi: "Hi %{to_user},"

       greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
       greeting: "Hi,"
       commented:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"


@@ -1306,6 +1333,7 @@ en:
         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}."
         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}."

+      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'

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


@@ -1363,6 +1391,7 @@ en:
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"

+      delete_button: "Delete"

       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
       back: "Back"
       to: "To"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."


@@ -1374,6 +1403,49 @@ en:
     delete:
       deleted: "Message deleted"
   site:
     delete:
       deleted: "Message deleted"
   site:

+    about:
+      next: Next
+      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
+      used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+      lede_text: |
+        OpenStreetMap is built by a community of mappers that contribute and maintain data
+        about roads, trails, cafés, railway stations, and much more, all over the world.
+      local_knowledge_title: Local Knowledge
+      local_knowledge_html: |
+        OpenStreetMap emphasizes local knowledge. Contributors use
+        aerial imagery, GPS devices, and low-tech field maps to verify that OSM
+        is accurate and up to date.
+      community_driven_title: Community Driven
+      community_driven_html: |
+        OpenStreetMap's community is diverse, passionate, and growing every day.
+        Our contributors include enthusiast mappers, GIS professionals, engineers
+        running the OSM servers, humanitarians mapping disaster-affected areas,
+        and many more.
+        To learn more about the community, see the
+        <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+        <a href='%{diary_path}'>user diaries</a>,
+        <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
+        the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
+      open_data_title: Open Data
+      open_data_html: |
+        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+        as long as you credit OpenStreetMap and its contributors. If you alter or
+        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='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+        on behalf of the community. Use of all OSMF operated services is subject
+        to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+        <br>
+        Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
+        if you have licensing, copyright or other legal questions.
+        <br>
+        OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
+      partners_title: Partners

     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."


@@ -1382,19 +1454,19 @@ en:
       createnote: Add a note
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
       createnote: Add a note
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"

-        license_url: "http://openstreetmap.org/copyright"
-        project_url: "http://openstreetmap.org"
+        license_url: "https://openstreetmap.org/copyright"
+        project_url: "https://openstreetmap.org"

       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
       user_page_link: user page
       anon_edits: "(%{link})"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
       user_page_link: user page
       anon_edits: "(%{link})"

-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"

       anon_edits_link_text: "Find out why this is the case."
       anon_edits_link_text: "Find out why this is the case."

-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'

       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"

-      potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
+      potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"

       potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
       id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
       potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
       id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."


@@ -1407,22 +1479,25 @@ en:
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"

-      where_am_i: "Where am I?"
+      where_am_i: "Where is this?"

       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"

+      reverse_directions_text: "Reverse Directions"

     key:
       table:
         entry:
           motorway: "Motorway"
     key:
       table:
         entry:
           motorway: "Motorway"

+          main_road: "Main road"

           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           trunk: "Trunk road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

-          unsurfaced: "Unsurfaced road"

           track: "Track"
           track: "Track"

-          byway: "Byway"

           bridleway: "Bridleway"
           cycleway: "Cycleway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"

+          cycleway_national: "National cycleway"
+          cycleway_regional: "Regional cycleway"
+          cycleway_local: "Local cycleway"

           footway: "Footway"
           rail: "Railway"
           subway: "Subway"
           footway: "Footway"
           rail: "Railway"
           subway: "Subway"


@@ -1444,7 +1519,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


@@ -1474,14 +1548,16 @@ 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"
           destination: "Destination access"
           construction: "Roads under construction"

+          bicycle_shop: "Bicycle shop"
+          bicycle_parking: "Bicycle parking"
+          toilets: "Toilets"

     richtext_area:
       edit: Edit
       preview: Preview
     markdown_help:
     richtext_area:
       edit: Edit
       preview: Preview
     markdown_help:

-      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Headings
       heading: Heading
       subheading: Subheading
       headings: Headings
       heading: Heading
       subheading: Subheading


@@ -1520,7 +1596,7 @@ en:
       save_button: "Save Changes"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       save_button: "Save Changes"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"

-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"

     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"
     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"


@@ -1528,14 +1604,14 @@ en:
       tags_help: "comma delimited"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       tags_help: "comma delimited"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"

-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"

       upload_button: "Upload"
       help: "Help"
       upload_button: "Upload"
       help: "Help"

-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+      help_url: "https://wiki.openstreetmap.org/wiki/Upload"

     trace_header:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
     trace_header:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"

-      see_your_traces: "See your traces"
+      see_my_traces: "See my traces"

       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."


@@ -1560,6 +1636,7 @@ en:
       delete_track: "Delete this trace"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       delete_track: "Delete this trace"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"

+      confirm_delete: "Delete this trace?"

     trace_paging_nav:
       showing_page: "Page %{page}"
       older: "Older Traces"
     trace_paging_nav:
       showing_page: "Page %{page}"
       older: "Older Traces"


@@ -1582,11 +1659,11 @@ en:
       map: "map"
     list:
       public_traces: "Public GPS traces"
       map: "map"
     list:
       public_traces: "Public GPS traces"

-      your_traces: "Your GPS traces"
+      my_traces: "My GPS traces"

       public_traces_from: "Public GPS traces from %{user}"
       public_traces_from: "Public GPS traces from %{user}"

-      description: "Browse recent GPS track uploads"
+      description: "Browse recent GPS trace uploads"

       tagged_with: " tagged with %{tags}"
       tagged_with: " tagged with %{tags}"

-      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."

     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -1609,6 +1686,7 @@ en:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:

+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."

       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:


@@ -1623,6 +1701,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."


@@ -1633,6 +1712,8 @@ en:
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"
       invalid: "The authorization token is not valid."
     revoke:
       flash: "You've revoked the token for %{application}"

+    permissions:
+      missing: "You have not permitted the application access to this facility"

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -1720,6 +1801,18 @@ en:
         google:
           title: Login with Google
           alt: Login with a Google OpenID
         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
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account

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


@@ -1752,17 +1845,17 @@ en:
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."

-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'

       about:
         header: Free and editable
         html: |
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
           and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       about:
         header: Free and editable
         html: |
           <p>Unlike other maps, OpenStreetMap is completely created by people like you,
           and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>

-      license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
+      license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'

       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"

-      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>)'
+      not displayed publicly: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'

       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"


@@ -1770,30 +1863,20 @@ en:
       confirm password: "Confirm Password:"
       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."
       confirm password: "Confirm Password:"
       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
-            with your ID in your user settings.
-          </li>
-        </ul>

       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."

-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
       read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
       read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"

-      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain

       guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
       agree: Agree
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
       agree: Agree

-      declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
+      declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"

       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Country of residence:"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
       legale_select: "Country of residence:"


@@ -1805,6 +1888,7 @@ en:
       title: "No such user"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       title: "No such user"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."

+      deleted: "deleted"

     view:
       my diary: My Diary
       new diary entry: new diary entry
     view:
       my diary: My Diary
       new diary entry: new diary entry


@@ -1840,7 +1924,7 @@ en:
       user location: User location
       if set location: "Set your home location on the %{settings_link} page to see nearby users."
       settings_link_text: settings
       user location: User location
       if set location: "Set your home location on the %{settings_link} page to see nearby users."
       settings_link_text: settings

-      your friends: Your friends
+      my friends: My friends

       no friends: You have not added any friends yet.
       km away: "%{count}km away"
       m away: "%{count}m away"
       no friends: You have not added any friends yet.
       km away: "%{count}km away"
       m away: "%{count}m away"


@@ -1855,16 +1939,16 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"

-      block_history: "blocks received"
-      moderator_history: "blocks given"
+      block_history: "Active Blocks"
+      moderator_history: "Blocks Given"

       comments: "Comments"
       comments: "Comments"

-      create_block: "block this user"
-      activate_user: "activate this user"
-      deactivate_user: "deactivate this user"
-      confirm_user: "confirm this user"
-      hide_user: "hide this user"
-      unhide_user: "unhide this user"
-      delete_user: "delete this user"
+      create_block: "Block this User"
+      activate_user: "Activate this User"
+      deactivate_user: "Deactivate this User"
+      confirm_user: "Confirm this User"
+      hide_user: "Hide this User"
+      unhide_user: "Unhide this User"
+      delete_user: "Delete this User"

       confirm: "Confirm"
       friends_changesets: "friends' changesets"
       friends_diaries: "friends' diary entries"
       confirm: "Confirm"
       friends_changesets: "friends' changesets"
       friends_diaries: "friends' diary entries"


@@ -1882,25 +1966,25 @@ en:
       email never displayed publicly: "(never displayed publicly)"
       external auth: "External Authentication:"
       openid:
       email never displayed publicly: "(never displayed publicly)"
       external auth: "External Authentication:"
       openid:

-        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link: "https://wiki.openstreetmap.org/wiki/OpenID"

         link text: "what is this?"
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
         link text: "what is this?"
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."

-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
+        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"

         enabled link text: "what is this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
       public editing note:
         heading: "Public editing"
         enabled link text: "what is this?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
       public editing note:
         heading: "Public editing"

-        text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+        text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"

       contributor terms:
         heading: "Contributor Terms:"
         agreed: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
       contributor terms:
         heading: "Contributor Terms:"
         agreed: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."

-        link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"

         link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
         link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"


@@ -1908,8 +1992,10 @@ en:
       image: "Image:"
       gravatar:
         gravatar: "Use Gravatar"
       image: "Image:"
       gravatar:
         gravatar: "Use Gravatar"

-        link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+        link: "https://wiki.openstreetmap.org/wiki/Gravatar"

         link text: "what is this?"
         link text: "what is this?"

+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."

       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"
       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"


@@ -1938,7 +2024,7 @@ en:
       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>."
     confirm_resend:
       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>."
     confirm_resend:

-      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."

       failure: "User %{name} not found."
     confirm_email:
       heading: Confirm a change of email address
       failure: "User %{name} not found."
     confirm_email:
       heading: Confirm a change of email address


@@ -1991,12 +2077,25 @@ en:
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
     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
+    auth_association:
+      heading: Your ID is not associated with a OpenStreetMap account yet.
+      option_1: |
+        If you are new to OpenStreetMap, please create a new account
+        using the form below.
+      option_2: |
+        If you already have an account, you can login to your account
+        using your username and password and then associate the account
+        with your ID in your user settings.

   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
       not_a_role: "The string `%{role}' is not a valid role."
       already_has_role: "The user already has role %{role}."
       doesnt_have_role: "The user does not have role %{role}."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
       not_a_role: "The string `%{role}' is not a valid role."
       already_has_role: "The user already has role %{role}."
       doesnt_have_role: "The user does not have role %{role}."

+      not_revoke_admin_current_user: "Cannot revoke administrator role from current user."

     grant:
       title: Confirm role granting
       heading: Confirm role granting
     grant:
       title: Confirm role granting
       heading: Confirm role granting


@@ -2060,23 +2159,10 @@ en:
     period:
       one: "1 hour"
       other: "%{count} hours"
     period:
       one: "1 hour"
       other: "%{count} hours"

-    partial:
-      show: "Show"
-      edit: "Edit"
-      revoke: "Revoke!"
-      confirm: "Are you sure?"
-      display_name: "Blocked User"
-      creator_name: "Creator"
-      reason: "Reason for block"
-      status: "Status"
-      revoker_name: "Revoked by"
-      not_revoked: "(not revoked)"
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"

     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."

+      time_future_and_until_login: "Ends in %{time} and after the user has logged in."

       time_past: "Ended %{time} ago."
     blocks_on:
       title: "Blocks on %{name}"
       time_past: "Ended %{time} ago."
     blocks_on:
       title: "Blocks on %{name}"


@@ -2091,6 +2177,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"


@@ -2100,6 +2188,21 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."

+  user_blocks:
+    block:
+      not_revoked: "(not revoked)"
+      show: "Show"
+      edit: "Edit"
+      revoke: "Revoke!"
+    blocks:
+      display_name: "Blocked User"
+      creator_name: "Creator"
+      reason: "Reason for block"
+      status: "Status"
+      revoker_name: "Revoked by"
+      showing_page: "Page %{page}"
+      next: "Next »"
+      previous: "« Previous"

   note:
     description:
       opened_at_html: "Created %{when} ago"
   note:
     description:
       opened_at_html: "Created %{when} ago"


@@ -2140,6 +2243,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:"


@@ -2151,10 +2255,13 @@ en:
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"

+      only_standard_layer: "Only the standard layer can be exported as an image"
+    embed:
+      report_problem: "Report a problem"

     key:
       title: "Map Key"
       tooltip: "Map Key"
     key:
       title: "Map Key"
       tooltip: "Map Key"

-      tooltip_disabled: "Map Key available only for Standard layer"
+      tooltip_disabled: "Map Key not available for this layer"

     map:
       zoom:
         in: Zoom In
     map:
       zoom:
         in: Zoom In


@@ -2166,12 +2273,12 @@ en:
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map
         standard: Standard
         cycle_map: Cycle Map
         transport_map: Transport Map

-        mapquest: MapQuest Open

         hot: Humanitarian
       layers:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         hot: Humanitarian
       layers:
         header: Map Layers
         notes: Map Notes
         data: Map Data

+        gps: Public GPS Traces

         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
         overlays: Enable overlays for troubleshooting the map
         title: "Layers"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"


@@ -2194,7 +2301,8 @@ en:
         unhide_comment: "unhide"
     notes:
       new:
         unhide_comment: "unhide"
     notes:
       new:

-        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.)"
+        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."
+        advice: "Your note is public and may be used to update the map, so 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.


@@ -2205,38 +2313,78 @@ en:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
         comment: Comment
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:

+      ascend: "Ascend"

       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"
       engines:
         graphhopper_bicycle: "Bicycle (GraphHopper)"

+        graphhopper_car: "Car (GraphHopper)"

         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"
         mapquest_foot: "Foot (MapQuest)"
         osrm_car: "Car (OSRM)"
         graphhopper_foot: "Foot (GraphHopper)"
         mapquest_bicycle: "Bicycle (MapQuest)"
         mapquest_car: "Car (MapQuest)"
         mapquest_foot: "Foot (MapQuest)"
         osrm_car: "Car (OSRM)"

+      descend: "Descend"

       directions: "Directions"
       distance: "Distance"
       errors:
         no_route: "Couldn't find a route between those two places."
       directions: "Directions"
       distance: "Distance"
       errors:
         no_route: "Couldn't find a route between those two places."

-        no_place: "Sorry - couldn't find that place."
+        no_place: "Sorry - couldn't locate '%{place}'."

       instructions:
       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
-        exit: exit %{exit}
-        unnamed: "(unnamed)"
+        continue_without_exit: Continue on %{name}
+        slight_right_without_exit: Slight right onto %{name}
+        offramp_right: Take the ramp on the right
+        offramp_right_with_exit: Take exit %{exit} on the right
+        offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name}
+        offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions}
+        offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions}
+        offramp_right_with_name: Take the ramp on the right onto %{name}
+        offramp_right_with_directions: Take the ramp on the right towards %{directions}
+        offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions}
+        onramp_right_without_exit: Turn right on the ramp onto %{name}
+        onramp_right_with_directions: Turn right onto the ramp towards %{directions}
+        onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
+        onramp_right_without_directions: Turn right onto the ramp
+        onramp_right: Turn right onto the ramp
+        endofroad_right_without_exit: At the end of the road turn right onto %{name}
+        merge_right_without_exit: Merge right onto %{name}
+        fork_right_without_exit: At the fork turn 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}
+        offramp_left: Take the ramp on the left
+        offramp_left_with_exit: Take exit %{exit} on the left
+        offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name}
+        offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions}
+        offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions}
+        offramp_left_with_name: Take the ramp on the left onto %{name}
+        offramp_left_with_directions: Take the ramp on the left towards %{directions}
+        offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions}
+        onramp_left_without_exit: Turn left on the ramp onto %{name}
+        onramp_left_with_directions: Turn left onto the ramp towards %{directions}
+        onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
+        onramp_left_without_directions: Turn left onto the ramp
+        onramp_left: Turn left onto the ramp
+        endofroad_left_without_exit: At the end of the road turn left onto %{name}
+        merge_left_without_exit: Merge left onto %{name}
+        fork_left_without_exit: At the fork 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 exit onto %{name}
+        leave_roundabout_without_exit: Leave roundabout - %{name}
+        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        start_without_exit: Start on %{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}
+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}
+        unnamed: "unnamed road"

         courtesy: "Directions courtesy of %{link}"
       time: "Time"
     query:
         courtesy: "Directions courtesy of %{link}"
       time: "Time"
     query:


@@ -2246,6 +2394,13 @@ en:
       nothing_found: No features found
       error: "Error contacting %{server}: %{error}"
       timeout: "Timeout contacting %{server}"
       nothing_found: No features found
       error: "Error contacting %{server}: %{error}"
       timeout: "Timeout contacting %{server}"

+    context:
+      directions_from: Directions from here
+      directions_to: Directions to here
+      add_note: Add a note here
+      show_address: Show address
+      query_features: Query features
+      centre_map: Centre map here

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"