Localisation updates from https://translatewiki.net.

[rails.git] / config / locales / en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml

index aac204a73224215b28cca4da953f15f2590f0d61..968247b2b6e2a0bc7b1c4a348fb8a8b12fd8b1e5 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2,7 +2,10 @@
  # Exported from translatewiki.net
  # Export driver: phpyaml
  # Author: Abijeet Patro
  # Exported from translatewiki.net
  # Export driver: phpyaml
  # Author: Abijeet Patro
+# Author: Alefar
  # Author: Andibing
  # Author: Andibing
+# Author: BEANS
+# Author: Bjh21
  # Author: Bpfhjquevaps
  # Author: Bruce89
  # Author: Caliburn
  # Author: Bpfhjquevaps
  # Author: Bruce89
  # Author: Caliburn
@@ -18,11 +21,15 @@
  # Author: Jlrb+
  # Author: Kosovastar
  # Author: Macofe
  # Author: Jlrb+
  # Author: Kosovastar
  # Author: Macofe
+# Author: Maro21
  # Author: Meno25
  # Author: Meno25
+# Author: Michel Bakni
  # Author: Mvolz
  # Author: Sampablokuper
  # Author: Mvolz
  # Author: Sampablokuper
+# Author: Samwilson
  # Author: Shirayuki
  # Author: Smsm1
  # Author: Shirayuki
  # Author: Smsm1
+# Author: Tlubenov
  # Author: TomH
  # Author: ديفيد
  ---
  # Author: TomH
  # Author: ديفيد
  ---
@@ -34,6 +41,8 @@ en-GB:
        friendly: '%e %B %Y at %H:%M'
        blog: '%e %B %Y'
    helpers:
        friendly: '%e %B %Y at %H:%M'
        blog: '%e %B %Y'
    helpers:
+    file:
+      prompt: Choose file
      submit:
        diary_comment:
          create: Save
      submit:
        diary_comment:
          create: Save
@@ -46,7 +55,7 @@ en-GB:
          create: Send
        client_application:
          create: Register
          create: Send
        client_application:
          create: Register
-        update: Edit
+        update: Update
        redaction:
          create: Create redaction
          update: Save redaction
        redaction:
          create: Create redaction
          update: Save redaction
@@ -69,6 +78,7 @@ en-GB:
        diary_comment: Diary Comment
        diary_entry: Diary Entry
        friend: Friend
        diary_comment: Diary Comment
        diary_entry: Diary Entry
        friend: Friend
+      issue: Issue
        language: Language
        message: Message
        node: Node
        language: Language
        message: Message
        node: Node
@@ -85,6 +95,7 @@ en-GB:
        relation: Relation
        relation_member: Relation Member
        relation_tag: Relation Tag
        relation: Relation
        relation_member: Relation Member
        relation_tag: Relation Tag
+      report: Report
        session: Session
        trace: Trace
        tracepoint: Trace Point
        session: Session
        trace: Trace
        tracepoint: Trace Point
@@ -96,6 +107,18 @@ en-GB:
        way_node: Way Node
        way_tag: Way Tag
      attributes:
        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:
        diary_comment:
          body: Body
        diary_entry:
@@ -110,24 +133,43 @@ en-GB:
        trace:
          user: User
          visible: Visible
        trace:
          user: User
          visible: Visible
-        name: Name
+        name: Filename
          size: Size
          latitude: Latitude
          longitude: Longitude
          public: Public
          description: Description
          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
        message:
          sender: Sender
          title: Subject
          body: Body
          recipient: Recipient
+      redaction:
+        description: Description
+      report:
+        category: 'Select a reason for your report:'
+        details: Please provide some more details about the problem (required).
        user:
          email: E-mail
        user:
          email: E-mail
+        new_email: New Email Address
          active: Active
          display_name: Display Name
          active: Active
          display_name: Display Name
-        description: Description
-        languages: Languages
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages
          pass_crypt: Password
          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?
