]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en.yml
Set a minimum height for the changeset list map
[rails.git] / config / locales / en.yml
index a053a77936c3ced0700253a7ed2d815f1a341e6d..352e3d15e7fa86f41df1c74a622add3035aa33be 100644 (file)
@@ -1,6 +1,9 @@
 en:
   html:
     dir: ltr
 en:
   html:
     dir: ltr
+  time:
+    formats:
+      friendly: "%e %B %Y at %H:%M"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -76,10 +79,17 @@ en:
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
     with_id: "{{id}}"
     with_version: "{{id}}, v{{version}}"
     with_name: "{{name}} ({{id}})"
-  map:
-    view: View
-    edit: Edit
-    coordinates: "Coordinates:"
+  editor:
+    default: "Default (currently {{name}})"
+    potlatch:
+      name: "Potlatch 1"
+      description: "Potlatch 1 (in-browser editor)"
+    potlatch2:
+      name: "Potlatch 2"
+      description: "Potlatch 2 (in-browser editor)"
+    remote:
+      name: "Remote Control"
+      description: "Remote Control (JOSM or Merkaartor)"
   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"
@@ -90,7 +100,7 @@ en:
       feed:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
       feed:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
-    changeset_navigation:
+    navigation:
       paging:
         user:
           prev: "« {{id}}"
       paging:
         user:
           prev: "« {{id}}"
@@ -99,12 +109,18 @@ en:
           prev: "« {{id}}"
           next: "{{id}} »"
       user:
           prev: "« {{id}}"
           next: "{{id}} »"
       user:
-        name_tooltip: "View edits by {{user}}"
-        prev_tooltip: "Previous edit by {{user}}"
-        next_tooltip: "Next edit by {{user}}"
+        name_changeset_tooltip: "View edits by {{user}}"
+        prev_changeset_tooltip: "Previous edit by {{user}}"
+        next_changeset_tooltip: "Next edit by {{user}}"
       all:
       all:
-        prev_tooltip: "Previous changeset"
-        next_tooltip: "Next changeset"
+        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:"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -122,9 +138,11 @@ en:
       has_relations:
         one:  "Has the following {{count}} relation:"
         other: "Has the following {{count}} relations:"
       has_relations:
         one:  "Has the following {{count}} relation:"
         other: "Has the following {{count}} relations:"
-    common_details: 
+    common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       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:"
       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
@@ -162,6 +180,13 @@ en:
         way: way
         relation: relation
         changeset: changeset
         way: way
         relation: relation
         changeset: changeset
+    timeout:
+      sorry: "Sorry, the data for the {{type}} with the id {{id}}, took too long to retrieve."
+      type:
+        node: node
+        way: way
+        relation: relation
+        changeset: changeset
     paging_nav:
       showing_page: "Showing page"
       of: "of"
     paging_nav:
       showing_page: "Showing page"
       of: "of"
@@ -196,6 +221,8 @@ en:
       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"
       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."
       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}})"
       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."
       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}})"
@@ -227,6 +254,10 @@ en:
             # 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:"
+      wiki_link:
+        key: "The wiki description page for the {{key}} tag"
+        tag: "The wiki description page for the {{key}}={{value}} tag"
+      wikipedia_link: "The {{page}} article on Wikipedia"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
@@ -247,7 +278,7 @@ en:
       view_history: "view history"
       edit: "edit"
   changeset:
       view_history: "view history"
       edit: "edit"
   changeset:
-    changeset_paging_nav: 
+    changeset_paging_nav:
       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"
       showing_page: "Showing page {{page}}"
       next: "Next »"
       previous: "« Previous"
@@ -281,6 +312,8 @@ en:
       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}}"
+    timeout:
+      sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     new:
       title: New Diary Entry
   diary_entry:
     new:
       title: New Diary Entry
@@ -306,7 +339,7 @@ en:
       save_button: "Save"
       marker_text: Diary entry location
     view:
       save_button: "Save"
       marker_text: Diary entry location
     view:
-      title: "Users' diaries | {{user}}"
+      title: "{{user}}'s diary | {{title}}"
       user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment: "{{login_link}} to leave a comment"
       user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment: "{{login_link}} to leave a comment"
