]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Localisation updates from https://translatewiki.net.
[rails.git] / config / locales / en.yml
index fbf65066031531d2566312aaa2dd9085ada28a69..88d42282cdc4244735a25b87b1c2689f7b86c57c 100644 (file)
@@ -4,6 +4,7 @@ en:
   time:
     formats:
       friendly: "%e %B %Y at %H:%M"
+      blog: "%e %B %Y"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -47,7 +48,7 @@ en:
         body: "Body"
       diary_entry:
         user: "User"
-        title: "Title"
+        title: "Subject"
         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"
@@ -65,7 +66,7 @@ en:
         description: "Description"
       message:
         sender: "Sender"
-        title: "Title"
+        title: "Subject"
         body: "Body"
         recipient: "Recipient"
       user:
@@ -78,12 +79,15 @@ en:
   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:
       name: "Potlatch 1"
       description: "Potlatch 1 (in-browser editor)"
+    id:
+      name: "iD"
+      description: "iD (in-browser editor)"
     potlatch2:
       name: "Potlatch 2"
       description: "Potlatch 2 (in-browser editor)"
@@ -91,90 +95,68 @@ en:
       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:
-      title: "Changeset"
-      changeset: "Changeset: %{id}"
-      download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"
+      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}"
-    navigation:
-      paging:
-        user:
-          prev: "&laquo; %{id}"
-          next: "%{id} &raquo;"
-        all:
-          prev: "&laquo; %{id}"
-          next: "%{id} &raquo;"
-      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"
-    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
+    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})"
-    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"
-    node_details:
-      coordinates: "Coordinates:"
-      part_of: "Part of:"
-    node_history:
-      node_history: "Node History"
-      node_history_title: "Node History: %{node_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    node:
-      node: "Node"
-      node_title: "Node: %{node_name}"
-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
-      download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
     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
@@ -187,109 +169,54 @@ en:
         way: way
         relation: relation
         changeset: changeset
-    paging_nav:
-      showing_page: "Showing page"
-      of: "of"
-    relation_details:
-      members: "Members:"
-      part_of: "Part of:"
-    relation_history:
-      relation_history: "Relation History"
-      relation_history_title: "Relation History: %{relation_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    relation_member:
-      entry: "%{type} %{name}"
-      entry_role: "%{type} %{name} as %{role}"
+    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."
       type:
-        node: "Node"
-        way: "Way"
-        relation: "Relation"
-    relation:
-      relation: "Relation"
-      relation_title: "Relation: %{relation_name}"
-      download: "%{download_xml_link} or %{view_history_link}"
-      download_xml: "Download XML"
-      view_history: "view history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
+        node: "node"
+        way: "way"
+        relation: "relation"
     start_rjs:
-      data_layer_name: "Data"
-      data_frame_title: "Data"
-      zoom_or_select: "Zoom in or select an area of the map to view"
-      drag_a_box: "Drag a box on the map to select an area"
-      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 100 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"
-      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..."
-      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: "Display object list"
-        type:
-          node: "Node"
-          way: "Way"
-          # There is no 'relation' type because it is not represented in OpenLayers
-        api: "Retrieve this area from the API"
-        details: "Details"
-        selected:
-          type:
-            node: "Node [[id]]"
-            way: "Way [[id]]"
-            # There is no 'relation' type because it is not represented in OpenLayers
-        history:
-          type:
-            node: "Node [[id]]"
-            way: "Way [[id]]"
-            # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
-      tags: "Tags:"
+      tags: "Tags"
       wiki_link:
         key: "The wiki description page for the %{key} tag"
         tag: "The wiki description page for the %{key}=%{value} tag"
+      wikidata_link: "The %{page} item on Wikidata"
       wikipedia_link: "The %{page} article on Wikipedia"
-    way_details:
-      nodes: "Nodes:"
-      part_of: "Part of:"
-      also_part_of:
-        one: "also part of way %{related_ways}"
-        other: "also part of ways %{related_ways}"
-    way_history:
-      way_history: "Way History"
-      way_history_title: "Way History: %{way_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
-      download_xml: "Download XML"
-      view_details: "view details"
-    way:
-      way: "Way"
-      way_title: "Way: %{way_name}"
-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
-      download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
+      telephone_link: "Call %{phone_number}"
+    note:
+      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>"
+    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: "Showing page %{page}"
-      next: "Next &raquo;"
-      previous: "&laquo; Previous"
+      showing_page: "Page %{page}"
+      next: "Next »"
+      previous: "« Previous"
     changeset:
-      id: "#%{id}"
-      still_editing: "(still editing)"
       anonymous: "Anonymous"
-      no_comment: "(none)"
       no_edits: "(no edits)"
-      show_area_box: "show area box"
-      big_area: "(big)"
       view_changeset_details: "View changeset details"
     changesets:
       id: "ID"
@@ -300,31 +227,37 @@ en:
     list:
       title: "Changesets"
       title_user: "Changesets by %{user}"
-      title_bbox: "Changesets within %{bbox}"
-      title_user_bbox: "Changesets by %{user} within %{bbox}"
-
-      heading: "Changesets"
-      heading_user: "Changesets"
-      heading_bbox: "Changesets"
-      heading_user_bbox: "Changesets"
-
-      description: "Recent changes"
-      description_user: "Changesets by %{user}"
-      description_bbox: "Changesets within %{bbox}"
-      description_user_bbox: "Changesets by %{user} within %{bbox}"
+      title_friend: "Changesets by your friends"
+      title_nearby: "Changesets by nearby users"
+      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."
+    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
     list:
       title: "Users' diaries"
