fix build on wily; fix some moderation branch language constants

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

index 99767f69938f2bc8098f07bdec6baf289a5dfa78..5e7f2527761baed391922b0e127b60b4f2a30e28 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,101 +95,75 @@ 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}"
+      title: "Changeset: %{id}"
+      belongs_to: "Author"
+      node: "Nodes (%{count})"
+      node_paginated: "Nodes (%{x}-%{y} of %{count})"
+      way: "Ways (%{count})"
+      way_paginated: "Ways (%{x}-%{y} of %{count})"
+      relation: "Relations (%{count})"
+      relation_paginated: "Relations (%{x}-%{y} of %{count})"
+      comment: "Comments (%{count})"
+      hidden_commented_by: "Hidden comment from %{user} <abbr title='%{exact_time}'>%{when} 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}"
        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 at:"
-      closed_at: "Closed at:"
-      belongs_to: "Belongs to:"
-      bounding_box: "Bounding box:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
-      show_area_box: "Show Area Box"
-      box: "box"
-      has_nodes:
-        one: "Has the following %{count} node:"
-        other: "Has the following %{count} nodes:"
-      has_ways:
-        one:  "Has the following %{count} way:"
-        other: "Has the following %{count} ways:"
-      has_relations:
-        one:  "Has the following %{count} relation:"
-        other: "Has the following %{count} relations:"
-    common_details:
-      edited_at: "Edited at:"
-      edited_by: "Edited by:"
-      deleted_at: "Deleted at:"
-      deleted_by: "Deleted by:"
-      version: "Version:"
-      in_changeset: "In changeset:"
-      changeset_comment: "Comment:"
+      join_discussion: "Log in to join the discussion"
+      discussion: Discussion
+      report: Report this changeset?
+    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:
@@ -197,9 +171,7 @@ en:
          way: way
          relation: relation
          changeset: changeset
          way: way
          relation: relation
          changeset: changeset
-    paging_nav:
-      showing_page: "page"
-      of: "of"
+        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."
@@ -207,110 +179,48 @@ 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:
      tag_details:
-      tags: "Tags:"
+      tags: "Tags"
        wiki_link:
          key: "The wiki description page for the %{key} tag"
          tag: "The wiki description page for the %{key}=%{value} tag"
        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}"
-      description: "Description:"
-      comments: "Comments:"
+      title: "Note: %{id}"
+      new_note: "New Note"
+      description: "Description"
+      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>"
+      report: Report this note?
+    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: "(none)"
        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"
@@ -321,29 +231,28 @@ en:
      list:
        title: "Changesets"
        title_user: "Changesets by %{user}"
      list:
        title: "Changesets"
        title_user: "Changesets by %{user}"
-      title_bbox: "Changesets within %{bbox}"
-      title_user_bbox: "Changesets by %{user} within %{bbox}"
        title_friend: "Changesets by your friends"
        title_nearby: "Changesets by nearby users"
        title_friend: "Changesets by your friends"
        title_nearby: "Changesets by nearby users"
-      heading: "Changesets"
-      heading_user: "Changesets"
-      heading_bbox: "Changesets"
-      heading_user_bbox: "Changesets"
-      heading_friend: "Changesets"
-      heading_nearby: "Changesets"
-      description: "Browse recent contributions to the map"
-      description_user: "Changesets by %{user}"
-      description_bbox: "Changesets within %{bbox}"
-      description_user_bbox: "Changesets by %{user} within %{bbox}"
-      description_friend: "Changesets by your friends"
-      description_nearby: "Changesets by nearby users"
-      empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
-      empty_anon_html: "No edits made yet."
+      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."
      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"
@@ -389,10 +298,12 @@ en:
        edit_link: Edit this entry
        hide_link: Hide this entry
        confirm: Confirm
        edit_link: Edit this entry
        hide_link: Hide this entry
        confirm: Confirm
+      report: Report this entry?
      diary_comment:
        comment_from: "Comment from %{link_user} on %{comment_created_at}"
        hide_link: Hide this comment
        confirm: Confirm
      diary_comment:
        comment_from: "Comment from %{link_user} on %{comment_created_at}"
        hide_link: Hide this comment
        confirm: Confirm
