Merge branch 'wikilinks'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index aeb0ad5092c34af32824a7869e30c852636188ef..7b9720fbdcbb1c469b7e6ac742d5b303dfd69384 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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,6 @@ 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:"

   browse:
     changeset:
       title: "Changeset"
   browse:
     changeset:
       title: "Changeset"


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


@@ -227,6 +233,9 @@ 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"

     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"


@@ -306,7 +315,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 +330,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 +340,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 +368,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"


@@ -400,10 +416,10 @@ en:
           bank: "Bank"
           bar: "Bar"
           bench: "Bench"
           bank: "Bank"
           bar: "Bar"
           bench: "Bench"

-          bicycle_parking: "Bicycle Parking"
-          bicycle_rental: "Bicycle Rental"
+          bicycle_parking: "Cycle Parking"
+          bicycle_rental: "Cycle Rental"

           brothel: "Brothel"
           brothel: "Brothel"

-          bureau_de_change: "Bureau De Change"
+          bureau_de_change: "Bureau de Change"

           bus_station: "Bus Station"
           cafe: "Cafe"
           car_rental: "Car Rental"
           bus_station: "Bus Station"
           cafe: "Cafe"
           car_rental: "Car Rental"


@@ -450,7 +466,7 @@ en:
           park: "Park"
           parking: "Parking"
           pharmacy: "Pharmacy"
           park: "Park"
           parking: "Parking"
           pharmacy: "Pharmacy"

-          place_of_worship: "Place Of Worship"
+          place_of_worship: "Place of Worship"

           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"
           police: "Police"
           post_box: "Post Box"
           post_office: "Post Office"


@@ -472,16 +488,16 @@ en:
           studio: "Studio"
           supermarket: "Supermarket"
           taxi: "Taxi"
           studio: "Studio"
           supermarket: "Supermarket"
           taxi: "Taxi"

-          telephone: "Telephone"
+          telephone: "Public Telephone"

           theatre: "Theatre"
           toilets: "Toilets"
           townhall: "Town Hall"
           university: "University"
           vending_machine: "Vending Machine"
           theatre: "Theatre"
           toilets: "Toilets"
           townhall: "Town Hall"
           university: "University"
           vending_machine: "Vending Machine"

-          veterinary: "Veterinary"
+          veterinary: "Veterinary Surgery"

           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"

-          wifi: "WiFi"
+          wifi: "WiFi Access"

           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"


@@ -514,14 +530,15 @@ en:
           store: "Store"
           terrace: "Terrace"
           tower: "Tower"
           store: "Store"
           terrace: "Terrace"
           tower: "Tower"

-          train_station: "Train Station"
+          train_station: "Railway Station"

           university: "University Building"
           university: "University Building"

+          yes: "Building"

         highway:
           bridleway: "Bridleway"
         highway:
           bridleway: "Bridleway"

-          bus_guideway: "Bus Guideway"
+          bus_guideway: "Guided Bus Lane"

           bus_stop: "Bus Stop"
           byway: "Byway"
           bus_stop: "Bus Stop"
           byway: "Byway"

-          construction: "Highway Construction"
+          construction: "Highway under Construction"

           cycleway: "Cycle Path"
           distance_marker: "Distance Marker"
           emergency_access_point: "Emergency Access Point"
           cycleway: "Cycle Path"
           distance_marker: "Distance Marker"
           emergency_access_point: "Emergency Access Point"


@@ -532,17 +549,17 @@ en:
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           minor: "Minor Road"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"

-          motorway_link: "Motorway Link"
+          motorway_link: "Motorway Road"

           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
           primary: "Primary Road"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
           primary: "Primary Road"

-          primary_link: "Primary Link Road"
+          primary_link: "Primary Road"

           raceway: "Raceway"
           residential: "Residential"
           road: "Road"
           secondary: "Secondary Road"
           raceway: "Raceway"
           residential: "Residential"
           road: "Road"
           secondary: "Secondary Road"

-          secondary_link: "Secondary Link Road"
+          secondary_link: "Secondary Road"

           service: "Service Road"
           services: "Motorway Services"
           steps: "Steps"
           service: "Service Road"
           services: "Motorway Services"
           steps: "Steps"


@@ -551,10 +568,10 @@ en:
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"
           track: "Track"
           trail: "Trail"
           trunk: "Trunk Road"

-          trunk_link: "Trunk Link Road"
+          trunk_link: "Trunk Road"

           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"
           unclassified: "Unclassified Road"
           unsurfaced: "Unsurfaced Road"

-        historic:"
+        historic:

           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"
           archaeological_site: "Archaeological Site"
           battlefield: "Battlefield"
           boundary_stone: "Boundary Stone"


@@ -576,9 +593,9 @@ en:
         landuse:
           allotments: "Allotments"
           basin: "Basin"
         landuse:
           allotments: "Allotments"
           basin: "Basin"