+      title_friends: "Friends' diaries"
+      title_nearby: "Nearby Users' diaries"
       user_title: "%{user}'s diary"
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
-      recent_entries: "Recent diary entries:"
+      recent_entries: "Recent diary entries"
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
@@ -349,16 +282,13 @@ en:
       title: "No such diary entry"
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
-    no_such_user:
-      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."
     diary_entry:
       posted_by: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
-        one: 1 comment
+        zero: No comments
+        one: "%{count} comment"
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry
@@ -381,20 +311,43 @@ en:
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
+    comments:
+      has_commented_on: "%{display_name} has commented on the following diary entries"
+      post: Post
+      when: When
+      comment: Comment
+      ago: "%{ago} ago"
+      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"
       format_to_export: "Format to Export"
       osm_xml_data: "OpenStreetMap XML Data"
-      mapnik_image: "Mapnik Image"
-      osmarender_image: "Osmarender Image"
+      map_image: "Map Image (shows standard layer)"
       embeddable_html: "Embeddable HTML"
       licence: "Licence"
-      export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
+      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."
+        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"
+        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"
+        metro:
+          title: "Metro Extracts"
+          description: "Extracts for major world cities and their surrounding areas"
+        other:
+          title: "Other Sources"
+          description: "Additional sources listed on the OpenStreetMap wiki"
       options: "Options"
       format: "Format"
       scale: "Scale"
@@ -407,14 +360,6 @@ en:
       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"
-      view_larger_map: "View Larger Map"
   geocoder:
     search:
       title:
@@ -422,27 +367,39 @@ en:
         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>'
-        osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
-    search_osm_namefinder:
-      prefix: "%{type}"
-      suffix_place: ", %{distance} %{direction} of %{placename}"
-      suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})"
-      suffix_suburb: "%{suffix}, %{parentname}"
+        osm_nominatim_reverse: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
+        geonames_reverse: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
+        aerialway:
+          cable_car: "Cable Car"
+          chair_lift: "Chair Lift"
+          drag_lift: "Drag Lift"
+          gondola: "Gondola Lift"
+          station: "Aerialway Station"
+        aeroway:
+          aerodrome: "Aerodrome"
+          apron: "Apron"
+          gate: "Gate"
+          helipad: "Helipad"
+          runway: "Runway"
+          taxiway: "Taxiway"
+          terminal: "Terminal"
         amenity:
-          airport: "Airport"
+          animal_shelter: "Animal Shelter"
           arts_centre: "Arts Centre"
           atm: "ATM"
-          auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
+          bbq: "BBQ"
           bench: "Bench"
           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"
@@ -451,9 +408,11 @@ en:
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"
+          charging_station: "Charging Station"
+          childcare: "Childcare"
           cinema: "Cinema"
           clinic: "Clinic"
-          club: "Club"
+          clock: "Clock"
           college: "College"
           community_centre: "Community Centre"
           courthouse: "Courthouse"
@@ -469,27 +428,28 @@ en:
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
+          food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
+          gambling: "Gambling"
           grave_yard: "Grave Yard"
           gym: "Fitness Centre / Gym"
-          hall: "Hall"
           health_centre: "Health Centre"
           hospital: "Hospital"
-          hotel: "Hotel"
           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"
-          park: "Park"
           parking: "Parking"
+          parking_entrance: "Parking Entrance"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
@@ -499,7 +459,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
-          public_market: "Public Market"
           reception_area: "Reception Area"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
@@ -508,10 +467,12 @@ en:
           school: "School"
           shelter: "Shelter"
           shop: "Shop"
-          shopping: "Shopping"
+          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"
           theatre: "Theatre"
@@ -522,56 +483,50 @@ en:
           veterinary: "Veterinary Surgery"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
-          wifi: "WiFi Access"
+          waste_disposal: "Waste Disposal"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
+          census: "Census Boundary"
+          national_park: "National Park"
+          protected_area : "Protected Area"
+        bridge:
+          aqueduct: "Aqueduct"
+          suspension: "Suspension Bridge"
+          swing: "Swing Bridge"
+          viaduct: "Viaduct"
+          "yes": "Bridge"
         building:
-          apartments: "Apartment Block"
-          block: "Building Block"
-          bunker: "Bunker"
-          chapel: "Chapel"
-          church: "Church"
-          city_hall: "City Hall"
-          commercial: "Commercial Building"
-          dormitory: "Dormitory"
-          entrance: "Building Entrance"
-          faculty: "Faculty Building"
-          farm: "Farm Building"
-          flats: "Flats"
-          garage: "Garage"
-          hall: "Hall"
-          hospital: "Hospital Building"
-          hotel: "Hotel"
-          house: "House"
-          industrial: "Industrial Building"
-          office: "Office Building"
-          public: "Public Building"
-          residential: "Residential Building"
-          retail: "Retail Building"
-          school: "School Building"
-          shop: "Shop"
-          stadium: "Stadium"
-          store: "Store"
-          terrace: "Terrace"
-          tower: "Tower"
-          train_station: "Railway Station"
-          university: "University Building"
-          yes: "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:
+          ambulance_station: "Ambulance Station"
+          defibrillator: "Defibrillator"
+          landing_site: "Emergency Landing Site"
+          phone: "Emergency Phone"
         highway:
+          abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
-          byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
-          distance_marker: "Distance Marker"
+          elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
-          gate: "Gate"
           living_street: "Living Street"
-          minor: "Minor Road"
+          milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
@@ -580,41 +535,56 @@ en:
           platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"
+          proposed: "Proposed Road"
           raceway: "Raceway"
