Site cleanup

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f24bc490f4d8e21469dfb65b577ceba7eb4772f0..831311615b007b89807fa0e58c4891aba202e98e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -94,7 +94,6 @@ en:
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"

-      download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:


@@ -168,16 +167,14 @@ en:
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"
     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"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     node:
       node: "Node"
       node_title: "Node: %{node_name}"
     node:
       node: "Node"
       node_title: "Node: %{node_name}"

-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit node"

     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:
     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:


@@ -193,17 +190,23 @@ en:
         relation: relation
         changeset: changeset
     paging_nav:
         relation: relation
         changeset: changeset
     paging_nav:

-      showing_page: "Showing page"
+      showing_page: "page"

       of: "of"
       of: "of"

+    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_details:
       members: "Members:"
       part_of: "Part of:"
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"
     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"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"
     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"


@@ -214,33 +217,29 @@ en:
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"

-      download: "%{download_xml_link} or %{view_history_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-    start:
-      view_data: "View data for current map view"
-      manually_select: "Manually select a different area"
+      view_history: "View history"

     start_rjs:
     start_rjs:

-      data_layer_name: "Data"
+      data_layer_name: "Browse Map Data"

       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       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"
+      view_data: "View data for current map view"

       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
       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."
+      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."

       load_data: "Load Data"
       load_data: "Load Data"

-      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})"
+      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..."
       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."

-      history_for_feature: "History for [[feature]]"
+      history_for_feature: "History for %{feature}"

       details: "Details"
       private_user: "private user"
       details: "Details"
       private_user: "private user"

-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+      edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"

       object_list:
         heading: "Object list"
       object_list:
         heading: "Object list"

-        back: "Display object list"
+        back: "Back to object list"

         type:
           node: "Node"
           way: "Way"
         type:
           node: "Node"
           way: "Way"


@@ -249,13 +248,13 @@ en:
         details: "Details"
         selected:
           type:
         details: "Details"
         selected:
           type:

-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"

             # There is no 'relation' type because it is not represented in OpenLayers
         history:
           type:
             # There is no 'relation' type because it is not represented in OpenLayers
         history:
           type:

-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"

             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"


@@ -272,23 +271,20 @@ en:
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
     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"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     way:
       way: "Way"
       way_title: "Way: %{way_name}"
     way:
       way: "Way"
       way_title: "Way: %{way_name}"

-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit way"

   changeset:
     changeset_paging_nav:
   changeset:
     changeset_paging_nav:

-      showing_page: "Showing page %{page}"
+      showing_page: "Page %{page}"

       next: "Next »"
       previous: "« Previous"
     changeset:
       next: "Next »"
       previous: "« Previous"
     changeset:

-      id: "#%{id}"

       still_editing: "(still editing)"
       anonymous: "Anonymous"
       no_comment: "(none)"
       still_editing: "(still editing)"
       anonymous: "Anonymous"
       no_comment: "(none)"


@@ -307,16 +303,22 @@ en:
       title_user: "Changesets by %{user}"
       title_bbox: "Changesets within %{bbox}"
       title_user_bbox: "Changesets by %{user} within %{bbox}"
       title_user: "Changesets by %{user}"
       title_bbox: "Changesets within %{bbox}"
       title_user_bbox: "Changesets by %{user} within %{bbox}"

-
+      title_friend: "Changesets by your friends"
+      title_nearby: "Changesets by nearby users"

       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"
       heading: "Changesets"
       heading_user: "Changesets"
       heading_bbox: "Changesets"
       heading_user_bbox: "Changesets"

-
-      description: "Recent changes"
+      heading_friend: "Changesets"
+      heading_nearby: "Changesets"
+      description: "Browse recent contributions to the map"

       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_user: "Changesets by %{user}"
       description_bbox: "Changesets within %{bbox}"
       description_user_bbox: "Changesets by %{user} within %{bbox}"

+      description_friend: "Changesets by your friends"
+      description_nearby: "Changesets by nearby users"
+      empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
+      empty_anon_html: "No edits made yet."

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:


@@ -324,12 +326,14 @@ en:
       title: New Diary Entry
     list:
       title: "Users' diaries"
       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
       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:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:


@@ -354,16 +358,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."
       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:
     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
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry


@@ -386,17 +387,24 @@ en:
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
       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:
     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"
   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"
       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."
       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."


@@ -427,27 +435,32 @@ 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>'
         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>'
         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}"

     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:

+        aeroway:
+          aerodrome: "Aerodrome"
+          apron: "Apron"
+          gate: "Gate"
+          helipad: "Helipad"
+          runway: "Runway"
+          taxiway: "Taxiway"
+          terminal: "Terminal"

         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"
         amenity:
           airport: "Airport"
           arts_centre: "Arts Centre"

+          artwork: "Artwork"

           atm: "ATM"
           auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"
           atm: "ATM"
           auditorium: "Auditorium"
           bank: "Bank"
           bar: "Bar"

+          bbq: "BBQ"

           bench: "Bench"
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"
           bench: "Bench"
           bicycle_parking: "Cycle Parking"
           bicycle_rental: "Cycle Rental"

+          biergarten: "Beer Garden"

           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"
           brothel: "Brothel"
           bureau_de_change: "Bureau de Change"
           bus_station: "Bus Station"


@@ -456,6 +469,7 @@ en:
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"
           car_sharing: "Car Sharing"
           car_wash: "Car Wash"
           casino: "Casino"

+          charging_station: "Charging Station"

           cinema: "Cinema"
           clinic: "Clinic"
           club: "Club"
           cinema: "Cinema"
           clinic: "Clinic"
           club: "Club"


@@ -474,6 +488,7 @@ en:
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"
           ferry_terminal: "Ferry Terminal"
           fire_hydrant: "Fire Hydrant"
           fire_station: "Fire Station"

+          food_court: "Food Court"

           fountain: "Fountain"
           fuel: "Fuel"
           grave_yard: "Grave Yard"
           fountain: "Fountain"
           fuel: "Fuel"
           grave_yard: "Grave Yard"


@@ -514,9 +529,12 @@ en:
           shelter: "Shelter"
           shop: "Shop"
           shopping: "Shopping"
           shelter: "Shelter"
           shop: "Shop"
           shopping: "Shopping"

+          shower: "Shower"
+          social_centre: "Social Centre"

           social_club: "Social Club"
           studio: "Studio"
           supermarket: "Supermarket"
           social_club: "Social Club"
           studio: "Studio"
           supermarket: "Supermarket"

+          swimming_pool: "Swimming Pool"

           taxi: "Taxi"
           telephone: "Public Telephone"
           theatre: "Theatre"
           taxi: "Taxi"
           telephone: "Public Telephone"
           theatre: "Theatre"


@@ -528,41 +546,21 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           wifi: "WiFi Access"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           wifi: "WiFi Access"

+          WLAN: "WiFi Access"

           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
           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:
         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"

         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"


@@ -570,12 +568,11 @@ en:
           byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"
           byway: "Byway"
           construction: "Highway under Construction"
           cycleway: "Cycle Path"

-          distance_marker: "Distance Marker"

           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"

-          gate: "Gate"

           living_street: "Living Street"
           living_street: "Living Street"

+          milestone: "Milestone"

           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"


@@ -587,14 +584,17 @@ en:
           primary_link: "Primary Road"
           raceway: "Raceway"
           residential: "Residential"
           primary_link: "Primary Road"
           raceway: "Raceway"
           residential: "Residential"

+          rest_area: "Rest Area"

           road: "Road"
           secondary: "Secondary Road"
           secondary_link: "Secondary Road"
           service: "Service Road"
           services: "Motorway Services"
           road: "Road"
           secondary: "Secondary Road"
           secondary_link: "Secondary Road"
           service: "Service Road"
           services: "Motorway Services"

+          speed_camera: "Speed Camera"

           steps: "Steps"
           stile: "Stile"
           tertiary: "Tertiary Road"
           steps: "Steps"
           stile: "Stile"
           tertiary: "Tertiary Road"

+          tertiary_link: "Tertiary Road"

           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"


@@ -608,6 +608,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
           building: "Building"
           castle: "Castle"
           church: "Church"