+      user:
+        new_email: (never displayed publicly)
    datetime:
      distance_in_words_ago:
        about_x_hours:
    datetime:
      distance_in_words_ago:
        about_x_hours:
@@ -172,18 +214,21 @@ en-GB:
      with_name_html: '%{name} (%{id})'
    editor:
      default: Default (currently %{name})
      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)
      id:
        name: iD
        description: iD (in-browser editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)
      remote:
        name: Remote Control
      remote:
        name: Remote Control
-      description: Remote Control (JOSM or Merkaartor)
+      description: Remote Control (JOSM, Potlatch, Merkaartor)
+  auth:
+    providers:
+      none: None
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
    api:
      notes:
        comment:
    api:
      notes:
        comment:
@@ -225,6 +270,8 @@ en-GB:
      view_history: View History
      view_details: View Details
      location: 'Location:'
      view_history: View History
      view_details: View Details
      location: 'Location:'
+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'
      changeset:
        title: 'Changeset: %{id}'
        belongs_to: Author
      changeset:
        title: 'Changeset: %{id}'
        belongs_to: Author
@@ -235,8 +282,8 @@ en-GB:
        relation: Relations (%{count})
        relation_paginated: Relations (%{x}-%{y} of %{count})
        comment: Comments (%{count})
        relation: Relations (%{count})
        relation_paginated: Relations (%{x}-%{y} of %{count})
        comment: Comments (%{count})
-      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</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:
        changesetxml: Changeset XML
        osmchangexml: osmChange XML
        feed:
@@ -247,30 +294,31 @@ en-GB:
        still_open: Changeset still open - discussion will open once the changeset is
          closed.
      node:
        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:
      way:
-      title: 'Way: %{name}'
-      history_title: 'Way History: %{name}'
+      title_html: 'Way: %{name}'
+      history_title_html: 'Way History: %{name}'
        nodes: Nodes
        nodes: Nodes
-      also_part_of:
+      also_part_of_html:
          one: part of way %{related_ways}
          other: part of ways %{related_ways}
      relation:
          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:
        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:
        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:
      not_found:
+      title: Not Found
        sorry: 'Sorry, %{type} #%{id} could not be found.'
        type:
          node: node
        sorry: 'Sorry, %{type} #%{id} could not be found.'
        type:
          node: node
@@ -279,6 +327,7 @@ en-GB:
          changeset: changeset
          note: note
      timeout:
          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
        sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
        type:
          node: node
@@ -316,16 +365,17 @@ en-GB:
        open_title: 'Unresolved note #%{note_name}'
        closed_title: 'Resolved note #%{note_name}'
        hidden_title: 'Hidden note #%{note_name}'
        open_title: 'Unresolved note #%{note_name}'
        closed_title: 'Resolved note #%{note_name}'
        hidden_title: 'Hidden note #%{note_name}'
-      opened_by: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_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
        report: Report this note
+      coordinates_html: '%{latitude}, %{longitude}'
      query:
        title: Query Features
        introduction: Click on the map to find nearby features.
      query:
        title: Query Features
        introduction: Click on the map to find nearby features.
@@ -376,13 +426,8 @@ en-GB:
      new:
        title: New Diary Entry
      form:
      new:
        title: New Diary Entry
      form:
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
+      location: Location
+      use_map_link: Use map
      index:
        title: Users' diaries
        title_friends: Friends' diaries
      index:
        title: Users' diaries
        title_friends: Friends' diaries
@@ -391,6 +436,7 @@ en-GB:
        in_language_title: Diary Entries in %{language}
        new: New Diary Entry
        new_title: Compose a new entry in my user diary
        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
        no_entries: No diary entries
        recent_entries: Recent diary entries
        older_entries: Older Entries
@@ -402,7 +448,7 @@ en-GB:
        title: '%{user}''s diary | %{title}'
        user_title: '%{user}''s diary'
        leave_a_comment: Leave a comment
        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
        login: Login
      no_such_entry:
        title: No such diary entry