-          residential: "Residential"
+          residential: "Residential Road"
+          rest_area: "Rest Area"
           road: "Road"
           secondary: "Secondary Road"
           secondary_link: "Secondary Road"
           service: "Service Road"
           services: "Motorway Services"
+          speed_camera: "Speed Camera"
           steps: "Steps"
-          stile: "Stile"
+          street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
+          tertiary_link: "Tertiary Road"
           track: "Track"
+          traffic_signals: "Traffic Signals"
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"
+          "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"
-          building: "Building"
+          building: "Historic Building"
+          bunker: "Bunker"
           castle: "Castle"
           church: "Church"
+          city_gate: "City Gate"
+          citywalls: "City Walls"
+          fort: "Fort"
+          heritage: "Heritage Site"
           house: "House"
           icon: "Icon"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           monument: "Monument"
-          museum: "Museum"
+          roman_road: "Roman Road"
           ruins: "Ruins"
+          stone: "Stone"
+          tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
+        junction:
+          "yes": "Junction"
         landuse:
           allotments: "Allotments"
           basin: "Basin"
@@ -627,6 +597,7 @@ en:
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
+          garages: "Garages"
           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"
@@ -634,27 +605,30 @@ en:
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"
-          mountain: "Mountain"
-          nature_reserve: "Nature Reserve"
-          park: "Park"
-          piste: "Piste"
-          plaza: "Plaza"
+          orchard: "Orchard"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
+          reservoir_watershed: "Reservoir Watershed"
           residential: "Residential Area"
           retail: "Retail"
+          road: "Road Area"
           village_green: "Village Green"
           vineyard: "Vineyard"
-          wetland: "Wetland"
-          wood: "Wood"
+          "yes": "Landuse"
         leisure:
           beach_resort: "Beach Resort"
+          bird_hide: "Bird Hide"
+          club: "Club"
           common: "Common Land"
+          dog_park: "Dog Park"
           fishing: "Fishing Area"
+          fitness_centre: "Fitness Centre"
+          fitness_station: "Fitness Station"
           garden: "Garden"
           golf_course: "Golf Course"
+          horse_riding: "Horse Riding"
           ice_rink: "Ice Rink"
           marina: "Marina"
           miniature_golf: "Miniature Golf"
@@ -663,26 +637,41 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
+          resort: "Resort"
+          sauna: "Sauna"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
           stadium: "Stadium"
           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"
+          bunker: "Bunker"
+        mountain_pass:
+          "yes" : "Mountain Pass"
         natural:
           bay: "Bay"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
-          channel: "Channel"
           cliff: "Cliff"
-          coastline: "Coastline"
           crater: "Crater"
-          feature: "Feature"
+          dune: "Dune"
           fell: "Fell"
           fjord: "Fjord"
+          forest: "Forest"
           geyser: "Geyser"
           glacier: "Glacier"
+          grassland: "Grassland"
           heath: "Heath"
           hill: "Hill"
           island: "Island"
@@ -694,21 +683,37 @@ en:
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
-          river: "River"
           rock: "Rock"
+          saddle: "Saddle"
+          sand: "Sand"
           scree: "Scree"
           scrub: "Scrub"
-          shoal: "Shoal"
           spring: "Spring"
+          stone: "Stone"
           strait: "Strait"
           tree: "Tree"
           valley: "Valley"
           volcano: "Volcano"
           water: "Water"
           wetland: "Wetland"
-          wetlands: "Wetlands"
           wood: "Wood"
+        office:
+          accountant: "Accountant"
+          administrative: "Admininstration"
+          architect: "Architect"
+          company: "Company"
+          employment_agency: "Employment Agency"
+          estate_agent: "Estate Agent"
+          government: "Governmental Office"
+          insurance: "Insurance Office"
+          lawyer: "Lawyer"
+          ngo: "NGO Office"
+          telecommunication: "Telecommunication Office"
+          travel_agent: "Travel Agency"
+          "yes": "Office"
         place:
+          allotments: "Allotments"
+          block: "Block"
           airport: "Airport"
           city: "City"
           country: "Country"
@@ -719,9 +724,11 @@ en:
           houses: "Houses"
           island: "Island"
           islet: "Islet"
+          isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
+          neighbourhood: "Neighbourhood"
           postcode: "Postcode"
           region: "Region"
           sea: "Sea"
@@ -731,6 +738,7 @@ en:
           town: "Town"
           unincorporated_area: "Unincorporated Area"
           village: "Village"
+          "yes": "Place"
         railway:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
@@ -742,31 +750,34 @@ en:
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
+          miniature: "Miniature Rail"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
+          proposed: "Proposed Railway"
           spur: "Railway Spur"
           station: "Railway Station"
+          stop: "Railway Stop"
           subway: "Subway Station"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
           tram: "Tramway"
           tram_stop: "Tram Stop"
-          yard: "Railway Yard"
         shop:
           alcohol: "Off License"
-          apparel: "Apparel Shop"
+          antiques: "Antiques"
           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           books: "Book Shop"
+          boutique: "Boutique"
           butcher: "Butcher"
           car: "Car Shop"
-          car_dealer: "Car Dealer"
           car_parts: "Car Parts"
+          car_repair: "Car Repair"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           charity: "Charity Shop"
@@ -777,10 +788,10 @@ en:
           convenience: "Convenience Store"
           copyshop: "Copy Shop"
           cosmetics: "Cosmetics Shop"
+          deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
-          drugstore: "Drugstore"
           dry_cleaning: "Dry Cleaning"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"
@@ -814,19 +825,24 @@ en:
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           pet: "Pet Shop"
+          pharmacy: "Pharmacy"
           photo: "Photo Shop"
           salon: "Salon"