+      report: Report this comment?
      location:
        location: "Location:"
        view: "View"
      location:
        location: "Location:"
        view: "View"
@@ -416,6 +327,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"
@@ -426,11 +338,14 @@ en:
        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).'
        too_large:
        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).'
        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"
@@ -452,16 +367,10 @@ 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:
+        latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
          us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
          uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
          ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
          us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'
          uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
          ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
@@ -473,8 +382,10 @@ en:
        prefix_format: "%{name}"
        prefix:
          aerialway:
        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"
            station: "Aerialway Station"
          aeroway:
            aerodrome: "Aerodrome"
            station: "Aerialway Station"
          aeroway:
            aerodrome: "Aerodrome"
@@ -485,11 +396,9 @@ en:
            taxiway: "Taxiway"
            terminal: "Terminal"
          amenity:
            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"
@@ -497,6 +406,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"
@@ -506,9 +416,10 @@ 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"
            college: "College"
            community_centre: "Community Centre"
            courthouse: "Courthouse"
@@ -527,25 +438,25 @@ en:
            food_court: "Food Court"
            fountain: "Fountain"
            fuel: "Fuel"
            food_court: "Food Court"
            fountain: "Fountain"
            fuel: "Fuel"
+          gambling: "Gambling"
            grave_yard: "Grave Yard"
            gym: "Fitness Centre / Gym"
            grave_yard: "Grave Yard"
            gym: "Fitness Centre / Gym"
-          hall: "Hall"
            health_centre: "Health Centre"
            hospital: "Hospital"
            health_centre: "Health Centre"
            hospital: "Hospital"
-          hotel: "Hotel"
            hunting_stand: "Hunting Stand"
            ice_cream: "Ice Cream"
            kindergarten: "Kindergarten"
            library: "Library"
            market: "Market"
            marketplace: "Marketplace"
            hunting_stand: "Hunting Stand"
            ice_cream: "Ice Cream"
            kindergarten: "Kindergarten"
            library: "Library"
            market: "Market"
            marketplace: "Marketplace"
-          mountain_rescue: "Mountain Rescue"
+          monastery: "Monastery"
+          motorcycle_parking: "Motorcycle Parking"
            nightclub: "Night Club"
            nursery: "Nursery"
            nursing_home: "Nursing Home"
            office: "Office"
            nightclub: "Night Club"
            nursery: "Nursery"
            nursing_home: "Nursing Home"
            office: "Office"
-          park: "Park"
            parking: "Parking"
            parking: "Parking"
+          parking_entrance: "Parking Entrance"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
            pharmacy: "Pharmacy"
            place_of_worship: "Place of Worship"
            police: "Police"
@@ -555,7 +466,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"
            reception_area: "Reception Area"
            recycling: "Recycling Point"
            restaurant: "Restaurant"
@@ -564,13 +474,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"
@@ -582,8 +490,7 @@ 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"
            youth_centre: "Youth Centre"
          boundary:
            administrative: "Administrative Boundary"
            youth_centre: "Youth Centre"
          boundary:
            administrative: "Administrative Boundary"
@@ -598,22 +505,35 @@ en:
            "yes": "Bridge"
          building:
            "yes": "Building"
            "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"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"
            phone: "Emergency Phone"
          highway:
            phone: "Emergency Phone"
          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"
            cycleway: "Cycle Path"
            construction: "Highway under Construction"
            cycleway: "Cycle Path"
+          elevator: "Elevator"
            emergency_access_point: "Emergency Access Point"
            footway: "Footpath"
            ford: "Ford"
            living_street: "Living Street"
            milestone: "Milestone"
            emergency_access_point: "Emergency Access Point"
            footway: "Footpath"
            ford: "Ford"
            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"