+          fort: "Fort"

           house: "House"
           icon: "Icon"
           manor: "Manor"
           house: "House"
           icon: "Icon"
           manor: "Manor"


@@ -632,6 +633,7 @@ en:
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"
           farmland: "Farmland"
           farmyard: "Farmyard"
           forest: "Forest"

+          garages: "Garages"

           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"
           grass: "Grass"
           greenfield: "Greenfield Land"
           industrial: "Industrial Area"


@@ -639,25 +641,28 @@ en:
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"
           meadow: "Meadow"
           military: "Military Area"
           mine: "Mine"

-          mountain: "Mountain"
+          orchard: "Orchard"

           nature_reserve: "Nature Reserve"
           park: "Park"
           piste: "Piste"
           nature_reserve: "Nature Reserve"
           park: "Park"
           piste: "Piste"

-          plaza: "Plaza"

           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
           quarry: "Quarry"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"

+          reservoir_watershed: "Reservoir Watershed"

           residential: "Residential Area"
           retail: "Retail"
           residential: "Residential Area"
           retail: "Retail"

+          road: "Road Area"

           village_green: "Village Green"
           vineyard: "Vineyard"
           wetland: "Wetland"
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"
           village_green: "Village Green"
           vineyard: "Vineyard"
           wetland: "Wetland"
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"

+          bird_hide: "Bird Hide"

           common: "Common Land"
           fishing: "Fishing Area"
           common: "Common Land"
           fishing: "Fishing Area"

+          fitness_station: "Fitness Station"

           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"
           garden: "Garden"
           golf_course: "Golf Course"
           ice_rink: "Ice Rink"


@@ -668,12 +673,17 @@ en:
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"
           pitch: "Sports Pitch"
           playground: "Playground"
           recreation_ground: "Recreation Ground"

+          sauna: "Sauna"

           slipway: "Slipway"
           sports_centre: "Sports Centre"
           stadium: "Stadium"
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"
           slipway: "Slipway"
           sports_centre: "Sports Centre"
           stadium: "Stadium"
           swimming_pool: "Swimming Pool"
           track: "Running Track"
           water_park: "Water Park"

+        military:
+          airfield: "Military Airfield"
+          barracks: "Barracks"
+          bunker: "Bunker"

         natural:
           bay: "Bay"
           beach: "Beach"
         natural:
           bay: "Bay"
           beach: "Beach"


@@ -681,11 +691,12 @@ en:
           cave_entrance: "Cave Entrance"
           channel: "Channel"
           cliff: "Cliff"
           cave_entrance: "Cave Entrance"
           channel: "Channel"
           cliff: "Cliff"

-          coastline: "Coastline"

           crater: "Crater"
           crater: "Crater"

+          dune: "Dune"

           feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"
           feature: "Feature"
           fell: "Fell"
           fjord: "Fjord"

+          forest: "Forest"

           geyser: "Geyser"
           glacier: "Glacier"
           heath: "Heath"
           geyser: "Geyser"
           glacier: "Glacier"
           heath: "Heath"


@@ -705,6 +716,7 @@ en:
           scrub: "Scrub"
           shoal: "Shoal"
           spring: "Spring"
           scrub: "Scrub"
           shoal: "Shoal"
           spring: "Spring"

+          stone: "Stone"

           strait: "Strait"
           tree: "Tree"
           valley: "Valley"
           strait: "Strait"
           tree: "Tree"
           valley: "Valley"


@@ -713,6 +725,19 @@ en:
           wetland: "Wetland"
           wetlands: "Wetlands"
           wood: "Wood"
           wetland: "Wetland"
           wetlands: "Wetlands"
           wood: "Wood"

+        office:
+          accountant: "Accountant"
+          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:
           airport: "Airport"
           city: "City"
         place:
           airport: "Airport"
           city: "City"


@@ -724,6 +749,7 @@ en:
           houses: "Houses"
           island: "Island"
           islet: "Islet"
           houses: "Houses"
           island: "Island"
           islet: "Islet"

+          isolated_dwelling: "Isolated Dwelling"

           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"


@@ -747,6 +773,7 @@ en:
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"