+          second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
           shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
+          tailor: "Tailor"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
           wine: "Off License"
+          "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
+          apartment: "Apartment"
           artwork: "Artwork"
           attraction: "Attraction"
           bed_and_breakfast: "Bed and Breakfast"
@@ -834,22 +850,24 @@ en:
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           chalet: "Chalet"
+          gallery: "Gallery"
           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"
-          valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
+        tunnel:
+          culvert: "Culvert"
+          "yes": "Tunnel"
         waterway:
+          artificial: "Artificial Waterway"
           boatyard: "Boatyard"
           canal: "Canal"
-          connector: "Waterway Connector"
           dam: "Dam"
           derelict_canal: "Derelict Canal"
           ditch: "Ditch"
@@ -857,27 +875,30 @@ en:
           drain: "Drain"
           lock: "Lock"
           lock_gate: "Lock Gate"
-          mineral_spring: "Mineral Spring"
           mooring: "Mooring"
           rapids: "Rapids"
           river: "River"
-          riverbank: "Riverbank"
           stream: "Stream"
           wadi: "Wadi"
           waterfall: "Waterfall"
-          water_point: "Water Point"
           weir: "Weir"
+          "yes": "Waterway"
+      admin_levels:
+        level2: "Country Boundary"
+        level4: "State Boundary"
+        level5: "Region Boundary"
+        level6: "County Boundary"
+        level8: "City Boundary"
+        level9: "Village Boundary"
+        level10: "Suburb Boundary"
     description:
       title:
-        osm_namefinder: '%{types} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
         osm_nominatim: 'Location from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         towns: Towns
         places: Places
-    description_osm_namefinder:
-      prefix: "%{distance} %{direction} of %{type}"
     results:
       no_results: "No results found"
       more_results: "More results"
@@ -902,67 +923,49 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
-    welcome_user: "Welcome, %{user_link}"
-    welcome_user_link_tooltip: Your user page
-    home: home
-    home_tooltip: Go to home location
-    inbox: "inbox (%{count})"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
-      one: Your inbox contains 1 unread message
-      other: Your inbox contains %{count} unread messages
-    logout: logout
-    logout_tooltip: "Log out"
-    log_in: log in
+    home: Go to Home Location
+    logout: Log Out
+    log_in: Log In
     log_in_tooltip: Log in with an existing account
-    sign_up: sign up
+    sign_up: Sign Up
+    start_mapping: Start Mapping
     sign_up_tooltip: Create an account for editing
-    view: View
-    view_tooltip: View the map
     edit: Edit
     history: History
     export: Export
-    export_tooltip: Export map data
+    data: Data
+    export_data: Export Data
     gps_traces: GPS Traces
     gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
-    intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
-    intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
-    intro_3: "OpenStreetMap's hosting is kindly supported by %{ucl}, %{ic} and %{bytemark}. Other supporters of the project are listed in the %{partners}."
-    intro_3_ucl: "the UCL VR Centre"
-    intro_3_ic: "Imperial College London"
-    intro_3_bytemark: "Bytemark Hosting"
-    intro_3_partners: "wiki"
-    intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
+    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"
+    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_bytemark: "Bytemark Hosting"
+    partners_partners: "partners"
+    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
     donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
-    donate_link_text: donating
     help: Help
-    help_centre: Help Centre
-    help_url: http://help.openstreetmap.org/
-    help_title: Help site for the project
-    wiki: Wiki
-    wiki_url: http://wiki.openstreetmap.org/
-    wiki_title: Wiki site for the project
-    documentation: Documentation
-    documentation_title: Documentation for the project
-    copyright: "Copyright &amp; License"
+    about: About
+    copyright: Copyright
+    community: Community
     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
-    license:
-      alt: CC by-sa 2.0
-      title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     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
@@ -973,115 +976,225 @@ en:
       text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
-    legal_babble: |
-      <h2>Copyright and License</h2>
-      <p>
-         OpenStreetMap is <i>open data</i>, licensed under the <a
-         href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-         Commons Attribution-ShareAlike 2.0</a> licence (CC-BY-SA).
-      </p>
-      <p>
-        You are free to copy, distribute, transmit and adapt our maps
-        and data, as long as you credit OpenStreetMap and its
-        contributors. If you alter or build upon our maps or data, you
+    legal_babble:
+      title_html: Copyright and License
+      intro_1_html: |
+        OpenStreetMap is <i>open data</i>, licensed under the <a
+        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        Commons Open Database License</a> (ODbL).
+      intro_2_html: |
+        You are free to copy, distribute, transmit and adapt our data,
+        as long as you credit OpenStreetMap and its
+        contributors. If you alter or build upon our data, you
         may distribute the result only under the same licence. The
-        full <a
-        href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
+        full <a href="http://opendatacommons.org/licenses/odbl/1.0/">legal
         code</a> explains your rights and responsibilities.