@@ -624,7 +544,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"
@@ -634,37 +554,44 @@ en:
            speed_camera: "Speed Camera"
            steps: "Steps"
            street_lamp: "Street Lamp"
            speed_camera: "Speed Camera"
            steps: "Steps"
            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"
            unclassified: "Unclassified Road"
            unsurfaced: "Unsurfaced Road"
            trail: "Trail"
            trunk: "Trunk Road"
            trunk_link: "Trunk 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"
            monument: "Monument"
            house: "House"
            icon: "Icon"
            manor: "Manor"
            memorial: "Memorial"
            mine: "Mine"
            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"
+        junction:
+          "yes": "Junction"
          landuse:
            allotments: "Allotments"
            basin: "Basin"
          landuse:
            allotments: "Allotments"
            basin: "Basin"
@@ -686,9 +613,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"
@@ -699,16 +623,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"
          leisure:
            beach_resort: "Beach Resort"
            bird_hide: "Bird Hide"
+          club: "Club"
            common: "Common Land"
            common: "Common Land"
+          dog_park: "Dog Park"
            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"
@@ -717,6 +644,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"
@@ -724,6 +652,13 @@ 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:
+          lighthouse: "Lighthouse"
+          pipeline: "Pipeline"
+          tower: "Tower"
+          works: "Factory"
+          "yes": "Man-made"
          military:
            airfield: "Military Airfield"
            barracks: "Barracks"
          military:
            airfield: "Military Airfield"
            barracks: "Barracks"
@@ -735,16 +670,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"
@@ -756,11 +690,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"
@@ -769,10 +703,10 @@ 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"
            company: "Company"
            employment_agency: "Employment Agency"
            architect: "Architect"
            company: "Company"
            employment_agency: "Employment Agency"
@@ -785,6 +719,8 @@ en:
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
            travel_agent: "Travel Agency"
            "yes": "Office"
          place:
+          allotments: "Allotments"
+          block: "Block"
            airport: "Airport"
            city: "City"
            country: "Country"
            airport: "Airport"
            city: "City"
            country: "Country"
@@ -809,6 +745,7 @@ en:
            town: "Town"
            unincorporated_area: "Unincorporated Area"
            village: "Village"
            town: "Town"
            unincorporated_area: "Unincorporated Area"
            village: "Village"
+          "yes": "Place"
          railway:
            abandoned: "Abandoned Railway"
            construction: "Railway under Construction"
          railway:
            abandoned: "Abandoned Railway"
            construction: "Railway under Construction"
@@ -829,12 +766,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"
@@ -913,6 +849,7 @@ en:
            "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"
@@ -920,16 +857,15 @@ 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:
@@ -939,7 +875,6 @@ en:
            artificial: "Artificial Waterway"
            boatyard: "Boatyard"
            canal: "Canal"
            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"
