]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Added complete Rails test suite
[rails.git] / config / locales / en-GB.yml
index 2aca1979518878bba0eca4462d4362dee8d80b60..a54403e54561352f7f6bffd881541b9bb7bfa152 100644 (file)
@@ -2,7 +2,10 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Abijeet Patro
+# Author: Alefar
 # Author: Andibing
+# Author: BEANS
+# Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Caliburn
 # Author: E THP
 # Author: EdLoach
 # Author: Eduard Popov
+# Author: Gravitystorm
 # Author: IknowJoseph
 # Author: Jagwar
 # Author: Jguthrie100
+# Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe
+# Author: Maro21
 # Author: Meno25
+# Author: Michel Bakni
 # Author: Mvolz
 # Author: Sampablokuper
+# Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
+# Author: Tlubenov
 # Author: TomH
 # Author: ديفيد
 ---
@@ -32,16 +41,21 @@ en-GB:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
   helpers:
+    file:
+      prompt: Choose file
     submit:
       diary_comment:
         create: Save
       diary_entry:
         create: Publish
+        update: Update
+      issue_comment:
+        create: Add Comment
       message:
         create: Send
       client_application:
         create: Register
-        update: Edit
+        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -52,6 +66,10 @@ en-GB:
         create: Create block
         update: Update block
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: does not appear to be a valid e-mail address
+        email_address_not_routable: is not routable
     models:
       acl: Access Control List
       changeset: Changeset
@@ -60,6 +78,7 @@ en-GB:
       diary_comment: Diary Comment
       diary_entry: Diary Entry
       friend: Friend
+      issue: Issue
       language: Language
       message: Message
       node: Node
@@ -76,6 +95,7 @@ en-GB:
       relation: Relation
       relation_member: Relation Member
       relation_tag: Relation Tag
+      report: Report
       session: Session
       trace: Trace
       tracepoint: Trace Point
@@ -87,6 +107,18 @@ en-GB:
       way_node: Way Node
       way_tag: Way Tag
     attributes:
+      client_application:
+        name: Name (Required)
+        url: Main Application URL (Required)
+        callback_url: 'Callback URL:'
+        support_url: Support URL
+        allow_read_prefs: read their user preferences
+        allow_write_prefs: modify their user preferences
+        allow_write_diary: create diary entries, comments and make friends
+        allow_write_api: modify the map
+        allow_read_gpx: read their private GPS traces
+        allow_write_gpx: upload GPS traces
+        allow_write_notes: modify notes
       diary_comment:
         body: Body
       diary_entry:
@@ -101,17 +133,23 @@ en-GB:
       trace:
         user: User
         visible: Visible
-        name: Name
+        name: Filename
         size: Size
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: Upload GPX File
+        visibility: Visibility
+        tagstring: Tags
       message:
         sender: Sender
         title: Subject
         body: Body
         recipient: Recipient
+      report:
+        category: 'Select a reason for your report:'
+        details: Please provide some more details about the problem (required).
       user:
         email: E-mail
         active: Active
@@ -119,23 +157,71 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
+        pass_crypt_confirmation: Confirm Password
+    help:
+      trace:
+        tagstring: comma delimited
+      user_block:
+        needs_view: Does the user need to log in before this block will be cleared?
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: about 1 hour ago
+        other: about %{count} hours ago
+      about_x_months:
+        one: about 1 month ago
+        other: about %{count} months ago
+      about_x_years:
+        one: about 1 year ago
+        other: about %{count} years ago
+      almost_x_years:
+        one: almost 1 year ago
+        other: almost %{count} years ago
+      half_a_minute: half a minute ago
+      less_than_x_seconds:
+        one: less than 1 second ago
+        other: less than %{count} seconds ago
+      less_than_x_minutes:
+        one: less than a minute ago
+        other: less than %{count} minutes ago
+      over_x_years:
+        one: over 1 year ago
+        other: over %{count} years ago
+      x_seconds:
+        one: 1 second ago
+        other: '%{count} seconds ago'
+      x_minutes:
+        one: 1 minute ago
+        other: '%{count} minutes ago'
+      x_days:
+        one: 1 day ago
+        other: '%{count} days ago'
+      x_months:
+        one: 1 month ago
+        other: '%{count} months ago'
+      x_years:
+        one: 1 year ago
+        other: '%{count} years ago'
   printable_name:
     with_version: '%{id}, v%{version}'
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-browser editor)
     id:
       name: iD
       description: iD (in-browser editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  auth:
+    providers:
+      none: None
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -177,6 +263,8 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
     changeset:
       title: 'Changeset: %{id}'
       belongs_to: Author
@@ -187,8 +275,8 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
@@ -196,31 +284,34 @@ en-GB:
         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}'
+      title_html: 'Node: %{name}'
+      history_title_html: 'Node History: %{name}'
     way:
-      title: 'Way: %{name}'
-      history_title: 'Way History: %{name}'
+      title_html: 'Way: %{name}'
+      history_title_html: 'Way History: %{name}'
       nodes: Nodes
-      also_part_of:
+      also_part_of_html:
         one: part of way %{related_ways}
         other: part of ways %{related_ways}
     relation:
-      title: 'Relation: %{name}'
-      history_title: 'Relation History: %{name}'
+      title_html: 'Relation: %{name}'
+      history_title_html: 'Relation History: %{name}'
       members: Members
     relation_member:
-      entry: '%{type} %{name}'
-      entry_role: '%{type} %{name} as %{role}'
+      entry_html: '%{type} %{name}'
+      entry_role_html: '%{type} %{name} as %{role}'
       type:
         node: Node
         way: Way
         relation: Relation
     containing_relation:
-      entry: Relation %{relation_name}
-      entry_role: Relation %{relation_name} (as %{relation_role})
+      entry_html: Relation %{relation_name}
+      entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
+      title: Not Found
       sorry: 'Sorry, %{type} #%{id} could not be found.'
       type:
         node: node
@@ -229,6 +320,7 @@ en-GB:
         changeset: changeset
         note: note
     timeout:
+      title: Timeout Error
       sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
       type:
         node: node
@@ -256,7 +348,9 @@ en-GB:
         tag: The wiki description page for the %{key}=%{value} tag
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} article on Wikipedia
+      wikimedia_commons_link: The %{page} item on Wikimedia Commons
       telephone_link: Call %{phone_number}
+      colour_preview: Colour %{colour_value} preview
     note:
       title: 'Note: %{id}'
       new_note: New Note
@@ -264,16 +358,17 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      open_by: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      open_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Report this note
+      coordinates_html: '%{latitude}, %{longitude}'
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
@@ -312,20 +407,20 @@ en-GB:
     comment:
       comment: 'New comment on changeset #%{changeset_id} by %{author}'
       commented_at_by_html: Updated %{when} by %{user}
+    comments:
+      comment: 'New comment on changeset #%{changeset_id} by %{author}'
     index:
       title_all: OpenStreetMap changeset discussion
       title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+    timeout:
+      sorry: Sorry, the list of changeset comments you requested took too long to
+        retrieve.
   diary_entries:
     new:
       title: New Diary Entry
     form:
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
       location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
+      use_map_link: Use map
     index:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -334,6 +429,7 @@ en-GB:
       in_language_title: Diary Entries in %{language}
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
+      my_diary: My Diary
       no_entries: No diary entries
       recent_entries: Recent diary entries
       older_entries: Older Entries
@@ -345,7 +441,7 @@ en-GB:
       title: '%{user}''s diary | %{title}'
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
-      login_to_leave_a_comment: '%{login_link} to leave a comment'
+      login_to_leave_a_comment_html: '%{login_link} to leave a comment'
       login: Login
     no_such_entry:
       title: No such diary entry
@@ -353,20 +449,25 @@ en-GB:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:
-      posted_by: Posted by %{link_user} on %{created} in %{language_link}
+      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
+      updated_at_html: Last updated on %{updated}.
       comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      reply_link: Send a message to the author
       comment_count:
         zero: No comments
         one: '%{count} comment'
         other: '%{count} comments'
       edit_link: Edit this entry
       hide_link: Hide this entry
+      unhide_link: Unhide this entry
       confirm: Confirm
+      report: Report this entry
     diary_comment:
-      comment_from: Comment from %{link_user} on %{comment_created_at}
+      comment_from_html: Comment from %{link_user} on %{comment_created_at}
       hide_link: Hide this comment
+      unhide_link: Unhide this comment
       confirm: Confirm
+      report: Report this comment
     location:
       location: 'Location:'
       view: View
@@ -388,17 +489,29 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
+  friendships:
+    make_friend:
+      heading: Add %{user} as a friend?
+      button: Add as friend
+      success: '%{name} is now your friend!'
+      failed: Sorry, failed to add %{name} as a friend.
+      already_a_friend: You are already friends with %{name}.
+    remove_friend:
+      heading: Unfriend %{user}?
+      button: Unfriend
+      success: '%{name} was removed from your friends.'
+      not_a_friend: '%{name} is not one of your friends.'
   geocoder:
     search:
       title:
-        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
+        latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
+        ca_postcode_html: Results from <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames: Results from <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: Results from <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_reverse: Results from <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse_html: Results from <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix_format: '%{name}'
       prefix:
@@ -407,12 +520,20 @@ en-GB:
           chair_lift: Chairlift
           drag_lift: Drag Lift
           gondola: Gondola Lift
+          magic_carpet: Magic Carpet Lift
+          platter: Platter Lift
+          pylon: Pylon
           station: Aerialway Station
+          t-bar: T-Bar Lift
         aeroway:
           aerodrome: Aerodrome
+          airstrip: Airstrip
           apron: Apron
           gate: Gate
