fixed missing translations

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 974449171d550e70d0d461cbd755cbe4c742a903..6e42e0306df1b53e14bcf8fa7d991ef81bf0dc76 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,6 @@
 en:
 en:

+  html:
+    dir: ltr

   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:


@@ -89,9 +91,9 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"

-      has_nodes: "Has the following {{node_count}} nodes:"
-      has_ways: "Has the following {{way_count}} ways:"
-      has_relations: "Has the following {{relation_count}} relations:"
+      has_nodes: "Has the following {{count}} nodes:"
+      has_ways: "Has the following {{count}} ways:"
+      has_relations: "Has the following {{count}} relations:"

     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"


@@ -120,6 +122,10 @@ en:
       view_history: "view history"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
       view_history: "view history"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."

+      type:
+        node: node
+        way: way
+        relation: relation

     paging_nav:
       showing_page: "Showing page"
       of: "of"
     paging_nav:
       showing_page: "Showing page"
       of: "of"


@@ -141,23 +147,40 @@ en:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start_rjs:

+      data_layer_name: "Data"

       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"

-      loaded_an_area: "You have loaded an area which contains"
-      browsers: "features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 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"
       load_data: "Load Data"

-      unable_to_load: "Unable to load: Bounding box size of"
-      must_be_smaller: "is too large (must be smaller than 0.25)"
+      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than {{max_bbox_size}})"

       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."
       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."

-      history_for: "History for"
+      history_for_feature: "History for [[feature]]"

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

-      edited_by: "Edited by"
-      at_timestamp: "at"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+      object_list:
+        heading: "Object list"
+        back: "Display object list"
+        type:
+          node: "Node"
+          way: "Way"
+          # There's no 'relation' type because it isn't represented in OpenLayers
+        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
+        history:
+          type:
+            node: "Node [[id]]"
+            way: "Way [[id]]"
+            # There's no 'relation' type because it isn't represented in OpenLayers

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


@@ -243,12 +266,17 @@ en:
       marker_text: Diary entry location
     view:
       title: "Users' diaries | {{user}}"
       marker_text: Diary entry location
     view:
       title: "Users' diaries | {{user}}"

+      user_title: "{{user}}'s diary"

       leave_a_comment: "Leave a comment"
       leave_a_comment: "Leave a comment"

+      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      login: "Login"

       save_button: "Save"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_user:
       save_button: "Save"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     no_such_user:

+      title: "No such user"
+      heading: "The user {{user}} does not exist"

       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
       posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
       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}}"


@@ -297,40 +325,99 @@ en:
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
   layouts:
       type_from_source: "{{type}} from {{source_link}}"
       no_results: "No results found"
   layouts:

+    project_name:
+      # in <title>
+      title: OpenStreetMap
+      # in <h1>
+      h1: OpenStreetMap
+    logo:
+      alt_text: OpenStreetMap logo

     welcome_user: "Welcome, {{user_link}}"
     welcome_user: "Welcome, {{user_link}}"

-    inbox: "inbox ({{size}})"
+    welcome_user_link_tooltip: Your user page
+    home: home
+    home_tooltip: Go to home location
+    inbox: "inbox ({{count}})"
+    inbox_tooltip:
+      zero: Your inbox contains no unread messages
+      one: Your inbox contians 1 unread message
+      other: Your inbox contains {{count}} unread messages

     logout: logout
     logout: logout

+    logout_tooltip: "Log out"

     log_in: log in
     log_in: log in

+    log_in_tooltip: Log in with an existing account

     sign_up: sign up
     sign_up: sign up

+    sign_up_tooltip: Create an account for editing

     view: View
     view: View

+    view_tooltip: View maps

     edit: Edit
     edit: Edit

+    edit_tooltip: Edit maps

     history: History
     history: History

+    history_tooltip: Changeset history

     export: Export
     export: Export

+    export_tooltip: Export map data

     gps_traces: GPS Traces
     gps_traces: GPS Traces

+    gps_traces_tooltip: Manage traces

     user_diaries: User Diaries
     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}}."
     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_ucl: "UCL VR Centre"
+    intro_3_bytemark: "bytemark"

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

+    news_blog_tooltip: "News blog about OpenStreetMap, free geographical data, etc."

     shop: Shop
     shop: Shop

+    shop_tooltip: Shop with branded OpenStreetMap 
+    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!'
     alt_donation: Make a Donation
   notifier:
     diary_comment_notification:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   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}}"
       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"
+      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}}"
+      footer2: "and you can reply at {{replyurl}}"

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

+    gpx_notification:
+      greeting: "Hi,"
+      your_gpx_file: "It looks like your GPX file"
+      with_description: "with the description"
+      and_the_tags: "and the following tags:"
+      and_no_tags: "and no tags."
+      failure:
+        subject: "[OpenStreetMap] GPX Import failure"
+        failed_to_import: "failed to import. Here's 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"
+      success:
+        subject: "[OpenStreetMap] GPX Import success"
+        loaded_successfully: |
+          loaded successfully with {{trace_points}} out of a possible
+          {{possible_points}} points.
+    signup_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"

     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"


@@ -340,8 +427,10 @@ en:
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"
       introductory_video: "You can watch an introductory video to OpenStreetMap here:"
       more_videos: "There are more videos here:"
       the_wiki: "Get reading about OpenStreetMap on the wiki:"

+      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"

       opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:"
       wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
       opengeodata: "OpenGeoData.org is OpenStreetMap'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
       user_wiki_1: "It is recommended that you create a user wiki page, which includes"
       user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
       # next four translations are in pairs : please word wrap appropriately
       user_wiki_1: "It is recommended that you create a user wiki page, which includes"
       user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."