@@ -321,7 +354,7 @@ 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."
     diary_entry:
       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}} at {{created}} in {{language_link}}"
+      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:
       comment_link: Comment on this entry
       reply_link: Reply to this entry
       comment_count:
@@ -331,9 +364,13 @@ en:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
       hide_link: Hide this entry
       confirm: Confirm
     diary_comment:
-      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+      comment_from: "Comment from {{link_user}} on {{comment_created_at}}"
       hide_link: Hide this comment
       confirm: Confirm
       hide_link: Hide this comment
       confirm: Confirm
+    location:
+      location: "Location:"
+      view: "View"
+      edit: "Edit"
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
@@ -355,6 +392,9 @@ en:
       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>.'
       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>.'
+      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."
       options: "Options"
       format: "Format"
       scale: "Scale"
       options: "Options"
       format: "Format"
       scale: "Scale"
@@ -391,30 +431,442 @@ en:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
     search_osm_nominatim:
-      prefix
+      prefix_format: "{{name}}"
+      prefix:
+        amenity:
+          airport: "Airport"
+          arts_centre: "Arts Centre"
+          atm: "ATM"
+          auditorium: "Auditorium"
+          bank: "Bank"
+          bar: "Bar"
+          bench: "Bench"
+          bicycle_parking: "Cycle Parking"
+          bicycle_rental: "Cycle Rental"
+          brothel: "Brothel"
+          bureau_de_change: "Bureau de Change"
+          bus_station: "Bus Station"
+          cafe: "Cafe"
+          car_rental: "Car Rental"
+          car_sharing: "Car Sharing"
+          car_wash: "Car Wash"
+          casino: "Casino"
+          cinema: "Cinema"
+          clinic: "Clinic"
+          club: "Club"
+          college: "College"
+          community_centre: "Community Centre"
+          courthouse: "Courthouse"
+          crematorium: "Crematorium"
+          dentist: "Dentist"
+          doctors: "Doctors"
+          dormitory: "Dormitory"
+          drinking_water: "Drinking Water"
+          driving_school: "Driving School"
+          embassy: "Embassy"
+          emergency_phone: "Emergency Phone"
+          fast_food: "Fast Food"
+          ferry_terminal: "Ferry Terminal"
+          fire_hydrant: "Fire Hydrant"
+          fire_station: "Fire Station"
+          fountain: "Fountain"
+          fuel: "Fuel"
+          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"
+          nightclub: "Night Club"
+          nursery: "Nursery"
+          nursing_home: "Nursing Home"
+          office: "Office"
+          park: "Park"
+          parking: "Parking"
+          pharmacy: "Pharmacy"
+          place_of_worship: "Place of Worship"
+          police: "Police"
+          post_box: "Post Box"
+          post_office: "Post Office"
+          preschool: "Pre-School"
+          prison: "Prison"
+          pub: "Pub"
+          public_building: "Public Building"
+          public_market: "Public Market"
+          reception_area: "Reception Area"
+          recycling: "Recycling Point"
+          restaurant: "Restaurant"
+          retirement_home: "Retirement Home"
+          sauna: "Sauna"
+          school: "School"
+          shelter: "Shelter"
+          shop: "Shop"
+          shopping: "Shopping"
+          social_club: "Social Club"
+          studio: "Studio"
+          supermarket: "Supermarket"
+          taxi: "Taxi"
+          telephone: "Public Telephone"
+          theatre: "Theatre"
+          toilets: "Toilets"
+          townhall: "Town Hall"
+          university: "University"
+          vending_machine: "Vending Machine"
+          veterinary: "Veterinary Surgery"
+          village_hall: "Village Hall"
+          waste_basket: "Waste Basket"
+          wifi: "WiFi Access"
+          youth_centre: "Youth Centre"
+        boundary:
+          administrative: "Administrative Boundary"
+        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"
         highway:
         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"
+          emergency_access_point: "Emergency Access Point"
+          footway: "Footpath"
+          ford: "Ford"
+          gate: "Gate"
+          living_street: "Living Street"
+          minor: "Minor Road"
           motorway: "Motorway"
           motorway: "Motorway"
