Fixed a link to the openID wiki page

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 84df13c9bd812f865dea9560e42ab9a0642323cd..6479895d6a028b4bbf346afcfcb47c15250d6296 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -91,6 +91,13 @@ en:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
     changeset_navigation:
         title: "Changeset {{id}}"
         title_comment: "Changeset {{id}} - {{comment}}"
     changeset_navigation:

+      paging:
+        user:
+          prev: "« {{id}}"
+          next: "{{id}} »"
+        all:
+          prev: "« {{id}}"
+          next: "{{id}} »"

       user:
         name_tooltip: "View edits by {{user}}"
         prev_tooltip: "Previous edit by {{user}}"
       user:
         name_tooltip: "View edits by {{user}}"
         prev_tooltip: "Previous edit by {{user}}"


@@ -155,6 +162,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"


@@ -205,19 +219,19 @@ en:
         type:
           node: "Node"
           way: "Way"
         type:
           node: "Node"
           way: "Way"

-          # There's no 'relation' type because it isn't represented in OpenLayers
+          # There is no 'relation' type because it is not represented in OpenLayers

         api: "Retrieve this area from the API"
         details: "Details"
         selected:
           type:
             node: "Node [[id]]"
             way: "Way [[id]]"
         api: "Retrieve this area from the API"
         details: "Details"
         selected:
           type:
             node: "Node [[id]]"
             way: "Way [[id]]"

-            # There's no 'relation' type because it isn't represented in OpenLayers
+            # There is no 'relation' type because it is not represented in OpenLayers

         history:
           type:
             node: "Node [[id]]"
             way: "Way [[id]]"
         history:
           type:
             node: "Node [[id]]"
             way: "Way [[id]]"

-            # There's no 'relation' type because it isn't represented in OpenLayers
+            # There is no 'relation' type because it is not represented in OpenLayers

     tag_details:
       tags: "Tags:"
     way_details:
     tag_details:
       tags: "Tags:"
     way_details:


@@ -241,8 +255,9 @@ en:
       edit: "edit"
   changeset:
     changeset_paging_nav: 
       edit: "edit"
   changeset:
     changeset_paging_nav: 

-      showing_page: "Showing page"
-      of: "of"
+      showing_page: "Showing page {{page}}"
+      next: "Next »"
+      previous: "« Previous"

     changeset:
       id: "#{{id}}"
       still_editing: "(still editing)"
     changeset:
       id: "#{{id}}"
       still_editing: "(still editing)"


@@ -320,8 +335,12 @@ en:
         one: 1 comment
         other: "{{count}} comments"
       edit_link: Edit this entry
         one: 1 comment
         other: "{{count}} comments"
       edit_link: Edit this entry

+      hide_link: Hide this entry
+      confirm: Confirm

     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"

+      hide_link: Hide this comment
+      confirm: Confirm

     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"
     feed:
       user:
         title: "OpenStreetMap diary entries for {{user}}"


@@ -371,19 +390,453 @@ en:
         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>'
         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_twain: 'Results from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</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}}"
         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_twain:
-      prefix_highway: "{{type}} road"
-      prefix_other: "{{type}}"
+    search_osm_nominatim:
+      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:
+          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_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"
+          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"
+          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"
+          town: "Town"
+          unincorporated_area: "Unincorporated Area"
+          village: "Village"
+        railway:
+          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>'

+        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
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities


@@ -393,6 +846,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"


@@ -421,7 +875,7 @@ en:
     inbox: "inbox ({{count}})"
     inbox_tooltip:
       zero: Your inbox contains no unread messages
     inbox: "inbox ({{count}})"
     inbox_tooltip:
       zero: Your inbox contains no unread messages

-      one: Your inbox contians 1 unread message
+      one: Your inbox contains 1 unread message

       other: Your inbox contains {{count}} unread messages
     logout: logout
     logout_tooltip: "Log out"
       other: Your inbox contains {{count}} unread messages
     logout: logout
     logout_tooltip: "Log out"


@@ -469,15 +923,11 @@ en:
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] {{user}} commented on your diary entry"

-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"

       hi: "Hi {{to_user}},"
       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"
       hi: "Hi {{to_user}},"
       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"

-      banner1: "*                   Please do not reply to this email.                    *"
-      banner2: "*                Use the OpenStreetMap web site to reply.                 *"

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


@@ -494,7 +944,7 @@ en:
       and_no_tags: "and no tags."
       failure:
         subject: "[OpenStreetMap] GPX Import failure"
       and_no_tags: "and no tags."
       failure:
         subject: "[OpenStreetMap] GPX Import failure"

-        failed_to_import: "failed to import. Here's the error:"
+        failed_to_import: "failed to import. Here is the error:"

         more_info_1: "More information about GPX import failures and how to avoid"
         more_info_2: "them can be found at:"
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
         more_info_1: "More information about GPX import failures and how to avoid"
         more_info_2: "them can be found at:"
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"


@@ -513,7 +963,8 @@ en:
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
       the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
       the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"

-      opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
+      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:"

       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