+          miniature: "Miniature Rail"

           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"


@@ -761,7 +788,7 @@ en:
           yard: "Railway Yard"
         shop:
           alcohol: "Off License"
           yard: "Railway Yard"
         shop:
           alcohol: "Off License"

-          apparel: "Apparel Shop"
+          antiques: "Antiques"

           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"
           art: "Art Shop"
           bakery: "Bakery"
           beauty: "Beauty Shop"


@@ -770,7 +797,6 @@ en:
           books: "Book Shop"
           butcher: "Butcher"
           car: "Car Shop"
           books: "Book Shop"
           butcher: "Butcher"
           car: "Car Shop"

-          car_dealer: "Car Dealer"

           car_parts: "Car Parts"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           car_parts: "Car Parts"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"


@@ -785,7 +811,6 @@ en:
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
           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"
           dry_cleaning: "Dry Cleaning"
           electronics: "Electronics Shop"
           estate_agent: "Estate Agent"


@@ -851,7 +876,10 @@ en:
           valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"
           valley: "Valley"
           viewpoint: "Viewpoint"
           zoo: "Zoo"

+        tunnel:
+          "yes": "Tunnel"

         waterway:
         waterway:

+          artificial: "Artificial Waterway"

           boatyard: "Boatyard"
           canal: "Canal"
           connector: "Waterway Connector"
           boatyard: "Boatyard"
           canal: "Canal"
           connector: "Waterway Connector"


@@ -874,15 +902,12 @@ en:
           weir: "Weir"
     description:
       title:
           weir: "Weir"
     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
         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"
     results:
       no_results: "No results found"
       more_results: "More results"


@@ -907,11 +932,10 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
       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
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location

-    inbox: "inbox (%{count})"
+    inbox_html: "inbox %{count}"

     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message
     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message


@@ -934,14 +958,19 @@ en:
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map
     user_diaries_tooltip: View user diaries
     edit_with: Edit with %{editor}
     tag_line: The Free Wiki World Map

-    intro_1: "OpenStreetMap is a free 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_1: "OpenStreetMap is a free worldwide map, created by people like you."
+    intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map."
+    intro_2_create_account: "Create a user account"
+    intro_2_license: "open license"
+    intro_2_use: "use"
+    intro_2_download: "download"
+    intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap"
+    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
+    partners_ucl: "the UCL VR Centre"
+    partners_ic: "Imperial College London"
+    partners_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."
     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."


@@ -956,14 +985,11 @@ en:
     documentation: Documentation
     documentation_title: Documentation for the project
     copyright: "Copyright & License"
     documentation: Documentation
     documentation_title: Documentation for the project
     copyright: "Copyright & License"

+    community: Community

     community_blogs: "Community Blogs"
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
     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
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation


@@ -978,115 +1004,109 @@ 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
       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
         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.
         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>.
         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.
         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>.
         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_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.
         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>.

   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"


@@ -1120,13 +1140,12 @@ en:
         subject: "[OpenStreetMap] GPX Import success"
         loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
     signup_confirm:
         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!"
       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."
+      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: "We would like to welcome you and provide you with some additional information to get you started."
+    signup_confirm_plain:

       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:"
       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:"


@@ -1136,15 +1155,9 @@ en:
       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"
       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:"
+      user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user: "A list of current users in categories, based on where in the world they are, is available from:"

     signup_confirm_html:
     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}."
       introductory_video: "You can watch an %{introductory_video_link}."
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are %{more_videos_link}."


@@ -1181,7 +1194,13 @@ en:
       title: "Inbox"
       my_inbox: "My inbox"
       outbox: "outbox"
       title: "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"
       from: "From"
       subject: "Subject"
       date: "Date"


@@ -1201,10 +1220,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."
       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"
     no_such_message:
       title: "No such message"
       heading: "No such message"


@@ -1214,7 +1229,9 @@ en:
       my_inbox: "My %{inbox_link}"
       inbox: "inbox"
       outbox: "outbox"
       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"
       to: "To"
       subject: "Subject"
       date: "Date"


