Enable access token reuse for OAuth 2

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

index 1de83f9d66c0fd0446ef1c1c80362b7d5c3000cf..6ebeb3746bd11eff8b1ee3290cdc84f225fe3749 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -6,6 +6,8 @@ en:
        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
@@ -18,7 +20,10 @@ en:
          create: Send
        client_application:
          create: Register
          create: Send
        client_application:
          create: Register
-        update: Edit
+        update: Update
+      doorkeeper_application:
+        create: Register
+        update: Update
        redaction:
          create: Create redaction
          update: Save redaction
        redaction:
          create: Create redaction
          update: Save redaction
@@ -42,6 +47,7 @@ en:
        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"
@@ -58,6 +64,7 @@ en:
        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"
@@ -71,6 +78,18 @@ en:
      # Translates all the model attributes, which is used in error handling on the web site
      # Only the ones that are used on the web site are translated at the moment
      attributes:
      # Translates all the model attributes, which is used in error handling on the web site
      # Only the ones that are used on the web site are translated at the moment
      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:
@@ -79,6 +98,11 @@ en:
          latitude: "Latitude"
          longitude: "Longitude"
          language: "Language"
          latitude: "Latitude"
          longitude: "Longitude"
          language: "Language"
+      doorkeeper/application:
+        name: Name
+        redirect_uri: Redirect URIs
+        confidential: Confidential application?
+        scopes: Permissions
        friend:
          user: "User"
          friend: "Friend"
        friend:
          user: "User"
          friend: "Friend"
@@ -91,18 +115,48 @@ en:
          longitude: "Longitude"
          public: "Public"
          description: "Description"
          longitude: "Longitude"
          public: "Public"
          description: "Description"
+        name: Filename
+        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:
+        title: Title
+        description: Description
+      report:
+        category: Select a reason for your report
+        details: Please provide some more details about the problem (required).
        user:
        user:
+        auth_provider: Authentication Provider
+        auth_uid: Authentication UID
          email: "Email"
          email: "Email"
+        email_confirmation: "Email Confirmation"
+        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
+        preferred_editor: Preferred Editor
          pass_crypt: "Password"
          pass_crypt: "Password"
+        pass_crypt_confirmation: "Confirm Password"
+    help:
+      doorkeeper/application:
+        confidential: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)"
+        redirect_uri: "Use one line per URI"
+      trace:
+        tagstring: comma delimited
+      user_block:
+        reason: The reason why the user 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.
+        needs_view: Does the user need to log in before this block will be cleared?
+      user:
+        email_confirmation: '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.'
+        new_email: "(never displayed publicly)"
    datetime:
      distance_in_words_ago:
        about_x_hours:
    datetime:
      distance_in_words_ago:
        about_x_hours:
@@ -148,25 +202,28 @@ en:
      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:
          opened_at_html: "Created %{when}"
          opened_at_by_html: "Created %{when} by %{user}"
          commented_at_html: "Updated %{when}"
    api:
      notes:
        comment:
          opened_at_html: "Created %{when}"
          opened_at_by_html: "Created %{when} by %{user}"
          commented_at_html: "Updated %{when}"
-        commented_at_by_html: "Updated %{when}by %{user}"
+        commented_at_by_html: "Updated %{when} by %{user}"
          closed_at_html: "Resolved %{when}"
          closed_at_by_html: "Resolved %{when} by %{user}"
          reopened_at_html: "Reactivated %{when}"
          closed_at_html: "Resolved %{when}"
          closed_at_by_html: "Resolved %{when} by %{user}"
          reopened_at_html: "Reactivated %{when}"
@@ -196,10 +253,18 @@ en:
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
      anonymous: "anonymous"
      no_comment: "(no comment)"
      part_of: "Part of"
+    part_of_relations:
+      one: 1 relation
+      other: "%{count} relations"
+    part_of_ways:
+      one: 1 way
+      other: "%{count} ways"
      download_xml: "Download XML"
      view_history: "View History"
      view_details: "View Details"
      location: "Location:"
      download_xml: "Download XML"
      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"
@@ -210,8 +275,8 @@ en:
        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:
@@ -221,30 +286,36 @@ en:
        discussion: Discussion
        still_open: "Changeset still open - discussion will open once the changeset is closed."
      node:
        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:
      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:
+      nodes_count:
+        other: "%{count} nodes"
+      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"
        members: "Members"
+      members_count:
+        one: 1 member
+        other: "%{count} members"
      relation_member:
      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
@@ -253,6 +324,7 @@ en:
          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
@@ -278,7 +350,9 @@ en:
          tag: "The wiki description page for the %{key}=%{value} tag"
        wikidata_link: "The %{page} item on Wikidata"
        wikipedia_link: "The %{page} article on Wikipedia"
          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}"
        telephone_link: "Call %{phone_number}"
+      colour_preview: "Colour %{colour_value} preview"
      note:
        title: "Note: %{id}"
        new_note: "New Note"
      note:
        title: "Note: %{id}"
        new_note: "New Note"
@@ -286,16 +360,17 @@ en:
        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}"
-      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
        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."
@@ -345,13 +420,8 @@ en:
      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"
@@ -360,6 +430,7 @@ en:
        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
@@ -371,16 +442,17 @@ en:
        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"
        heading: "No entry with the id: %{id}"
        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:
        login: "Login"
      no_such_entry:
        title: "No such diary entry"
        heading: "No entry with the id: %{id}"
        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"
@@ -391,7 +463,7 @@ en:
        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
@@ -400,6 +472,7 @@ en:
        location: "Location:"
        view: "View"
        edit: "Edit"
        location: "Location:"
        view: "View"
        edit: "Edit"
+      coordinates: "%{latitude}; %{longitude}"
      feed:
        user:
          title: "OpenStreetMap diary entries for %{user}"
      feed:
        user:
          title: "OpenStreetMap diary entries for %{user}"
@@ -412,20 +485,39 @@ en:
          description: "Recent diary entries from users of OpenStreetMap"
      comments:
        has_commented_on: "%{display_name} has commented on the following diary entries"
          description: "Recent diary entries from users of OpenStreetMap"
      comments:
        has_commented_on: "%{display_name} has commented on the following diary entries"
+      no_comments: "No diary comments"
        post: Post
        when: When
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
        post: Post
        when: When
        comment: Comment
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Application Registered.
+  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}."
+      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."
+    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 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 Nominatim</a>'
-        geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
+        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_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_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:
@@ -434,10 +526,12 @@ en:
            chair_lift: "Chair Lift"
            drag_lift: "Drag Lift"
            gondola: "Gondola Lift"
            chair_lift: "Chair Lift"
            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"
            platter: "Platter Lift"
            pylon: "Pylon"
            station: "Aerialway Station"
            t-bar: "T-Bar Lift"
+          "yes": "Aerialway"
          aeroway:
            aerodrome: "Aerodrome"
            airstrip: "Airstrip"
          aeroway:
            aerodrome: "Aerodrome"
            airstrip: "Airstrip"
@@ -446,11 +540,15 @@ en:
            hangar: "Hangar"
            helipad: "Helipad"
            holding_position: "Holding Position"
            hangar: "Hangar"
            helipad: "Helipad"
            holding_position: "Holding Position"
+          navigationaid: "Aviation Navigation aid"
            parking_position: "Parking Position"
            runway: "Runway"
            parking_position: "Parking Position"
            runway: "Runway"
+          taxilane: "Taxilane"
            taxiway: "Taxiway"
            terminal: "Terminal"
            taxiway: "Taxiway"
            terminal: "Terminal"