@@ -947,16 +882,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"
@@ -976,19 +909,118 @@ 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"
+  issues:
+    report: Report
+    resolve: Resolve
+    ignore: Ignore
+    reopen: Reopen
+    index:
+      search:
+        user_not_found: User does not exist
+        issues_not_found: No such issues found    
+    create:
+      successful_report: Your report has been registered sucessfully
+      provide_details: Please provide the required details
+    update:
+      new_report: Your report been registered sucessfully
+      successful_update: Your report has been updated successfully
+      provide_details: Please provide the required details
+    new:
+      details: Please provide some more details into the problem. (This field cannot be left blank!)
+      select: Select a reason for your report
+      disclaimer:
+        intro: Before sending in a report for official action, be sure that
+        not_just_mistake: You are sure that the problem is not just a mistake
+        unable_to_fix: You are unable to fix the problem yourself
+        resolve_with_user: You have tried to resolve the problem with the user
+    show: 
+      comments:
+        reassign: The Issue was reassigned
+        reassign_param: Reassign Issue?
+    comment:
+      provide_details: Please provide the required details        
+      comment_created: Your comment was successfully created        
+    resolved: Issue status has been set to 'Resolved'
+    ignored: Issue status has been set to 'Ignored'
+    reopened: Issue status has been set to 'Open'
+    report_strings:
+      DiaryEntry:
+        spam: 
+          type: "[SPAM]"
+          details: This Diary Entry is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This Diary Entry is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This Diary Entry contains a threat
+        other: 
+          type: "[OTHER]"
+          details: Other
+      DiaryComment:
+        spam: 
+          type: "[SPAM]"
+          details: This Diary Comment is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This Diary Comment is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This Diary Comment contains a threat
+        other: 
+          type: "[OTHER]"
+          details: Other
+      User:
+        spam: 
+          type: "[SPAM]"
+          details: This User profile is/contains spam
+        offensive: 
+          type: "[OFFENSIVE]"
+          details: This User profile is obscene/offensive
+        threat: 
+          type: "[THREAT]"
+          details: This User profile contains a threat
+        vandal:
+          type: "[VANDAL]"
+          details: This User is a vandal
+        other: 
+          type: "[OTHER]"
+          details: Other      
+      Changeset:
+        undiscussed_import:
+          type: "[UNDISCUSSED-IMPORT]"
+          details: This changeset is an undiscussed import    
+        mechanical_edit:
+          type: "[MECH-EDIT]"
+          details: This changeset is a mechanical edit    
+        edit_error:
+          type: "[EDIT-ERROR]"
+          details: This changeset contains a newbie or an editor error    
+        spam:
+          type: "[SPAM]"
+          details: This changeset is/contains spam  
+        vandalism:
+          type: "[VANDALISM]"
+          details: This changeset is/contains vandalism  
+        other: 
+          type: "[OTHER]"
+          details: Other
+      Note:
+        spam:
+          type: "[SPAM]"
+          details: This note is spam            
+        vandalism:
+          type: "[VANDALISM]"
+          details: This note is vandalism            
+        personal:
+          type: "[PERSONAL]"
+          details: This note contains personal data            
+        abusive:
+          type: "[ABUSIVE]"
+          details: This note is abusive
+        other:
+          type: "[OTHER]"
+          details: Other            
    layouts:
      project_name:
        # in <title>
    layouts:
      project_name:
        # in <title>
@@ -998,15 +1030,16 @@ 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
      sign_up_tooltip: Create an account for editing
-    view: View
-    view_tooltip: View the map
      edit: Edit
      history: History
      edit: Edit
      history: History
+    export: Export
+    reports: Reports
      data: Data
      export_data: Export Data
      gps_traces: GPS Traces
      data: Data
      export_data: Export Data
      gps_traces: GPS Traces
@@ -1015,13 +1048,9 @@ en:
      user_diaries_tooltip: View user diaries
      edit_with: Edit with %{editor}
      tag_line: The Free Wiki World Map
      user_diaries_tooltip: View user diaries
      edit_with: Edit with %{editor}
      tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free worldwide map, created by people like you."
-    intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_header: Welcome to OpenStreetMap!
+    intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
      intro_2_create_account: "Create a user account"
-    intro_2_license: "open license"
-    intro_2_use: "use"
-    intro_2_download: "download"
-    intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
      partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
      partners_ucl: "the UCL VR Centre"
      partners_ic: "Imperial College London"
      partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
      partners_ucl: "the UCL VR Centre"
      partners_ic: "Imperial College London"
@@ -1032,7 +1061,8 @@ en:
      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
      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
-    copyright: "Copyright & License"
+    about: About
+    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"
@@ -1041,7 +1071,8 @@ en:
      make_a_donation:
        title: Support OpenStreetMap with a monetary donation
        text: Make a Donation
      make_a_donation:
        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
@@ -1055,9 +1086,10 @@ 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
+        OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
          href="http://opendatacommons.org/licenses/odbl/">Open Data
          href="http://opendatacommons.org/licenses/odbl/">Open Data
-        Commons Open Database License</a> (ODbL).
+        Commons Open Database License</a> (ODbL) by the  <a
+        href="http://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
        intro_2_html: |
          You are free to copy, distribute, transmit and adapt our data,
          as long as you credit OpenStreetMap and its
@@ -1093,6 +1125,7 @@ en:
        more_title_html: Finding out more
        more_1_html: |
          Read more about using our data, and how to credit us, at the <a
        more_title_html: Finding out more
        more_1_html: |
          Read more about using our data, and how to credit us, at the <a
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
          FAQ</a>.
        more_2_html: |
          href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
          FAQ</a>.
        more_2_html: |