@@ -410,9 +456,10 @@ 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:
        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
        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'
        comment_count:
          zero: No comments
          one: '%{count} comment'
@@ -423,7 +470,7 @@ en-GB:
        confirm: Confirm
        report: Report this entry
      diary_comment:
        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
        hide_link: Hide this comment
        unhide_link: Unhide this comment
        confirm: Confirm
@@ -449,17 +496,29 @@ en-GB:
        comment: Comment
        newer_comments: Newer Comments
        older_comments: Older Comments
        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:
    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>
            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>
            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:
      search_osm_nominatim:
        prefix_format: '%{name}'
        prefix:
@@ -468,6 +527,7 @@ en-GB:
            chair_lift: Chairlift
            drag_lift: Drag Lift
            gondola: Gondola Lift
            chair_lift: Chairlift
            drag_lift: Drag Lift
            gondola: Gondola Lift
+          magic_carpet: Magic Carpet Lift
            platter: Platter Lift
            pylon: Pylon
            station: Aerialway Station
            platter: Platter Lift
            pylon: Pylon
            station: Aerialway Station
@@ -494,7 +554,9 @@ en-GB:
            bench: Bench
            bicycle_parking: Cycle Parking
            bicycle_rental: Cycle Rental
            bench: Bench
            bicycle_parking: Cycle Parking
            bicycle_rental: Cycle Rental
+          bicycle_repair_station: Bicycle Repair Station
            biergarten: Beer Garden
            biergarten: Beer Garden
+          blood_bank: Blood Bank
            boat_rental: Boat Rental
            brothel: Brothel
            bureau_de_change: Bureau de Change
            boat_rental: Boat Rental
            brothel: Brothel
            bureau_de_change: Bureau de Change
@@ -511,6 +573,7 @@ en-GB:
            clock: Clock
            college: College
            community_centre: Community Centre
            clock: Clock
            college: College
            community_centre: Community Centre
+          conference_centre: Conference Centre
            courthouse: Court
            crematorium: Crematorium
            dentist: Dentist
            courthouse: Court
            crematorium: Crematorium
            dentist: Dentist
@@ -518,6 +581,7 @@ en-GB:
            drinking_water: Drinking Water
            driving_school: Driving School
            embassy: Embassy
            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
            fast_food: Fast Food
            ferry_terminal: Ferry Terminal
            fire_station: Fire Station
@@ -530,14 +594,19 @@ en-GB:
            hospital: Hospital
            hunting_stand: Hunting Stand
            ice_cream: Ice Cream
            hospital: Hospital
            hunting_stand: Hunting Stand
            ice_cream: Ice Cream
+          internet_cafe: Internet Cafe
            kindergarten: Nursery School
            kindergarten: Nursery School
+          language_school: Language school
            library: Library
            library: Library
+          loading_dock: Loading Dock
+          love_hotel: Love Hotel
            marketplace: Marketplace
            monastery: Monastery
            marketplace: Marketplace
            monastery: Monastery
+          money_transfer: Money Transfer
            motorcycle_parking: Motorcycle Parking
            motorcycle_parking: Motorcycle Parking
+          music_school: Music School
            nightclub: Night Club
            nursing_home: Nursing Home
            nightclub: Night Club
            nursing_home: Nursing Home
-          office: Office
            parking: Parking
            parking_entrance: Parking Entrance
            parking_space: Parking Space
            parking: Parking
            parking_entrance: Parking Entrance
            parking_space: Parking Space
@@ -546,20 +615,16 @@ en-GB:
            police: Police
            post_box: Post Box
            post_office: Post Office
            police: Police
            post_box: Post Box
            post_office: Post Office
-          preschool: Pre-School
            prison: Prison
            pub: Pub
            prison: Prison
            pub: Pub
+          public_bath: Public Bath
            public_building: Public Building
            recycling: Recycling Point
            restaurant: Restaurant
            public_building: Public Building
            recycling: Recycling Point
            restaurant: Restaurant