+          windsock: "Windsock"
          amenity:
          amenity:
+          animal_boarding: "Animal Boarding"
            animal_shelter: "Animal Shelter"
            arts_centre: "Arts Centre"
            atm: "ATM"
            animal_shelter: "Animal Shelter"
            arts_centre: "Arts Centre"
            atm: "ATM"
@@ -460,7 +558,9 @@ en:
            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"
@@ -477,6 +577,7 @@ en:
            clock: "Clock"
            college: "College"
            community_centre: "Community Centre"
            clock: "Clock"
            college: "College"
            community_centre: "Community Centre"
+          conference_centre: "Conference Centre"
            courthouse: "Courthouse"
            crematorium: "Crematorium"
            dentist: "Dentist"
            courthouse: "Courthouse"
            crematorium: "Crematorium"
            dentist: "Dentist"
@@ -484,6 +585,7 @@ en:
            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"
@@ -496,36 +598,42 @@ en:
            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: "Kindergarten"
            kindergarten: "Kindergarten"
+          language_school: "Language school"
            library: "Library"
            library: "Library"
+          loading_dock: "Loading Dock"
+          love_hotel: "Love Hotel"
            marketplace: "Marketplace"
            marketplace: "Marketplace"
+          mobile_money_agent: "Mobile Money Agent"
            monastery: "Monastery"
            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"
+          payment_terminal: "Payment Terminal"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
            post_box: "Post Box"
            post_office: "Post Office"
            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"
            prison: "Prison"
            pub: "Pub"
+          public_bath: "Public Bath"
+          public_bookcase: "Public Bookcase"
            public_building: "Public Building"
            public_building: "Public Building"
+          ranger_station: "Ranger Station"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
-          retirement_home: "Retirement Home"
-          sauna: "Sauna"
+          sanitary_dump_station: "Sanitary Dump Station"
            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"
@@ -534,19 +642,27 @@ en:
            theatre: "Theatre"
            toilets: "Toilets"
            townhall: "Town Hall"
            theatre: "Theatre"
            toilets: "Toilets"
            townhall: "Town Hall"
+          training: "Training Facility"
            university: "University"
            university: "University"
+          vehicle_inspection: "Vehicle Inspection"
            vending_machine: "Vending Machine"
            veterinary: "Veterinary Surgery"
            village_hall: "Village Hall"
            waste_basket: "Waste Basket"
            waste_disposal: "Waste Disposal"
            vending_machine: "Vending Machine"
            veterinary: "Veterinary Surgery"
            village_hall: "Village Hall"
            waste_basket: "Waste Basket"
            waste_disposal: "Waste Disposal"
+          waste_dump_site: "Waste Dump Site"
+          watering_place: "Watering Place"
            water_point: "Water Point"
            water_point: "Water Point"
-          youth_centre: "Youth Centre"
+          weighbridge: "Weighbridge"
+          "yes": "Amenity"
          boundary:
          boundary:
+          aboriginal_lands: "Aboriginal Lands"
            administrative: "Administrative Boundary"
            census: "Census Boundary"
            national_park: "National Park"
            administrative: "Administrative Boundary"
            census: "Census Boundary"
            national_park: "National Park"
+          political: "Electoral Boundary"
            protected_area : "Protected Area"
            protected_area : "Protected Area"
+          "yes": "Boundary"
          bridge:
            aqueduct: "Aqueduct"
            boardwalk: "Boardwalk"
          bridge:
            aqueduct: "Aqueduct"
            boardwalk: "Boardwalk"
@@ -555,24 +671,94 @@ en:
            viaduct: "Viaduct"
            "yes": "Bridge"
          building:
            viaduct: "Viaduct"
            "yes": "Bridge"
          building:
+          apartment: "Apartment"
+          apartments: "Apartments"
+          barn: "Barn"
+          bungalow: "Bungalow"
+          cabin: "Cabin"
+          chapel: "Chapel"
+          church: "Church Building"
+          civic: "Civic Building"
+          college: "College Building"
+          commercial: "Commercial Building"
+          construction: "Building under Construction"
+          detached: "Detached House"
+          dormitory: "Dormitory"
+          duplex: "Duplex House"
+          farm: "Farm House"
+          farm_auxiliary: "Auxiliary Farm House"
+          garage: "Garage"
+          garages: "Garages"
+          greenhouse: "Greenhouse"
+          hangar: "Hangar"
+          hospital: "Hospital Building"
+          hotel: "Hotel Building"
+          house: "House"
+          houseboat: "Houseboat"
+          hut: "Hut"
+          industrial: "Industrial Building"
+          kindergarten: "Kindergarden Building"
+          manufacture: "Manufacturing Building"
+          office: "Office Building"
+          public: "Public Building"
+          residential: "Residential Building"
+          retail: "Retail Building"
+          roof: "Roof"
+          ruins: "Ruined Building"
+          school: "School Building"
+          semidetached_house: "Semidetached House"
+          service: "Service Building"
+          shed: "Shed"
+          stable: "Stable"
+          static_caravan: "Caravan"
+          temple: "Temple Building"
+          terrace: "Terrace Building"
+          train_station: "Train Station Building"
+          university: "University Building"
+          warehouse: "Warehouse"
            "yes": "Building"
            "yes": "Building"
+        club:
+          scout: "Scout Group Base"
+          sport: "Sportsclub"
+          "yes": "Club"
          craft:
          craft:
+          beekeper: "Beekeeper"
+          blacksmith: "Blacksmith"
            brewery: "Brewery"
            carpenter: "Carpenter"
            brewery: "Brewery"
            carpenter: "Carpenter"
+          caterer: "Caterer"
+          confectionery: "Confectionary"
+          dressmaker: "Dressmaker"
            electrician: "Electrician"
            electrician: "Electrician"
+          electronics_repair: "Electronics Repair"
            gardener: "Gardener"
            gardener: "Gardener"
+          glaziery: "Glaziery"
+          handicraft: "Handicraft"
+          hvac: "HVAC Craft"
+          metal_construction: "Metal Constructioner"
            painter: "Painter"
            photographer: "Photographer"
            plumber: "Plumber"
            painter: "Painter"
            photographer: "Photographer"
            plumber: "Plumber"
+          roofer: "Roofer"
+          sawmill: "Sawmill"
            shoemaker: "Shoemaker"
            shoemaker: "Shoemaker"
+          stonemason: "Stonemason"
            tailor: "Tailor"
            tailor: "Tailor"
+          window_construction: "Window Construction"
+          winery: "Winery"
            "yes": "Craft Shop"
          emergency:
            "yes": "Craft Shop"
          emergency:
+          access_point: "Access Point"
            ambulance_station: "Ambulance Station"
            assembly_point: "Assembly Point"
            defibrillator: "Defibrillator"
            ambulance_station: "Ambulance Station"
            assembly_point: "Assembly Point"
            defibrillator: "Defibrillator"
+          fire_xtinguisher: "Fire Extinguisher"
+          fire_water_pond: "Fire Water Pond"
            landing_site: "Emergency Landing Site"
            landing_site: "Emergency Landing Site"
+          life_ring: "Emergency Life Ring"
            phone: "Emergency Phone"
            phone: "Emergency Phone"
+          siren: "Emergency Siren"
+          suction_point: "Emergency Suction Point"
            water_tank: "Emergency Water Tank"
            "yes": "Emergency"
          highway:
            water_tank: "Emergency Water Tank"
            "yes": "Emergency"
          highway:
@@ -585,6 +771,7 @@ en:
            cycleway: "Cycle Path"
            elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
            cycleway: "Cycle Path"
            elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