-          trunk: "Trunk road"
-          primary: "Primary road"
-          secondary: "Secondary road"
-          tertiary: "Tertiary road"
-          unclassified: "Unclassified road"
-          residential: "Residential road"
+          motorway_junction: "Motorway Junction"
+          motorway_link: "Motorway Road"
+          path: "Path"
+          pedestrian: "Pedestrian Way"
+          platform: "Platform"
+          primary: "Primary Road"
+          primary_link: "Primary Road"
+          raceway: "Raceway"
+          residential: "Residential"
+          road: "Road"
+          secondary: "Secondary Road"
+          secondary_link: "Secondary Road"
+          service: "Service Road"
+          services: "Motorway Services"
+          steps: "Steps"
+          stile: "Stile"
+          tertiary: "Tertiary Road"
           track: "Track"
           track: "Track"
-          footway: "Footpath"
-          cycleway: "Cycle path"
-          bridleway: "Bridleway"
-        place:             
+          trail: "Trail"
+          trunk: "Trunk Road"
+          trunk_link: "Trunk Road"
+          unclassified: "Unclassified Road"
+          unsurfaced: "Unsurfaced Road"
+        historic:
+          archaeological_site: "Archaeological Site"
+          battlefield: "Battlefield"
+          boundary_stone: "Boundary Stone"
+          building: "Building"
+          castle: "Castle"
+          church: "Church"
+          house: "House"
+          icon: "Icon"
+          manor: "Manor"
+          memorial: "Memorial"
+          mine: "Mine"
+          monument: "Monument"
+          museum: "Museum"
+          ruins: "Ruins"
+          tower: "Tower"
+          wayside_cross: "Wayside Cross"
+          wayside_shrine: "Wayside Shrine"
+          wreck: "Wreck"
+        landuse:
+          allotments: "Allotments"
+          basin: "Basin"
+          brownfield: "Brownfield Land"
+          cemetery: "Cemetery"
+          commercial: "Commercial Area"
+          conservation: "Conservation"
+          construction: "Construction"
+          farm: "Farm"
+          farmland: "Farmland"
+          farmyard: "Farmyard"
+          forest: "Forest"
+          grass: "Grass"
+          greenfield: "Greenfield Land"
+          industrial: "Industrial Area"
+          landfill: "Landfill"
+          meadow: "Meadow"
+          military: "Military Area"
+          mine: "Mine"
+          mountain: "Mountain"
+          nature_reserve: "Nature Reserve"
+          park: "Park"
+          piste: "Piste"
+          plaza: "Plaza"
+          quarry: "Quarry"
+          railway: "Railway"
+          recreation_ground: "Recreation Ground"
+          reservoir: "Reservoir"
+          residential: "Residential Area"
+          retail: "Retail"
+          village_green: "Village Green"
+          vineyard: "Vineyard"
+          wetland: "Wetland"
+          wood: "Wood"
+        leisure:
+          beach_resort: "Beach Resort"
+          common: "Common Land"
+          fishing: "Fishing Area"
+          garden: "Garden"
+          golf_course: "Golf Course"
+          ice_rink: "Ice Rink"
+          marina: "Marina"
+          miniature_golf: "Miniature Golf"
+          nature_reserve: "Nature Reserve"
+          park: "Park"
+          pitch: "Sports Pitch"
+          playground: "Playground"
+          recreation_ground: "Recreation Ground"
+          slipway: "Slipway"
+          sports_centre: "Sports Centre"
+          stadium: "Stadium"
+          swimming_pool: "Swimming Pool"
+          track: "Running Track"
+          water_park: "Water Park"
+        natural:
+          bay: "Bay"
+          beach: "Beach"
+          cape: "Cape"
+          cave_entrance: "Cave Entrance"
+          channel: "Channel"
+          cliff: "Cliff"
+          coastline: "Coastline"
+          crater: "Crater"
+          feature: "Feature"
+          fell: "Fell"
+          fjord: "Fjord"
+          geyser: "Geyser"
+          glacier: "Glacier"
+          heath: "Heath"
+          hill: "Hill"
+          island: "Island"
+          land: "Land"
+          marsh: "Marsh"
+          moor: "Moor"
+          mud: "Mud"
+          peak: "Peak"
+          point: "Point"
+          reef: "Reef"
+          ridge: "Ridge"
+          river: "River"
+          rock: "Rock"
+          scree: "Scree"
+          scrub: "Scrub"
+          shoal: "Shoal"
+          spring: "Spring"
+          strait: "Strait"
+          tree: "Tree"
+          valley: "Valley"
+          volcano: "Volcano"
+          water: "Water"
+          wetland: "Wetland"
+          wetlands: "Wetlands"
+          wood: "Wood"
+        place:
+          airport: "Airport"
           city: "City"
           city: "City"