-      </p>
-
-      <h3>How to credit OpenStreetMap</h3>
-      <p>
-        If you are using OpenStreetMap map images, we request that
-        your credit reads at least &ldquo;&copy; OpenStreetMap
-        contributors, CC-BY-SA&rdquo;. If you are using map data only,
-        we request &ldquo;Map data &copy; OpenStreetMap contributors,
-        CC-BY-SA&rdquo;.
-      </p>
-      <p>
-        Where possible, OpenStreetMap should be hyperlinked to <a
-        href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
-        and CC-BY-SA to <a
-        href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If
-        you are using a medium where links are not possible (e.g. a
-        printed work), we suggest you direct your readers to
-        www.openstreetmap.org (perhaps by expanding
-        &lsquo;OpenStreetMap&rsquo; to this full address) and to
-        www.creativecommons.org.
-      </p>
-
-      <h3>Finding out more</h3>
-      <p>
-        Read more about using our data at the <a
+      intro_3_html: |
+        The cartography in our map tiles, and our documentation, are
+        licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+      credit_title_html: How to credit OpenStreetMap
+      credit_1_html: |
+        We require that you use the credit &ldquo;&copy; OpenStreetMap
+        contributors&rdquo;.
+      credit_2_html: |
+        You must also make it clear that the data is available under the Open
+        Database License, and if using our map tiles, that the cartography is
+        licensed as CC BY-SA. You may do this by linking to
+        <a href="http://www.openstreetmap.org/copyright">this copyright page</a>.
+        Alternatively, and as a requirement if you are distributing OSM in a
+        data form, you can name and link directly to the license(s). In media
+        where links are not possible (e.g. printed works), we suggest you
+        direct your readers to openstreetmap.org (perhaps by expanding
+        'OpenStreetMap' to this full address), to opendatacommons.org, and
+        if relevant, to creativecommons.org.
+      credit_3_html: |
+        For a browsable electronic map, the credit should appear in the corner of the map.
+        For example:
+      attribution_example:
+        alt: Example of how to attribute OpenStreetMap on a webpage
+        title: Attribution example
+      more_title_html: Finding out more
+      more_1_html: |
+        Read more about using our data, and how to credit us, at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
-      </p>
-      <p>
-        OSM contributors are reminded never to add data from any
-        copyrighted sources (e.g. Google Maps or printed maps) without
-        explicit permission from the copyright holders.
-      </p>
-      <p>
+      more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.
-
         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
-      </p>
-
-      <h3>Our contributors</h3>
-      <p>
-        Our CC-BY-SA licence requires you to &ldquo;give the Original
-        Author credit reasonable to the medium or means You are
-        utilising&rdquo;. Individual OSM mappers do not request a
-        credit over and above that to &ldquo;OpenStreetMap
-        contributors&rdquo;, but where data from a national mapping
-        agency or other major source has been included in
-        OpenStreetMap, it may be reasonable to credit them by directly
-        reproducing their credit or by linking to it on this page.
-      </p>
-
-      <!--
-      Information for page editors
-
-      The following lists only those organisations who require attribution
-      as a condition of their data being used in OpenStreetMap. It is not a
-      general catalogue of imports, and must not be used except when
-      attribution is required to comply with the licence of the imported
-      data.
-
-      Any additions here must be discussed with OSM sysadmins first.
-      -->
-
-      <ul id="contributors">
-          <li><strong>Australia</strong>: Contains suburb data based
-          on Australian Bureau of Statistics data.</li>
-          <li><strong>Austria</strong>: Contains data from
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC-BY</a>.</li>
-          <li><strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).</li>
-          <li><strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.</li>
-          <li><strong>New Zealand</strong>: Contains data sourced from
-          Land Information New Zealand. Crown Copyright reserved.</li>
-          <li><strong>Poland</strong>: Contains data from <a
-          href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
-          UMP-pcPL contributors.</li>
-          <li><strong>United Kingdom</strong>: Contains Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010.</li>
-      </ul>
-
-      <p>
+      contributors_title_html: Our contributors
+      contributors_intro_html: |
+        Our contributors are thousands of individuals. We also include
+        openly-licensed data from national mapping agencies
+        and other sources, among them:
+      contributors_at_html: |
+        <strong>Austria</strong>: Contains data from
+        <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
+        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
+      contributors_ca_html: |
+        <strong>Canada</strong>: Contains data from
+        GeoBase&reg;, GeoGratis (&copy; Department of Natural
+        Resources Canada), CanVec (&copy; Department of Natural
+        Resources Canada), and StatCan (Geography Division,
+        Statistics Canada).
+      contributors_fi_html: |
+        <strong>Finland</strong>: Contains data from the
+        National Land Survey of Finland's Topographic Database
+        and other datasets, under the
+        <a href="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_nl_html: |
+        <strong>Netherlands</strong>: Contains &copy; AND data, 2007
+        (<a href="http://www.and.com">www.and.com</a>)
+      contributors_nz_html: |
+        <strong>New Zealand</strong>: Contains data sourced from
+        Land Information New Zealand. Crown Copyright reserved.
+      contributors_za_html: |
+        <strong>South Africa</strong>: Contains data sourced from
+        <a href="http://www.ngi.gov.za/">Chief Directorate:
+        National Geo-Spatial Information</a>, State copyright reserved.
+      contributors_gb_html: |
+        <strong>United Kingdom</strong>: Contains Ordnance
+        Survey data &copy; Crown copyright and database right
+        2010-12.
+      contributors_footer_1_html: |
+        For further details of these, and other sources that have been used
+        to help improve OpenStreetMap, please see the <a
+        href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+        page</a> on the OpenStreetMap Wiki.
+      contributors_footer_2_html: |
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
         accepts any liability.
