Update Nominatim description terms

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

index ee316f055c780eba1f190ccbd85e4730430ed092..7d56436ac083ab94c4564d928c37e45c8a0584b1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -48,7 +48,7 @@ en:
          body: "Body"
        diary_entry:
          user: "User"
          body: "Body"
        diary_entry:
          user: "User"
-        title: "Title"
+        title: "Subject"
          latitude: "Latitude"
          longitude: "Longitude"
          language: "Language"
          latitude: "Latitude"
          longitude: "Longitude"
          language: "Language"
@@ -66,7 +66,7 @@ en:
          description: "Description"
        message:
          sender: "Sender"
          description: "Description"
        message:
          sender: "Sender"
-        title: "Title"
+        title: "Subject"
          body: "Body"
          recipient: "Recipient"
        user:
          body: "Body"
          recipient: "Recipient"
        user:
@@ -79,7 +79,7 @@ en:
    printable_name:
      with_id: "%{id}"
      with_version: "%{id}, v%{version}"
    printable_name:
      with_id: "%{id}"
      with_version: "%{id}, v%{version}"
-    with_name: "%{name} (%{id})"
+    with_name_html: "%{name} (%{id})"
    editor:
      default: "Default (currently %{name})"
      potlatch:
    editor:
      default: "Default (currently %{name})"
      potlatch:
@@ -95,40 +95,25 @@ en:
        name: "Remote Control"
        description: "Remote Control (JOSM or Merkaartor)"
    browse:
        name: "Remote Control"
        description: "Remote Control (JOSM or Merkaartor)"
    browse:
+    created: "Created"
+    closed: "Closed"
+    created_html: "Created <abbr title='%{title}'>%{time} ago</abbr>"
+    closed_html: "Closed <abbr title='%{title}'>%{time} ago</abbr>"
+    created_by_html: "Created <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    deleted_by_html: "Deleted <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    edited_by_html: "Edited <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    closed_by_html: "Closed <abbr title='%{title}'>%{time} ago</abbr> by %{user}"
+    version: "Version"
+    in_changeset: "Changeset"
+    anonymous: "anonymous"
+    no_comment: "(no comment)"
+    part_of: "Part of"
+    download_xml: "Download XML"
+    view_history: "View History"
+    view_details: "View Details"
+    location: "Location:"
      changeset:
      changeset:
-      title: "Changeset"
-      changeset: "Changeset %{id}"
-      changesetxml: "Changeset XML"
-      osmchangexml: "osmChange XML"
-      feed:
-        title: "Changeset %{id}"
-        title_comment: "Changeset %{id} - %{comment}"
-    navigation:
-      paging:
-        user:
-          prev: "« %{id}"
-          next: "%{id} »"
-        all:
-          prev: "« %{id}"
-          next: "%{id} »"
-      user:
-        name_changeset_tooltip: "View edits by %{user}"
-        prev_changeset_tooltip: "Previous edit by %{user}"
-        next_changeset_tooltip: "Next edit by %{user}"
-      all:
-        prev_node_tooltip: "Previous node"
-        next_node_tooltip: "Next node"
-        prev_way_tooltip: "Previous way"
-        next_way_tooltip: "Next way"
-        prev_relation_tooltip: "Previous relation"
-        next_relation_tooltip: "Next relation"
-        prev_changeset_tooltip: "Previous changeset"
-        next_changeset_tooltip: "Next changeset"
-        prev_note_tooltip: "Previous note"
-        next_note_tooltip: "Next note"
-    changeset_details:
-      created_at: "Created"
-      closed_at: "Closed"
+      title: "Changeset: %{id}"
        belongs_to: "Author"
        node: "Nodes (%{count})"
        node_paginated: "Nodes (%{x}-%{y} of %{count})"
        belongs_to: "Author"
        node: "Nodes (%{count})"
        node_paginated: "Nodes (%{x}-%{y} of %{count})"
@@ -136,55 +121,49 @@ en:
        way_paginated: "Ways (%{x}-%{y} of %{count})"
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
        way_paginated: "Ways (%{x}-%{y} of %{count})"
        relation: "Relations (%{count})"
        relation_paginated: "Relations (%{x}-%{y} of %{count})"
-      no_comment: "(no comment)"
-      ago: "%{ago} ago"
-      by: "by"
-    common_details:
-      edited: "Edited"
-      deleted: "Deleted"
-      by: "by"
-      version: "Version"
-      in_changeset: "Changeset"
-      changeset_comment: "Comment"
+      comment: "Comments (%{count})"
+      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+      feed:
+        title: "Changeset %{id}"
+        title_comment: "Changeset %{id} - %{comment}"
+      join_discussion: "Log in to join the discussion"
+      discussion: Discussion
+      still_open: "Changeset still open - discussion will open once the changeset is closed."
+    node:
+      title: "Node: %{name}"
+      history_title: "Node History: %{name}"
+    way:
+      title: "Way: %{name}"
+      history_title: "Way History: %{name}"
+      nodes: "Nodes"
+      also_part_of:
+        one: "part of way %{related_ways}"
+        other: "part of ways %{related_ways}"
+    relation:
+      title: "Relation: %{name}"
+      history_title: "Relation History: %{name}"
+      members: "Members"
+    relation_member:
+      entry: "%{type} %{name}"
+      entry_role: "%{type} %{name} as %{role}"
+      type:
+        node: "Node"
+        way: "Way"
+        relation: "Relation"
      containing_relation:
        entry: "Relation %{relation_name}"
        entry_role: "Relation %{relation_name} (as %{relation_role})"
      containing_relation:
        entry: "Relation %{relation_name}"
        entry_role: "Relation %{relation_name} (as %{relation_role})"
-    map:
-      loading: "Loading..."
-      deleted: "Deleted"
-      larger:
-        area: "View area on larger map"
-        node: "View node on larger map"
-        way: "View way on larger map"
-        relation: "View relation on larger map"
-        note: "View note on larger map"
-      edit:
-        area: "Edit area"
-        node: "Edit node"
-        way: "Edit way"
-        relation: "Edit relation"
-        note: "Edit note"
-    node_details:
-      coordinates: "Coordinates:"
-      part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
-      node_history_title: "Node History: %{node_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    node:
-      node: "Node"
-      node_title: "Node: %{node_name}"
-      download_xml: "Download XML"
-      view_history: "View history"
-      edit: "Edit node"
      not_found:
      not_found:
-      sorry: "Sorry, the %{type} with the id %{id}, could not be found."
+      sorry: "Sorry, %{type} #%{id} could not be found."
        type:
          node: node
          way: way
          relation: relation
          changeset: changeset
        type:
          node: node
          way: way
          relation: relation
          changeset: changeset
+        note: note
      timeout:
        sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
        type:
      timeout:
        sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
        type:
@@ -192,6 +171,7 @@ en:
          way: way
          relation: relation
          changeset: changeset
          way: way
          relation: relation
          changeset: changeset
+        note: note
      redacted:
        redaction: "Redaction %{id}"
        message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
      redacted:
        redaction: "Redaction %{id}"
        message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details."
@@ -199,111 +179,47 @@ en:
          node: "node"
          way: "way"
          relation: "relation"
          node: "node"
          way: "way"
          relation: "relation"
-    relation_details:
-      members: "Members:"
-      part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
-      relation_history_title: "Relation History: %{relation_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    relation_member:
-      entry: "%{type} %{name}"
-      entry_role: "%{type} %{name} as %{role}"
-      type:
-        node: "Node"
-        way: "Way"
-        relation: "Relation"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: %{relation_name}"
-      download_xml: "Download XML"
-      view_history: "View history"
      start_rjs:
      start_rjs:
-      notes_layer_name: "Browse Notes"
-      data_layer_name: "Browse Map Data"
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
-      hide_areas: "Hide areas"
-      show_areas: "Show areas"
-      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
        load_data: "Load Data"
        load_data: "Load Data"
-      unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"
        loading: "Loading..."
        loading: "Loading..."
-      show_history: "Show History"
-      wait: "Wait..."
-      history_for_feature: "History for %{feature}"
-      details: "Details"
-      private_user: "private user"
-      edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"
-      object_list:
-        heading: "Object list"
-        back: "Back to object list"
-        type:
-          node: "Node"
-          way: "Way"
-          # There is no 'relation' type because it is not represented in OpenLayers
-        api: "Retrieve this area from the API"
-        details: "Details"
-        selected:
-          type:
-            node: "Node %{id}"
-            way: "Way %{id}"
-            # There is no 'relation' type because it is not represented in OpenLayers
-        history:
-          type:
-            node: "Node %{id}"
-            way: "Way %{id}"
-            # There is no 'relation' type because it is not represented in OpenLayers
      tag_details:
        tags: "Tags"
        wiki_link:
          key: "The wiki description page for the %{key} tag"
          tag: "The wiki description page for the %{key}=%{value} tag"
      tag_details:
        tags: "Tags"
        wiki_link:
          key: "The wiki description page for the %{key} tag"
          tag: "The wiki description page for the %{key}=%{value} tag"
+      wikidata_link: "The %{page} item on Wikidata"
        wikipedia_link: "The %{page} article on Wikipedia"
        wikipedia_link: "The %{page} article on Wikipedia"
-    way_details:
-      nodes: "Nodes:"
-      part_of: "Part of:"
-      also_part_of:
-        one: "part of way %{related_ways}"
-        other: "part of ways %{related_ways}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: %{way_name}"
-      download_xml: "Download XML"
-      view_details: "View details"
-    way:
-      way: "Way"
-      way_title: "Way: %{way_name}"
-      download_xml: "Download XML"
-      view_history: "View history"
-      edit: "Edit way"
+      telephone_link: "Call %{phone_number}"
      note:
      note:
-      title: "Note"
-      open_title: "Unresolved note: %{note_name}"
-      closed_title: "Resolved note: %{note_name}"
-      opened: "Opened"
-      last_modified: "Last modified"
-      closed: "Closed"
-      at_html: "%{when} ago"
-      at_by_html: "%{when} ago by %{user}"
+      title: "Note: %{id}"
+      new_note: "New Note"
        description: "Description"
        description: "Description"
-      comments: "Comments"
-      anonymous: "anonymous"
+      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} ago</abbr>"
+      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      closed_by_anonymous: "Resolved by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
+      hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
+    query:
+      title: "Query Features"
+      introduction: "Click on the map to find nearby features."
+      nearby: "Nearby features"
+      enclosing: "Enclosing features"
    changeset:
      changeset_paging_nav:
        showing_page: "Page %{page}"
        next: "Next »"
        previous: "« Previous"
      changeset:
    changeset:
      changeset_paging_nav:
        showing_page: "Page %{page}"
        next: "Next »"
        previous: "« Previous"
      changeset:
-      still_editing: "(still editing)"
        anonymous: "Anonymous"
        anonymous: "Anonymous"
-      no_comment: "(no comment)"
        no_edits: "(no edits)"
        no_edits: "(no edits)"
-      show_area_box: "show area box"
-      big_area: "(big)"
        view_changeset_details: "View changeset details"
      changesets:
        id: "ID"
        view_changeset_details: "View changeset details"
      changesets:
        id: "ID"
@@ -316,14 +232,26 @@ en:
        title_user: "Changesets by %{user}"
        title_friend: "Changesets by your friends"
        title_nearby: "Changesets by nearby users"
        title_user: "Changesets by %{user}"
        title_friend: "Changesets by your friends"
        title_nearby: "Changesets by nearby users"
-      empty: "No changesets in this area."
-      no_more: "No more changesets in this area."
+      empty: "No changesets found."
+      empty_area: "No changesets in this area."
+      empty_user: "No changesets by this user."
+      no_more: "No more changesets found."
+      no_more_area: "No more changesets in this area."
+      no_more_user: "No more changesets by this user."
        load_more: "Load more"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
        load_more: "Load more"
      timeout:
        sorry: "Sorry, the list of changesets you requested took too long to retrieve."
+    rss:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
+      comment: "New comment on changeset #%{changeset_id} by %{author}"
+      commented_at_html: "Updated %{when} ago"
+      commented_at_by_html: "Updated %{when} ago by %{user}"
+      full: Full discussion
    diary_entry:
      new:
        title: New Diary Entry
    diary_entry:
      new:
        title: New Diary Entry
+      publish_button: "Publish"
      list:
        title: "Users' diaries"
        title_friends: "Friends' diaries"
      list:
        title: "Users' diaries"
        title_friends: "Friends' diaries"
@@ -396,6 +324,7 @@ en:
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
    export:
        newer_comments: "Newer Comments"
        older_comments: "Older Comments"
    export:
+    title: "Export"
      start:
        area_to_export: "Area to Export"
        manually_select: "Manually select a different area"
      start:
        area_to_export: "Area to Export"
        manually_select: "Manually select a different area"
@@ -404,13 +333,16 @@ en:
        map_image: "Map Image (shows standard layer)"
        embeddable_html: "Embeddable HTML"
        licence: "Licence"
        map_image: "Map Image (shows standard layer)"
        embeddable_html: "Embeddable HTML"
        licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
+      export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).'
        too_large:
        too_large:
-        heading: "Area Too Large"
-        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 following sources for bulk data downloads:"
+        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."
          planet:
            title: "Planet OSM"
            description: "Regularly-updated copies of the complete OpenStreetMap database"
          planet:
            title: "Planet OSM"
            description: "Regularly-updated copies of the complete OpenStreetMap database"
+        overpass:
+          title: "Overpass API"
+          description: "Download this bounding box from a mirror of the OpenStreetMap database"
          geofabrik:
            title: "Geofabrik Downloads"
            description: "Regularly-updated extracts of continents, countries, and selected cities"
          geofabrik:
            title: "Geofabrik Downloads"
            description: "Regularly-updated extracts of continents, countries, and selected cities"
@@ -432,44 +364,44 @@ en:
        output: "Output"
        paste_html: "Paste HTML to embed in website"
        export_button: "Export"
        output: "Output"
        paste_html: "Paste HTML to embed in website"
        export_button: "Export"
-    start_rjs:
-      export: "Export"
-      drag_a_box: "Drag a box on the map to select an area"
-      manually_select: "Manually select a different area"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
    geocoder:
      search:
        title:
    geocoder:
      search:
        title:
-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
+        latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
          uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
          uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
-        ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
-        osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
+        osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
          geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
          geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
-        osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        osm_nominatim_reverse: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
          geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
          aerialway:
          geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
      search_osm_nominatim:
        prefix_format: "%{name}"
        prefix:
          aerialway:
+          cable_car: "Cable Car"
            chair_lift: "Chair Lift"
            drag_lift: "Drag Lift"
            chair_lift: "Chair Lift"
            drag_lift: "Drag Lift"
+          gondola: "Gondola Lift"
+          platter: "Platter Lift"
+          pylon: "Pylon"
            station: "Aerialway Station"
            station: "Aerialway Station"
+          t-bar: "T-Bar Lift"
          aeroway:
            aerodrome: "Aerodrome"
          aeroway:
            aerodrome: "Aerodrome"
+          airstrip: "Airstrip"
            apron: "Apron"
            gate: "Gate"
            apron: "Apron"
            gate: "Gate"
+          hangar: "Hangar"
            helipad: "Helipad"
            helipad: "Helipad"
+          holding_position: "Holding Position"
+          parking_position: "Parking Position"
            runway: "Runway"
            taxiway: "Taxiway"
            terminal: "Terminal"
          amenity:
            runway: "Runway"
            taxiway: "Taxiway"
            terminal: "Terminal"
          amenity:
-          airport: "Airport"
+          animal_shelter: "Animal Shelter"
            arts_centre: "Arts Centre"
            arts_centre: "Arts Centre"
-          artwork: "Artwork"
            atm: "ATM"
            atm: "ATM"
-          auditorium: "Auditorium"
            bank: "Bank"
            bar: "Bar"
            bbq: "BBQ"
            bank: "Bank"
            bar: "Bar"
            bbq: "BBQ"
@@ -477,6 +409,7 @@ en:
            bicycle_parking: "Cycle Parking"
            bicycle_rental: "Cycle Rental"
            biergarten: "Beer Garden"
            bicycle_parking: "Cycle Parking"
            bicycle_rental: "Cycle Rental"
            biergarten: "Beer Garden"
+          boat_rental: "Boat Rental"
            brothel: "Brothel"
            bureau_de_change: "Bureau de Change"
            bus_station: "Bus Station"
            brothel: "Brothel"
            bureau_de_change: "Bureau de Change"
            bus_station: "Bus Station"
@@ -486,46 +419,42 @@ en:
            car_wash: "Car Wash"
            casino: "Casino"
            charging_station: "Charging Station"
            car_wash: "Car Wash"
            casino: "Casino"
            charging_station: "Charging Station"
+          childcare: "Childcare"
            cinema: "Cinema"
            clinic: "Clinic"
            cinema: "Cinema"
            clinic: "Clinic"
-          club: "Club"
+          clock: "Clock"
            college: "College"
            community_centre: "Community Centre"
            courthouse: "Courthouse"
            crematorium: "Crematorium"
            dentist: "Dentist"
            doctors: "Doctors"
            college: "College"
            community_centre: "Community Centre"
            courthouse: "Courthouse"
            crematorium: "Crematorium"
            dentist: "Dentist"
            doctors: "Doctors"
-          dormitory: "Dormitory"
            drinking_water: "Drinking Water"
            driving_school: "Driving School"
            embassy: "Embassy"
            drinking_water: "Drinking Water"
            driving_school: "Driving School"
            embassy: "Embassy"
-          emergency_phone: "Emergency Phone"
            fast_food: "Fast Food"
            ferry_terminal: "Ferry Terminal"
            fast_food: "Fast Food"
            ferry_terminal: "Ferry Terminal"
-          fire_hydrant: "Fire Hydrant"
            fire_station: "Fire Station"
            food_court: "Food Court"
            fountain: "Fountain"
            fuel: "Fuel"
            fire_station: "Fire Station"
            food_court: "Food Court"
            fountain: "Fountain"
            fuel: "Fuel"
+          gambling: "Gambling"
            grave_yard: "Grave Yard"
            grave_yard: "Grave Yard"
-          gym: "Fitness Centre / Gym"
-          hall: "Hall"
-          health_centre: "Health Centre"
+          grit_bin: "Grit Bin"
            hospital: "Hospital"
            hospital: "Hospital"
-          hotel: "Hotel"
            hunting_stand: "Hunting Stand"
            ice_cream: "Ice Cream"
            kindergarten: "Kindergarten"
            library: "Library"
            hunting_stand: "Hunting Stand"
            ice_cream: "Ice Cream"
            kindergarten: "Kindergarten"
            library: "Library"
-          market: "Market"
            marketplace: "Marketplace"
            marketplace: "Marketplace"
-          mountain_rescue: "Mountain Rescue"
+          monastery: "Monastery"
+          motorcycle_parking: "Motorcycle Parking"
            nightclub: "Night Club"
            nightclub: "Night Club"
-          nursery: "Nursery"
            nursing_home: "Nursing Home"
            office: "Office"
            nursing_home: "Nursing Home"
            office: "Office"
-          park: "Park"
            parking: "Parking"
            parking: "Parking"
+          parking_entrance: "Parking Entrance"
+          parking_space: "Parking Space"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
@@ -535,8 +464,6 @@ en:
            prison: "Prison"
            pub: "Pub"
            public_building: "Public Building"
            prison: "Prison"
            pub: "Pub"
            public_building: "Public Building"
-          public_market: "Public Market"
-          reception_area: "Reception Area"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
            retirement_home: "Retirement Home"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
            retirement_home: "Retirement Home"
@@ -544,13 +471,11 @@ en:
            school: "School"
            shelter: "Shelter"
            shop: "Shop"
            school: "School"
            shelter: "Shelter"
            shop: "Shop"
-          shopping: "Shopping"
            shower: "Shower"
            social_centre: "Social Centre"
            social_club: "Social Club"
            social_facility: "Social Facility"
            studio: "Studio"
            shower: "Shower"
            social_centre: "Social Centre"
            social_club: "Social Club"
            social_facility: "Social Facility"
            studio: "Studio"
-          supermarket: "Supermarket"
            swimming_pool: "Swimming Pool"
            taxi: "Taxi"
            telephone: "Public Telephone"
            swimming_pool: "Swimming Pool"
            taxi: "Taxi"
            telephone: "Public Telephone"
@@ -562,8 +487,8 @@ en:
            veterinary: "Veterinary Surgery"
            village_hall: "Village Hall"
            waste_basket: "Waste Basket"
            veterinary: "Veterinary Surgery"
            village_hall: "Village Hall"
            waste_basket: "Waste Basket"
-          wifi: "WiFi Access"
-          WLAN: "WiFi Access"
+          waste_disposal: "Waste Disposal"
+          water_point: "Water Point"
            youth_centre: "Youth Centre"
          boundary:
            administrative: "Administrative Boundary"
            youth_centre: "Youth Centre"
          boundary:
            administrative: "Administrative Boundary"