-          town: "Town"
+          country: "Country"
+          county: "County"
+          farm: "Farm"
+          hamlet: "Hamlet"
+          house: "House"
+          houses: "Houses"
+          island: "Island"
+          islet: "Islet"
+          locality: "Locality"
+          moor: "Moor"
+          municipality: "Municipality"
+          postcode: "Postcode"
+          region: "Region"
+          sea: "Sea"
+          state: "State"
+          subdivision: "Subdivision"
           suburb: "Suburb"
           suburb: "Suburb"
+          town: "Town"
+          unincorporated_area: "Unincorporated Area"
           village: "Village"
           village: "Village"
-          hamlet: "Hamlet"
         railway:
         railway:
-          station: "Station"
-        amenity:
-          bus_stop: "Bus stop"
-          pub: "Pub"
+          abandoned: "Abandoned Railway"
+          construction: "Railway under Construction"
+          disused: "Disused Railway"
+          disused_station: "Disused Railway Station"
+          funicular: "Funicular Railway"
+          halt: "Train Stop"
+          historic_station: "Historic Railway Station"
+          junction: "Railway Junction"
+          level_crossing: "Level Crossing"
+          light_rail: "Light Rail"
+          monorail: "Monorail"
+          narrow_gauge: "Narrow Gauge Railway"
+          platform: "Railway Platform"
+          preserved: "Preserved Railway"
+          spur: "Railway Spur"
+          station: "Railway Station"
+          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"
+          art: "Art Shop"
+          bakery: "Bakery"
+          beauty: "Beauty Shop"
+          beverages: "Beverages Shop"
+          bicycle: "Bicycle Shop"
+          books: "Book Shop"
+          butcher: "Butcher"
+          car: "Car Shop"
+          car_dealer: "Car Dealer"
+          car_parts: "Car Parts"
+          carpet: "Carpet Shop"
+          car_repair: "Car Repair"
+          charity: "Charity Shop"
+          chemist: "Chemist"
+          clothes: "Clothes Shop"
+          computer: "Computer Shop"
+          confectionery: "Confectionery Shop"
+          convenience: "Convenience Store"
+          copyshop: "Copy Shop"
+          cosmetics: "Cosmetics Shop"
+          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"
+          farm: "Farm Shop"
+          fashion: "Fashion Shop"
+          fish: "Fish Shop"
+          florist: "Florist"
+          food: "Food Shop"
+          funeral_directors: "Funeral Directors"
+          furniture: "Furniture"
+          gallery: "Gallery"
+          garden_centre: "Garden Centre"
+          general: "General Store"
+          gift: "Gift Shop"
+          greengrocer: "Greengrocer"
+          grocery: "Grocery Shop"
+          hairdresser: "Hairdresser"
+          hardware: "Hardware Store"
+          hifi: "Hi-Fi"
+          insurance: "Insurance"
+          jewelry: "Jewelry Shop"
+          kiosk: "Kiosk Shop"
+          laundry: "Laundry"
+          mall: "Mall"
+          market: "Market"
+          mobile_phone: "Mobile Phone Shop"
+          motorcycle: "Motorcycle Shop"
+          music: "Music Shop"
+          newsagent: "Newsagent"
+          optician: "Optician"
+          organic: "Organic Food Shop"
+          outdoor: "Outdoor Shop"
+          pet: "Pet Shop"
+          photo: "Photo Shop"
+          salon: "Salon"
+          shoes: "Shoe Shop"
+          shopping_centre: "Shopping Centre"
+          sports: "Sports Shop"
+          stationery: "Stationery Shop"
+          supermarket: "Supermarket"
+          toys: "Toy Shop"
+          travel_agency: "Travel Agency"
+          video: "Video Shop"
+          wine: "Off License"
+        tourism:
+          alpine_hut: "Alpine Hut"
+          artwork: "Artwork"
+          attraction: "Attraction"
+          bed_and_breakfast: "Bed and Breakfast"
+          cabin: "Cabin"
+          camp_site: "Camp Site"
+          caravan_site: "Caravan Site"
+          chalet: "Chalet"
+          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"
+        waterway:
+          boatyard: "Boatyard"
+          canal: "Canal"
+          connector: "Waterway Connector"
+          dam: "Dam"
+          derelict_canal: "Derelict Canal"
+          ditch: "Ditch"
+          dock: "Dock"
+          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"
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
@@ -428,6 +880,7 @@ en:
       prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
       prefix: "{{distance}} {{direction}} of {{type}}"
     results:
       no_results: "No results found"