+          emergency_bay: "Emergency Bay"
            footway: "Footpath"
            ford: "Ford"
            give_way: "Give Way Sign"
            footway: "Footpath"
            ford: "Ford"
            give_way: "Give Way Sign"
@@ -615,37 +802,45 @@ en:
            tertiary: "Tertiary Road"
            tertiary_link: "Tertiary Road"
            track: "Track"
            tertiary: "Tertiary Road"
            tertiary_link: "Tertiary Road"
            track: "Track"
+          traffic_mirror: "Traffic Mirror"
            traffic_signals: "Traffic Signals"
            traffic_signals: "Traffic Signals"
-          trail: "Trail"
+          trailhead: "Trailhead"
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
            turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
            "yes" : "Road"
          historic:
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
            turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
            "yes" : "Road"
          historic:
+          aircraft: "Historic Aircraft"
            archaeological_site: "Archaeological Site"
            archaeological_site: "Archaeological Site"
+          bomb_crater: "Historic Bomb Crater"
            battlefield: "Battlefield"
            boundary_stone: "Boundary Stone"
            building: "Historic Building"
            bunker: "Bunker"
            battlefield: "Battlefield"
            boundary_stone: "Boundary Stone"
            building: "Historic Building"
            bunker: "Bunker"
+          cannon: "Historic Cannon"
            castle: "Castle"
            castle: "Castle"
+          charcoal_pile: "Historic Charcoal Pile"
            church: "Church"
            city_gate: "City Gate"
            citywalls: "City Walls"
            fort: "Fort"
            heritage: "Heritage Site"
            church: "Church"
            city_gate: "City Gate"
            citywalls: "City Walls"
            fort: "Fort"
            heritage: "Heritage Site"
+          hollow_way: "Hollow Way"
            house: "House"
            house: "House"
-          icon: "Icon"
            manor: "Manor"
            memorial: "Memorial"
            manor: "Manor"
            memorial: "Memorial"
+          milestone: "Historic Milestone"
            mine: "Mine"
            mine_shaft: "Mine Shaft"
            monument: "Monument"
            mine: "Mine"
            mine_shaft: "Mine Shaft"
            monument: "Monument"
+          railway: "Historic Railway"
            roman_road: "Roman Road"
            ruins: "Ruins"
            stone: "Stone"
            tomb: "Tomb"
            tower: "Tower"
            roman_road: "Roman Road"
            ruins: "Ruins"
            stone: "Stone"
            tomb: "Tomb"
            tower: "Tower"
+          wayside_chapel: "Wayside Chapel"
            wayside_cross: "Wayside Cross"
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
            wayside_cross: "Wayside Cross"
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
@@ -654,6 +849,7 @@ en:
            "yes": "Junction"
          landuse:
            allotments: "Allotments"
            "yes": "Junction"
          landuse:
            allotments: "Allotments"
+          aquaculture: "Aquaculture"
            basin: "Basin"
            brownfield: "Brownfield Land"
            cemetery: "Cemetery"
            basin: "Basin"
            brownfield: "Brownfield Land"
            cemetery: "Cemetery"
@@ -673,21 +869,28 @@ en:
            military: "Military Area"
            mine: "Mine"
            orchard: "Orchard"
            military: "Military Area"
            mine: "Mine"
            orchard: "Orchard"
+          plant_nursery: "Plant Nursery"
            quarry: "Quarry"
            railway: "Railway"
            recreation_ground: "Recreation Ground"
            quarry: "Quarry"
            railway: "Railway"
            recreation_ground: "Recreation Ground"
+          religious: "Religious Ground"
            reservoir: "Reservoir"
            reservoir_watershed: "Reservoir Watershed"
            residential: "Residential Area"
            retail: "Retail"
            reservoir: "Reservoir"
            reservoir_watershed: "Reservoir Watershed"
            residential: "Residential Area"
            retail: "Retail"
-          road: "Road Area"
            village_green: "Village Green"
            vineyard: "Vineyard"
            "yes": "Landuse"
          leisure:
            village_green: "Village Green"
            vineyard: "Vineyard"
            "yes": "Landuse"
          leisure:
+          adult_gaming_centre: "Adult Gaming Centre"
+          amusement_arcade: "Amusement Arcade"
+          bandstand: "Bandstand"
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
+          bleachers: "Bleachers"
+          bowling_alley: "Bowling Alley"
            common: "Common Land"
            common: "Common Land"
+          dance: "Dance Hall"
            dog_park: "Dog Park"
            firepit: "Fire Pit"
            fishing: "Fishing Area"
            dog_park: "Dog Park"
            firepit: "Fire Pit"
            fishing: "Fishing Area"
@@ -700,7 +903,9 @@ en:
            marina: "Marina"
            miniature_golf: "Miniature Golf"
            nature_reserve: "Nature Reserve"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
            nature_reserve: "Nature Reserve"
+          outdoor_seating: "Outdoor Seating"
            park: "Park"
            park: "Park"
+          picnic_table: "Picnic Table"
            pitch: "Sports Pitch"
            playground: "Playground"
            recreation_ground: "Recreation Ground"
            pitch: "Sports Pitch"
            playground: "Playground"
            recreation_ground: "Recreation Ground"
@@ -715,13 +920,21 @@ en:
            "yes": "Leisure"
          man_made:
            adit: "Adit"
            "yes": "Leisure"
          man_made:
            adit: "Adit"
+          advertising: "Advertising"
+          antenna:  "Antenna"
+          avalanche_protection: "Avalanche Protection"
            beacon: "Beacon"
            beacon: "Beacon"
+          beam: "Beam"
            beehive: "Bee Hive"
            breakwater: "Breakwater"
            bridge: "Bridge"
            bunker_silo: "Bunker"
            beehive: "Bee Hive"
            breakwater: "Breakwater"
            bridge: "Bridge"
            bunker_silo: "Bunker"
+          cairn: "Cairn"
            chimney: "Chimney"
            chimney: "Chimney"
+          clearcut: "Clearcut"
+          communications_tower: "Communications Tower"
            crane: "Crane"
            crane: "Crane"
+          cross: "Cross"
            dolphin: "Mooring Post"
            dyke: "Dyke"
            embankment: "Embankment"
            dolphin: "Mooring Post"
            dyke: "Dyke"
            embankment: "Embankment"
@@ -730,6 +943,7 @@ en:
            groyne: "Groyne"
            kiln: "Kiln"
            lighthouse: "Lighthouse"
            groyne: "Groyne"
            kiln: "Kiln"
            lighthouse: "Lighthouse"
+          manhole: "Manhole"
            mast: "Mast"
            mine: "Mine"
            mineshaft: "Mine Shaft"
            mast: "Mast"
            mine: "Mine"
            mineshaft: "Mine Shaft"
@@ -737,12 +951,20 @@ en:
            petroleum_well: "Petroleum Well"
            pier: "Pier"
            pipeline: "Pipeline"
            petroleum_well: "Petroleum Well"
            pier: "Pier"
            pipeline: "Pipeline"
+          pumping_station: "Pumping Station"
+          reservoir_covered: "Covered Reservoir"
            silo: "Silo"
            silo: "Silo"
+          snow_cannon: "Snow Cannon"
+          snow_fence: "Snow Fence"
            storage_tank: "Storage Tank"
            storage_tank: "Storage Tank"
+          street_cabinet: "Street Cabinet"
            surveillance: "Surveillance"
            surveillance: "Surveillance"
+          telescope: "Telescope"
            tower: "Tower"
            tower: "Tower"