@@ -572,31 +497,51 @@ en:
            protected_area : "Protected Area"
          bridge:
            aqueduct: "Aqueduct"
            protected_area : "Protected Area"
          bridge:
            aqueduct: "Aqueduct"
+          boardwalk: "Boardwalk"
            suspension: "Suspension Bridge"
            swing: "Swing Bridge"
            viaduct: "Viaduct"
            "yes": "Bridge"
          building:
            "yes": "Building"
            suspension: "Suspension Bridge"
            swing: "Swing Bridge"
            viaduct: "Viaduct"
            "yes": "Bridge"
          building:
            "yes": "Building"
+        craft:
+          brewery: "Brewery"
+          carpenter: "Carpenter"
+          electrician: "Electrician"
+          gardener: "Gardener"
+          painter: "Painter"
+          photographer: "Photographer"
+          plumber: "Plumber"
+          shoemaker: "Shoemaker"
+          tailor: "Tailor"
+          "yes": "Craft Shop"
          emergency:
          emergency:
-          fire_hydrant: "Fire Hydrant"
+          ambulance_station: "Ambulance Station"
+          assembly_point: "Assembly Point"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"
            phone: "Emergency Phone"
            phone: "Emergency Phone"
+          water_tank: "Emergency Water Tank"
+          "yes": "Emergency"
          highway:
          highway:
+          abandoned: "Abandoned Highway"
            bridleway: "Bridleway"
            bus_guideway: "Guided Bus Lane"
            bus_stop: "Bus Stop"
            bridleway: "Bridleway"
            bus_guideway: "Guided Bus Lane"
            bus_stop: "Bus Stop"
-          byway: "Byway"
            construction: "Highway under Construction"
            construction: "Highway under Construction"
+          corridor: "Corridor"
            cycleway: "Cycle Path"
            cycleway: "Cycle Path"
+          elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
            footway: "Footpath"
            ford: "Ford"
            emergency_access_point: "Emergency Access Point"
            footway: "Footpath"
            ford: "Ford"
+          give_way: "Give Way Sign"
            living_street: "Living Street"
            milestone: "Milestone"
            living_street: "Living Street"
            milestone: "Milestone"
-          minor: "Minor Road"
            motorway: "Motorway"
            motorway_junction: "Motorway Junction"
            motorway_link: "Motorway Road"
            motorway: "Motorway"
            motorway_junction: "Motorway Junction"
            motorway_link: "Motorway Road"
+          passing_place: "Passing Place"
            path: "Path"
            pedestrian: "Pedestrian Way"
            platform: "Platform"
            path: "Path"
            pedestrian: "Pedestrian Way"
            platform: "Platform"
@@ -604,7 +549,7 @@ en:
            primary_link: "Primary Road"
            proposed: "Proposed Road"
            raceway: "Raceway"
            primary_link: "Primary Road"
            proposed: "Proposed Road"
            raceway: "Raceway"
-          residential: "Residential"
+          residential: "Residential Road"
            rest_area: "Rest Area"
            road: "Road"
            secondary: "Secondary Road"
            rest_area: "Rest Area"
            road: "Road"
            secondary: "Secondary Road"
@@ -613,38 +558,48 @@ en:
            services: "Motorway Services"
            speed_camera: "Speed Camera"
            steps: "Steps"
            services: "Motorway Services"
            speed_camera: "Speed Camera"
            steps: "Steps"
+          stop: "Stop Sign"
            street_lamp: "Street Lamp"
            street_lamp: "Street Lamp"
-          stile: "Stile"
            tertiary: "Tertiary Road"
            tertiary_link: "Tertiary Road"
            track: "Track"
            tertiary: "Tertiary Road"
            tertiary_link: "Tertiary Road"
            track: "Track"
+          traffic_signals: "Traffic Signals"
            trail: "Trail"
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
            trail: "Trail"
            trunk: "Trunk Road"
            trunk_link: "Trunk Road"
+          turning_loop: "Turning Loop"
            unclassified: "Unclassified Road"
            unclassified: "Unclassified Road"
-          unsurfaced: "Unsurfaced Road"
+          "yes" : "Road"
          historic:
            archaeological_site: "Archaeological Site"
            battlefield: "Battlefield"
            boundary_stone: "Boundary Stone"
          historic:
            archaeological_site: "Archaeological Site"
            battlefield: "Battlefield"
            boundary_stone: "Boundary Stone"
-          building: "Building"
+          building: "Historic Building"
+          bunker: "Bunker"
            castle: "Castle"
            church: "Church"
            castle: "Castle"
            church: "Church"
+          city_gate: "City Gate"
            citywalls: "City Walls"
            fort: "Fort"
            citywalls: "City Walls"
            fort: "Fort"
+          heritage: "Heritage Site"
            house: "House"
            icon: "Icon"
            manor: "Manor"
            memorial: "Memorial"
            mine: "Mine"
            house: "House"
            icon: "Icon"
            manor: "Manor"
            memorial: "Memorial"
            mine: "Mine"
+          mine_shaft: "Mine Shaft"
            monument: "Monument"
            monument: "Monument"
-          museum: "Museum"
+          roman_road: "Roman Road"
            ruins: "Ruins"
            ruins: "Ruins"
+          stone: "Stone"
            tomb: "Tomb"
            tower: "Tower"
            wayside_cross: "Wayside Cross"
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
            tomb: "Tomb"
            tower: "Tower"
            wayside_cross: "Wayside Cross"
            wayside_shrine: "Wayside Shrine"
            wreck: "Wreck"
+          "yes": "Historic Site"
+        junction:
+          "yes": "Junction"
          landuse:
            allotments: "Allotments"
            basin: "Basin"
          landuse:
            allotments: "Allotments"
            basin: "Basin"
@@ -666,9 +621,6 @@ en:
            military: "Military Area"
            mine: "Mine"
            orchard: "Orchard"
            military: "Military Area"
            mine: "Mine"
            orchard: "Orchard"
-          nature_reserve: "Nature Reserve"
-          park: "Park"
-          piste: "Piste"
            quarry: "Quarry"
            railway: "Railway"
            recreation_ground: "Recreation Ground"
            quarry: "Quarry"
            railway: "Railway"
            recreation_ground: "Recreation Ground"
@@ -679,16 +631,19 @@ en:
            road: "Road Area"
            village_green: "Village Green"
            vineyard: "Vineyard"
            road: "Road Area"
            village_green: "Village Green"
            vineyard: "Vineyard"
-          wetland: "Wetland"
-          wood: "Wood"
+          "yes": "Landuse"
          leisure:
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
            common: "Common Land"
          leisure:
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
            common: "Common Land"
+          dog_park: "Dog Park"
+          firepit: "Fire Pit"
            fishing: "Fishing Area"
            fishing: "Fishing Area"
+          fitness_centre: "Fitness Centre"
            fitness_station: "Fitness Station"
            garden: "Garden"
            golf_course: "Golf Course"
            fitness_station: "Fitness Station"
            garden: "Garden"
            golf_course: "Golf Course"
+          horse_riding: "Horse Riding"
            ice_rink: "Ice Rink"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
            ice_rink: "Ice Rink"
            marina: "Marina"
            miniature_golf: "Miniature Golf"
@@ -697,6 +652,7 @@ en:
            pitch: "Sports Pitch"
            playground: "Playground"
            recreation_ground: "Recreation Ground"
            pitch: "Sports Pitch"
            playground: "Playground"
            recreation_ground: "Recreation Ground"
+          resort: "Resort"
            sauna: "Sauna"
            slipway: "Slipway"
            sports_centre: "Sports Centre"
            sauna: "Sauna"
            slipway: "Slipway"
            sports_centre: "Sports Centre"
@@ -704,10 +660,48 @@ en:
            swimming_pool: "Swimming Pool"
            track: "Running Track"
            water_park: "Water Park"
            swimming_pool: "Swimming Pool"
            track: "Running Track"
            water_park: "Water Park"
+          "yes": "Leisure"
+        man_made:
+          adit: "Adit"
+          beacon: "Beacon"
+          beehive: "Bee Hive"
+          breakwater: "Breakwater"
+          bridge: "Bridge"
+          bunker_silo: "Bunker"
+          chimney: "Chimney"
+          crane: "Crane"
+          dolphin: "Mooring Post"
+          dyke: "Dyke"
+          embankment: "Embankment"
+          flagpole: "Flagpole"
+          gasometer: "Gasometer"
+          groyne: "Groyne"
+          kiln: "Kiln"
+          lighthouse: "Lighthouse"
+          mast: "Mast"
+          mine: "Mine"
+          mineshaft: "Mine Shaft"
+          monitoring_station: "Monitoring Station"
+          petroleum_well: "Petroleum Well"
+          pier: "Pier"
+          pipeline: "Pipeline"
+          silo: "Silo"
+          storage_tank: "Storage Tank"
+          surveillance: "Surveillance"
+          tower: "Tower"
+          wastewater_plant: "Wastewater Plant"
+          watermill: "Water Mill"
+          water_tower: "Water Tower"
+          water_well: "Well"
+          water_works: "Water Works"
+          windmill: "Wind Mill"
+          works: "Factory"
+          "yes": "Man-made"
          military:
            airfield: "Military Airfield"
            barracks: "Barracks"
            bunker: "Bunker"
          military:
            airfield: "Military Airfield"
            barracks: "Barracks"
            bunker: "Bunker"
+          "yes": "Military"
          mountain_pass:
            "yes" : "Mountain Pass"
          natural:
          mountain_pass:
            "yes" : "Mountain Pass"
          natural:
@@ -715,16 +709,15 @@ en:
            beach: "Beach"
            cape: "Cape"
            cave_entrance: "Cave Entrance"
            beach: "Beach"
            cape: "Cape"
            cave_entrance: "Cave Entrance"
-          channel: "Channel"
            cliff: "Cliff"
            crater: "Crater"
            dune: "Dune"
            cliff: "Cliff"
            crater: "Crater"
            dune: "Dune"
-          feature: "Feature"
            fell: "Fell"
            fjord: "Fjord"
            forest: "Forest"
            geyser: "Geyser"
            glacier: "Glacier"
            fell: "Fell"
            fjord: "Fjord"
            forest: "Forest"
            geyser: "Geyser"
            glacier: "Glacier"
+          grassland: "Grassland"
            heath: "Heath"
            hill: "Hill"
            island: "Island"
            heath: "Heath"
            hill: "Hill"
            island: "Island"