+      more_results: "More results"
     distance:
       zero: "less than 1km"
       one: "about 1km"
     distance:
       zero: "less than 1km"
       one: "about 1km"
@@ -465,42 +918,166 @@ en:
     sign_up: sign up
     sign_up_tooltip: Create an account for editing
     view: View
     sign_up: sign up
     sign_up_tooltip: Create an account for editing
     view: View
-    view_tooltip: View maps
+    view_tooltip: View the map
     edit: Edit
     edit: Edit
-    edit_tooltip: Edit maps
     history: History
     history: History
-    history_tooltip: Changeset history
     export: Export
     export_tooltip: Export map data
     gps_traces: GPS Traces
     export: Export
     export_tooltip: Export map data
     gps_traces: GPS Traces
-    gps_traces_tooltip: Manage traces
+    gps_traces_tooltip: Manage GPS traces
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
     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."
     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 the {{ucl}} and {{bytemark}}."
+    intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}."
     intro_3_ucl: "UCL VR Centre"
     intro_3_bytemark: "bytemark"
     intro_3_ucl: "UCL VR Centre"
     intro_3_bytemark: "bytemark"
+    intro_3_partners: "wiki"
+    intro_3_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
     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_wiki: "Help &amp; Wiki"
-    help_wiki_tooltip: "Help &amp; Wiki site for the project"
-    help_wiki_url: "http://wiki.openstreetmap.org"
-    news_blog: "News blog"
-    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."
-    shop: Shop
-    shop_tooltip: Shop with branded OpenStreetMap merchandise
-    shop_url: http://wiki.openstreetmap.org/wiki/Merchandise
-    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
+    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"
+    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
     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
+
+  license_page:
+    foreign:
+      title: About this translation
+      text: In the event of a conflict between this translated page and {{english_original_link}}, the English page shall take precedence
+      english_link: the English original
+    native:
+      title: About this page
+      text: You are viewing the English version of the copyright page. You can go back to the {{native_link}} of this page or you can stop reading about copyright and {{mapping_link}}.
+      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
+        may distribute the result only under the same licence. The
+        full <a
+        href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">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
+        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>
+        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>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>
+        Inclusion of data in OpenStreetMap does not imply that the original
+        data provider endorses OpenStreetMap, provides any warranty, or
+        accepts any liability.
+      </p>
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
@@ -508,7 +1085,7 @@ en:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
-      subject: "[OpenStreetMap] {{user}} sent you a new message"
+      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}}"
       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}}"
@@ -516,7 +1093,8 @@ en:
     friend_notification:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
     friend_notification:
       subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
-      see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+      see_their_profile: "You can see their profile at {{userurl}}."
+      befriend_them: "You can also add them as a friend at {{befriendurl}}."
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"
     gpx_notification:
       greeting: "Hi,"
       your_gpx_file: "It looks like your GPX file"
@@ -546,6 +1124,7 @@ en:
       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:"
       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
       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
@@ -562,6 +1141,7 @@ en:
       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!
       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>.'
       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>.'
@@ -597,7 +1177,7 @@ en:
       subject: "Subject"
       date: "Date"
       no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       subject: "Subject"
       date: "Date"
       no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      people_mapping_nearby: "people mapping nearby"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