@@ -529,7 +980,7 @@ en:
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"
       video_to_openstreetmap: "introductory video to OpenStreetMap"
       more_videos: "There are {{more_videos_link}}."
       more_videos_here: "more videos here"

-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</a> or <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
+      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!

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


@@ -579,6 +1030,7 @@ en:
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
       send_button: "Send"
       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 or message"
       heading: "No such user or message"
     no_such_user:
       title: "No such user or message"
       heading: "No such user or message"


@@ -615,7 +1067,7 @@ en:
       deleted: "Message deleted"
   site:
     index:
       deleted: "Message deleted"
   site:
     index:

-      js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript."
+      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
       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


@@ -627,7 +1079,7 @@ en:
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
     edit:
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
     edit:

-      not_public: "You haven't set your edits to be public."
+      not_public: "You have not set your edits to be public."

       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
       user_page_link: user page
       anon_edits: "({{link}})"
       not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
       user_page_link: user page
       anon_edits: "({{link}})"


@@ -641,6 +1093,7 @@ en:
     search:
       search: Search
       where_am_i: "Where am I?"
     search:
       search: Search
       where_am_i: "Where am I?"

+      where_am_i_title: Describe the current location using the search engine

       submit_text: "Go"
       search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
     key:
       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:


@@ -777,13 +1230,14 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
       description: "Description:"
       tags: "Tags:"
       none: "None"

-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
+      edit_track: "Edit this trace"
+      delete_track: "Delete this trace"

       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"


@@ -794,7 +1248,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"


@@ -804,9 +1260,14 @@ en:
       public_traces_from: "Public GPS traces from {{user}}"
       tagged_with: " tagged with {{tags}}"
     delete:
       public_traces_from: "Public GPS traces from {{user}}"
       tagged_with: " tagged with {{tags}}"
     delete:

-      scheduled_for_deletion: "Track scheduled for deletion"
+      scheduled_for_deletion: "Trace scheduled for deletion"

     make_public:
     make_public:

-      made_public: "Track made 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."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."


@@ -838,7 +1299,7 @@ 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"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       edit: "Edit Details"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."


@@ -887,18 +1348,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:"

+      openid: "OpenID:"
+      openid description: "Use your OpenID to login"
+      alternatively: "Alternatively"

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

-      auth failure: "Sorry, couldn't log in with those details."
+      auth failure: "Sorry, could not log in with those details."
+      openid missing provider: "Sorry, could not contact your OpenID provider"
+      openid invalid: "Sorry, your OpenID seems misformed"

     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
     lost_password:
       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"

-      help_text: "Enter the email address you used to sign up, we'll send a link to it that you can use to reset your password."
+      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."

       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."

-      notice email cannot find: "Couldn't find that email address, sorry."
+      notice email cannot find: "Could not find that email address, sorry."

     reset_password:
       title: "Reset password"
       heading: "Reset Password for {{user}}"
     reset_password:
       title: "Reset password"
       heading: "Reset Password for {{user}}"


@@ -906,13 +1372,13 @@ en:
       confirm password: "Confirm Password:"
       reset: "Reset Password"
       flash changed: "Your password has been changed."
       confirm password: "Confirm Password:"
       reset: "Reset Password"
       flash changed: "Your password has been changed."

-      flash token bad: "Didn't find that token, check the URL maybe?"
+      flash token bad: "Did not find that token, check the URL maybe?"

     new:
       title: "Create account"
       heading: "Create a User 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.'
     new:
       title: "Create account"
       heading: "Create a User 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'll send you a quick email to activate your account."
+      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>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       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>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"


@@ -921,8 +1387,10 @@ 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:"

+      openID: "OpenID:"
+      openID description: '(Optional) If you have an <a href="http://wiki.openstreetmap.org/wiki/openID">OpenID</a> you can associate it with this account to login'

       signup: Signup
       signup: Signup

-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)<br /><br />Please note that you won't 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."
+      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."

     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"


@@ -987,13 +1455,20 @@ en:
       title: "Edit account"
       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"
       title: "Edit account"
       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"

+      openid:
+        openid: "OpenID:"
+        link: "http://wiki.openstreetmap.org/wiki/OpenID"
+        link text: "what is this?"

       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
       public editing:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"

-        enabled link text: "what's this?"
+        enabled link text: "what is this?"

         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"

+      public editing note:
+        heading: "Public editing"
+        text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"http://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"

       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
       home location: "Home Location:"
       profile description: "Profile Description:"
       preferred languages: "Preferred Languages:"
       home location: "Home Location:"


@@ -1034,7 +1509,7 @@ en:
   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."

-      not_a_role: "The string `{{role}}' isn't a valid role."
+      not_a_role: "The string `{{role}}' is not a valid role."

       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:
       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:


@@ -1042,13 +1517,13 @@ en:
       heading: Confirm role granting
       are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
       confirm: "Confirm"
       heading: Confirm role granting
       are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
       confirm: "Confirm"

-      fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
+      fail: "Could not grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."

     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking
       are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
       confirm: "Confirm"
     revoke:
       title: Confirm role revoking
       heading: Confirm role revoking
       are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
       confirm: "Confirm"

-      fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
+      fail: "Could not revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."

   user_block:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
   user_block:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."