@@ -736,11 +729,11 @@ en:
            point: "Point"
            reef: "Reef"
            ridge: "Ridge"
            point: "Point"
            reef: "Reef"
            ridge: "Ridge"
-          river: "River"
            rock: "Rock"
            rock: "Rock"
+          saddle: "Saddle"
+          sand: "Sand"
            scree: "Scree"
            scrub: "Scrub"
            scree: "Scree"
            scrub: "Scrub"
-          shoal: "Shoal"
            spring: "Spring"
            stone: "Stone"
            strait: "Strait"
            spring: "Spring"
            stone: "Stone"
            strait: "Strait"
@@ -749,24 +742,28 @@ en:
            volcano: "Volcano"
            water: "Water"
            wetland: "Wetland"
            volcano: "Volcano"
            water: "Water"
            wetland: "Wetland"
-          wetlands: "Wetlands"
            wood: "Wood"
          office:
            accountant: "Accountant"
            wood: "Wood"
          office:
            accountant: "Accountant"
+          administrative: "Administration"
            architect: "Architect"
            architect: "Architect"
+          association: "Association"
            company: "Company"
            company: "Company"
+          educational_institution: "Educational Institution"
            employment_agency: "Employment Agency"
            estate_agent: "Estate Agent"
            government: "Governmental Office"
            insurance: "Insurance Office"
            employment_agency: "Employment Agency"
            estate_agent: "Estate Agent"
            government: "Governmental Office"
            insurance: "Insurance Office"
+          it: "IT Office"
            lawyer: "Lawyer"
            ngo: "NGO Office"
            telecommunication: "Telecommunication Office"
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
            lawyer: "Lawyer"
            ngo: "NGO Office"
            telecommunication: "Telecommunication Office"
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
-          airport: "Airport"
+          allotments: "Allotments"
            city: "City"
            city: "City"
+          city_block: "City Block"
            country: "Country"
            county: "County"
            farm: "Farm"
            country: "Country"
            county: "County"
            farm: "Farm"
@@ -777,26 +774,26 @@ en:
            islet: "Islet"
            isolated_dwelling: "Isolated Dwelling"
            locality: "Locality"
            islet: "Islet"
            isolated_dwelling: "Isolated Dwelling"
            locality: "Locality"
-          moor: "Moor"
            municipality: "Municipality"
            neighbourhood: "Neighbourhood"
            postcode: "Postcode"
            municipality: "Municipality"
            neighbourhood: "Neighbourhood"
            postcode: "Postcode"
+          quarter: "Quarter"
            region: "Region"
            sea: "Sea"
            region: "Region"
            sea: "Sea"
+          square: "Square"
            state: "State"
            subdivision: "Subdivision"
            suburb: "Suburb"
            town: "Town"
            unincorporated_area: "Unincorporated Area"
            village: "Village"
            state: "State"
            subdivision: "Subdivision"
            suburb: "Suburb"
            town: "Town"
            unincorporated_area: "Unincorporated Area"
            village: "Village"
+          "yes": "Place"
          railway:
            abandoned: "Abandoned Railway"
            construction: "Railway under Construction"
            disused: "Disused Railway"
          railway:
            abandoned: "Abandoned Railway"
            construction: "Railway under Construction"
            disused: "Disused Railway"
-          disused_station: "Disused Railway Station"
            funicular: "Funicular Railway"
            halt: "Train Stop"
            funicular: "Funicular Railway"
            halt: "Train Stop"
-          historic_station: "Historic Railway Station"
            junction: "Railway Junction"
            level_crossing: "Level Crossing"
            light_rail: "Light Rail"
            junction: "Railway Junction"
            level_crossing: "Level Crossing"
            light_rail: "Light Rail"
@@ -809,12 +806,11 @@ en:
            spur: "Railway Spur"
            station: "Railway Station"
            stop: "Railway Stop"
            spur: "Railway Spur"
            station: "Railway Station"
            stop: "Railway Stop"
-          subway: "Subway Station"
+          subway: "Subway"
            subway_entrance: "Subway Entrance"
            switch: "Railway Points"
            tram: "Tramway"
            tram_stop: "Tram Stop"
            subway_entrance: "Subway Entrance"
            switch: "Railway Points"
            tram: "Tramway"
            tram_stop: "Tram Stop"
-          yard: "Railway Yard"
          shop:
            alcohol: "Off License"
            antiques: "Antiques"
          shop:
            alcohol: "Off License"
            antiques: "Antiques"
@@ -823,6 +819,7 @@ en:
            beauty: "Beauty Shop"
            beverages: "Beverages Shop"
            bicycle: "Bicycle Shop"
            beauty: "Beauty Shop"
            beverages: "Beverages Shop"
            bicycle: "Bicycle Shop"
+          bookmaker: "Bookmaker"
            books: "Book Shop"
            boutique: "Boutique"
            butcher: "Butcher"
            books: "Book Shop"
            boutique: "Boutique"
            butcher: "Butcher"
@@ -830,7 +827,6 @@ en:
            car_parts: "Car Parts"
            car_repair: "Car Repair"
            carpet: "Carpet Shop"
            car_parts: "Car Parts"
            car_repair: "Car Repair"
            carpet: "Carpet Shop"
-          car_repair: "Car Repair"
            charity: "Charity Shop"
            chemist: "Chemist"
            clothes: "Clothes Shop"
            charity: "Charity Shop"
            chemist: "Chemist"
            clothes: "Clothes Shop"
@@ -862,12 +858,16 @@ en:
            hairdresser: "Hairdresser"
            hardware: "Hardware Store"
            hifi: "Hi-Fi"
            hairdresser: "Hairdresser"
            hardware: "Hardware Store"
            hifi: "Hi-Fi"
-          insurance: "Insurance"
+          houseware: "Houseware Shop"
+          interior_decoration: "Interior Decoration"
            jewelry: "Jewelry Shop"
            kiosk: "Kiosk Shop"
            jewelry: "Jewelry Shop"
            kiosk: "Kiosk Shop"
+          kitchen: "Kitchen Shop"
            laundry: "Laundry"
            laundry: "Laundry"
+          lottery: "Lottery"
            mall: "Mall"
            market: "Market"
            mall: "Mall"
            market: "Market"
+          massage: "Massage"
            mobile_phone: "Mobile Phone Shop"
            motorcycle: "Motorcycle Shop"
            music: "Music Shop"
            mobile_phone: "Mobile Phone Shop"
            motorcycle: "Motorcycle Shop"
            music: "Music Shop"
@@ -875,24 +875,31 @@ en:
            optician: "Optician"
            organic: "Organic Food Shop"
            outdoor: "Outdoor Shop"
            optician: "Optician"
            organic: "Organic Food Shop"
            outdoor: "Outdoor Shop"
+          paint: "Paint Shop"
+          pawnbroker: "Pawnbroker"
            pet: "Pet Shop"
            pharmacy: "Pharmacy"
            photo: "Photo Shop"
            pet: "Pet Shop"
            pharmacy: "Pharmacy"
            photo: "Photo Shop"
-          salon: "Salon"
+          seafood: "Sea Food"
            second_hand: "Second-hand Shop"
            shoes: "Shoe Shop"
            second_hand: "Second-hand Shop"
            shoes: "Shoe Shop"
-          shopping_centre: "Shopping Centre"
            sports: "Sports Shop"
            stationery: "Stationery Shop"
            supermarket: "Supermarket"
            tailor: "Tailor"
            sports: "Sports Shop"
            stationery: "Stationery Shop"
            supermarket: "Supermarket"
            tailor: "Tailor"
+          ticket: "Ticket Shop"
+          tobacco: "Tobacco Shop"
            toys: "Toy Shop"
            travel_agency: "Travel Agency"
            toys: "Toy Shop"
            travel_agency: "Travel Agency"
+          tyres: "Tyre Shop"
+          vacant: "Vacant Shop"
+          variety_store: "Variety Store"
            video: "Video Shop"
            video: "Video Shop"
-          wine: "Off License"
+          wine: "Wine Store"
            "yes": "Shop"
          tourism:
            alpine_hut: "Alpine Hut"
            "yes": "Shop"
          tourism:
            alpine_hut: "Alpine Hut"
+          apartment: "Apartment"
            artwork: "Artwork"
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
            artwork: "Artwork"
            attraction: "Attraction"
            bed_and_breakfast: "Bed and Breakfast"
@@ -900,26 +907,25 @@ en:
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            chalet: "Chalet"
            camp_site: "Camp Site"
            caravan_site: "Caravan Site"
            chalet: "Chalet"
+          gallery: "Gallery"
            guest_house: "Guest House"
            hostel: "Hostel"
            hotel: "Hotel"
            information: "Information"
            guest_house: "Guest House"
            hostel: "Hostel"
            hotel: "Hotel"
            information: "Information"
-          lean_to: "Lean To"
            motel: "Motel"
            museum: "Museum"
            picnic_site: "Picnic Site"
            theme_park: "Theme Park"
            motel: "Motel"
            museum: "Museum"
            picnic_site: "Picnic Site"
            theme_park: "Theme Park"
-          valley: "Valley"
            viewpoint: "Viewpoint"
            zoo: "Zoo"
          tunnel:
            viewpoint: "Viewpoint"
            zoo: "Zoo"
          tunnel:
+          building_passage: "Building Passage"
            culvert: "Culvert"
            "yes": "Tunnel"
          waterway:
            artificial: "Artificial Waterway"
            boatyard: "Boatyard"
            canal: "Canal"
            culvert: "Culvert"
            "yes": "Tunnel"
          waterway:
            artificial: "Artificial Waterway"
            boatyard: "Boatyard"
            canal: "Canal"
-          connector: "Waterway Connector"
            dam: "Dam"
            derelict_canal: "Derelict Canal"
            ditch: "Ditch"
            dam: "Dam"
            derelict_canal: "Derelict Canal"
            ditch: "Ditch"
@@ -927,16 +933,14 @@ en:
            drain: "Drain"
            lock: "Lock"
            lock_gate: "Lock Gate"
            drain: "Drain"
            lock: "Lock"
            lock_gate: "Lock Gate"
-          mineral_spring: "Mineral Spring"
            mooring: "Mooring"
            rapids: "Rapids"
            river: "River"
            mooring: "Mooring"
            rapids: "Rapids"
            river: "River"
-          riverbank: "Riverbank"
            stream: "Stream"
            wadi: "Wadi"
            waterfall: "Waterfall"
            stream: "Stream"
            wadi: "Wadi"
            waterfall: "Waterfall"