@@ -1118,6 +1151,11 @@ en:
          Resources Canada), CanVec (&copy; Department of Natural
          Resources Canada), and StatCan (Geography Division,
          Statistics Canada).
          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="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>.
        contributors_fr_html: |
          <strong>France</strong>: Contains data sourced from
          Direction Générale des Impôts.
        contributors_fr_html: |
          <strong>France</strong>: Contains data sourced from
          Direction Générale des Impôts.
@@ -1127,6 +1165,11 @@ en:
        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:
@@ -1155,6 +1198,9 @@ en:
          to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
          procedure</a> or file directly at our
          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
          to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
          procedure</a> or file directly at our
          <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+      trademarks_title_html: <span id="trademarks"></span>Trademarks
+      trademarks_1_html: |
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
    welcome_page:
      title: Welcome!
      introduction_html: |
    welcome_page:
      title: Welcome!
      introduction_html: |
@@ -1178,12 +1224,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='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='http://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: |
@@ -1200,23 +1254,100 @@ 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='http://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: http://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: http://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: http://forum.openstreetmap.org/
+      title: Forums
+      description: Questions and discussions for those that prefer a bulletin board style interface.
+    irc:
+      url: http://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:
        url: http://wiki.openstreetmap.org/
        title: wiki.openstreetmap.org
        description: Browse the wiki for in-depth OSM documentation.
      wiki:
        url: http://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
+    used_by: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+    lede_text: |
+      OpenStreetMap is built by a community of mappers that contribute and maintain data
+      about roads, trails, cafés, railway stations, and much more, all over the world.
+    local_knowledge_title: Local Knowledge
+    local_knowledge_html: |
+      OpenStreetMap emphasizes local knowledge. Contributors use
+      aerial imagery, GPS devices, and low-tech field maps to verify that OSM
+      is accurate and up to date.
+    community_driven_title: Community Driven
+    community_driven_html: |
+      OpenStreetMap's community is diverse, passionate, and growing every day.
+      Our contributors include enthusiast mappers, GIS professionals, engineers
+      running the OSM servers, humanitarians mapping disaster-affected areas,
+      and many more.
+      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
+      <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
+      the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
+    open_data_title: Open Data
+    open_data_html: |
+      OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      as long as you credit OpenStreetMap and its contributors. If you alter or
+      build upon the data in certain ways, you may distribute the result only
+      under the same licence. See the <a href='%{copyright_path}'>Copyright and
+      License page</a> for details.
+    legal_title: Legal
+    legal_html: |
+      This site and many other related services are formally operated by the  
+      <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) 
+      on behalf of the community.
+      <br> 
+      Please <a href='http://osmfoundation.org/Contact'>contact the OSMF</a> 
+      if you have licensing, copyright or other legal questions and issues.
+    partners_title: Partners
    notifier:
      diary_comment_notification:
        subject: "[OpenStreetMap] %{user} commented on your diary entry"
    notifier:
      diary_comment_notification:
        subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1293,6 +1424,21 @@ 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:
+      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}."
+    new_issue_notification:
+      subject: "[OpenStreetMap] New Issue"
+      greeting: "Hi,"
+      new_issue: "A new issue has been created"
+      url: You can view the issue here
    message:
      inbox:
        title: "Inbox"
    message:
      inbox:
        title: "Inbox"
@@ -1390,23 +1536,28 @@ en:
        close: Close
      search:
        search: Search
        close: Close
      search:
        search: Search
+      get_directions: "Get directions"
+      get_directions_title: "Find directions between two points"
+      from: "From"
+      to: "To"
        where_am_i: "Where am I?"
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
        where_am_i: "Where am I?"
        where_am_i_title: Describe the current location using the search engine
        submit_text: "Go"
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
      key:
        table:
          entry:
            motorway: "Motorway"
      key:
        table:
          entry:
            motorway: "Motorway"
+          main_road: "Main road"
            trunk: "Trunk road"
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
            trunk: "Trunk road"
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
-          unsurfaced: "Unsurfaced road"
            track: "Track"
            track: "Track"