-          retirement_home: Retirement Home
-          sauna: Sauna
            school: School
            shelter: Shelter
            school: School
            shelter: Shelter
-          shop: Shop
            shower: Shower
            social_centre: Social Centre
            shower: Shower
            social_centre: Social Centre
-          social_club: Social Club
            social_facility: Social Facility
            studio: Studio
            swimming_pool: Swimming Pool
            social_facility: Social Facility
            studio: Studio
            swimming_pool: Swimming Pool
@@ -575,12 +640,12 @@ en-GB:
            waste_basket: Waste Bin
            waste_disposal: Waste Disposal
            water_point: Water Point
            waste_basket: Waste Bin
            waste_disposal: Waste Disposal
            water_point: Water Point
-          youth_centre: Youth Centre
          boundary:
            administrative: Administrative Boundary
            census: Census Boundary
            national_park: National Park
            protected_area: Protected Area
          boundary:
            administrative: Administrative Boundary
            census: Census Boundary
            national_park: National Park
            protected_area: Protected Area
+          "yes": Boundary
          bridge:
            aqueduct: Aqueduct
            boardwalk: Promenade
          bridge:
            aqueduct: Aqueduct
            boardwalk: Promenade
@@ -589,6 +654,22 @@ en-GB:
            viaduct: Viaduct
            "yes": Bridge
          building:
            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
            "yes": Building
          craft:
            brewery: Brewery
@@ -615,16 +696,19 @@ en-GB:
            bus_guideway: Guided Bus Lane
            bus_stop: Bus Stop
            construction: Highway under construction
            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
@@ -641,14 +725,15 @@ en-GB:
            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
            track: Track
            traffic_signals: Traffic Signals
            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
            trunk: Trunk Road
            trunk_link: Trunk Road
+          turning_loop: Turning Loop
            unclassified: Unclassified Road
            "yes": Road
          historic:
            unclassified: Unclassified Road
            "yes": Road
          historic:
@@ -664,10 +749,10 @@ en-GB:
            fort: Fort
            heritage: Heritage Site
            house: House
            fort: Fort
            heritage: Heritage Site
            house: House
-          icon: Icon
            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
@@ -677,6 +762,7 @@ en-GB:
            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:
@@ -707,7 +793,6 @@ en-GB:
            reservoir_watershed: Reservoir Watershed
            residential: Residential Area
            retail: Retail
            reservoir_watershed: Reservoir Watershed
            residential: Residential Area
            retail: Retail
-          road: Road Area
            village_green: Village Green
            vineyard: Vineyard
            "yes": Landuse
            village_green: Village Green
            vineyard: Vineyard
            "yes": Landuse
@@ -716,6 +801,7 @@ en-GB:
            bird_hide: Bird Hide
            common: Common Land
            dog_park: Dog Park
            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
            fishing: Fishing Area
            fitness_centre: Fitness Centre
            fitness_station: Fitness Station
@@ -727,6 +813,7 @@ en-GB:
            miniature_golf: Miniature Golf
            nature_reserve: Nature Reserve
            park: Park
            miniature_golf: Miniature Golf
            nature_reserve: Nature Reserve
            park: Park
+          picnic_table: Picnic Table
            pitch: Sports Pitch
            playground: Playground
            recreation_ground: Recreation Ground
            pitch: Sports Pitch
            playground: Playground
            recreation_ground: Recreation Ground
@@ -740,16 +827,55 @@ en-GB:
            water_park: Water Park
            "yes": Leisure
          man_made:
            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
            lighthouse: Lighthouse
+          manhole: Manhole
+          mast: Mast
+          mine: Mine
+          mineshaft: Mine Shaft
+          monitoring_station: Monitoring Station
            petroleum_well: Oil Well
            petroleum_well: Oil 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: Windmill
            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:
@@ -795,11 +921,14 @@ en-GB:
            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
@@ -808,6 +937,7 @@ en-GB:
          place:
            allotments: Allotments
            city: City
          place:
            allotments: Allotments
            city: City