-          water_point: "Water Point"
            weir: "Weir"
            weir: "Weir"
+          "yes": "Waterway"
        admin_levels:
          level2: "Country Boundary"
          level4: "State Boundary"
        admin_levels:
          level2: "Country Boundary"
          level4: "State Boundary"
@@ -947,7 +951,7 @@ en:
          level10: "Suburb Boundary"
      description:
        title:
          level10: "Suburb Boundary"
      description:
        title:
-        osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        osm_nominatim: 'Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
          geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
        types:
          cities: Cities
          geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
        types:
          cities: Cities
@@ -956,19 +960,6 @@ en:
      results:
        no_results: "No results found"
        more_results: "More results"
      results:
        no_results: "No results found"
        more_results: "More results"
-    distance:
-      zero: "less than 1km"
-      one: "about 1km"
-      other: "about %{count}km"
-    direction:
-      south_west: "south-west"
-      south: "south"
-      south_east: "south-east"
-      east: "east"
-      north_east: "north-east"
-      north: "north"
-      north_west: "north-west"
-      west: "west"
    layouts:
      project_name:
        # in <title>
    layouts:
      project_name:
        # in <title>
@@ -978,10 +969,11 @@ en:
      logo:
        alt_text: OpenStreetMap logo
      home: Go to Home Location
      logo:
        alt_text: OpenStreetMap logo
      home: Go to Home Location
-    logout: Logout
+    logout: Log Out
      log_in: Log In
      log_in_tooltip: Log in with an existing account
      sign_up: Sign Up
      log_in: Log In
      log_in_tooltip: Log in with an existing account
      sign_up: Sign Up
+    start_mapping: Start Mapping
      sign_up_tooltip: Create an account for editing
      edit: Edit
      history: History
      sign_up_tooltip: Create an account for editing
      edit: Edit
      history: History
@@ -995,20 +987,19 @@ en:
      edit_with: Edit with %{editor}
      tag_line: The Free Wiki World Map
      intro_header: Welcome to OpenStreetMap!
      edit_with: Edit with %{editor}
      tag_line: The Free Wiki World Map
      intro_header: Welcome to OpenStreetMap!
-    intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors.
+    intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
      intro_2_create_account: "Create a user account"
-    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
-    partners_ucl: "the UCL VR Centre"
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    partners_ucl: "UCL"
      partners_ic: "Imperial College London"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
      partners_ic: "Imperial College London"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
-    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
      help: Help
      about: About
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
      help: Help
      about: About
-    copyright: "Copyright & License"
+    copyright: Copyright
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
      community: Community
      community_blogs: "Community Blogs"
      community_blogs_title: "Blogs from members of the OpenStreetMap community"
@@ -1018,6 +1009,7 @@ en:
        title: Support OpenStreetMap with a monetary donation
        text: Make a Donation
      learn_more: "Learn More"
        title: Support OpenStreetMap with a monetary donation
        text: Make a Donation
      learn_more: "Learn More"
+    more: More
    license_page:
      foreign:
        title: About this translation
    license_page:
      foreign:
        title: About this translation
@@ -1031,19 +1023,20 @@ en:
      legal_babble:
        title_html: Copyright and License
        intro_1_html: |
      legal_babble:
        title_html: Copyright and License
        intro_1_html: |
-        OpenStreetMap is <i>open data</i>, licensed under the <a
-        href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
+        href="https://opendatacommons.org/licenses/odbl/">Open Data
+        Commons Open Database License</a> (ODbL) by the  <a
+        href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
        intro_2_html: |
          You are free to copy, distribute, transmit and adapt our data,
          as long as you credit OpenStreetMap and its
          contributors. If you alter or build upon our data, you
          may distribute the result only under the same licence. The
        intro_2_html: |
          You are free to copy, distribute, transmit and adapt our data,
          as long as you credit OpenStreetMap and its
          contributors. If you alter or build upon our data, you
          may distribute the result only under the same licence. The
-        full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
+        full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
          code</a> explains your rights and responsibilities.
        intro_3_html: |
          The cartography in our map tiles, and our documentation, are
          code</a> explains your rights and responsibilities.
        intro_3_html: |
          The cartography in our map tiles, and our documentation, are
-        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
        credit_title_html: How to credit OpenStreetMap
        credit_1_html: |
          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
        credit_title_html: How to credit OpenStreetMap
        credit_1_html: |
@@ -1053,7 +1046,7 @@ en:
          You must also make it clear that the data is available under the Open
          Database License, and if using our map tiles, that the cartography is
          licensed as CC BY-SA. You may do this by linking to
          You must also make it clear that the data is available under the Open
          Database License, and if using our map tiles, that the cartography is
          licensed as CC BY-SA. You may do this by linking to
-        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+        <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
          Alternatively, and as a requirement if you are distributing OSM in a
          data form, you can name and link directly to the license(s). In media
          where links are not possible (e.g. printed works), we suggest you
          Alternatively, and as a requirement if you are distributing OSM in a
          data form, you can name and link directly to the license(s). In media
          where links are not possible (e.g. printed works), we suggest you
@@ -1069,14 +1062,13 @@ en:
        more_title_html: Finding out more
        more_1_html: |
          Read more about using our data, and how to credit us, at the <a
        more_title_html: Finding out more
        more_1_html: |
          Read more about using our data, and how to credit us, at the <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+        href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
        more_2_html: |
          Although OpenStreetMap is open data, we cannot provide a
        more_2_html: |
          Although OpenStreetMap is open data, we cannot provide a
-        free-of-charge map API for third-party developers.
-        See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
-        <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
-        and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
        contributors_title_html: Our contributors
        contributors_intro_html: |
          Our contributors are thousands of individuals. We also include
        contributors_title_html: Our contributors
        contributors_intro_html: |
          Our contributors are thousands of individuals. We also include
@@ -1084,25 +1076,35 @@ en:
          and other sources, among them:
        contributors_at_html: |
          <strong>Austria</strong>: Contains data from
          and other sources, among them:
        contributors_at_html: |
          <strong>Austria</strong>: Contains data from
-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (under
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+        Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
        contributors_ca_html: |
          <strong>Canada</strong>: Contains data from
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
          Resources Canada), CanVec (&copy; Department of Natural
          Resources Canada), and StatCan (Geography Division,
          Statistics Canada).
        contributors_ca_html: |
          <strong>Canada</strong>: Contains data from
          GeoBase&reg;, GeoGratis (&copy; Department of Natural
          Resources Canada), CanVec (&copy; Department of Natural
          Resources Canada), and StatCan (Geography Division,
          Statistics Canada).
+      contributors_fi_html: |
+        <strong>Finland</strong>: Contains data from the
+        National Land Survey of Finland's Topographic Database
+        and other datasets, under the
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI License</a>.
        contributors_fr_html: |
          <strong>France</strong>: Contains data sourced from
          Direction Générale des Impôts.
        contributors_nl_html: |
          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
        contributors_fr_html: |
          <strong>France</strong>: Contains data sourced from
          Direction Générale des Impôts.
        contributors_nl_html: |
          <strong>Netherlands</strong>: Contains &copy; AND data, 2007
-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)
        contributors_nz_html: |
          <strong>New Zealand</strong>: Contains data sourced from
          Land Information New Zealand. Crown Copyright reserved.
        contributors_nz_html: |
          <strong>New Zealand</strong>: Contains data sourced from
          Land Information New Zealand. Crown Copyright reserved.
+      contributors_si_html: |
+        <strong>Slovenia</strong>: Contains data from the
+        <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
+        <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
+        (public information of Slovenia).
        contributors_za_html: |
          <strong>South Africa</strong>: Contains data sourced from
          <a href="http://www.ngi.gov.za/">Chief Directorate:
        contributors_za_html: |
          <strong>South Africa</strong>: Contains data sourced from
          <a href="http://www.ngi.gov.za/">Chief Directorate:
@@ -1114,7 +1116,7 @@ en:
        contributors_footer_1_html: |
          For further details of these, and other sources that have been used
          to help improve OpenStreetMap, please see the <a
        contributors_footer_1_html: |
          For further details of these, and other sources that have been used
          to help improve OpenStreetMap, please see the <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+        href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
          page</a> on the OpenStreetMap Wiki.
        contributors_footer_2_html: |
          Inclusion of data in OpenStreetMap does not imply that the original
          page</a> on the OpenStreetMap Wiki.
        contributors_footer_2_html: |
          Inclusion of data in OpenStreetMap does not imply that the original
@@ -1128,9 +1130,12 @@ en:
        infringement_2_html: |
          If you believe that copyrighted material has been inappropriately
          added to the OpenStreetMap database or this site, please refer
        infringement_2_html: |
          If you believe that copyrighted material has been inappropriately
          added to the OpenStreetMap database or this site, please refer
-        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+        to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
          procedure</a> or file directly at our
          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
          procedure</a> or file directly at our
          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>Trademarks
+      trademarks_1_html: |
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.
    welcome_page:
      title: Welcome!
      introduction_html: |
    welcome_page:
      title: Welcome!
      introduction_html: |
@@ -1154,12 +1159,20 @@ en:
        editor_html: |
          An <strong>editor</strong> is a program or website you can use to edit the map.
        node_html: |
        editor_html: |
          An <strong>editor</strong> is a program or website you can use to edit the map.
        node_html: |
-        A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
+        A <strong>node</strong> is a point on the map, like a single restaurant or a tree.
        way_html: |
          A <strong>way</strong> is a line or area, like a road, stream, lake or building.
        tag_html: |
          A <strong>tag</strong> is a bit of data about a node or way, like a
          restaurant's name or a road's speed limit.
        way_html: |
          A <strong>way</strong> is a line or area, like a road, stream, lake or building.
        tag_html: |
          A <strong>tag</strong> is a bit of data about a node or way, like a
          restaurant's name or a road's speed limit.
+    rules:
+      title: Rules!
+      paragraph_1_html: |
+        OpenStreetMap has few formal rules but we expect all participants to collaborate
+        with, and communicate with, the community. If you are considering
+        any activities other than editing by hand, please read and follow the guidelines on 
+        <a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
      questions:
        title: Any questions?
        paragraph_1_html: |
      questions:
        title: Any questions?
        paragraph_1_html: |
@@ -1176,43 +1189,86 @@ en:
          Just go to <a href='%{map_url}'>the map</a> and click the note icon:
          <span class='icon note'></span>. This will add a marker to the map, which you can move
          by dragging. Add your message, then click save, and other mappers will investigate.
          Just go to <a href='%{map_url}'>the map</a> and click the note icon:
          <span class='icon note'></span>. This will add a marker to the map, which you can move
          by dragging. Add your message, then click save, and other mappers will investigate.