-      </p>
+      infringement_title_html: Copyright infringement
+      infringement_1_html: |
+        OSM contributors are reminded never to add data from any
+        copyrighted sources (e.g. Google Maps or printed maps) without
+        explicit permission from the copyright holders.
+      infringement_2_html: |
+        If you believe that copyrighted material has been inappropriately
+        added to the OpenStreetMap database or this site, please refer
+        to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
+        procedure</a> or file directly at our
+        <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+  welcome_page:
+    title: Welcome!
+    introduction_html: |
+      Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
+      up, you're all set to get started mapping. Here's a quick guide with the most important
+      things you need to know.
+    whats_on_the_map:
+      title: What's on the Map
+      on_html: |
+        OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        it includes millions of buildings, roads, and other details about places. You can map
+        whatever real-world features are interesting to you.
+      off_html: |
+        What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        hypothetical features, and data from copyrighted sources. Unless you have special
+        permission, don't copy from online or paper maps.
+    basic_terms:
+      title: Basic Terms For Mapping
+      paragraph_1_html: |
+        OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
+      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 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.
+    questions:
+      title: Any questions?
+      paragraph_1_html: |
+        OpenStreetMap has several resources for learning about the project, asking and answering
+        questions, and collaboratively discussing and documenting mapping topics.
+        <a href='%{help_url}'>Get help here</a>.
+    start_mapping: Start Mapping
+    add_a_note:
+      title: No Time To Edit? Add a Note!
+      paragraph_1_html: |
+        If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
+        easy to add a note.
+      paragraph_2_html: |
+        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:
+      url: /welcome
+      title: Welcome to OSM
+      description: Start with this quick guide covering the OpenStreetMap basics.
+    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.
+    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 hundreds 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.
+    partners_title: Partners
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1092,8 +1205,7 @@ en:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
-      footer1: "You can also read the message at %{readurl}"
-      footer2: "and you can reply at %{replyurl}"
+      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
     friend_notification:
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
@@ -1115,46 +1227,16 @@ en:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
-      subject: "[OpenStreetMap] Confirm your email address"
-    signup_confirm_plain:
+      subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      # next two translations run-on : please word wrap appropriately
-      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
-      click_the_link_2: "account and read on for more information about OpenStreetMap."
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
-      blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
-      opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:"
-      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      # next four translations are in pairs : please word wrap appropriately
-      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
-      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user_1: "A list of current users in categories, based on where in the world"
-      current_user_2: "they are, is available from:"
-    signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an %{introductory_video_link}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are %{more_videos_link}."
-      more_videos_here: "more videos here"
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a>, catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>, or browse through OpenStreetMap founder Steve Coast's <a href="http://www.opengeodata.org/">OpenGeoData blog</a> for the potted history of the project, which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!
-      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      created: "Someone (hopefully you) just created an account at %{site_url}."
+      confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
+      welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:
       greeting: "Hi,"
-      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
-      hopefully_you_2: "%{server_url} to %{new_address}."
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
       click_the_link: "If this is you, please click the link below to confirm the change."
     email_confirm_html:
       greeting: "Hi,"
@@ -1164,19 +1246,53 @@ en:
       subject: "[OpenStreetMap] Password reset request"
     lost_password_plain:
       greeting: "Hi,"
-      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
-      hopefully_you_2: "email addresses openstreetmap.org account."
+      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
     lost_password_html:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
+    note_comment_notification:
+      anonymous: An anonymous user
+      greeting: "Hi,"
+      commented:
+        subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
+        your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+        commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+      closed:
+        subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
+        your_note: "%{commenter} has resolved one of your map notes near %{place}."
+        commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+      reopened:
+        subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
+        your_note: "%{commenter} has reactivated one of your map notes near %{place}."
+        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}."
   message:
     inbox:
       title: "Inbox"
-      my_inbox: "My inbox"
+      my_inbox: "My Inbox"
       outbox: "outbox"
-      you_have: "You have %{new_count} new messages and %{old_count} old messages"
+      messages: "You have %{new_messages} and %{old_messages}"
+      new_messages:
+        one: "%{count} new message"
+        other: "%{count} new messages"
+      old_messages:
+        one: "%{count} old message"
+        other: "%{count} old messages"
       from: "From"
       subject: "Subject"
       date: "Date"
@@ -1196,10 +1312,6 @@ en:
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
-    no_such_user:
-      title: "No such user"
-      heading: "No such user"
-      body: "Sorry there is no user with that name."
     no_such_message:
       title: "No such message"
       heading: "No such message"
@@ -1209,7 +1321,9 @@ en:
       my_inbox: "My %{inbox_link}"
       inbox: "inbox"
       outbox: "outbox"
-      you_have_sent_messages: "You have %{count} sent messages"
+      messages:
+        one: "You have %{count} sent message"
+        other: "You have %{count} sent messages"
       to: "To"
       subject: "Subject"
       date: "Date"
@@ -1219,17 +1333,14 @@ en:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     read:
       title: "Read message"
-      reading_your_messages: "Reading your messages"
       from: "From"
       subject: "Subject"
       date: "Date"
       reply_button: "Reply"
       unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
+      back: "Back"
       to: "To"
-      back_to_outbox: "Back to outbox"
-      wrong_user: "You are logged in as `%{user}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it."
+      wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       delete_button: "Delete"
     mark:
@@ -1241,14 +1352,12 @@ en:
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'
       permalink: Permalink
       shortlink: Shortlink
+      createnote: Add a note
       license:
-        notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors."
-        license_name: "Creative Commons Attribution-Share Alike 2.0"
-        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
-        project_name: "OpenStreetMap project"
+        copyright: "Copyright OpenStreetMap and contributors, under an open license"
+        license_url: "http://openstreetmap.org/copyright"
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
@@ -1262,19 +1371,23 @@ en:
       potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
       potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
       potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+      id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
       close: Close
     search:
       search: Search
+      get_directions: "Get directions"
+      get_directions_title: "Find directions between two points"
+      close_directions: "Close directions"
+      close_directions_title: "Close the directions panel"
+      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"
-      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:
-      map_key: "Map Key"
-      map_key_tooltip: "Key for the map"
       table:
         entry:
           motorway: "Motorway"