+          hangar: Hangar
           helipad: Helipad
+          holding_position: Holding Position
+          parking_position: Parking Position
           runway: Runway
           taxiway: Taxiway
           terminal: Terminal
@@ -426,7 +547,9 @@ en-GB:
           bench: Bench
           bicycle_parking: Cycle Parking
           bicycle_rental: Cycle Rental
+          bicycle_repair_station: Bicycle Repair Station
           biergarten: Beer Garden
+          blood_bank: Blood Bank
           boat_rental: Boat Rental
           brothel: Brothel
           bureau_de_change: Bureau de Change
@@ -443,6 +566,7 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
+          conference_centre: Conference Centre
           courthouse: Court
           crematorium: Crematorium
           dentist: Dentist
@@ -450,6 +574,7 @@ en-GB:
           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy
+          events_venue: Events Venue
           fast_food: Fast Food
           ferry_terminal: Ferry Terminal
           fire_station: Fire Station
@@ -458,38 +583,41 @@ en-GB:
           fuel: Fuel
           gambling: Gambling
           grave_yard: Graveyard
+          grit_bin: Grit Bin
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
+          internet_cafe: Internet Cafe
           kindergarten: Nursery School
+          language_school: Language school
           library: Library
+          loading_dock: Loading Dock
+          love_hotel: Love Hotel
           marketplace: Marketplace
           monastery: Monastery
+          money_transfer: Money Transfer
           motorcycle_parking: Motorcycle Parking
+          music_school: Music School
           nightclub: Night Club
           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
           post_box: Post Box
           post_office: Post Office
-          preschool: Pre-School
           prison: Prison
           pub: Pub
+          public_bath: Public Bath
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
           school: School
           shelter: Shelter
-          shop: Shop
           shower: Shower
           social_centre: Social Centre
-          social_club: Social Club
           social_facility: Social Facility
           studio: Studio
           swimming_pool: Swimming Pool
@@ -504,12 +632,13 @@ en-GB:
           village_hall: Village Hall
           waste_basket: Waste Bin
           waste_disposal: Waste Disposal
-          youth_centre: Youth Centre
+          water_point: Water Point
         boundary:
           administrative: Administrative Boundary
           census: Census Boundary
           national_park: National Park
           protected_area: Protected Area
+          "yes": Boundary
         bridge:
           aqueduct: Aqueduct
           boardwalk: Promenade
@@ -518,6 +647,22 @@ en-GB:
           viaduct: Viaduct
           "yes": Bridge
         building:
+          apartment: Apartment
+          apartments: Apartments
+          bungalow: Bungalow
+          cabin: Cabin
+          chapel: Chapel
+          church: Church
+          college: College Building
+          commercial: Commercial Building
+          construction: Building under Construction
+          garage: Garage
+          garages: Garages
+          hospital: Hospital
+          hotel: Hotel
+          house: House
+          industrial: Industrial Building
+          roof: Roof
           "yes": Building
         craft:
           brewery: Brewery
@@ -532,25 +677,31 @@ en-GB:
           "yes": Craft Shop
         emergency:
           ambulance_station: Ambulance Station
+          assembly_point: Assembly Point
           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
+          corridor: Corridor
           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
+          passing_place: Passing Place
           path: Path
           pedestrian: Pedestrian Way
           platform: Platform
@@ -567,14 +718,15 @@ en-GB:
           services: Motorway Services
           speed_camera: Speed Camera
           steps: Steps
+          stop: Stop Sign
           street_lamp: Street Lamp
           tertiary: Tertiary Road
           tertiary_link: Tertiary Road
           track: Track
           traffic_signals: Traffic Signals
-          trail: Trail
           trunk: Trunk Road
           trunk_link: Trunk Road
+          turning_loop: Turning Loop
           unclassified: Unclassified Road
           "yes": Road
         historic:
@@ -590,10 +742,10 @@ en-GB:
           fort: Fort
           heritage: Heritage Site
           house: House
-          icon: Icon
           manor: Manor
           memorial: Memorial
           mine: Mine
+          mine_shaft: Mine Shaft
           monument: Monument
           roman_road: Roman Road
           ruins: Ruins
@@ -603,6 +755,7 @@ en-GB:
           wayside_cross: Wayside Cross
           wayside_shrine: Wayside Shrine
           wreck: Wreck
+          "yes": Historic Site
         junction:
           "yes": Junction
         landuse:
@@ -633,7 +786,6 @@ en-GB:
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
           retail: Retail
-          road: Road Area
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
@@ -642,6 +794,7 @@ en-GB:
           bird_hide: Bird Hide
           common: Common Land
           dog_park: Dog Park
+          firepit: Fire Pit
           fishing: Fishing Area
           fitness_centre: Fitness Centre
           fitness_station: Fitness Station
@@ -653,6 +806,7 @@ en-GB:
           miniature_golf: Miniature Golf
           nature_reserve: Nature Reserve
           park: Park