+  fixthemap:
+    title: Report a problem / Fix the map
+    how_to_help:
+      title: How to Help
+      join_the_community:
+        title: Join the community
+        explanation_html: |
+          If you have noticed a problem with our map data, for example a road is missing or your address, the best way to
+          proceed is to join the OpenStreetMap community and add or repair the data yourself. 
+      add_a_note:
+        instructions_html: |
+          Just click <a class='icon note'></a> or the same icon on the map display.
+          This will add a marker to the map, which you can move
+          by dragging. Add your message, then click save, and other mappers will investigate.
+    other_concerns:
+      title: Other concerns
+      explanation_html: |
+        If you have concerns about how our data is being used or about the contents please consult our
+        <a href='/copyright'>copyright page</a> for more legal information, or contact the appropriate 
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF working group</a>.  
    help_page:
      title: Getting Help
      introduction: |
        OpenStreetMap has several resources for learning about the project, asking and answering questions,
        and collaboratively discussing and documenting mapping topics.
      welcome:
    help_page:
      title: Getting Help
      introduction: |
        OpenStreetMap has several resources for learning about the project, asking and answering questions,
        and collaboratively discussing and documenting mapping topics.
      welcome:
-      url: http://www.openstreetmap.org/welcome
+      url: /welcome
        title: Welcome to OSM
        description: Start with this quick guide covering the OpenStreetMap basics.
        title: Welcome to OSM
        description: Start with this quick guide covering the OpenStreetMap basics.
+    beginners_guide:
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      title: Beginners' Guide
+      description: Community maintained guide for beginners.
      help:
        url: https://help.openstreetmap.org/
        title: help.openstreetmap.org
        description: Ask a question or look up answers on OSM's question-and-answer site.
      help:
        url: https://help.openstreetmap.org/
        title: help.openstreetmap.org
        description: Ask a question or look up answers on OSM's question-and-answer site.
+    mailing_lists:
+      url: https://lists.openstreetmap.org/
+      title: Mailing Lists
+      description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists.
+    forums:
+      url: https://forum.openstreetmap.org/
+      title: Forums
+      description: Questions and discussions for those that prefer a bulletin board style interface.
+    irc:
+      url: https://irc.openstreetmap.org/
+      title: IRC
+      description: Interactive chat in many different languages and on many topics.
+    switch2osm:
+      url: https://switch2osm.org/
+      title: switch2osm
+      description: Help for companies and organisations switching to OpenStreetMap based maps and other services.
      wiki:
      wiki:
-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/
        title: wiki.openstreetmap.org
        description: Browse the wiki for in-depth OSM documentation.
    about_page:
      next: Next
      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
        title: wiki.openstreetmap.org
        description: Browse the wiki for in-depth OSM documentation.
    about_page:
      next: Next
      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-    used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices"
+    used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
      lede_text: |
      lede_text: |
-      OSM is built by a community of local mappers that keeps data about
-      roads, cafés, subway stations, and much more up to date every day.
+      OpenStreetMap is built by a community of mappers that contribute and maintain data
+      about roads, trails, cafés, railway stations, and much more, all over the world.
      local_knowledge_title: Local Knowledge
      local_knowledge_html: |
        OpenStreetMap emphasizes local knowledge. Contributors use
        aerial imagery, GPS devices, and low-tech field maps to verify that OSM
      local_knowledge_title: Local Knowledge
      local_knowledge_html: |
        OpenStreetMap emphasizes local knowledge. Contributors use
        aerial imagery, GPS devices, and low-tech field maps to verify that OSM
-      is up to date and accurate.
+      is accurate and up to date.
      community_driven_title: Community Driven
      community_driven_html: |
      community_driven_title: Community Driven
      community_driven_html: |
-      From the engineers that tune OSM's servers to the Humanitarian OSM Team
-      that maps disaster-affected areas, OSM's community is diverse,
-      passionate, and growing every day. To learn more about the community,
-      see the <a href='%{diary_path}'>user diaries</a>,
-      <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
-      the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
+      OpenStreetMap's community is diverse, passionate, and growing every day.
+      Our contributors include enthusiast mappers, GIS professionals, engineers
+      running the OSM servers, humanitarians mapping disaster-affected areas,
+      and many more.
+      To learn more about the community, see the
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+      <a href='%{diary_path}'>user diaries</a>,
+      <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and
+      the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
      open_data_title: Open Data
      open_data_html: |
        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
      open_data_title: Open Data
      open_data_html: |
        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
@@ -1220,12 +1276,24 @@ en:
        build upon the data in certain ways, you may distribute the result only
        under the same licence. See the <a href='%{copyright_path}'>Copyright and
        License page</a> for details.
        build upon the data in certain ways, you may distribute the result only
        under the same licence. See the <a href='%{copyright_path}'>Copyright and
        License page</a> for details.
+    legal_title: Legal
+    legal_html: |
+      This site and many other related services are formally operated by the  
+      <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
+      on behalf of the community. Use of all OSMF operated services is subject 
+      to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
+      <br> 
+      Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 
+      if you have licensing, copyright or other legal questions.
+      <br>
+      OpenStreetMap, the magnifiying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.
      partners_title: Partners
    notifier:
      diary_comment_notification:
      partners_title: Partners
    notifier:
      diary_comment_notification:
-      subject: "[OpenStreetMap] %{user} commented on your diary entry"
+      subject: "[OpenStreetMap] %{user} commented on a diary entry"
        hi: "Hi %{to_user},"
        hi: "Hi %{to_user},"
-      header: "%{from_user} has commented on your recent OpenStreetMap diary entry with the subject %{subject}:"
+      header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
        footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
      message_notification:
        subject_header: "[OpenStreetMap] %{subject}"
        footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
      message_notification:
        subject_header: "[OpenStreetMap] %{subject}"
@@ -1233,6 +1301,7 @@ en:
        header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
      friend_notification:
        header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
      friend_notification:
+      hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] %{user} added you as a friend"
        had_added_you: "%{user} has added you as a friend on OpenStreetMap."
        see_their_profile: "You can see their profile at %{userurl}."
        subject: "[OpenStreetMap] %{user} added you as a friend"
        had_added_you: "%{user} has added you as a friend on OpenStreetMap."
        see_their_profile: "You can see their profile at %{userurl}."
@@ -1248,7 +1317,7 @@ en:
          failed_to_import: "failed to import. Here is the error:"
          more_info_1: "More information about GPX import failures and how to avoid"
          more_info_2: "them can be found at:"
          failed_to_import: "failed to import. Here is the error:"
          more_info_1: "More information about GPX import failures and how to avoid"
          more_info_2: "them can be found at:"
-        import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
        success:
          subject: "[OpenStreetMap] GPX Import success"
          loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
        success:
          subject: "[OpenStreetMap] GPX Import success"
          loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
@@ -1297,6 +1366,18 @@ en:
          your_note: "%{commenter} has reactivated one of your map notes near %{place}."
          commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
        details: "More details about the note can be found at %{url}."
          your_note: "%{commenter} has reactivated one of your map notes near %{place}."
          commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
        details: "More details about the note can be found at %{url}."
+    changeset_comment_notification:
+      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}"
+        partial_changeset_with_comment: "with comment '%{changeset_comment}'"
+        partial_changeset_without_comment: "without comment"
+      details: "More details about the changeset can be found at %{url}."
+      unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
    message:
      inbox:
        title: "Inbox"
    message:
      inbox:
        title: "Inbox"
@@ -1354,6 +1435,7 @@ en:
        date: "Date"
        reply_button: "Reply"
        unread_button: "Mark as unread"
        date: "Date"
        reply_button: "Reply"
        unread_button: "Mark as unread"
+      delete_button: "Delete"
        back: "Back"
        to: "To"
        wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
        back: "Back"
        to: "To"
        wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1373,19 +1455,19 @@ en:
        createnote: Add a note
        license:
          copyright: "Copyright OpenStreetMap and contributors, under an open license"
        createnote: Add a note
        license:
          copyright: "Copyright OpenStreetMap and contributors, under an open license"
-        license_url: "http://openstreetmap.org/copyright"
-        project_url: "http://openstreetmap.org"
+        license_url: "https://openstreetmap.org/copyright"
+        project_url: "https://openstreetmap.org"
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
      edit:
        not_public: "You have not set your edits to be public."
        not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
        user_page_link: user page
        anon_edits: "(%{link})"
        remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
      edit:
        not_public: "You have not set your edits to be public."
        not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}."
        user_page_link: user page
        anon_edits: "(%{link})"
-      anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
+      anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
        anon_edits_link_text: "Find out why this is the case."
        anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
+      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
        potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
        potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
-      potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
+      potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
        potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
        id_not_configured: "iD has not been configured"
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
        potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
        id_not_configured: "iD has not been configured"
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
@@ -1394,22 +1476,28 @@ en:
        close: Close
      search:
        search: Search
        close: Close
      search:
        search: Search
-      where_am_i: "Where am I?"
+      get_directions: "Get directions"
+      get_directions_title: "Find directions between two points"
+      from: "From"
+      to: "To"
+      where_am_i: "Where is this?"
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
      key:
        table:
          entry:
            motorway: "Motorway"
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
      key:
        table:
          entry:
            motorway: "Motorway"
+          main_road: "Main road"
            trunk: "Trunk road"
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
            trunk: "Trunk road"
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
            track: "Track"
            track: "Track"
-          byway: "Byway"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
+          cycleway_national: "National cycleway"
+          cycleway_regional: "Regional cycleway"
+          cycleway_local: "Local cycleway"
            footway: "Footway"
            rail: "Railway"
            subway: "Subway"
            footway: "Footway"
            rail: "Railway"
            subway: "Subway"
@@ -1431,7 +1519,6 @@ en:
            golf: "Golf course"
            park: "Park"
            resident: "Residential area"
            golf: "Golf course"
            park: "Park"
            resident: "Residential area"
-          tourist: "Tourist attraction"
            common:
              - Common
              - meadow
            common:
              - Common
              - meadow
@@ -1461,14 +1548,16 @@ en:
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
-          permissive: "Permissive access"
            destination: "Destination access"
            construction: "Roads under construction"
            destination: "Destination access"
            construction: "Roads under construction"
+          bicycle_shop: "Bicycle shop"
+          bicycle_parking: "Bicycle parking"
+          toilets: "Toilets"
      richtext_area:
        edit: Edit
        preview: Preview
      markdown_help:
      richtext_area:
        edit: Edit
        preview: Preview
      markdown_help:
-      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
        headings: Headings
        heading: Heading
        subheading: Subheading
        headings: Headings
        heading: Heading
        subheading: Subheading
@@ -1507,7 +1596,7 @@ en:
        save_button: "Save Changes"
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
        save_button: "Save Changes"
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      trace_form:
        upload_gpx: "Upload GPX File:"
        description: "Description:"
      trace_form:
        upload_gpx: "Upload GPX File:"
        description: "Description:"
@@ -1515,10 +1604,10 @@ en:
        tags_help: "comma delimited"
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
        tags_help: "comma delimited"
        visibility: "Visibility:"
        visibility_help: "what does this mean?"
-      visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+      visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
        upload_button: "Upload"
        help: "Help"
        upload_button: "Upload"
        help: "Help"
-      help_url: "http://wiki.openstreetmap.org/wiki/Upload"
+      help_url: "https://wiki.openstreetmap.org/wiki/Upload"
      trace_header:
        upload_trace: "Upload a trace"
        see_all_traces: "See all traces"
      trace_header:
        upload_trace: "Upload a trace"
        see_all_traces: "See all traces"
@@ -1573,7 +1662,7 @@ en:
        public_traces_from: "Public GPS traces from %{user}"
        description: "Browse recent GPS track uploads"
        tagged_with: " tagged with %{tags}"
        public_traces_from: "Public GPS traces from %{user}"
        description: "Browse recent GPS track uploads"
        tagged_with: " tagged with %{tags}"
-      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
      delete:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
      delete:
        scheduled_for_deletion: "Trace scheduled for deletion"
      make_public:
@@ -1596,10 +1685,12 @@ en:
      require_moderator:
        not_a_moderator: "You need to be a moderator to perform that action."
      setup_user_auth:
      require_moderator:
        not_a_moderator: "You need to be a moderator to perform that action."
      setup_user_auth:
+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
        blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
    oauth:
      oauthorize:
        blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
    oauth:
      oauthorize:
+      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."
        allow_to: "Allow the client application to:"
        allow_read_prefs:  "read your user preferences."
        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."
        allow_to: "Allow the client application to:"
        allow_read_prefs:  "read your user preferences."
@@ -1609,8 +1700,19 @@ en:
        allow_read_gpx:    "read your private GPS traces."
        allow_write_gpx:   "upload GPS traces."
        allow_write_notes: "modify notes."
        allow_read_gpx:    "read your private GPS traces."
        allow_write_gpx:   "upload GPS traces."
        allow_write_notes: "modify notes."
+      grant_access: "Grant Access"
+    oauthorize_success:
+      title: "Authorization request allowed"
+      allowed: "You have granted application %{app_name} access to your account."
+      verification: "The verification code is %{code}."
+    oauthorize_failure:
+      title: "Authorization request failed"
+      denied: "You have denied application %{app_name} access to your account."
+      invalid: "The authorization token is not valid."
      revoke:
        flash: "You've revoked the token for %{application}"
      revoke:
        flash: "You've revoked the token for %{application}"
+    permissions:
+      missing: "You have not permitted the application access to this facility"
    oauth_clients:
      new:
        title: "Register a new application"
    oauth_clients:
      new:
        title: "Register a new application"
@@ -1682,7 +1784,7 @@ en:
        login_button: "Login"
        register now: Register now
        with username: "Already have an OpenStreetMap account? Please login with your username and password:"
        login_button: "Login"
        register now: Register now
        with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with openid: "Alternatively, use OpenID to login:"
+      with external: "Alternatively, use a third party to login:"
        new to osm: New to OpenStreetMap?
        to make changes: To make changes to the OpenStreetMap data, you must have an account.
        create account minute: Create an account. It only takes a minute.
        new to osm: New to OpenStreetMap?
        to make changes: To make changes to the OpenStreetMap data, you must have an account.
        create account minute: Create an account. It only takes a minute.
@@ -1690,22 +1792,29 @@ en:
        account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
        account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
        auth failure: "Sorry, could not log in with those details."
        account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
        account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
        auth failure: "Sorry, could not log in with those details."
-      openid missing provider: "Sorry, could not contact your OpenID provider"
-      openid invalid: "Sorry, your OpenID seems to be malformed"
        openid_logo_alt: "Log in with an OpenID"
        openid_logo_alt: "Log in with an OpenID"
-      openid_providers:
+      auth_providers:
          openid:
            title: Login with OpenID
            alt: Login with an OpenID URL
          google:
            title: Login with Google
            alt: Login with a Google OpenID
          openid:
            title: Login with OpenID
            alt: Login with an OpenID URL
          google:
            title: Login with Google
            alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
          yahoo:
            title: Login with Yahoo
            alt: Login with a Yahoo OpenID
          yahoo:
            title: Login with Yahoo
            alt: Login with a Yahoo OpenID
-        myopenid:
-          title: Login with myOpenID
-          alt: Login with a myOpenID OpenID
          wordpress:
            title: Login with Wordpress
            alt: Login with a Wordpress OpenID
          wordpress:
            title: Login with Wordpress
            alt: Login with a Wordpress OpenID
@@ -1735,48 +1844,38 @@ en:
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
      new:
        title: "Sign Up"
        no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
        about:
          header: Free and editable
          html: |
            <p>Unlike other maps, OpenStreetMap is completely created by people like you,
            and it's free for anyone to fix, update, download and use.</p>
            <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
        about:
          header: Free and editable
          html: |
            <p>Unlike other maps, OpenStreetMap is completely created by people like you,
            and it's free for anyone to fix, update, download and use.</p>
            <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
+      license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
        email address: "Email Address:"
        confirm email address: "Confirm Email Address:"
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
+      not displayed publicly: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'
        display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
-      openid: "%{logo} OpenID:"
+      external auth: "Third Party Authentication:"
        password: "Password:"
        confirm password: "Confirm Password:"
        password: "Password:"
        confirm password: "Confirm Password:"
-      use openid: "Alternatively, use %{logo} OpenID to login"
-      openid no password: "With OpenID a password is not required, but some extra tools or server may still need one."
-      openid association: |
-        <p>Your OpenID is not associated with a OpenStreetMap account yet.</p>
-        <ul>
-          <li>If you are new to OpenStreetMap, please create a new account using the form below.</li>
-          <li>
-            If you already have an account, you can login to your account
-            using your username and password and then associate the account
-            with your OpenID in your user settings.
-          </li>
-        </ul>
+      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>."
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
      terms:
        title: "Contributor terms"
        heading: "Contributor terms"
        read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
        consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
      terms:
        title: "Contributor terms"
        heading: "Contributor terms"
        read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
        consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
        consider_pd_why: "what's this?"
-      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
        guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
        agree: Agree
        guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>'
        agree: Agree
-      declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
+      declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
        decline: "Decline"
        you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
        legale_select: "Country of residence:"
        decline: "Decline"
        you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
        legale_select: "Country of residence:"
@@ -1788,12 +1887,14 @@ en:
        title: "No such user"
        heading: "The user %{user} does not exist"
        body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
        title: "No such user"
        heading: "The user %{user} does not exist"
        body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
+      deleted: "deleted"
      view:
        my diary: My Diary
        new diary entry: new diary entry
        my edits: My Edits
        my traces: My Traces
        my notes: My Notes
      view:
        my diary: My Diary
        new diary entry: new diary entry
        my edits: My Edits
        my traces: My Traces
        my notes: My Notes
+      my messages: My Messages
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
        my profile: My Profile
        my settings: My Settings
        my comments: My Comments
@@ -1837,16 +1938,16 @@ en:
          revoke:
            administrator: "Revoke administrator access"
            moderator: "Revoke moderator access"
          revoke:
            administrator: "Revoke administrator access"
            moderator: "Revoke moderator access"
-      block_history: "blocks received"
-      moderator_history: "blocks given"
+      block_history: "Active Blocks"
+      moderator_history: "Blocks Given"
        comments: "Comments"
        comments: "Comments"
-      create_block: "block this user"
-      activate_user: "activate this user"
-      deactivate_user: "deactivate this user"
-      confirm_user: "confirm this user"
-      hide_user: "hide this user"
-      unhide_user: "unhide this user"
-      delete_user: "delete this user"
+      create_block: "Block this User"
+      activate_user: "Activate this User"
+      deactivate_user: "Deactivate this User"
+      confirm_user: "Confirm this User"
+      hide_user: "Hide this User"
+      unhide_user: "Unhide this User"
+      delete_user: "Delete this User"
        confirm: "Confirm"
        friends_changesets: "friends' changesets"
        friends_diaries: "friends' diary entries"
        confirm: "Confirm"
        friends_changesets: "friends' changesets"
        friends_diaries: "friends' diary entries"
@@ -1862,27 +1963,27 @@ en:
        current email address: "Current Email Address:"
        new email address: "New Email Address:"
        email never displayed publicly: "(never displayed publicly)"
        current email address: "Current Email Address:"
        new email address: "New Email Address:"
        email never displayed publicly: "(never displayed publicly)"
+      external auth: "External Authentication:"
        openid:
        openid:
-        openid: "OpenID:"
-        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link: "https://wiki.openstreetmap.org/wiki/OpenID"
          link text: "what is this?"
        public editing:
          heading: "Public editing:"
          enabled: "Enabled. Not anonymous and can edit data."
          link text: "what is this?"
        public editing:
          heading: "Public editing:"
          enabled: "Enabled. Not anonymous and can edit data."
-        enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
+        enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
          enabled link text: "what is this?"
          disabled: "Disabled and cannot edit data, all previous edits are anonymous."
          disabled link text: "why can't I edit?"
        public editing note:
          heading: "Public editing"
          enabled link text: "what is this?"
          disabled: "Disabled and cannot edit data, all previous edits are anonymous."
          disabled link text: "why can't I edit?"
        public editing note:
          heading: "Public editing"
-        text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+        text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
        contributor terms:
          heading: "Contributor Terms:"
          agreed: "You have agreed to the new Contributor Terms."
          not yet agreed: "You have not yet agreed to the new Contributor Terms."
          review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
        contributor terms:
          heading: "Contributor Terms:"
          agreed: "You have agreed to the new Contributor Terms."
          not yet agreed: "You have not yet agreed to the new Contributor Terms."
          review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
          agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
-        link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
          link text: "what is this?"
        profile description: "Profile Description:"
        preferred languages: "Preferred Languages:"
          link text: "what is this?"
        profile description: "Profile Description:"
        preferred languages: "Preferred Languages:"