-          byway: "Byway"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
+          cycleway_national: "National cycleway"
+          cycleway_regional: "Regional cycleway"
+          cycleway_local: "Local cycleway"
            footway: "Footway"
            rail: "Railway"
            subway: "Subway"
            footway: "Footway"
            rail: "Railway"
            subway: "Subway"
@@ -1428,7 +1579,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
@@ -1458,9 +1608,11 @@ 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
      richtext_area:
        edit: Edit
        preview: Preview
@@ -1590,6 +1742,8 @@ en:
    application:
      require_cookies:
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
    application:
      require_cookies:
        cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+    require_admin:
+      not_an_admin: You need to be an admin to perform that action.
      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:
@@ -1597,6 +1751,7 @@ en:
        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:
        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."
@@ -1606,6 +1761,15 @@ 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}"
    oauth_clients:
      revoke:
        flash: "You've revoked the token for %{application}"
    oauth_clients:
@@ -1679,7 +1843,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.
@@ -1687,22 +1851,26 @@ 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
          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
@@ -1732,7 +1900,7 @@ 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: |
        about:
          header: Free and editable
          html: |
@@ -1745,21 +1913,11 @@ en:
        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>)'
        display name: "Display Name:"
        display name description: "Your publicly displayed username. You can change this later in the preferences."
        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>)'
        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>."
@@ -1785,12 +1943,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
@@ -1834,21 +1994,22 @@ 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"
        nearby_changesets: "nearby user changesets"
        nearby_diaries: "nearby user diary entries"
        confirm: "Confirm"
        friends_changesets: "friends' changesets"
        friends_diaries: "friends' diary entries"
        nearby_changesets: "nearby user changesets"
        nearby_diaries: "nearby user diary entries"
+      report: "Report this user?"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
      popup:
        your location: "Your location"
        nearby mapper: "Nearby mapper"
@@ -1859,8 +2020,8 @@ 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 text: "what is this?"
        public editing:
          link: "http://wiki.openstreetmap.org/wiki/OpenID"
          link text: "what is this?"
        public editing:
@@ -1889,6 +2050,8 @@ en:
          gravatar: "Use Gravatar"
          link: "http://wiki.openstreetmap.org/wiki/Gravatar"
          link text: "what is this?"
          gravatar: "Use Gravatar"
          link: "http://wiki.openstreetmap.org/wiki/Gravatar"
          link text: "what is this?"
+        disabled: "Gravatar has been disabled."
+        enabled: "Display of your Gravatar has been enabled."
        new image: "Add an image"
        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"
@@ -1912,18 +2075,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:
@@ -1965,6 +2130,21 @@ 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."
    user_role:
      filter:
        not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2065,6 +2245,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"
@@ -2114,6 +2296,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:"
@@ -2125,6 +2308,9 @@ 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"
@@ -2140,7 +2326,6 @@ 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
          hot: Humanitarian
        layers:
          header: Map Layers
@@ -2149,34 +2334,90 @@ en:
          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>"
+      donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
      site:
        edit_tooltip: Edit the map
        edit_disabled_tooltip: Zoom in to edit the map
-      history_tooltip: View edits for this area
-      history_disabled_tooltip: Zoom in to view edits for this area
        createnote_tooltip: Add a note to the map
        createnote_disabled_tooltip: Zoom in to add a note to 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. (Please 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:
+      engines:
+        graphhopper_bicycle: "Bicycle (GraphHopper)"
+        graphhopper_foot: "Foot (GraphHopper)"
+        mapquest_bicycle: "Bicycle (MapQuest)"
+        mapquest_car: "Car (MapQuest)"
+        mapquest_foot: "Foot (MapQuest)"
+        osrm_car: "Car (OSRM)"
+        mapzen_bicycle: "Bicycle (Mapzen)"
+        mapzen_car: "Car (Mapzen)"
+        mapzen_foot: "Foot (Mapzen)"
+      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}
+        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}"
    redaction:
      edit:
        description: "Description"
    redaction:
      edit:
        description: "Description"