+          picnic_table: Picnic Table
           pitch: Sports Pitch
           playground: Playground
           recreation_ground: Recreation Ground
@@ -666,16 +820,55 @@ en-GB:
           water_park: Water Park
           "yes": Leisure
         man_made:
+          adit: Adit
+          advertising: Advertising
+          antenna: Antenna/Antennae
+          avalanche_protection: Avalanche Protection
+          beacon: Beacon
+          beam: Beam
+          beehive: Bee Hive
+          breakwater: Breakwater
+          bridge: Bridge
+          bunker_silo: Bunker
+          cairn: Cairn
+          chimney: Chimney
+          clearcut: Clearcut
+          communications_tower: Communications Tower
+          crane: Crane
+          cross: Cross
+          dolphin: Mooring Post
+          dyke: Dyke
+          embankment: Embankment
+          flagpole: Flagpole
+          gasometer: Gasometer
+          groyne: Groyne
+          kiln: Kiln
           lighthouse: Lighthouse
+          manhole: Manhole
+          mast: Mast
+          mine: Mine
+          mineshaft: Mine Shaft
+          monitoring_station: Monitoring Station
           petroleum_well: Oil Well
+          pier: Pier
           pipeline: Pipeline
+          silo: Silo
+          storage_tank: Storage Tank
+          surveillance: Surveillance
           tower: Tower
+          wastewater_plant: Wastewater Plant
+          watermill: Water Mill
+          water_tower: Water Tower
+          water_well: Well
+          water_works: Water Works
+          windmill: Windmill
           works: Factory
           "yes": Man-made
         military:
           airfield: Military Airfield
           barracks: Barracks
           bunker: Bunker
+          "yes": Military
         mountain_pass:
           "yes": Mountain Pass
         natural:
@@ -721,11 +914,14 @@ en-GB:
           accountant: Accountant
           administrative: Administration
           architect: Architect
+          association: Association
           company: Company
+          educational_institution: Educational Institution
           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
@@ -734,6 +930,7 @@ en-GB:
         place:
           allotments: Allotments
           city: City
+          city_block: City Block
           country: Country
           county: County
           farm: Farm
@@ -747,13 +944,14 @@ en-GB:
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
+          quarter: Quarter
           region: Region
           sea: Sea
+          square: Square
           state: State
           subdivision: Subdivision
           suburb: Suburb
           town: Town
-          unincorporated_area: Unincorporated Area
           village: Village
           "yes": Place
         railway:
@@ -779,6 +977,7 @@ en-GB:
           switch: Railway Points
           tram: Tramway
           tram_stop: Tram Stop
+          yard: Railway Yard
         shop:
           alcohol: Off Licence
           antiques: Antiques
@@ -787,6 +986,7 @@ en-GB:
           beauty: Beauty Shop
           beverages: Beverages Shop
           bicycle: Bicycle Shop
+          bookmaker: Bookmaker
           books: Book Shop
           boutique: Boutique
           butcher: Butcher
@@ -811,12 +1011,10 @@ en-GB:
           estate_agent: Estate Agent
           farm: Farm Shop
           fashion: Fashion Shop
-          fish: Fishmonger
           florist: Florist
           food: Food Shop
           funeral_directors: Funeral Directors
           furniture: Furniture
-          gallery: Gallery
           garden_centre: Garden Centre
           general: General Store
           gift: Gift Shop
@@ -825,11 +1023,15 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
+          houseware: Houseware Shop
+          interior_decoration: Interior Decoration
           jewelry: Jewellers
           kiosk: Kiosk Shop
+          kitchen: Kitchen Shop
           laundry: Laundry
+          lottery: Lottery
           mall: Mall
-          market: Market
+          massage: Massage
           mobile_phone: Mobile Phone Shop
           motorcycle: Motorcycle Shop
           music: Music Shop
@@ -837,15 +1039,19 @@ en-GB:
           optician: Optician
           organic: Organic Food Shop
           outdoor: Outdoor Shop
+          paint: Paint Shop
+          pawnbroker: Pawnbroker
           pet: Pet Shop
-          pharmacy: Pharmacy
           photo: Photo Shop
+          seafood: Seafood
           second_hand: Second-hand Shop
           shoes: Shoe Shop
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
           tailor: Tailor
+          ticket: Ticket Shop
+          tobacco: Tobacconist
           toys: Toy Shop
           travel_agency: Travel Agency
           video: Video Shop
@@ -902,11 +1108,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
-    description:
-      title:
-        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
         towns: Towns
@@ -914,6 +1115,9 @@ en-GB:
     results:
       no_results: No results found
       more_results: More results
+  issues:
+    index:
+      reports: Reports
   layouts:
     project_name:
       title: OpenStreetMap
@@ -963,43 +1167,36 @@ en-GB:
       text: Make a Donation
     learn_more: Learn More
     more: More
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
       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}
+        or send a message to the author at %{replyurl}
     message_notification:
-      subject_header: '[OpenStreetMap] %{subject}'
       hi: Hi %{to_user},
       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:
+      footer_html: You can also read the message at %{readurl} and you can send a
+        message to the author at %{replyurl}
+    friendship_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}.
       befriend_them: You can also add them as a friend at %{befriendurl}.
-    gpx_notification:
-      greeting: Hi,
-      your_gpx_file: It looks like your GPX file
-      with_description: with the description
-      and_the_tags: 'and the following tags:'
-      and_no_tags: and no tags.
-      failure:
-        subject: '[OpenStreetMap] GPX Import failure'
-        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
-      success:
-        subject: '[OpenStreetMap] GPX Import success'
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible
-          %{possible_points} points.
+    gpx_failure:
+      failed_to_import: 'failed to import. Here is the error:'
+      import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+      subject: '[OpenStreetMap] GPX Import failure'
+    gpx_success:
+      loaded_successfully:
+        one: loaded successfully with %{trace_points} out of a possible 1 point.
+        other: loaded successfully with %{trace_points} out of a possible %{possible_points}
+          points.
+      subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       greeting: Hi there!
@@ -1010,28 +1207,16 @@ en-GB:
         information to get you started.
     email_confirm:
       subject: '[OpenStreetMap] Confirm your e-mail address'
-    email_confirm_plain:
-      greeting: Hi,
-      hopefully_you: Someone (hopefully you) would like to change their email address
-        over at %{server_url} to %{new_address}.
-      click_the_link: If this is you, please click the link below to confirm the change.
-    email_confirm_html:
       greeting: Hi,
       hopefully_you: Someone (hopefully you) would like to change their email address
         over at %{server_url} to %{new_address}.
       click_the_link: If this is you, please click the link below to confirm the change.
     lost_password:
       subject: '[OpenStreetMap] Password reset request'
-    lost_password_plain:
       greeting: Hi,
       hopefully_you: Someone (possibly you) has asked for the password to be reset
         on this email address's openstreetmap.org account.
       click_the_link: If this is you, please click the link below to reset your password.
-    lost_password_html:
-      greeting: Hi,
-      hopefully_you: Someone (possibly you) has asked for the password to be reset
-        on this e-mail address's openstreetmap.org account.
-      click_the_link: If this is you, please click the link below to reset your password.
     note_comment_notification:
       anonymous: An anonymous user
       greeting: Hi,
@@ -1065,10 +1250,9 @@ en-GB:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset
           you are interested in'
-        your_changeset: '%{commenter} has left a comment on one of your changesets
-          created at %{time}'
-        commented_changeset: '%{commenter} has left a comment on a map changeset you
-          are watching created by %{changeset_author} at %{time}'
+        your_changeset: '%{commenter} left a comment at %{time} on one of your changesets'
+        commented_changeset: '%{commenter} left a comment at %{time} on a changeset
+          you are watching created by %{changeset_author}'
         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}.
@@ -1089,8 +1273,8 @@ en-GB:
       from: From
       subject: Subject
       date: Date
-      no_messages_yet: You have no messages yet. Why not get in touch with some of
-        the %{people_mapping_nearby_link}?
+      no_messages_yet_html: You have no messages yet. Why not get in touch with some
+        of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
     message_summary:
       unread_button: Mark as unread
@@ -1099,7 +1283,7 @@ en-GB:
       destroy_button: Delete
     new:
       title: Send message
-      send_message_to: Send a new message to %{name}
+      send_message_to_html: Send a new message to %{name}
       subject: Subject
       body: Body
       back_to_inbox: Back to inbox
@@ -1113,7 +1297,7 @@ en-GB:
       body: Sorry, there is no message with that id.
     outbox:
       title: Outbox
-      my_inbox: My %{inbox_link}
+      my_inbox_html: My %{inbox_link}
       inbox: inbox
       outbox: outbox
       messages:
@@ -1122,8 +1306,8 @@ en-GB:
       to: To
       subject: Subject
       date: Date