@@ -613,10 +1193,14 @@ en:
       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:
       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 or message"
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
-    outbox: 
+      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"
+      body: "Sorry there is no message with that id."
+    outbox:
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
@@ -627,6 +1211,8 @@ en:
       date: "Date"
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"
       date: "Date"
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"
+    reply:
+      wrong_user: "You are logged in as `{{user}}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"
     read:
       title: "Read message"
       reading_your_messages: "Reading your messages"
@@ -639,6 +1225,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."
     sent_message_summary:
       delete_button: "Delete"
     mark:
     sent_message_summary:
       delete_button: "Delete"
     mark:
@@ -659,6 +1246,7 @@ en:
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
         license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
+      remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled"
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
     edit:
       not_public: "You have not set your edits to be public."
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
@@ -668,6 +1256,9 @@ en:
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       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.)"
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
       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.)"
+      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close
@@ -678,10 +1269,9 @@ en:
       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:
       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: "Map key for the mapnik rendering at this zoom level"
+      map_key: "Map Key"
+      map_key_tooltip: "Key for the map"
       table:
       table:
-        heading: "Legend for z{{zoom_level}}"
         entry:
           motorway: "Motorway"
           trunk: "Trunk road"
         entry:
           motorway: "Motorway"
           trunk: "Trunk road"
@@ -761,7 +1351,7 @@ en:
       heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"
       heading: "Editing trace {{name}}"
       filename: "Filename:"
       download: "download"
-      uploaded_at: "Uploaded at:"
+      uploaded_at: "Uploaded:"
       points: "Points:"
       start_coord: "Start coordinate:"
       map: "map"
       points: "Points:"
       start_coord: "Start coordinate:"
       map: "map"
@@ -790,7 +1380,8 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
+      your_traces: "See just your traces"
+      upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       see_your_traces: "See all 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."
       see_all_traces: "See all traces"
       see_your_traces: "See all 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."
@@ -802,7 +1393,7 @@ en:
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
       pending: "PENDING"
       filename: "Filename:"
       download: "download"
-      uploaded: "Uploaded at:"
+      uploaded: "Uploaded:"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       map: "map"
       points: "Points:"
       start_coordinates: "Start coordinate:"
       map: "map"
@@ -816,8 +1407,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: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next &raquo;"
+      previous: "&laquo; Previous"
     trace:
       pending: "PENDING"
       count_points: "{{count}} points"
     trace:
       pending: "PENDING"
       count_points: "{{count}} points"
@@ -828,7 +1420,9 @@ en:
       edit: "edit"
       edit_map: "Edit Map"
       public: "PUBLIC"
       edit: "edit"
       edit_map: "Edit Map"
       public: "PUBLIC"
+      identifiable: "IDENTIFIABLE"
       private: "PRIVATE"
       private: "PRIVATE"
+      trackable: "TRACKABLE"
       by: "by"
       in: "in"
       map: "map"
       by: "by"
       in: "in"
       map: "map"
@@ -841,11 +1435,17 @@ en:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
       made_public: "Trace made public"
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
       made_public: "Trace made public"
+    offline_warning:
+      message: "The GPX file upload system is currently unavailable"
+    offline:
+      heading: "GPX Storage Offline"
+      message: "The GPX file storage and upload system is currently unavailable."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     setup_user_auth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     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:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
   oauth:
     oauthorize:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -905,7 +1505,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
-    not_found: 
+    not_found:
       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"
       sorry: "Sorry, that {{type}} could not be found."
     create:
       flash: "Registered the information successfully"
@@ -921,10 +1521,23 @@ en:
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
       create_account: "create an account"
       email or username: "Email Address or Username:"
       password: "Password:"
+      remember: "Remember me:"
       lost password link: "Lost your password?"
       login_button: "Login"
       lost password link: "Lost your password?"
       login_button: "Login"
-      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
+      register now: Register now
+      already have: Already have an OpenStreetMap account? Please 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.
+      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
       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>)"
+    logout:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
@@ -947,7 +1560,7 @@ en:
       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."
       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."