-          brownfield: "Brownfield"
+          brownfield: "Brownfield Land"

           cemetery: "Cemetery"
           cemetery: "Cemetery"

-          commercial: "Commercial"
+          commercial: "Commercial Area"

           conservation: "Conservation"
           construction: "Construction"
           farm: "Farm"
           conservation: "Conservation"
           construction: "Construction"
           farm: "Farm"


@@ -586,11 +603,11 @@ en:
           farmyard: "Farmyard"
           forest: "Forest"
           grass: "Grass"
           farmyard: "Farmyard"
           forest: "Forest"
           grass: "Grass"

-          greenfield: "Greenfield"
-          industrial: "Industrial"
+          greenfield: "Greenfield Land"
+          industrial: "Industrial Area"

           landfill: "Landfill"
           meadow: "Meadow"
           landfill: "Landfill"
           meadow: "Meadow"

-          military: "Military"
+          military: "Military Area"

           mine: "Mine"
           mountain: "Mountain"
           nature_reserve: "Nature Reserve"
           mine: "Mine"
           mountain: "Mountain"
           nature_reserve: "Nature Reserve"


@@ -601,7 +618,7 @@ en:
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"
           railway: "Railway"
           recreation_ground: "Recreation Ground"
           reservoir: "Reservoir"

-          residential: "Residential"
+          residential: "Residential Area"

           retail: "Retail"
           village_green: "Village Green"
           vineyard: "Vineyard"
           retail: "Retail"
           village_green: "Village Green"
           vineyard: "Vineyard"


@@ -609,8 +626,8 @@ en:
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"
           wood: "Wood"
         leisure:
           beach_resort: "Beach Resort"

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

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


@@ -691,24 +708,24 @@ en:
           village: "Village"
         railway:
           abandoned: "Abandoned Railway"
           village: "Village"
         railway:
           abandoned: "Abandoned Railway"

-          construction: "Railway Construction"
+          construction: "Railway under Construction"

           disused: "Disused Railway"
           disused: "Disused Railway"

-          disused_station: "Disused Station"
-          funicular: "Funicular"
+          disused_station: "Disused Railway Station"
+          funicular: "Funicular Railway"

           halt: "Train Stop"
           halt: "Train Stop"

-          historic_station: "Historic Train Station"
-          junction: "Junction"
+          historic_station: "Historic Railway Station"
+          junction: "Railway Junction"

           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           monorail: "Monorail"
           narrow_gauge: "Narrow Gauge Railway"

-          platform: "Train Platform"
+          platform: "Railway Platform"

           preserved: "Preserved Railway"
           spur: "Railway Spur"
           preserved: "Preserved Railway"
           spur: "Railway Spur"

-          station: "Train Station"
-          subway: "Subway"
+          station: "Railway Station"
+          subway: "Subway Station"

           subway_entrance: "Subway Entrance"
           subway_entrance: "Subway Entrance"

-          switch: "Railway Switch"
+          switch: "Railway Points"

           tram: "Tramway"
           tram_stop: "Tram Stop"
           yard: "Railway Yard"
           tram: "Tramway"
           tram_stop: "Tram Stop"
           yard: "Railway Yard"


@@ -787,7 +804,7 @@ en:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
           attraction: "Attraction"
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
           attraction: "Attraction"

-          bed_and_breakfast: "Bed And Breakfast"
+          bed_and_breakfast: "Bed and Breakfast"

           cabin: "Cabin"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"
           cabin: "Cabin"
           camp_site: "Camp Site"
           caravan_site: "Caravan Site"


@@ -838,6 +855,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"


@@ -875,23 +893,23 @@ 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
     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."
     user_diaries: User Diaries
     user_diaries_tooltip: View user diaries
     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."
     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."


@@ -926,7 +944,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"


@@ -1023,9 +1042,13 @@ 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"
+      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}}"
     outbox: 
       title: "Outbox"
       my_inbox: "My {{inbox_link}}"


@@ -1037,6 +1060,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"


@@ -1049,6 +1074,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:


@@ -1171,7 +1197,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"


@@ -1212,7 +1238,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"


@@ -1226,8 +1252,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"


@@ -1238,7 +1265,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"


@@ -1251,6 +1280,11 @@ 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."
   application:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."


@@ -1331,10 +1365,15 @@ 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"
       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, could not log in with those details."
       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, could not log in with those details."

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


@@ -1377,6 +1416,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


@@ -1389,23 +1429,16 @@ en:
       ago: "({{time_in_words_ago}} ago)"
       email address: "Email address:"
       created from: "Created from:"
       ago: "({{time_in_words_ago}} ago)"
       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

       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"


@@ -1424,12 +1457,15 @@ en:
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"
       unhide_user: "unhide this user"
       delete_user: "delete this user"
       confirm: "Confirm"

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


@@ -1443,6 +1479,12 @@ en:
         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:"
         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:"

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


@@ -1595,5 +1637,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