+          utility_pole: "Utility Pole"
            wastewater_plant: "Wastewater Plant"
            watermill: "Water Mill"
            wastewater_plant: "Wastewater Plant"
            watermill: "Water Mill"
+          water_tap: "Water Tap"
            water_tower: "Water Tower"
            water_well: "Well"
            water_works: "Water Works"
            water_tower: "Water Tower"
            water_well: "Well"
            water_works: "Water Works"
@@ -753,15 +975,20 @@ en:
            airfield: "Military Airfield"
            barracks: "Barracks"
            bunker: "Bunker"
            airfield: "Military Airfield"
            barracks: "Barracks"
            bunker: "Bunker"
+          checkpoint: "Checkpoint"
+          trench: "Trench"
            "yes": "Military"
          mountain_pass:
            "yes" : "Mountain Pass"
          natural:
            "yes": "Military"
          mountain_pass:
            "yes" : "Mountain Pass"
          natural:
+          atoll: "Atoll"
+          bare_rock: "Bare Rock"
            bay: "Bay"
            beach: "Beach"
            cape: "Cape"
            cave_entrance: "Cave Entrance"
            cliff: "Cliff"
            bay: "Bay"
            beach: "Beach"
            cape: "Cape"
            cave_entrance: "Cave Entrance"
            cliff: "Cliff"
+          coastline: "Coastline"
            crater: "Crater"
            dune: "Dune"
            fell: "Fell"
            crater: "Crater"
            dune: "Dune"
            fell: "Fell"
@@ -772,12 +999,14 @@ en:
            grassland: "Grassland"
            heath: "Heath"
            hill: "Hill"
            grassland: "Grassland"
            heath: "Heath"
            hill: "Hill"
+          hot_spring: "Hot Spring"
            island: "Island"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
            mud: "Mud"
            peak: "Peak"
            island: "Island"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
            mud: "Mud"
            peak: "Peak"
+          peninsula: "Peninsula"
            point: "Point"
            reef: "Reef"
            ridge: "Ridge"
            point: "Point"
            reef: "Reef"
            ridge: "Ridge"
@@ -795,25 +1024,37 @@ en:
            water: "Water"
            wetland: "Wetland"
            wood: "Wood"
            water: "Water"
            wetland: "Wetland"
            wood: "Wood"
+          "yes": "Natural Feature"
          office:
            accountant: "Accountant"
            administrative: "Administration"
          office:
            accountant: "Accountant"
            administrative: "Administration"
+          advertising_agency: "Advertising Agency"
            architect: "Architect"
            association: "Association"
            company: "Company"
            architect: "Architect"
            association: "Association"
            company: "Company"
+          diplomatic: "Diplomatic Office"
            educational_institution: "Educational Institution"
            employment_agency: "Employment Agency"
            educational_institution: "Educational Institution"
            employment_agency: "Employment Agency"
+          energy_supplier: "Energy Supplier Office"
            estate_agent: "Estate Agent"
            estate_agent: "Estate Agent"
+          financial: "Financial Office"
            government: "Governmental Office"
            insurance: "Insurance Office"
            it: "IT Office"
            lawyer: "Lawyer"
            government: "Governmental Office"
            insurance: "Insurance Office"
            it: "IT Office"
            lawyer: "Lawyer"
+          logistics: "Logistics Office"
+          newspaper: "Newspaper Office"
            ngo: "NGO Office"
            ngo: "NGO Office"
+          notary: "Notary"
+          religion: "Religious Office"
+          research: "Research Office"
+          tax_advisor: "Tax Advisor"
            telecommunication: "Telecommunication Office"
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
            allotments: "Allotments"
            telecommunication: "Telecommunication Office"
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
            allotments: "Allotments"
+          archipelago: "Archipelago"
            city: "City"
            city_block: "City Block"
            country: "Country"
            city: "City"
            city_block: "City Block"
            country: "Country"
@@ -828,6 +1069,7 @@ en:
            locality: "Locality"
            municipality: "Municipality"
            neighbourhood: "Neighbourhood"
            locality: "Locality"
            municipality: "Municipality"
            neighbourhood: "Neighbourhood"
+          plot: "Plot"
            postcode: "Postcode"
            quarter: "Quarter"
            region: "Region"
            postcode: "Postcode"
            quarter: "Quarter"
            region: "Region"
@@ -837,7 +1079,6 @@ en:
            subdivision: "Subdivision"
            suburb: "Suburb"
            town: "Town"
            subdivision: "Subdivision"
            suburb: "Suburb"
            town: "Town"
-          unincorporated_area: "Unincorporated Area"
            village: "Village"
            "yes": "Place"
          railway:
            village: "Village"
            "yes": "Place"
          railway:
@@ -863,12 +1104,19 @@ en:
            switch: "Railway Points"
            tram: "Tramway"
            tram_stop: "Tram Stop"
            switch: "Railway Points"
            tram: "Tramway"
            tram_stop: "Tram Stop"
+          yard: "Railway Yard"
          shop:
          shop:
+          agrarian: "Agrarian Shop"
            alcohol: "Off License"
            antiques: "Antiques"
            alcohol: "Off License"
            antiques: "Antiques"
+          appliance: "Appliances Shop"
            art: "Art Shop"
            art: "Art Shop"
+          baby_goods: "Baby Goods"
+          bag: "Bag Shop"
            bakery: "Bakery"
            bakery: "Bakery"
+          bathroom_furnishing: "Bathroom Furnishing"
            beauty: "Beauty Shop"
            beauty: "Beauty Shop"
+          bed: "Bedding Products"
            beverages: "Beverages Shop"
            bicycle: "Bicycle Shop"
            bookmaker: "Bookmaker"
            beverages: "Beverages Shop"
            bicycle: "Bicycle Shop"
            bookmaker: "Bookmaker"
@@ -880,65 +1128,90 @@ en:
            car_repair: "Car Repair"
            carpet: "Carpet Shop"
            charity: "Charity Shop"
            car_repair: "Car Repair"
            carpet: "Carpet Shop"
            charity: "Charity Shop"
+          cheese: "Cheese Shop"
            chemist: "Chemist"
            chemist: "Chemist"
+          chocolate: "Chocolate"
            clothes: "Clothes Shop"
            clothes: "Clothes Shop"
+          coffee: "Coffee Shop"
            computer: "Computer Shop"
            confectionery: "Confectionery Shop"
            convenience: "Convenience Store"
            copyshop: "Copy Shop"
            cosmetics: "Cosmetics Shop"
            computer: "Computer Shop"
            confectionery: "Confectionery Shop"
            convenience: "Convenience Store"
            copyshop: "Copy Shop"
            cosmetics: "Cosmetics Shop"
+          craft: "Crafts Supply Store"
+          curtain: "Curtain Shop"
+          dairy: "Dairy Shop"
            deli: "Deli"
            department_store: "Department Store"
            discount: "Discount Items Shop"
            doityourself: "Do-It-Yourself"
            dry_cleaning: "Dry Cleaning"
            deli: "Deli"
            department_store: "Department Store"
            discount: "Discount Items Shop"
            doityourself: "Do-It-Yourself"
            dry_cleaning: "Dry Cleaning"
+          e-cigarette: "E-Cigarette Shop"
            electronics: "Electronics Shop"
            electronics: "Electronics Shop"
+          erotic: "Erotic Shop"
            estate_agent: "Estate Agent"
            estate_agent: "Estate Agent"
+          fabric: "Fabric Store"
            farm: "Farm Shop"
            fashion: "Fashion Shop"
            farm: "Farm Shop"
            fashion: "Fashion Shop"