@@ -1341,6 +1454,23 @@ en:
           permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
+    richtext_area:
+      edit: Edit
+      preview: Preview
+    markdown_help:
+      title_html: Parsed with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      headings: Headings
+      heading: Heading
+      subheading: Subheading
+      unordered: Unordered list
+      ordered: Ordered list
+      first: First item
+      second: Second item
+      link: Link
+      text: Text
+      image: Image
+      alt: Alt text
+      url: URL
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"
@@ -1368,10 +1498,6 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-    no_such_user:
-      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."
     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"
@@ -1387,7 +1513,9 @@ en:
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       see_your_traces: "See your traces"
-      traces_waiting: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+      traces_waiting:
+        one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+        other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"
     view:
@@ -1410,9 +1538,9 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
-      showing_page: "Showing page %{page}"
-      next: "Next &raquo;"
-      previous: "&laquo; Previous"
+      showing_page: "Page %{page}"
+      older: "Older Traces"
+      newer: "Newer Traces"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"
@@ -1433,7 +1561,9 @@ en:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
+      description: "Browse recent GPS track uploads"
       tagged_with: " tagged with %{tags}"
+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
@@ -1443,14 +1573,24 @@ en:
     offline:
       heading: "GPX Storage Offline"
       message: "The GPX file storage and upload system is currently unavailable."
+    georss:
+      title: "OpenStreetMap GPS Traces"
+    description:
+      description_with_count:
+        one: "GPX file with %{count} point from %{user}"
+        other: "GPX file with %{count} points from %{user}"
+      description_without_count: "GPX file from %{user}"
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
+    require_moderator:
+      not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
     oauthorize:
+      title: "Authorize access to your account"
       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       allow_read_prefs:  "read your user preferences."
@@ -1459,6 +1599,15 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
+    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:
@@ -1475,8 +1624,10 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
-      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."
+      support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures."
       edit: "Edit Details"
+      delete: "Delete Client"
+      confirm: "Are you sure?"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       allow_write_prefs: "modify their user preferences."
@@ -1484,6 +1635,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
@@ -1508,6 +1660,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
+      allow_write_notes: "modify notes."
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
@@ -1523,20 +1676,19 @@ en:
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "%{logo} OpenID:"
-      remember: "Remember me:"
+      remember: "Remember me"
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now
       with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with openid: "Alternatively please use your OpenID to login:"
+      with openid: "Alternatively, use OpenID to login:"
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
       account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the %{webmaster} if you wish to discuss this.
-      webmaster: webmaster
+      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."
-      notice: "<a href=\"http://www.osmfoundation.org/wiki/License/We_Are_Changing_The_License\">Find out more about OpenStreetMap's upcoming license change</a> (<a href=\"http://wiki.openstreetmap.org/wiki/ODbL/We_Are_Changing_The_License\">translations</a>) (<a href=\"http://wiki.openstreetmap.org/wiki/Talk:ODbL/Upcoming\">discussion</a>)"
       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"
@@ -1550,9 +1702,6 @@ en:
         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
@@ -1580,11 +1729,15 @@ en:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
     new:
-      title: "Create account"
-      heading: "Create a User Account"
+      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.'
-      fill_form: "Fill in the form and we will send you a quick email to activate your account."
+      about:
+        header: Free and editable
+        html: |
+          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
+          and it's free for anyone to fix, update, download and use.</p>
+          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
@@ -1605,16 +1758,15 @@ en:
             using your username and password and then associate the account
             with your OpenID in your user settings.
           </li>
-        </ul> 
-      continue: Continue
-      flash create success message: "Thanks for signing up. We've sent a 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."
+        </ul>
+      continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
-      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@@ -1623,7 +1775,7 @@ en:
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
-      legale_select: "Please select your country of residence:"
+      legale_select: "Country of residence:"
       legale_names:
         france: "France"
         italy: "Italy"
@@ -1633,22 +1785,31 @@ en:
       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."
     view:
-      my diary: my diary
+      my diary: My Diary
       new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my settings: my settings
+      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
       oauth settings: oauth settings
-      blocks on me: blocks on me
-      blocks by me: blocks by me
-      send message: send message
-      diary: diary
-      edits: edits
-      traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
+      blocks on me: Blocks on Me
+      blocks by me: Blocks by Me
+      send message: Send Message
+      diary: Diary
+      edits: Edits
+      traces: Traces
+      notes: Map Notes
+      remove as friend: Unfriend
+      add as friend: Add Friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
+      ct status: "Contributor terms:"
+      ct undecided: Undecided
+      ct declined: Declined
+      ct accepted: Accepted %{ago} ago
       latest edit: "Latest edit %{ago}:"
       email address: "Email address:"
       created from: "Created from:"
@@ -1656,7 +1817,7 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
-      if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page."
+      if set location: "Set your home location on the %{settings_link} page to see nearby users."
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
@@ -1673,8 +1834,9 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
-      block_history: "view blocks received"
-      moderator_history: "view blocks given"
+      block_history: "blocks received"
+      moderator_history: "blocks given"
+      comments: "Comments"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
@@ -1683,6 +1845,10 @@ en:
       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"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
@@ -1719,6 +1885,10 @@ en:
       preferred languages: "Preferred Languages:"
       preferred editor: "Preferred Editor:"
       image: "Image:"
+      gravatar:
+        gravatar: "Use Gravatar"
+        link: "http://wiki.openstreetmap.org/wiki/Gravatar"
+        link text: "what is this?"
       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"
@@ -1735,14 +1905,16 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     confirm:
-      heading: Confirm a user account
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
       already active: "This account has already been confirmed."