-      no_sent_messages: You have no sent messages yet. Why not get in touch with some
-        of the %{people_mapping_nearby_link}?
+      no_sent_messages_html: You have no sent messages yet. Why not get in touch with
+        some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
     reply:
       wrong_user: You are logged in as `%{user}' but the message you have asked to
@@ -1153,8 +1337,8 @@ en-GB:
     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'
+      used_by_html: '%{name} provides map data for 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.
@@ -1166,7 +1350,7 @@ en-GB:
       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.
+        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
@@ -1175,26 +1359,23 @@ en-GB:
         under the same licence. See the <a href='%{copyright_path}'>Copyright and
         Licence page</a> for details.
       legal_title: Legal
-      legal_html: "This site and many other related services are formally operated
+      legal_1_html: "This site and many other related services are formally operated
         by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
         (OSMF) \non behalf of the community. Use of all OSMF operated services is
         subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
         of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
         Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>\n<br> \nPlease <a href='https://osmfoundation.org/Contact'>contact
-        the OSMF</a> \nif you have licensing, copyright or other legal questions.\n<br>\nOpenStreetMap,
-        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>."
+        Policy</a>."
       partners_title: Partners
     copyright:
       foreign:
         title: About this translation
-        text: In the event of a conflict between this translated page and %{english_original_link},
+        html: In the event of a conflict between this translated page and %{english_original_link},
           the English page shall take precedence
         english_link: the English original
       native:
         title: About this page
-        text: You are viewing the English version of the copyright page. You can go
+        html: You are viewing the English version of the copyright page. You can go
           back to the %{native_link} of this page or you can stop reading about copyright
           and %{mapping_link}.
         native_link: British English version
@@ -1203,34 +1384,32 @@ en-GB:
         title_html: Copyright and Licence
         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
-          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 full <a href="http://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
-          licenced under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
+          The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
+          code</a> explains your rights and responsibilities.
+        intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
+          Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |-
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
+        credit_2_1_html: |-
           You must also make it clear that the data is available under the Open
           Database Licence, and if using our map tiles, that the cartography is
-          licenced as CC BY-SA. You may do this by linking to
-          <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+          licensed as CC BY-SA. You may do this by linking to
+          <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 licence(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
           'OpenStreetMap' to this full address), to opendatacommons.org, and
           if relevant, to creativecommons.org.
-        credit_3_html: |-
+        credit_4_html: |-
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
@@ -1239,9 +1418,7 @@ en-GB:
         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
           free-of-charge map API for third-parties.
@@ -1290,7 +1467,7 @@ en-GB:
         contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
           Survey data &copy; Crown copyright and database right 2010-19.'
         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
+          that have been used to help improve OpenStreetMap, please see the <a 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 data provider endorses OpenStreetMap, provides any warranty,
@@ -1301,15 +1478,14 @@ en-GB:
           permission from the copyright holders.
         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
-          procedure</a> or file directly at our <a href="http://dmca.openstreetmap.org/">on-line
+          href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+          procedure</a> or file directly at our <a href="https://dmca.openstreetmap.org/">on-line
           filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
         trademarks_1_html: 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 send your questions to
-          the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
-          Working Group</a>.
+          have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
+          Policy</a>.
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
@@ -1323,22 +1499,11 @@ en-GB:
         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}.
+      not_public_description_html: 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_html: (%{link})
       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="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.)
-      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.
@@ -1351,7 +1516,7 @@ en-GB:
       map_image: Map Image (shows standard layer)
       embeddable_html: Embeddable HTML
       licence: Licence
-      export_details: OpenStreetMap data is licenced under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details_html: OpenStreetMap data is licenced under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database Licence</a> (ODbL).
       too_large:
         advice: 'If the above export fails, please consider using one of the sources
@@ -1406,7 +1571,7 @@ en-GB:
         title: Other concerns
         explanation_html: "If you have concerns about how our data is being used or
           about the contents please consult our\n<a href='/copyright'>copyright page</a>
-          for more legal information, or contact the appropriate \n<a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
+          for more legal information, or contact the appropriate \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
           working group</a>."
     help:
       title: Getting Help
@@ -1415,16 +1580,16 @@ en-GB:
         mapping topics.
       welcome:
         url: /welcome
-        title: Welcome to OSM
+        title: Welcome to OpenStreetMap
         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:
         url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: Ask a question or look up answers on OSM's question-and-answer
+        title: Help Forum
+        description: Ask a question or look up answers on OpenStreetMap's question-and-answer
           site.
       mailing_lists:
         title: Mailing Lists
@@ -1442,9 +1607,9 @@ en-GB:
         description: Help for companies and organisations switching to OpenStreetMap
           based maps and other services.
       wiki:
-        url: http://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Browse the wiki for in-depth OSM documentation.
+        url: https://wiki.openstreetmap.org/
+        title: OpenStreetMap Wiki
+        description: Browse the wiki for in-depth OpenStreetMap documentation.
     sidebar:
       search_results: Search Results
       close: Close
@@ -1576,8 +1741,8 @@ en-GB:
         paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants
           to collaborate\nwith, and communicate with, the community. If you are considering\nany
           activities other than editing by hand, please read and follow the guidelines
-          on \n<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a>
-          and \n<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated
+          on \n<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a>
+          and \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated
           Edits</a>."
       questions:
         title: Any questions?
@@ -1601,15 +1766,10 @@ en-GB:
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
     new:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      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
       help: Help
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
+      help_url: https://wiki.openstreetmap.org/wiki/Upload
     create:
       upload_trace: Upload GPS Trace
       trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
@@ -1617,26 +1777,14 @@ en-GB:
         will be sent to you on completion.
       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.
+          this 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.
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
-      filename: 'Filename:'
-      download: download
-      uploaded_at: 'Uploaded:'
-      points: 'Points:'
-      start_coord: 'Start coordinate:'
-      map: map
-      edit: edit
-      owner: 'Owner:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
     trace_optionals:
@@ -1666,7 +1814,9 @@ en-GB:
       newer: Newer Traces
     trace:
       pending: PENDING
-      count_points: '%{count} points'
+      count_points:
+        one: 1 point
+        other: '%{count} points'
       more: more
       trace_details: View Trace Details
       view_map: View Map
@@ -1685,11 +1835,11 @@ en-GB:
       description: Browse recent GPS track uploads
       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
+        or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
       upload_trace: Upload a trace
       see_all_traces: See all traces
-    delete:
+    destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:
       made_public: Trace made public
@@ -1720,9 +1870,9 @@ en-GB:
   oauth:
     authorize:
       title: Authorise access to your account
-      request_access: The application %{app_name} is requesting access to your account,
-        %{user}. Please check whether you would like the application to have the following
-        capabilities. You may choose as many or as few as you like.
+      request_access_html: The application %{app_name} is requesting access to your
+        account, %{user}. Please check whether you would like the application to have
+        the following capabilities. You may choose as many or as few as you like.
       allow_to: 'Allow the client application to:'
       allow_read_prefs: read your user preferences.
       allow_write_prefs: modify your user preferences.
@@ -1734,7 +1884,7 @@ en-GB:
       grant_access: Grant Access
     authorize_success:
       title: Authorisation request allowed
-      allowed: You have granted application %{app_name} access to your account.
+      allowed_html: You have granted application %{app_name} access to your account.
       verification: The verification code is %{code}.
     authorize_failure:
       title: Authorisation request failed
@@ -1761,13 +1911,6 @@ en-GB:
       delete: Delete Client
       confirm: Are you sure?
       requests: 'Requesting the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     index:
       title: My OAuth Details
       my_tokens: My Authorised Applications
@@ -1777,25 +1920,13 @@ en-GB:
       issued_at: Issued At
       revoke: Revoke!
       my_apps: My Client Applications
-      no_apps: Do you have an application you would like to register for use with
-        us using the %{oauth} standard? You must register your web application before
-        it can make OAuth requests to this service.
+      no_apps_html: Do you have an application you would like to register for use
+        with us using the %{oauth} standard? You must register your web application
+        before it can make OAuth requests to this service.
       registered_apps: 'You have the following client applications registered:'
       register_new: Register your application
     form:
-      name: Name
-      required: Required
-      url: Main Application URL
-      callback_url: Callback URL
-      support_url: Support URL
       requests: 'Request the following permissions from the user:'
-      allow_read_prefs: read their user preferences.
-      allow_write_prefs: modify their user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read their private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
     not_found:
       sorry: Sorry, that %{type} could not be found.
     create:
@@ -1810,7 +1941,7 @@ en-GB:
       heading: Login
       email or username: 'E-mail Address or Username:'
       password: 'Password:'
-      openid: '%{logo} OpenID:'
+      openid_html: '%{logo} OpenID:'
       remember: Remember me
       lost password link: Lost your password?
       login_button: Login
@@ -1876,8 +2007,6 @@ en-GB:
     reset_password:
       title: Reset password
       heading: Reset Password for %{user}
-      password: 'Password:'
-      confirm password: 'Confirm Password:'
       reset: Reset Password
       flash changed: Your password has been changed.
       flash token bad: Did not find that token, check the URL maybe?
@@ -1885,22 +2014,19 @@ en-GB:
       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="%{webmaster}">webmaster</a> to
-        arrange for an account to be created - we will try and deal with the request
+      contact_webmaster_html: 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>
-      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>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
-      not displayed publicly: Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
-        title="OSMF privacy policy including section on email addresses">privacy policy</a>
-        for more information
+      not_displayed_publicly_html: 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.
@@ -1914,7 +2040,7 @@ en-GB:
       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: Terms
       heading: Terms
@@ -1922,9 +2048,9 @@ en-GB:
         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
-      guidance: 'Information to help understand these terms: a <a href="%{summary}">human
+      guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human
         readable summary</a> and some <a href="%{translations}">informal translations</a>'
-      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.
@@ -1970,8 +2096,8 @@ en-GB:
       spam score: 'Spam Score:'
       description: Description
       user location: User location
-      if set location: Set your home location on the %{settings_link} page to see
-        nearby users.
+      if_set_location_html: Set your home location on the %{settings_link} page to
+        see nearby users.
       settings_link_text: settings
       no friends: You have not added any friends yet.
       km away: '%{count}km away'
@@ -2014,21 +2140,21 @@ en-GB:
       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.
-        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
-        text: Currently your edits are anonymous and people cannot send you messages
+        html: 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
+          only public users can edit map data</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
           out why</a>).<ul><li>Your e-mail 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>
@@ -2048,7 +2174,7 @@ en-GB:
       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?
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
@@ -2081,10 +2207,11 @@ en-GB:
       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
-        %{sender} as we are unable to reply to any confirmation requests.
+      success_html: 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 e-mail address
@@ -2098,25 +2225,14 @@ en-GB:
       flash success: Home location saved successfully
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
-    make_friend:
-      heading: Add %{user} as a friend?
-      button: Add as friend
-      success: '%{name} is now your friend!'
-      failed: Sorry, failed to add %{name} as a friend.
-      already_a_friend: You are already friends with %{name}.
-    remove_friend:
-      heading: Unfriend %{user}?
-      button: Unfriend
-      success: '%{name} was removed from your friends.'
-      not_a_friend: '%{name} is not one of your friends.'
     index:
       title: Users
       heading: Users
       showing:
         one: Page %{page} (%{first_item} of %{items})
         other: Page %{page} (%{first_item}-%{last_item} of %{items})
-      summary: '%{name} created from %{ip_address} on %{date}'
-      summary_no_ip: '%{name} created on %{date}'
+      summary_html: '%{name} created from %{ip_address} on %{date}'
+      summary_no_ip_html: '%{name} created on %{date}'
       confirm: Confirm Selected Users
       hide: Hide Selected Users
       empty: No matching users found
@@ -2124,7 +2240,7 @@ en-GB:
       title: Account Suspended
       heading: Account Suspended
       webmaster: webmaster
-      body: |-
+      body_html: |-
         <p>
           Sorry, your account has been automatically suspended due to suspicious activity.
         </p>
@@ -2176,28 +2292,18 @@ en-GB:
       back: Back to index
     new:
       title: Creating block on %{name}
-      heading: Creating block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation, remembering
-        that the message will be publicly visible. Bear in mind that not all users
-        understand the community jargon, so please try to use laymans terms.
+      heading_html: Creating block on %{name}
       period: How long, starting now, the user will be blocked from the API for.
       tried_contacting: I have contacted the user and asked them to stop.
       tried_waiting: I have given a reasonable amount of time for the user to respond
         to those communications.
-      needs_view: User needs to log in before this block will be cleared
       back: View all blocks
     edit:
       title: Editing block on %{name}
-      heading: Editing block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation. Bear in
-        mind that not all users understand the community jargon, so please try to
-        use laymans terms.
+      heading_html: Editing block on %{name}
       period: How long, starting now, the user will be blocked from the API for.
       show: View this block
       back: View all blocks
-      needs_view: Does the user need to log in before this block will be cleared?
     filter:
       block_expired: The block has already expired and cannot be edited.
       block_period: The blocking period must be one of the values selectable in the
@@ -2217,32 +2323,33 @@ en-GB:
       empty: No blocks have been made yet.
     revoke:
       title: Revoking block on %{block_on}
-      heading: Revoking block on %{block_on} by %{block_by}
+      heading_html: Revoking block on %{block_on} by %{block_by}
       time_future: This block will end in %{time}.
       past: This block ended %{time} and cannot be revoked now.
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
-      time_future: Ends in %{time}.
+      time_future_html: 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}.
+      time_future_and_until_login_html: Ends in %{time} and after the user has logged
+        in.
+      time_past_html: Ended %{time}.
       block_duration:
         hours:
           one: 1 hour
           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
-      heading: List of blocks on %{name}
+      heading_html: List of blocks on %{name}
       empty: '%{name} has not been blocked yet.'
     blocks_by:
       title: Blocks by %{name}
-      heading: List of blocks by %{name}
+      heading_html: List of blocks by %{name}
       empty: '%{name} has not made any blocks yet.'
     show:
       title: '%{block_on} blocked by %{block_by}'
-      heading: '%{block_on} blocked by %{block_by}'
+      heading_html: '%{block_on} blocked by %{block_by}'
       created: Created
       status: Status
       show: Show
@@ -2268,7 +2375,7 @@ en-GB:
       next: Next »
       previous: « Previous
   notes:
-    mine:
+    index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
       subheading_html: Notes submitted or commented on by %{user}
@@ -2291,7 +2398,6 @@ en-GB:
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'
-      image_size: Image will show standard layer at
       download: Download
       short_url: Short URL
       include_marker: Include marker
@@ -2311,7 +2417,6 @@ en-GB:
         out: Zoom Out
       locate:
         title: Show My Location
-        popup: You are within {distance} {unit} of this point
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -2420,6 +2525,17 @@ en-GB:
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
+        exit_counts:
+          first: 1st
+          second: 2nd
+          third: 3rd
+          fourth: 4th
+          fifth: 5th
+          sixth: 6th
+          seventh: 7th
+          eighth: 8th
+          ninth: 9th
+          tenth: 10th
       time: Time
     query:
       node: Node
@@ -2465,4 +2581,6 @@ en-GB:
         this redaction before destroying it.
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
+  validations:
+    invalid_characters: contains invalid characters
 ...