@@ -1890,8 +1991,10 @@ en:
        image: "Image:"
        gravatar:
          gravatar: "Use Gravatar"
        image: "Image:"
        gravatar:
          gravatar: "Use Gravatar"
-        link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+        link: "https://wiki.openstreetmap.org/wiki/Gravatar"
          link text: "what is this?"
          link text: "what is this?"
+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."
        new image: "Add an image"
        keep image: "Keep the current image"
        delete image: "Remove the current image"
        new image: "Add an image"
        keep image: "Keep the current image"
        delete image: "Remove the current image"
@@ -1915,18 +2018,20 @@ en:
          Confirm your account by clicking on the link in the email and you'll be able to start mapping.
        press confirm button: "Press the confirm button below to activate your account."
        button: Confirm
          Confirm your account by clicking on the link in the email and you'll be able to start mapping.
        press confirm button: "Press the confirm button below to activate your account."
        button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
        already active: "This account has already been confirmed."
        unknown token: "That confirmation code has expired or does not exist."
        reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
      confirm_resend:
        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 webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
        failure: "User %{name} not found."
      confirm_email:
        heading: Confirm a change of email address
        press confirm button: "Press the confirm button below to confirm your new email address."
        button: Confirm
        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 email address, thanks for signing up!"
+      success: "Confirmed your change of email address!"
        failure: "An email address has already been confirmed with this token."
        failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
      set_home:
        flash success: "Home location saved successfully"
      go_public:
      set_home:
        flash success: "Home location saved successfully"
      go_public:
@@ -1968,12 +2073,28 @@ en:
            This decision will be reviewed by an administrator shortly, or
            you may contact the %{webmaster} if you wish to discuss this.
          </p>
            This decision will be reviewed by an administrator shortly, or
            you may contact the %{webmaster} if you wish to discuss this.
          </p>
+    auth_failure:
+      connection_failed: Connection to authentication provider failed
+      invalid_credentials: Invalid authentication credentials
+      no_authorization_code: No authorization code
+      unknown_signature_algorithm: Unknown signature algorithm
+      invalid_scope: Invalid scope
+    auth_association:
+      heading: Your ID is not associated with a OpenStreetMap account yet.
+      option_1: |
+        If you are new to OpenStreetMap, please create a new account
+        using the form below.
+      option_2: |
+        If you already have an account, you can login to your account
+        using your username and password and then associate the account
+        with your ID in your user settings.
    user_role:
      filter:
        not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
        not_a_role: "The string `%{role}' is not a valid role."
        already_has_role: "The user already has role %{role}."
        doesnt_have_role: "The user does not have role %{role}."
    user_role:
      filter:
        not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
        not_a_role: "The string `%{role}' is not a valid role."
        already_has_role: "The user already has role %{role}."
        doesnt_have_role: "The user does not have role %{role}."
+      not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
        title: Confirm role granting
        heading: Confirm role granting
      grant:
        title: Confirm role granting
        heading: Confirm role granting
@@ -2054,6 +2175,7 @@ en:
      helper:
        time_future: "Ends in %{time}."
        until_login: "Active until the user logs in."
      helper:
        time_future: "Ends in %{time}."
        until_login: "Active until the user logs in."
+      time_future_and_until_login: "Ends in %{time} and after the user has logged in."
        time_past: "Ended %{time} ago."
      blocks_on:
        title: "Blocks on %{name}"
        time_past: "Ended %{time} ago."
      blocks_on:
        title: "Blocks on %{name}"
@@ -2068,6 +2190,8 @@ en:
        heading: "%{block_on} blocked by %{block_by}"
        time_future: "Ends in %{time}"
        time_past: "Ended %{time} ago"
        heading: "%{block_on} blocked by %{block_by}"
        time_future: "Ends in %{time}"
        time_past: "Ended %{time} ago"
+      created: "Created"
+      ago: "%{time} ago"
        status: "Status"
        show: "Show"
        edit: "Edit"
        status: "Status"
        show: "Show"
        edit: "Edit"
@@ -2117,6 +2241,7 @@ en:
        link: "Link or HTML"
        long_link: "Link"
        short_link: "Short Link"
        link: "Link or HTML"
        long_link: "Link"
        short_link: "Short Link"
+      geo_uri: "Geo URI"
        embed: "HTML"
        custom_dimensions: "Set custom dimensions"
        format: "Format:"
        embed: "HTML"
        custom_dimensions: "Set custom dimensions"
        format: "Format:"
@@ -2128,10 +2253,13 @@ en:
        center_marker: "Center map on marker"
        paste_html: "Paste HTML to embed in website"
        view_larger_map: "View Larger Map"
        center_marker: "Center map on marker"
        paste_html: "Paste HTML to embed in website"
        view_larger_map: "View Larger Map"
+      only_standard_layer: "Only the standard layer can be exported as an image"
+    embed:
+      report_problem: "Report a problem"
      key:
        title: "Map Key"
        tooltip: "Map Key"
      key:
        title: "Map Key"
        tooltip: "Map Key"
-      tooltip_disabled: "Map Key available only for Standard layer"
+      tooltip_disabled: "Map Key not available for this layer"
      map:
        zoom:
          in: Zoom In
      map:
        zoom:
          in: Zoom In
@@ -2143,12 +2271,12 @@ en:
          standard: Standard
          cycle_map: Cycle Map
          transport_map: Transport Map
          standard: Standard
          cycle_map: Cycle Map
          transport_map: Transport Map
-        mapquest: MapQuest Open
          hot: Humanitarian
        layers:
          header: Map Layers
          notes: Map Notes
          data: Map Data
          hot: Humanitarian
        layers:
          header: Map Layers
          notes: Map Notes
          data: Map Data
+        gps: Public GPS Traces
          overlays: Enable overlays for troubleshooting the map
          title: "Layers"
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
          overlays: Enable overlays for troubleshooting the map
          title: "Layers"
        copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
@@ -2158,27 +2286,97 @@ en:
        edit_disabled_tooltip: Zoom in to edit the map
        createnote_tooltip: Add a note to the map
        createnote_disabled_tooltip: Zoom in to add a note to the map
        edit_disabled_tooltip: Zoom in to edit the map
        createnote_tooltip: Add a note to the map
        createnote_disabled_tooltip: Zoom in to add a note to the map
+      map_notes_zoom_in_tooltip: Zoom in to see map notes
+      map_data_zoom_in_tooltip: Zoom in to see map data
+      queryfeature_tooltip: Query features
+      queryfeature_disabled_tooltip: Zoom in to query features
+    changesets:
+      show:
+        comment: "Comment"
+        subscribe: "Subscribe"
+        unsubscribe: "Unsubscribe"
+        hide_comment: "hide"
+        unhide_comment: "unhide"
      notes:
        new:
      notes:
        new:
-        intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
          add: Add Note
        show:
          add: Add Note
        show:
-        permalink: Permalink
          anonymous_warning: This note includes comments from anonymous users which should be independently verified.
          anonymous_warning: This note includes comments from anonymous users which should be independently verified.
-        opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
-        opened_by_anonymous: "created by anonymous at %{time}"
-        commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
-        commented_by_anonymous: "comment from anonymous at %{time}"
-        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
-        closed_by_anonymous: "resolved by anonymous at %{time}"
-        reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
-        reopened_by_anonymous: "reactivated by anonymous at %{time}"
          hide: Hide
          resolve: Resolve
          reactivate: Reactivate
          comment_and_resolve: Comment & Resolve
          comment: Comment
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
          hide: Hide
          resolve: Resolve
          reactivate: Reactivate
          comment_and_resolve: Comment & Resolve
          comment: Comment
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
+    directions:
+      ascend: "Ascend"
+      engines:
+        graphhopper_bicycle: "Bicycle (GraphHopper)"
+        graphhopper_car: "Car (GraphHopper)"
+        graphhopper_foot: "Foot (GraphHopper)"
+        mapquest_bicycle: "Bicycle (MapQuest)"
+        mapquest_car: "Car (MapQuest)"
+        mapquest_foot: "Foot (MapQuest)"
+        osrm_car: "Car (OSRM)"
+      descend: "Descend"
+      directions: "Directions"
+      distance: "Distance"
+      errors:
+        no_route: "Couldn't find a route between those two places."
+        no_place: "Sorry - couldn't find that place."
+      instructions:
+        continue_without_exit: Continue on %{name}
+        slight_right_without_exit: Slight right onto %{name}
+        offramp_right_without_exit: Take the ramp on the right onto %{name}
+        onramp_right_without_exit: Turn right on the ramp onto %{name}
+        endofroad_right_without_exit: At the end of the road turn right onto %{name}
+        merge_right_without_exit: Merge right onto %{name}
+        fork_right_without_exit: At the fork turn right onto %{name}
+        turn_right_without_exit: Turn right onto %{name}
+        sharp_right_without_exit: Sharp right onto %{name}
+        uturn_without_exit: U-turn along %{name}
+        sharp_left_without_exit: Sharp left onto %{name}
+        turn_left_without_exit: Turn left onto %{name}
+        offramp_left_without_exit: Take the ramp on the left onto %{name}
+        onramp_left_without_exit: Turn left on the ramp onto %{name}
+        endofroad_left_without_exit: At the end of the road turn left onto %{name}
+        merge_left_without_exit: Merge left onto %{name}
+        fork_left_without_exit: At the fork turn left onto %{name}
+        slight_left_without_exit: Slight left onto %{name}
+        via_point_without_exit: (via point)
+        follow_without_exit: Follow %{name}
+        roundabout_without_exit: At roundabout take %{name}
+        leave_roundabout_without_exit: Leave roundabout - %{name}
+        stay_roundabout_without_exit: Stay on roundabout - %{name}
+        start_without_exit: Start at end of %{name}
+        destination_without_exit: Reach destination
+        against_oneway_without_exit: Go against one-way on %{name}
+        end_oneway_without_exit: End of one-way on %{name}
+        roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}
+        unnamed: "unnamed road"
+        courtesy: "Directions courtesy of %{link}"
+      time: "Time"
+    query:
+      node: Node
+      way: Way
+      relation: Relation
+      nothing_found: No features found
+      error: "Error contacting %{server}: %{error}"
+      timeout: "Timeout contacting %{server}"
+    context:
+      directions_from: Directions from here
+      directions_to: Directions to here
+      add_note: Add a note here
+      show_address: Show address
+      query_features: Query features
+      centre_map: Centre map here
    redaction:
      edit:
        description: "Description"
    redaction:
      edit:
        description: "Description"