-          fish: "Fish Shop"
+          fishing: "Fishing Supplies Shop"
            florist: "Florist"
            food: "Food Shop"
            florist: "Florist"
            food: "Food Shop"
+          frame: "Frame Shop"
            funeral_directors: "Funeral Directors"
            furniture: "Furniture"
            funeral_directors: "Funeral Directors"
            furniture: "Furniture"
-          gallery: "Gallery"
            garden_centre: "Garden Centre"
            garden_centre: "Garden Centre"
+          gas: "Gas Store"
            general: "General Store"
            gift: "Gift Shop"
            greengrocer: "Greengrocer"
            grocery: "Grocery Shop"
            hairdresser: "Hairdresser"
            hardware: "Hardware Store"
            general: "General Store"
            gift: "Gift Shop"
            greengrocer: "Greengrocer"
            grocery: "Grocery Shop"
            hairdresser: "Hairdresser"
            hardware: "Hardware Store"
+          health_food: "Health Food Store"
+          hearing_aids: "Hearing Aids"
+          herbalist: "Herbalist"
            hifi: "Hi-Fi"
            houseware: "Houseware Shop"
            hifi: "Hi-Fi"
            houseware: "Houseware Shop"
+          ice_cream: "Ice Cream Shop"
            interior_decoration: "Interior Decoration"
            jewelry: "Jewelry Shop"
            kiosk: "Kiosk Shop"
            kitchen: "Kitchen Shop"
            laundry: "Laundry"
            interior_decoration: "Interior Decoration"
            jewelry: "Jewelry Shop"
            kiosk: "Kiosk Shop"
            kitchen: "Kitchen Shop"
            laundry: "Laundry"
+          locksmith: "Locksmith"
            lottery: "Lottery"
            mall: "Mall"
            lottery: "Lottery"
            mall: "Mall"
-          market: "Market"
            massage: "Massage"
            massage: "Massage"
+          medical_supply: "Medical Supply Shop"
            mobile_phone: "Mobile Phone Shop"
            mobile_phone: "Mobile Phone Shop"
+          money_lender: "Money Lender"
            motorcycle: "Motorcycle Shop"
            motorcycle: "Motorcycle Shop"
+          motorcycle_repair: "Motorcycle Repair Shop"
            music: "Music Shop"
            music: "Music Shop"
+          musical_instrument: "Musical Instruments"
            newsagent: "Newsagent"
            newsagent: "Newsagent"
+          nutrition_supplements: "Nutrition Supplements"
            optician: "Optician"
            organic: "Organic Food Shop"
            outdoor: "Outdoor Shop"
            paint: "Paint Shop"
            optician: "Optician"
            organic: "Organic Food Shop"
            outdoor: "Outdoor Shop"
            paint: "Paint Shop"
+          pastry: "Pastry Shop"
            pawnbroker: "Pawnbroker"
            pawnbroker: "Pawnbroker"
+          perfumery: "Perfumery"
            pet: "Pet Shop"
            pet: "Pet Shop"
-          pharmacy: "Pharmacy"
+          pet_grooming: "Pet Grooming"
            photo: "Photo Shop"
            seafood: "Sea Food"
            second_hand: "Second-hand Shop"
            photo: "Photo Shop"
            seafood: "Sea Food"
            second_hand: "Second-hand Shop"
+          sewing: "Sewing Shop"
            shoes: "Shoe Shop"
            sports: "Sports Shop"
            stationery: "Stationery Shop"
            shoes: "Shoe Shop"
            sports: "Sports Shop"
            stationery: "Stationery Shop"
+          storage_rental: "Storage Rental"
            supermarket: "Supermarket"
            tailor: "Tailor"
            supermarket: "Supermarket"
            tailor: "Tailor"
+          tattoo: "Tattoo Shop"
+          tea: "Tea Shop"
            ticket: "Ticket Shop"
            tobacco: "Tobacco Shop"
            toys: "Toy Shop"
            ticket: "Ticket Shop"
            tobacco: "Tobacco Shop"
            toys: "Toy Shop"
@@ -947,6 +1220,8 @@ en:
            vacant: "Vacant Shop"
            variety_store: "Variety Store"
            video: "Video Shop"
            vacant: "Vacant Shop"
            variety_store: "Variety Store"
            video: "Video Shop"
+          video_games: "Video Game Store"
+          wholesale: "Wholesale Store"
            wine: "Wine Store"
            "yes": "Shop"
          tourism:
            wine: "Wine Store"
            "yes": "Shop"
          tourism:
@@ -956,6 +1231,7 @@ en:
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
            cabin: "Cabin"
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
            cabin: "Cabin"
+          camp_pitch: "Camp Pitch"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            chalet: "Chalet"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            chalet: "Chalet"
@@ -969,6 +1245,7 @@ en:
            picnic_site: "Picnic Site"
            theme_park: "Theme Park"
            viewpoint: "Viewpoint"
            picnic_site: "Picnic Site"
            theme_park: "Theme Park"
            viewpoint: "Viewpoint"
+          wilderness_hut: "Wilderness Hut"
            zoo: "Zoo"
          tunnel:
            building_passage: "Building Passage"
            zoo: "Zoo"
          tunnel:
            building_passage: "Building Passage"
@@ -995,16 +1272,15 @@ en:
            "yes": "Waterway"
        admin_levels:
          level2: "Country Boundary"
            "yes": "Waterway"
        admin_levels:
          level2: "Country Boundary"
+        level3: "Region Boundary"
          level4: "State Boundary"
          level5: "Region Boundary"
          level6: "County Boundary"
          level4: "State Boundary"
          level5: "Region Boundary"
          level6: "County Boundary"
+        level7: "Municipality Boundary"
          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>'
+        level11: "Neighbourhood Boundary"
        types:
          cities: Cities
          towns: Towns
        types:
          cities: Cities
          towns: Towns
@@ -1040,7 +1316,7 @@ en:
          open: Open
          resolved: Resolved
      update:
          open: Open
          resolved: Resolved
      update:
-      new_report: Your report has been registered sucessfully
+      new_report: Your report has been registered successfully
        successful_update: Your report has been updated successfully
        provide_details: Please provide the required details
      show:
        successful_update: Your report has been updated successfully
        provide_details: Please provide the required details
      show:
@@ -1068,11 +1344,10 @@ en:
      reopen:
        reopened: Issue status has been set to 'Open'
      comments:
      reopen:
        reopened: Issue status has been set to 'Open'
      comments:
-      created_at: "On %{datetime}"
+      comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
        reassign_param: Reassign Issue?
      reports:
        reassign_param: Reassign Issue?
      reports:
-      updated_at: "On %{datetime}"
-      reported_by_html: "Reported as %{category} by %{user}"
+      reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
      helper:
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
      helper:
        reportable_title:
          diary_comment: "%{entry_title}, comment #%{comment_id}"
@@ -1084,8 +1359,6 @@ en:
      new:
        title_html: "Report %{link}"
        missing_params: "Cannot create a new report"
      new:
        title_html: "Report %{link}"
        missing_params: "Cannot create a new report"
-      details: Please provide some more details about the problem (required).
-      select: "Select a reason for your report:"
        disclaimer:
          intro: "Before sending your report to the site moderators, please ensure that:"
          not_just_mistake: You are certain that the problem is not just a mistake
        disclaimer:
          intro: "Before sending your report to the site moderators, please ensure that:"
          not_just_mistake: You are certain that the problem is not just a mistake
@@ -1114,7 +1387,7 @@ en:
            abusive_label: This note is abusive
            other_label: Other
      create:
            abusive_label: This note is abusive
            other_label: Other
      create:
-      successful_report: Your report has been registered sucessfully
+      successful_report: Your report has been registered successfully
        provide_details: Please provide the required details
    layouts:
      project_name:
        provide_details: Please provide the required details
    layouts:
      project_name:
@@ -1167,38 +1440,44 @@ en:
        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}:"
      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}"
+      header_html: "%{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 send a message to the author at %{replyurl}"
+      footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
      message_notification:
      message_notification:
-      subject_header: "[OpenStreetMap] %{subject}"
+      subject: "[OpenStreetMap] %{message_title}"
        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:
+      header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
+      footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
+      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}."
        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}."
+      see_their_profile_html: "You can see their profile at %{userurl}."
        befriend_them: "You can also add them as a friend at %{befriendurl}."
        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: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
-        subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+      befriend_them_html: "You can also add them as a friend at %{befriendurl}."
+    gpx_description:
+      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+    gpx_failure:
+      hi: "Hi %{to_user},"
+      failed_to_import: "failed to import. Here is the error:"
+      more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
+      import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      subject: "[OpenStreetMap] GPX Import failure"
+    gpx_success:
+      hi: "Hi %{to_user},"
+      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!"
@@ -1207,21 +1486,11 @@ en:
        welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
      email_confirm:
        subject: "[OpenStreetMap] Confirm your email address"
        welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
      email_confirm:
        subject: "[OpenStreetMap] Confirm your email 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."
-    lost_password_html:
        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."
@@ -1232,35 +1501,72 @@ en:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
          your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
          your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+        your_note_html: "%{commenter} has left a comment on one of your map notes near %{place}."
          commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
          commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+        commented_note_html: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
        closed:
          subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
          your_note: "%{commenter} has resolved one of your map notes near %{place}."
        closed:
          subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
          your_note: "%{commenter} has resolved one of your map notes near %{place}."
+        your_note_html: "%{commenter} has resolved one of your map notes near %{place}."
          commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
          commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+        commented_note_html: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
        reopened:
          subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
          your_note: "%{commenter} has reactivated one of your map notes near %{place}."
        reopened:
          subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
          subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
          your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+        your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."
          commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
          commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
+        commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
        details: "More details about the note can be found at %{url}."
        details: "More details about the note can be found at %{url}."
+      details_html: "More details about the note can be found at %{url}."
      changeset_comment_notification:
        hi: "Hi %{to_user},"
        greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
      changeset_comment_notification:
        hi: "Hi %{to_user},"
        greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
-        your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}"
-        commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}"
+        your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"
+        your_changeset_html: "%{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}"
+        commented_changeset_html: "%{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_with_comment: "with comment '%{changeset_comment}'"
+        partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
          partial_changeset_without_comment: "without comment"
        details: "More details about the changeset can be found at %{url}."
+      details_html: "More details about the changeset can be found at %{url}."
        unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
        unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+      unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+  confirmations:
+    confirm:
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
+      already active: "This account has already been confirmed."
+      unknown token: "That confirmation code has expired or does not exist."
+      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
+    confirm_resend:
+      failure: "User %{name} not found."
+    confirm_email:
+      heading: Confirm a change of email address
+      press confirm button: "Press the confirm button below to confirm your new email address."
+      button: Confirm
+      success: "Confirmed your change of email address!"
+      failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
+    resend_success_flash:
+      confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
+      whitelist: 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.
    messages:
      inbox:
        title: "Inbox"
        my_inbox: "My Inbox"
    messages:
      inbox:
        title: "Inbox"
        my_inbox: "My Inbox"
-      outbox: "outbox"
+      my_outbox: "My Outbox"
        messages: "You have %{new_messages} and %{old_messages}"
        new_messages:
          one: "%{count} new message"
        messages: "You have %{new_messages} and %{old_messages}"
        new_messages:
          one: "%{count} new message"
@@ -1271,7 +1577,7 @@ en:
        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"
@@ -1280,7 +1586,7 @@ en:
        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"
@@ -1293,16 +1599,15 @@ en:
        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}"
-      inbox: "inbox"
-      outbox: "outbox"
+      my_inbox: "My Inbox"
+      my_outbox: "My Outbox"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
        to: "To"
        subject: "Subject"
        date: "Date"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
        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 reply to was not sent to that user. Please login as the correct user in order to reply."
        people_mapping_nearby: "people mapping nearby"
      reply:
        wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
@@ -1324,11 +1629,94 @@ en:
        as_unread: "Message marked as unread"
      destroy:
        destroyed: "Message deleted"
        as_unread: "Message marked as unread"
      destroy:
        destroyed: "Message deleted"
+  passwords:
+    lost_password:
+      title: "Lost password"
+      heading: "Forgotten Password?"
+      email address: "Email Address:"
+      new password button: "Reset password"
+      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
+      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+      notice email cannot find: "Could not find that email address, sorry."
+    reset_password:
+      title: "Reset password"
+      heading: "Reset Password for %{user}"
+      reset: "Reset Password"
+      flash changed: "Your password has been changed."
+      flash token bad: "Did not find that token, check the URL maybe?"
+  sessions:
+    new:
+      title: "Login"
+      heading: "Login"
+      email or username: "Email Address or Username:"
+      password: "Password:"
+      openid_html: "%{logo} OpenID:"
+      remember: "Remember me"
+      lost password link: "Lost your password?"
+      login_button: "Login"
+      register now: Register now
+      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
+      with external: "Alternatively, use a third party to login:"
+      new to osm: New to OpenStreetMap?
+      to make changes: To make changes to the OpenStreetMap data, you must have an account.
+      create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
+      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
+      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
+      auth failure: "Sorry, could not log in with those details."
+      openid_logo_alt: "Log in with an OpenID"
+      auth_providers:
+        openid:
+          title: Login with OpenID
+          alt: Login with an OpenID URL
+        google:
+          title: Login with Google
+          alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
+        wordpress:
+          title: Login with Wordpress
+          alt: Login with a Wordpress OpenID
+        aol:
+          title: Login with AOL
+          alt: Login with an AOL OpenID
+    destroy:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"
+  shared:
+    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
+    richtext_field:
+      edit: Edit
+      preview: Preview
    site:
      about:
        next: Next
        copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
    site:
      about:
        next: Next
        copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+      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.
@@ -1356,13 +1744,13 @@ en:
          under the same licence. See the <a href='%{copyright_path}'>Copyright and
          License page</a> for details.
        legal_title: Legal
          under the same licence. See the <a href='%{copyright_path}'>Copyright and
          License page</a> for details.
        legal_title: Legal
-      legal_html: |
+      legal_1_html: |
          This site and many other related services are formally operated by the
          <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
          on behalf of the community. Use of all OSMF operated services is subject
          to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
          This site and many other related services are formally operated by the
          <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
          on behalf of the community. Use of all OSMF operated services is subject
          to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
-        <br>
+        Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>.
+      legal_2_html: |
          Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
          if you have licensing, copyright or other legal questions.
          <br>
          Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a>
          if you have licensing, copyright or other legal questions.
          <br>
@@ -1371,11 +1759,11 @@ en:
      copyright:
        foreign:
          title: About this translation
      copyright:
        foreign:
          title: About this translation
-        text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence
+        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
          english_link: the English original
        native:
          title: About this page
-        text: 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}.
+        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: THIS_LANGUAGE_NAME_HERE version
          mapping_link: start mapping
        legal_babble:
          native_link: THIS_LANGUAGE_NAME_HERE version
          mapping_link: start mapping
        legal_babble:
@@ -1392,26 +1780,30 @@ en:
            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.
            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
-          licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+        intro_3_1_html: |
+          Our documentation is licensed under the
+          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> license (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
            You must also make it clear that the data is available under the Open
-          Database License, and if using our map tiles, that the cartography is
-          licensed as CC BY-SA. You may do this by linking to
+          Database License. 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 license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            direct your readers to openstreetmap.org (perhaps by expanding
            <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
            Alternatively, and as a requirement if you are distributing OSM in a
            data form, you can name and link directly to the license(s). In media
            where links are not possible (e.g. printed works), we suggest you
            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: |
+          'OpenStreetMap' to this full address) and to opendatacommons.org.
+        credit_3_1_html: |
+          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a
+          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
+          under the Open Database License. If you are using these tiles please use
+          the following attribution:
+          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;.
+        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:
@@ -1502,7 +1894,7 @@ en:
            added to the OpenStreetMap database or this site, please refer
            to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
            procedure</a> or file directly at our
            added to the OpenStreetMap database or this site, please refer
            to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
            procedure</a> or file directly at our
-          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+          <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 see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</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 see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
@@ -1519,15 +1911,11 @@ en:
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
      edit:
        not_public: "You have not set your edits to be public."
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
      edit:
        not_public: "You have not set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
+      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: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
        anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        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."
      export:
        id_not_configured: "iD has not been configured"
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      export:
@@ -1539,7 +1927,7 @@ en:
        map_image: "Map Image (shows standard layer)"
        embeddable_html: "Embeddable HTML"
        licence: "Licence"
        map_image: "Map Image (shows standard layer)"
        embeddable_html: "Embeddable HTML"
        licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+      export_details_html: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
        too_large:
          advice: "If the above export fails, please consider using one of the sources listed below:"
          body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
        too_large:
          advice: "If the above export fails, please consider using one of the sources listed below:"
          body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads."
@@ -1597,7 +1985,7 @@ en:
          and collaboratively discussing and documenting mapping topics.
        welcome:
          url: /welcome
          and collaboratively discussing and documenting 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: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
          description: Start with this quick guide covering the OpenStreetMap basics.
        beginners_guide:
          url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
@@ -1605,8 +1993,8 @@ en:
          description: Community maintained guide for beginners.
        help:
          url: https://help.openstreetmap.org/
          description: Community maintained guide for beginners.
        help:
          url: https://help.openstreetmap.org/
-        title: help.openstreetmap.org
-        description: Ask a question or look up answers on OSM's question-and-answer site.
+        title: Help Forum
+        description: Ask a question or look up answers on OpenStreetMap's question-and-answer site.
        mailing_lists:
          url: https://lists.openstreetmap.org/
          title: Mailing Lists
        mailing_lists:
          url: https://lists.openstreetmap.org/
          title: Mailing Lists
@@ -1629,8 +2017,12 @@ en:
          description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
        wiki:
          url: https://wiki.openstreetmap.org/
          description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat.
        wiki:
          url: https://wiki.openstreetmap.org/
-        title: wiki.openstreetmap.org
-        description: Browse the wiki for in-depth OSM documentation.
+        title: OpenStreetMap Wiki
+        description: Browse the wiki for in-depth OpenStreetMap documentation.
+    potlatch:
+      removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
+      desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
      sidebar:
        search_results: Search Results
        close: Close
      sidebar:
        search_results: Search Results
        close: Close
@@ -1714,23 +2106,6 @@ en:
            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:
        title: Welcome!
        introduction_html: |
@@ -1792,11 +2167,6 @@ en:
        identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
      new:
        upload_trace: "Upload GPS Trace"
        identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
      new:
        upload_trace: "Upload GPS Trace"
-      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"
@@ -1809,20 +2179,9 @@ en:
          one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
          other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
      edit:
          one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
          other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
      edit:
+      cancel: Cancel
        title: "Editing trace %{name}"
        heading: "Editing trace %{name}"
        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: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      update:
        visibility_help: "what does this mean?"
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      update:
@@ -1838,6 +2197,7 @@ en:
        uploaded: "Uploaded:"
        points: "Points:"
        start_coordinates: "Start coordinate:"
        uploaded: "Uploaded:"
        points: "Points:"
        start_coordinates: "Start coordinate:"
+      coordinates_html: "%{latitude}; %{longitude}"
        map: "map"
        edit: "edit"
        owner: "Owner:"
        map: "map"
        edit: "edit"
        owner: "Owner:"
@@ -1855,11 +2215,12 @@ en:
        newer: "Newer Traces"
      trace:
        pending: "PENDING"
        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"
        more: "more"
        trace_details: "View Trace Details"
        view_map: "View Map"
-      edit: "edit"
        edit_map: "Edit Map"
        public: "PUBLIC"
        identifiable: "IDENTIFIABLE"
        edit_map: "Edit Map"
        public: "PUBLIC"
        identifiable: "IDENTIFIABLE"
@@ -1867,7 +2228,6 @@ en:
        trackable: "TRACKABLE"
        by: "by"
        in: "in"
        trackable: "TRACKABLE"
        by: "by"
        in: "in"
-      map: "map"
      index:
        public_traces: "Public GPS traces"
        my_traces: "My GPS traces"
      index:
        public_traces: "Public GPS traces"
        my_traces: "My GPS traces"
@@ -1876,9 +2236,11 @@ en:
        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='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
        upload_trace: "Upload a trace"
        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='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
        upload_trace: "Upload a trace"
-      see_all_traces: "See all traces"
-      see_my_traces: "See my traces"
-    delete:
+      all_traces: "All Traces"
+      my_traces: "My Traces"
+      traces_from: "Public Traces from %{user}"
+      remove_tag_filter: "Remove Tag Filter"
+    destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
        made_public: "Trace made public"
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
        made_public: "Trace made public"
@@ -1907,7 +2269,7 @@ en:
    oauth:
      authorize:
        title: "Authorize access to your account"
    oauth:
      authorize:
        title: "Authorize 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."
@@ -1919,7 +2281,7 @@ en:
        grant_access: "Grant Access"
      authorize_success:
        title: "Authorization request allowed"
        grant_access: "Grant Access"
      authorize_success:
        title: "Authorization 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: "Authorization request failed"
        verification: "The verification code is %{code}."
      authorize_failure:
        title: "Authorization request failed"
@@ -1929,6 +2291,14 @@ en:
        flash: "You've revoked the token for %{application}"
      permissions:
        missing: "You have not permitted the application access to this facility"
        flash: "You've revoked the token for %{application}"
      permissions:
        missing: "You have not permitted the application access to this facility"
+    scopes:
+      read_prefs: Read user preferences
+      write_prefs: Modify user preferences
+      write_diary: Create diary entries, comments and make friends
+      write_api: Modify the map
+      read_gpx: Read private GPS traces
+      write_gpx: Upload GPS traces
+      write_notes: Modify notes
    oauth_clients:
      new:
        title: "Register a new application"
    oauth_clients:
      new:
        title: "Register a new application"
@@ -1946,13 +2316,6 @@ en:
        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"
@@ -1961,23 +2324,12 @@ en:
        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."
+      oauth: OAuth
        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:
@@ -1986,100 +2338,72 @@ en:
        flash: "Updated the client information successfully"
      destroy:
        flash: "Destroyed the client application registration"
        flash: "Updated the client information successfully"
      destroy:
        flash: "Destroyed the client application registration"
+  oauth2_applications:
+    index:
+      title: "My client applications"
+      no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
+      oauth_2: "OAuth 2"
+      new: "Register new application"
+      name: "Name"
+      permissions: "Permissions"
+    application:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+    new:
+      title: "Register a new application"
+    edit:
+      title: "Edit your application"
+    show:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+      client_id: "Client ID"
+      client_secret: "Client Secret"
+      client_secret_warning: "Make sure to save this secret - it will not be accessible again"
+      permissions: "Permissions"
+      redirect_uris: "Redirect URIs"
+    not_found:
+      sorry: "Sorry, that application could not be found."
+  oauth2_authorizations:
+    new:
+      title: "Authorization required"
+      introduction: "Authorize %{application} to access your account with the following permissions?"
+      authorize: "Authorize"
+      deny: "Deny"
+    error:
+      title: "An error has occurred"
+    show:
+      title: "Authorization code"
+  oauth2_authorized_applications:
+    index:
+      title: "My authorized applications"
+      application: "Application"
+      permissions: "Permissions"
+      no_applications_html: "You have not yet authorized any %{oauth2} applications."
+    application:
+      revoke: "Revoke Access"
+      confirm_revoke: "Revoke access for this application?"
    users:
    users:
-    login:
-      title: "Login"
-      heading: "Login"
-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid: "%{logo} OpenID:"
-      remember: "Remember me"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      register now: Register now
-      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with external: "Alternatively, use a third party to login:"
-      new to osm: New to OpenStreetMap?
-      to make changes: To make changes to the OpenStreetMap data, you must have an account.
-      create account minute: Create an account. It only takes a minute.
-      no account: Don't have an account?
-      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
-      auth failure: "Sorry, could not log in with those details."
-      openid_logo_alt: "Log in with an OpenID"
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
-        wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID
-        wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID
-    logout:
-      title: "Logout"
-      heading: "Logout from OpenStreetMap"
-      logout_button: "Logout"
-    lost_password:
-      title: "Lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Reset password"
-      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Could not find that email address, sorry."
-    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?"
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      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>
        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="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
-      not displayed publicly: '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."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        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."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
-      terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      terms:
        title: "Terms"
        heading: "Terms"
      terms:
        title: "Terms"
        heading: "Terms"
@@ -2087,12 +2411,12 @@ en:
        read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button."
        contributor_terms_explain: "This agreement governs the terms for your existing and future contributions."
        read_ct: "I have read and agree to the above contributor terms"
        read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button."
        contributor_terms_explain: "This agreement governs the terms for your existing and future contributions."
        read_ct: "I have read and agree to the above contributor terms"
-      tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and aggree to the text."
+      tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text."
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
        consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
        read_tou: "I have read and agree to the Terms of Use"
        consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
        consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
-      guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
+      guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
        continue: Continue
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
        continue: Continue
        declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
@@ -2102,6 +2426,10 @@ en:
          france: "France"
          italy: "Italy"
          rest_of_world: "Rest of the world"
          france: "France"
          italy: "Italy"
          rest_of_world: "Rest of the world"
+    terms_declined_flash:
+      terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
+      terms_declined_link: this wiki page
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      no_such_user:
        title: "No such user"
        heading: "The user %{user} does not exist"
      no_such_user:
        title: "No such user"
        heading: "The user %{user} does not exist"
@@ -2117,7 +2445,6 @@ en:
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
-      oauth settings: oauth settings
        blocks on me: Blocks on Me
        blocks by me: Blocks by Me
        send message: Send Message
        blocks on me: Blocks on Me
        blocks by me: Blocks by Me
        send message: Send Message
@@ -2138,7 +2465,7 @@ en:
        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
        my friends: My friends
        no friends: You have not added any friends yet.
        settings_link_text: settings
        my friends: My friends
        no friends: You have not added any friends yet.
@@ -2178,15 +2505,13 @@ en:
      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?"
@@ -2194,23 +2519,20 @@ en:
          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 or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+        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 out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
        contributor terms:
        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 accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
          link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
          link text: "what is this?"
          agreed: "You have agreed to the new Contributor Terms."
          not yet agreed: "You have not yet agreed to the new Contributor Terms."
          review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
          link: "https://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?"
+        what_is_gravatar: "What is Gravatar?"
          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"
@@ -2218,61 +2540,29 @@ en:
        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
        return to profile: Return to profile
        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
        return to profile: Return to profile
+      oauth1 settings: OAuth 1 settings
+      oauth2 applications: OAuth 2 applications
+      oauth2 authorizations: OAuth 2 authorizations
        flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
        flash update success: "User information updated successfully."
        flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
        flash update success: "User information updated successfully."
-    confirm:
-      heading: Check your email!
-      introduction_1: |
-        We sent you a confirmation email.
-      introduction_2: |
-        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      already active: "This account has already been confirmed."
-      unknown token: "That confirmation code has expired or does not exist."
-      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
-    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."
-      failure: "User %{name} not found."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your change of email address!"
-      failure: "An email address has already been confirmed with this token."
-      unknown_token: "That confirmation code has expired or does not exist."
      set_home:
        flash success: "Home location saved successfully"
      go_public:
        flash success: "All your edits are now public, and you are now allowed to edit."
      set_home:
        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
@@ -2280,7 +2570,7 @@ en:
        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>
            Sorry, your account has been automatically suspended due to
            suspicious activity.
@@ -2331,21 +2621,17 @@ en:
        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 drop-down list."
      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 drop-down list."
@@ -2362,17 +2648,17 @@ en:
        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"
        block_duration:
          hours:
            one: "1 hour"
@@ -2391,17 +2677,18 @@ en:
            other: "%{count} years"
      blocks_on:
        title: "Blocks on %{name}"
            other: "%{count} years"
      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}"