+          city_block: City Block
            country: Country
            county: County
            farm: Farm
            country: Country
            county: County
            farm: Farm
@@ -821,13 +951,14 @@ en-GB:
            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
            town: Town
            state: State
            subdivision: Subdivision
            suburb: Suburb
            town: Town
-          unincorporated_area: Unincorporated Area
            village: Village
            "yes": Place
          railway:
            village: Village
            "yes": Place
          railway:
@@ -853,6 +984,7 @@ en-GB:
            switch: Railway Points
            tram: Tramway
            tram_stop: Tram Stop
            switch: Railway Points
            tram: Tramway
            tram_stop: Tram Stop
+          yard: Railway Yard
          shop:
            alcohol: Off Licence
            antiques: Antiques
          shop:
            alcohol: Off Licence
            antiques: Antiques
@@ -861,6 +993,7 @@ en-GB:
            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
@@ -885,12 +1018,10 @@ en-GB:
            estate_agent: Estate Agent
            farm: Farm Shop
            fashion: Fashion Shop
            estate_agent: Estate Agent
            farm: Farm Shop
            fashion: Fashion Shop
-          fish: Fishmonger
            florist: Florist
            food: Food Shop
            funeral_directors: Funeral Directors
            furniture: Furniture
            florist: Florist
            food: Food Shop
            funeral_directors: Funeral Directors
            furniture: Furniture
-          gallery: Gallery
            garden_centre: Garden Centre
            general: General Store
            gift: Gift Shop
            garden_centre: Garden Centre
            general: General Store
            gift: Gift Shop
@@ -899,11 +1030,15 @@ en-GB:
            hairdresser: Hairdresser
            hardware: Hardware Store
            hifi: Hi-Fi
            hairdresser: Hairdresser
            hardware: Hardware Store
            hifi: Hi-Fi
+          houseware: Houseware Shop
+          interior_decoration: Interior Decoration
            jewelry: Jewellers
            kiosk: Kiosk Shop
            jewelry: Jewellers
            kiosk: Kiosk Shop
+          kitchen: Kitchen Shop
            laundry: Laundry
            laundry: Laundry
+          lottery: Lottery
            mall: Mall
            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
@@ -911,15 +1046,19 @@ en-GB:
            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
            pet: Pet Shop
-          pharmacy: Pharmacy
            photo: Photo Shop
            photo: Photo Shop
+          seafood: Seafood
            second_hand: Second-hand Shop
            shoes: Shoe Shop
            sports: Sports Shop
            stationery: Stationers
            supermarket: Supermarket
            tailor: Tailor
            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
            toys: Toy Shop
            travel_agency: Travel Agency
            video: Video Shop
@@ -976,11 +1115,6 @@ en-GB:
          level8: City Boundary
          level9: Village Boundary
          level10: Suburb Boundary
          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
        types:
          cities: Cities
          towns: Towns
@@ -988,6 +1122,9 @@ en-GB:
      results:
        no_results: No results found
        more_results: More results
      results:
        no_results: No results found
        more_results: More results
+  issues:
+    index:
+      reports: Reports
    layouts:
      project_name:
        title: OpenStreetMap
    layouts:
      project_name:
        title: OpenStreetMap
@@ -1037,43 +1174,36 @@ en-GB:
        text: Make a Donation
      learn_more: Learn More
      more: More
        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}
      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:
      message_notification:
-      subject_header: '[OpenStreetMap] %{subject}'
        hi: Hi %{to_user},
        header: '%{from_user} has sent you a message through OpenStreetMap with the
          subject %{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}.
        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!
      signup_confirm:
        subject: '[OpenStreetMap] Welcome to OpenStreetMap'
        greeting: Hi there!
@@ -1084,28 +1214,16 @@ en-GB:
          information to get you started.
      email_confirm:
        subject: '[OpenStreetMap] Confirm your e-mail address'
          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'
        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.
        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,
      note_comment_notification:
        anonymous: An anonymous user
        greeting: Hi,