@@ -1234,7 +1251,7 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
       reading_your_sent_messages: "Reading your sent messages"
       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:
     sent_message_summary:
       delete_button: "Delete"
     mark:


@@ -1246,14 +1263,11 @@ 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."
     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
       license:
       permalink: Permalink
       shortlink: Shortlink
       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:
         project_url: "http://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:


@@ -1346,6 +1360,23 @@ en:
           permissive: "Permissive access"
           destination: "Destination access"
           construction: "Roads under construction"
           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)"
   trace:
     visibility:
       private: "Private (only shared as anonymous, unordered points)"


@@ -1373,10 +1404,6 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       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:"
     trace_form:
       upload_gpx: "Upload GPX File:"
       description: "Description:"


@@ -1415,9 +1442,9 @@ en:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:

-      showing_page: "Showing page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      showing_page: "Page %{page}"
+      older: "Older Traces"
+      newer: "Newer Traces"

     trace:
       pending: "PENDING"
       count_points: "%{count} points"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"


@@ -1438,7 +1465,9 @@ en:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       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}"
       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:
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -1451,6 +1480,8 @@ en:
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."

+    require_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."
     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."


@@ -1480,8 +1511,10 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
       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) as well as plain text in SSL mode."

       edit: "Edit Details"
       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."
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       allow_write_prefs: "modify their user preferences."


@@ -1528,7 +1561,7 @@ en:
       email or username: "Email Address or Username:"
       password: "Password:"
       openid: "%{logo} OpenID:"
       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
       lost password link: "Lost your password?"
       login_button: "Login"
       register now: Register now


@@ -1537,11 +1570,10 @@ en:
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.
       new to osm: New to OpenStreetMap?
       to make changes: To make changes to the OpenStreetMap data, you must have an account.
       create account minute: Create an account. It only takes a minute.

+      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 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."
       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"
       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"


@@ -1612,6 +1644,7 @@ en:
           </li>
         </ul>
       continue: Continue
           </li>
         </ul>
       continue: Continue

+      flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."

       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."
       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>."
       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."
       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>."


@@ -1643,6 +1676,7 @@ en:
       my edits: my edits
       my traces: my traces
       my settings: my settings
       my edits: my edits
       my traces: my traces
       my settings: my settings

+      my comments: my comments

       oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me
       oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me


@@ -1650,8 +1684,8 @@ en:
       diary: diary
       edits: edits
       traces: traces
       diary: diary
       edits: edits
       traces: traces

-      remove as friend: remove as friend
-      add as friend: add as friend
+      remove as friend: unfriend
+      add as friend: add friend

       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"


@@ -1665,7 +1699,7 @@ en:
       spam score: "Spam Score:"
       description: Description
       user location: User location
       spam score: "Spam Score:"
       description: Description
       user location: User location

-      if set location: "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.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.


@@ -1682,8 +1716,9 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         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"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"


@@ -1692,6 +1727,10 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       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"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"


@@ -1728,6 +1767,10 @@ en:
       preferred languages: "Preferred Languages:"
       preferred editor: "Preferred Editor:"
       image: "Image:"
       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"
       new image: "Add an image"
       keep image: "Keep the current image"
       delete image: "Remove the current image"


@@ -1766,10 +1809,14 @@ en:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:
     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:
       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:
       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:


@@ -1778,8 +1825,8 @@ en:
       title: Users
       heading: Users
       showing:
       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
       summary: "%{name} created from %{ip_address} on %{date}"
       summary_no_ip: "%{name} created on %{date}"
       confirm: Confirm Selected Users


@@ -1843,7 +1890,6 @@ en:
       back: "View all blocks"
       needs_view: "Does the user need to log in before this block will be cleared?"
     filter:
       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:
       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:


@@ -1879,6 +1925,9 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
       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."
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."


@@ -1908,8 +1957,7 @@ en:
   javascripts:
     map:
       base:
   javascripts:
     map:
       base:

-        mapnik: Mapnik
-        osmarender: Osmarender
+        standard: Standard

         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open
         cycle_map: Cycle Map
         transport_map: Transport Map
         mapquest: MapQuest Open


@@ -1922,3 +1970,34 @@ en:
       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
       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

+  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."