-      license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
+      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:"
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
@@ -955,8 +1568,27 @@ en:
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
-      signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<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."
+      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."
+      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."
+      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
+      agree: Agree
+      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_names:
+        france: "France"
+        italy: "Italy"
+        rest_of_world: "Rest of the world"
     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"
     no_such_user:
       title: "No such user"
       heading: "The user {{user}} does not exist"
@@ -967,6 +1599,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
+      oauth settings: oauth settings
       blocks on me: blocks on me
       blocks by me: blocks by me
       send message: send message
       blocks on me: blocks on me
       blocks by me: blocks by me
       send message: send message
@@ -977,25 +1610,21 @@ en:
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
       add as friend: add as friend
       mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} ago)"
+      latest edit: "Latest edit {{ago}}:"
       email address: "Email address:"
       created from: "Created from:"
       email address: "Email address:"
       created from: "Created from:"
-      user image heading: User image
-      delete image: Delete Image
-      upload an image: Upload an image
-      add image: Add Image
+      status: "Status:"
+      spam score: "Spam Score:"
       description: Description
       user location: User location
       description: Description
       user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
+      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."
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
       m away: "{{count}}m away"
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
       m away: "{{count}}m away"
-      nearby users: "Nearby users:"
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
-      my_oauth_details: "View my OAuth details"
+      nearby users: "Other nearby users"
+      no nearby users: "There are no other users who admit to mapping nearby yet."
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
@@ -1010,16 +1639,20 @@ en:
       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"
+      confirm_user: "confirm this user"
       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       hide_user: "hide this user"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
-    friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: [[nearby_user]]"
+    popup:
+      your location: "Your location"
+      nearby mapper: "Nearby mapper"
+      friend: "Friend"
     account:
       title: "Edit account"
       my settings: My settings
     account:
       title: "Edit account"
       my settings: My settings
+      current email address: "Current Email Address:"
+      new email address: "New Email Address:"
       email never displayed publicly: "(never displayed publicly)"
       public editing:
         heading: "Public editing:"
       email never displayed publicly: "(never displayed publicly)"
       public editing:
         heading: "Public editing:"
@@ -1031,8 +1664,23 @@ en:
       public editing note:
         heading: "Public editing"
         text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       public editing note:
         heading: "Public editing"
         text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
+      contributor terms:
+        heading: "Contributor Terms:"
+        agreed: "You have agreed to the new Contributor Terms."
+        not yet agreed: "You have not yet agreed to the new Contributor Terms."
+        review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
+        agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
+        link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms"
+        link text: "what is this?"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
+      preferred editor: "Preferred Editor:"
+      image: "Image:"
+      new image: "Add an image"
+      keep image: "Keep the current image"
+      delete image: "Remove the current image"
+      replace image: "Replace the current image"
+      image size hint: "(square images at least 100x100 work best)"
       home location: "Home Location:"
       no home location: "You have not entered your home location."
       latitude: "Latitude:"
       home location: "Home Location:"
       no home location: "You have not entered your home location."
       latitude: "Latitude:"
@@ -1048,7 +1696,13 @@ en:
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
-      failure: "A user account with this token has already been confirmed."
+      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>."
+    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."
     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
     confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
@@ -1068,6 +1722,30 @@ en:
       not_a_friend: "{{name}} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "{{name}} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
+    list:
+      title: Users
+      heading: Users
+      showing:
+        one: Showing page {{page}} ({{first_item}} of {{items}})
+        other: Showing 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
+      hide: Hide Selected Users
+      empty: No matching users found
+    suspended:
+      title: Account Suspended
+      heading: Account Suspended
+      webmaster: webmaster
+      body: |
+        <p>
+          Sorry, your account has been automatically suspended due to
+          suspicious activity.
+        </p>
+        <p>
+          This decision will be reviewed by an administrator shortly, or
+          you may contact the {{webmaster}} if you wish to discuss this.
+        </p>
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -1185,5 +1863,9 @@ en:
       overlays:
         maplint: Maplint
     site:
       overlays:
         maplint: Maplint
     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
       edit_zoom_alert: You must zoom in to edit the map
-      history_zoom_alert: You must zoom in to see the editing history
+      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