@@ -1162,8 +1280,8 @@ en-GB:
        from: From
        subject: Subject
        date: Date
        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
        people_mapping_nearby: people mapping nearby
      message_summary:
        unread_button: Mark as unread
@@ -1172,7 +1290,7 @@ en-GB:
        destroy_button: Delete
      new:
        title: Send message
        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
        subject: Subject
        body: Body
        back_to_inbox: Back to inbox
@@ -1186,7 +1304,7 @@ en-GB:
        body: Sorry, there is no message with that id.
      outbox:
        title: Outbox
        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:
        inbox: inbox
        outbox: outbox
        messages:
@@ -1195,8 +1313,8 @@ en-GB:
        to: To
        subject: Subject
        date: Date
        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
        people_mapping_nearby: people mapping nearby
      reply:
        wrong_user: You are logged in as `%{user}' but the message you have asked to
@@ -1226,8 +1344,8 @@ en-GB:
      about:
        next: Next
        copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
      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.
        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.
@@ -1248,26 +1366,23 @@ en-GB:
          under the same licence. See the <a href='%{copyright_path}'>Copyright and
          Licence page</a> for details.
        legal_title: Legal
          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
          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
        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
            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
            back to the %{native_link} of this page or you can stop reading about copyright
            and %{mapping_link}.
          native_link: British English version
@@ -1284,18 +1399,16 @@ en-GB:
            build upon our data, you may distribute the result only under the same licence.
            The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
            code</a> explains your rights and responsibilities.
            build upon our data, you may distribute the result only under the same licence.
            The 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
-          licenced under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
+        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_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
            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
+          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
            <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
@@ -1303,7 +1416,7 @@ en-GB:
            direct your readers to openstreetmap.org (perhaps by expanding
            'OpenStreetMap' to this full address), to opendatacommons.org, and
            if relevant, to creativecommons.org.
            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:
            For a browsable electronic map, the credit should appear in the corner of the map.
            For example:
          attribution_example:
@@ -1393,22 +1506,11 @@ en-GB:
          the remote control option is enabled
      edit:
        not_public: You have not set your edits to be public.
          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
        user_page_link: user page
-      anon_edits: (%{link})
+      anon_edits_html: (%{link})
        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="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.
        id_not_configured: iD has not been configured
        no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
          for this feature.
@@ -1421,7 +1523,7 @@ en-GB:
        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 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
          Data Commons Open Database Licence</a> (ODbL).
        too_large:
          advice: 'If the above export fails, please consider using one of the sources
@@ -1598,23 +1700,6 @@ en-GB:
            bicycle_shop: Bicycle shop
            bicycle_parking: Bicycle parking
            toilets: Toilets
            bicycle_shop: Bicycle shop
            bicycle_parking: Bicycle parking
            toilets: Toilets
-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL
      welcome:
        title: Welcome!
        introduction_html: Welcome to OpenStreetMap, the free and editable map of the
      welcome:
        title: Welcome!
        introduction_html: Welcome to OpenStreetMap, the free and editable map of the
@@ -1671,11 +1756,6 @@ en-GB:
        identifiable: Identifiable (shown in trace list and as identifiable, ordered
          points with timestamps)
      new:
        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: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
        help: Help
        visibility_help: what does this mean?
        visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
        help: Help
@@ -1695,18 +1775,6 @@ en-GB:
      edit:
        title: Editing trace %{name}
        heading: Editing trace %{name}
      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:
        visibility_help: what does this mean?
        visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
      trace_optionals:
@@ -1792,9 +1860,9 @@ en-GB:
    oauth:
      authorize:
        title: Authorise access to your account
    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.
        allow_to: 'Allow the client application to:'
        allow_read_prefs: read your user preferences.
        allow_write_prefs: modify your user preferences.
@@ -1806,7 +1874,7 @@ en-GB:
        grant_access: Grant Access
      authorize_success:
        title: Authorisation request allowed
        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
        verification: The verification code is %{code}.
      authorize_failure:
        title: Authorisation request failed
@@ -1833,13 +1901,6 @@ en-GB:
        delete: Delete Client
        confirm: Are you sure?
        requests: 'Requesting the following permissions from the user:'
        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
      index:
        title: My OAuth Details
        my_tokens: My Authorised Applications
@@ -1849,25 +1910,13 @@ en-GB:
        issued_at: Issued At
        revoke: Revoke!
        my_apps: My Client Applications
        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:
        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:'
        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:
      not_found:
        sorry: Sorry, that %{type} could not be found.
      create:
@@ -1882,7 +1931,7 @@ en-GB:
        heading: Login
        email or username: 'E-mail Address or Username:'
        password: 'Password:'
        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
        remember: Remember me
        lost password link: Lost your password?
        login_button: Login
@@ -1948,8 +1997,6 @@ en-GB:
      reset_password:
        title: Reset password
        heading: Reset Password for %{user}
      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?
        reset: Reset Password
        flash changed: Your password has been changed.
        flash token bad: Did not find that token, check the URL maybe?
@@ -1957,28 +2004,20 @@ en-GB:
        title: Sign Up
        no_auto_account_create: Unfortunately we are not currently able to create an
          account for you automatically.
        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>
          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:'
        email address: 'Email Address:'
        confirm email address: 'Confirm Email Address:'
-      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:'
-      password: 'Password:'
-      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.
        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.
@@ -1994,7 +2033,7 @@ 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
          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: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
        decline: Decline
          readable summary</a> and some <a href="%{translations}">informal translations</a>'
        declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
        decline: Decline
@@ -2042,8 +2081,8 @@ en-GB:
        spam score: 'Spam Score:'
        description: Description
        user location: User location
        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'
        settings_link_text: settings
        no friends: You have not added any friends yet.
        km away: '%{count}km away'
@@ -2081,15 +2120,13 @@ en-GB:
      account:
        title: Edit account
        my settings: My settings
      account:
        title: Edit account
        my settings: My settings
-      current email address: 'Current Email Address:'
-      new email address: 'New Email Address:'
-      email never displayed publicly: (never displayed publicly)
-      external auth: 'External Authentication:'
+      current email address: Current Email Address
+      external auth: External Authentication
        openid:
          link: https://wiki.openstreetmap.org/wiki/OpenID
          link text: what is this?
        public editing:
        openid:
          link: https://wiki.openstreetmap.org/wiki/OpenID
          link text: what is this?
        public editing:
-        heading: 'Public editing:'
+        heading: Public editing
          enabled: Enabled. Not anonymous and can edit data.
          enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
          enabled link text: what is this?
          enabled: Enabled. Not anonymous and can edit data.
          enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
          enabled link text: what is this?
@@ -2097,7 +2134,7 @@ en-GB:
          disabled link text: why can't I edit?
        public editing note:
          heading: Public editing
          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="https://wiki.openstreetmap.org/wiki/Anonymous_edits">find
            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
@@ -2105,7 +2142,7 @@ en-GB:
            public.</li><li>This action cannot be reversed and all new users are now
            public by default.</li></ul>
        contributor terms:
            public.</li><li>This action cannot be reversed and all new users are now
            public by default.</li></ul>
        contributor terms:
-        heading: '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
          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
@@ -2114,14 +2151,10 @@ en-GB:
            in the Public Domain.
          link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
          link text: what is this?
            in the Public Domain.
          link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
          link text: what is this?
-      profile description: 'Profile Description:'
-      preferred languages: 'Preferred Languages:'
-      preferred editor: 'Preferred Editor:'
-      image: 'Image:'
+      image: Image
        gravatar:
          gravatar: Use Gravatar
          link: https://wiki.openstreetmap.org/wiki/Gravatar
        gravatar:
          gravatar: Use 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.
        new image: Add an image
          disabled: Gravatar has been disabled.
          enabled: Display of your Gravatar has been enabled.
        new image: Add an image
@@ -2129,10 +2162,8 @@ en-GB:
        delete image: Remove the current image
        replace image: Replace the current image
        image size hint: (square images at least 100x100 work best)
        delete image: Remove the current image
        replace image: Replace the current image
        image size hint: (square images at least 100x100 work best)
-      home location: 'Home Location:'
+      home location: Home Location
        no home location: You have not entered your home location.
        no home location: You have not entered your home location.
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
        update home location on click: Update home location when I click on the map?
        save changes button: Save Changes
        make edits public button: Make all my edits public
        update home location on click: Update home location when I click on the map?
        save changes button: Save Changes
        make edits public button: Make all my edits public
@@ -2153,10 +2184,11 @@ en-GB:
        reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
          here</a>.
      confirm_resend:
        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
        failure: User %{name} not found.
      confirm_email:
        heading: Confirm a change of e-mail address
@@ -2170,25 +2202,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.
        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})
      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
        confirm: Confirm Selected Users
        hide: Hide Selected Users
        empty: No matching users found
@@ -2196,7 +2217,7 @@ en-GB:
        title: Account Suspended
        heading: Account Suspended
        webmaster: webmaster
        title: Account Suspended
        heading: Account Suspended
        webmaster: webmaster
-      body: |-
+      body_html: |-
          <p>
            Sorry, your account has been automatically suspended due to suspicious activity.
          </p>
          <p>
            Sorry, your account has been automatically suspended due to suspicious activity.
          </p>
@@ -2248,28 +2269,18 @@ en-GB:
        back: Back to index
      new:
        title: Creating block on %{name}
        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.
        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}
        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
        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
      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
@@ -2289,32 +2300,33 @@ en-GB:
        empty: No blocks have been made yet.
      revoke:
        title: Revoking block on %{block_on}
        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: 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.
        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}
        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}
        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}'
        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
        created: Created
        status: Status
        show: Show
@@ -2340,7 +2352,7 @@ en-GB:
        next: Next »
        previous: « Previous
    notes:
        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}
        title: Notes submitted or commented on by %{user}
        heading: '%{user}''s notes'
        subheading_html: Notes submitted or commented on by %{user}
@@ -2363,7 +2375,6 @@ en-GB:
        custom_dimensions: Set custom dimensions
        format: 'Format:'
        scale: 'Scale:'
        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
        download: Download
        short_url: Short URL
        include_marker: Include marker
@@ -2383,7 +2394,6 @@ en-GB:
          out: Zoom Out
        locate:
          title: Show My Location
          out: Zoom Out
        locate:
          title: Show My Location
-        popup: You are within {distance} {unit} of this point
        base:
          standard: Standard
          cycle_map: Cycle Map
        base:
          standard: Standard
          cycle_map: Cycle Map
@@ -2492,6 +2502,17 @@ en-GB:
          roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
          unnamed: unnamed road
          courtesy: Directions courtesy of %{link}
          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
        time: Time
      query:
        node: Node
@@ -2509,7 +2530,6 @@ en-GB:
        centre_map: Centre map here
    redactions:
      edit:
        centre_map: Centre map here
    redactions:
      edit:
-      description: Description
        heading: Edit redaction
        title: Edit redaction
      index:
        heading: Edit redaction
        title: Edit redaction
      index:
@@ -2517,7 +2537,6 @@ en-GB:
        heading: List of redactions
        title: List of redactions
      new:
        heading: List of redactions
        title: List of redactions
      new:
-      description: Description
        heading: Enter information for new redaction
        title: Creating new redaction
      show:
        heading: Enter information for new redaction
        title: Creating new redaction
      show:
@@ -2537,4 +2556,6 @@ en-GB:
          this redaction before destroying it.
        flash: Redaction destroyed.
        error: There was an error destroying this redaction.
          this redaction before destroying it.
        flash: Redaction destroyed.
        error: There was an error destroying this redaction.
+  validations:
+    invalid_characters: contains invalid characters
  ...
  ...