@@ -359,8 +448,39 @@ en:
       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>.'

+    email_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    email_confirm_html:
+      greeting: "Hi,"
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    lost_password:
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
+      hopefully_you_2: "email addresses openstreetmap.org account."
+      click_the_link: "If this is you, please click the link below to reset your password."
+    lost_password_html:
+      greeting: "Hi,"
+      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
+      click_the_link: "If this is you, please click the link below to reset your password."
+    reset_password:
+      subject: "[OpenStreetMap] Password reset"
+    reset_password_plain:
+      greeting: "Hi,"
+      reset: "Your password has been reset to {{new_password}}"
+    reset_password_html:
+      greeting: "Hi,"
+      reset: "Your password has been reset to {{new_password}}"

   message:
     inbox:
   message:
     inbox:

+      title: "Inbox"

       my_inbox: "My inbox"
       outbox: "outbox"
       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
       my_inbox: "My inbox"
       outbox: "outbox"
       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"


@@ -374,15 +494,19 @@ en:
       read_button: "Mark as read"
       reply_button: "Reply"
     new:
       read_button: "Mark as read"
       reply_button: "Reply"
     new:

+      title: "Send message"

       send_message_to: "Send a new message to {{name}}"
       subject: "Subject"
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       send_message_to: "Send a new message to {{name}}"
       subject: "Subject"
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"

+      message_sent: "Message sent"

     no_such_user:
     no_such_user:

-      no_such_user: "No such user or message"
-      sorry: "Sorry there is no user or message with that name or id"
+      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: 
     outbox: 

+      title: "Outbox"

       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"


@@ -393,6 +517,7 @@ en:
       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"
     read:
       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"
     read:

+      title: "Read message"

       reading_your_messages: "Reading your messages"
       from: "From"
       subject: "Subject"
       reading_your_messages: "Reading your messages"
       from: "From"
       subject: "Subject"


@@ -403,14 +528,21 @@ 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"

+    mark:
+      as_read: "Message marked as read"
+      as_unread: "Message marked as unread"

   site:
     index:
   site:
     index:

-      home: "home"

       js_1: "You are either using a browser that doesn't 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_1: "You are either using a browser that doesn't 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

-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        project_name: "OpenStreetMap project"
+        project_url: "http://openstreetmap.org"

     edit:
       not_public: "You haven't 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 haven't 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}}."


@@ -431,6 +563,7 @@ en:
       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"
       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"

   trace:
     create:
       upload_trace: "Upload GPS Trace"
   trace:
     create:
       upload_trace: "Upload GPS Trace"


@@ -446,7 +579,9 @@ en:
       tags: "Tags:"
       save_button: "Save Changes"
     no_such_user:
       tags: "Tags:"
       save_button: "Save Changes"
     no_such_user:

-      no_such_user: "Sorry, there is no user with the name {{name}}. Please check your spelling, or maybe the link you clicked is wrong."
+      title: "No such user"
+      heading: "The user {{user}} does not exist"
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."

     trace_form:
       upload_gpx: "Upload GPX File"
       description: "Description"
     trace_form:
       upload_gpx: "Upload GPX File"
       description: "Description"


@@ -454,6 +589,7 @@ en:
       public: "Public?"
       upload_button: "Upload"
       help: "Help"
       public: "Public?"
       upload_button: "Upload"
       help: "Help"

+      help_url: "http://wiki.openstreetmap.org/wiki/Upload"

     trace_header:
       see_just_your_traces: "See just your traces, or upload a trace"
       see_all_traces: "See all traces"
     trace_header:
       see_just_your_traces: "See just your traces, or upload a trace"
       see_all_traces: "See all traces"


@@ -507,6 +643,7 @@ en:
       made_public: "Track made public"
   user:
     login:
       made_public: "Track made public"
   user:
     login:

+      title: "Login"

       heading: "Login"
       please login: "Please login or {{create_user_link}}."
       create_account: "create an account"
       heading: "Login"
       please login: "Please login or {{create_user_link}}."
       create_account: "create an account"


@@ -528,6 +665,7 @@ en:
       flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
       flash token bad: "Didn't find that token, check the URL maybe?"
     new:
       flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
       flash token bad: "Didn't 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. '
       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. '


@@ -542,6 +680,8 @@ en:
       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."
     no_such_user:
       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."
     no_such_user:

+      title: "No such user"
+      heading: "The user {{user}} does not exist"

       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
       my diary: my diary
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
       my diary: my diary


@@ -568,7 +708,7 @@ en:
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.

-      km away: "{{distance}}km away"
+      km away: "{{count}}km away"

       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings


@@ -576,6 +716,7 @@ en:
       your location: Your location
       nearby mapper: "Nearby mapper: "
     account:
       your location: Your location
       nearby mapper: "Nearby mapper: "
     account:

+      title: "Edit account"

       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"
       public editing:
       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"
       public editing:


@@ -603,7 +744,7 @@ en:
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."

-    confirm email:
+    confirm_email:

       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm


@@ -613,3 +754,10 @@ en:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."

+    make_friend:
+      success: "{{name}} is now your friend."
+      failed: "Sorry, failed to add {{name}} as a friend."
+      already_a_friend: "You are already friends with {{name}}."
+    remove_friend:
+      success: "{{name}} was removed from your friends."
+      not_a_friend: "{{name}} is not one of your friends."