-      unknown token: "That token doesn't seem to exist."
-      reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
+      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."
       failure: "User %{name} not found."
@@ -1757,10 +1929,14 @@ en:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:
-      success: "%{name} is now your friend."
+      heading: "Add %{user} as a friend?"
+      button: "Add as friend"
+      success: "%{name} is now your friend!"
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:
+      heading: "Unfriend %{user}?"
+      button: "Unfriend"
       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:
@@ -1769,8 +1945,8 @@ en:
       title: Users
       heading: Users
       showing:
-        one: Showing page %{page} (%{first_item} of %{items})
-        other: Showing page %{page} (%{first_item}-%{last_item} of %{items})
+        one: Page %{page} (%{first_item} of %{items})
+        other: Page %{page} (%{first_item}-%{last_item} of %{items})
       summary: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip: "%{name} created on %{date}"
       confirm: Confirm Selected Users
@@ -1834,7 +2010,6 @@ en:
       back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
-      not_a_moderator: "You need to be a moderator to perform that action."
       block_expired: "The block has already expired and cannot be edited."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
@@ -1870,6 +2045,9 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
+      showing_page: "Page %{page}"
+      next: "Next »"
+      previous: "« Previous"
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
@@ -1896,19 +2074,179 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
+  note:
+    description:
+      opened_at_html: "Created %{when} ago"
+      opened_at_by_html: "Created %{when} ago by %{user}"
+      commented_at_html: "Updated %{when} ago"
+      commented_at_by_html: "Updated %{when} ago by %{user}"
+      closed_at_html: "Resolved %{when} ago"
+      closed_at_by_html: "Resolved %{when} ago by %{user}"
+      reopened_at_html: "Reactivated %{when} ago"
+      reopened_at_by_html: "Reactivated %{when} ago by %{user}"
+    rss:
+      title: "OpenStreetMap Notes"
+      description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
+      description_item: "An rss feed for note %{id}"
+      opened: "new note (near %{place})"
+      commented: "new comment (near %{place})"
+      closed: "closed note (near %{place})"
+      reopened: "reactivated note (near %{place})"
+    entry:
+      comment: Comment
+      full: Full note
+    mine:
+      title: "Notes submitted or commented on by %{user}"
+      heading: "%{user}'s notes"
+      subheading: "Notes submitted or commented on by %{user}"
+      id: "Id"
+      creator: "Creator"
+      description: "Description"
+      created_at: "Created at"
+      last_changed: "Last changed"
+      ago_html: "%{when} ago"
   javascripts:
+    close: Close
+    share:
+      title: "Share"
+      cancel: "Cancel"
+      image: "Image"
+      link: "Link or HTML"
+      long_link: "Link"
+      short_link: "Short Link"
+      embed: "HTML"
+      custom_dimensions: "Set custom dimensions"
+      format: "Format:"
+      scale: "Scale:"
+      image_size: "Image will show standard layer at "
+      download: "Download"
+      short_url: "Short URL"
+      include_marker: "Include marker"
+      center_marker: "Center map on marker"
+      paste_html: "Paste HTML to embed in website"
+      view_larger_map: "View Larger Map"
+    key:
+      title: "Map Key"
+      tooltip: "Map Key"
+      tooltip_disabled: "Map Key available only for Standard layer"
     map:
+      zoom:
+        in: Zoom In
+        out: Zoom Out
+      locate:
+        title: Show My Location
+        popup: You are within {distance} {unit} of this point
       base:
-        mapnik: Mapnik
-        osmarender: Osmarender
+        standard: Standard
         cycle_map: Cycle Map
-        noname: NoName
-      overlays:
-        maplint: Maplint
+        transport_map: Transport Map
+        mapquest: MapQuest Open
+        hot: Humanitarian
+      layers:
+        header: Map Layers
+        notes: Map Notes
+        data: Map Data
+        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
-      edit_zoom_alert: You must zoom in to edit the map
-      history_tooltip: View edits for this area
-      history_disabled_tooltip: Zoom in to view edits for this area
-      history_zoom_alert: You must 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
+      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:
+        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:
+        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
+        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)"
+      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_on: "Continue on "
+        slight_right: "Slight right onto "
+        turn_right: "Turn right onto "
+        sharp_right: "Sharp right onto "
+        uturn: "U-turn along "
+        sharp_left: "Sharp left onto "
+        turn_left: "Turn left onto "
+        slight_left: "Slight left onto "
+        via_point: "(via point) "
+        follow:  "Follow "
+        roundabout: "At roundabout take "
+        leave_roundabout: "Leave roundabout - "
+        stay_roundabout: "Stay on roundabout - "
+        start: "Start at end of "
+        destination: "Reach destination"
+        against_oneway: "Go against one-way on "
+        end_oneway: "End of one-way on "
+        unnamed: "(unnamed)"
+        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"
+      heading: "Edit redaction"
+      submit: "Save redaction"
+      title: "Edit redaction"
+    index:
+      empty: "No redactions to show."
+      heading: "List of redactions"
+      title: "List of redactions"
+    new:
+      description: "Description"
+      heading: "Enter information for new redaction"
+      submit: "Create redaction"
+      title: "Creating new redaction"
+    show:
+      description: "Description:"
+      heading: "Showing redaction \"%{title}\""
+      title: "Showing redaction"
+      user: "Creator:"
+      edit: "Edit this redaction"
+      destroy: "Remove this redaction"
+      confirm: "Are you sure?"
+    create:
+      flash: "Redaction created."
+    update:
+      flash: "Changes saved."
+    destroy:
+      not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it."
+      flash: "Redaction destroyed."
+      error: "There was an error destroying this redaction."