-      created: "Created"
-      status: "Status"
+      heading_html: "%{block_on} blocked by %{block_by}"
+      created: "Created:"
+      duration: "Duration:"
+      status: "Status:"
        show: "Show"
        edit: "Edit"
        revoke: "Revoke!"
        show: "Show"
        edit: "Edit"
        revoke: "Revoke!"
@@ -2425,10 +2712,11 @@ en:
        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}"
+      no_notes: No notes
        id: "Id"
        creator: "Creator"
        description: "Description"
        id: "Id"
        creator: "Creator"
        description: "Description"
@@ -2448,7 +2736,7 @@ en:
        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 "
+      image_dimensions: "Image will show standard layer at %{width} x %{height}"
        download: "Download"
        short_url: "Short URL"
        include_marker: "Include marker"
        download: "Download"
        short_url: "Short URL"
        include_marker: "Include marker"
@@ -2468,12 +2756,19 @@ en:
          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
+        metersPopup:
+          one: You are within one meter of this point
+          other: You are within %{count} meters of this point
+        feetPopup:
+          one: You are within one foot of this point
+          other: You are within %{count} feet of this point
        base:
          standard: Standard
        base:
          standard: Standard
+        cyclosm: CyclOSM
          cycle_map: Cycle Map
          transport_map: Transport Map
          hot: Humanitarian
          cycle_map: Cycle Map
          transport_map: Transport Map
          hot: Humanitarian
+        opnvkarte: ÖPNVKarte
        layers:
          header: Map Layers
          notes: Map Notes
        layers:
          header: Map Layers
          notes: Map Notes
@@ -2484,6 +2779,10 @@ en:
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
        donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
        terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
        donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
        terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
+      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
+      thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
+      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
+      hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
@@ -2611,7 +2910,6 @@ en:
        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:
@@ -2619,7 +2917,6 @@ en:
        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: