more translations

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8f6caf72985eab053d404e83ce7aa1f22002d30f..0a7e589af0b954bd232f4ce278cfa61bb3d092a1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,10 +1,82 @@
 en:
 en:

+  activerecord:
+    # Translates all the model names, which is used in error handling on the web site
+    models:
+      acl: "Access Control List"
+      changeset: "Changeset"
+      changeset_tag: "Changeset Tag"
+      country: "Country"
+      diary_comment: "Diary Comment"
+      diary_entry: "Diary Entry"
+      friend: "Friend"
+      language: "Language"
+      message: "Message"
+      node: "Node"
+      node_tag: "Node Tag"
+      notifier: "Notifier"
+      old_node: "Old Node"
+      old_node_tag: "Old Node Tag"
+      old_relation: "Old Relation"
+      old_relation_member: "Old Relation Member"
+      old_relation_tag: "Old Relation Tag"
+      old_way: "Old Way"
+      old_way_node: "Old Way Node"
+      old_way_tag: "Old Way Tag"
+      relation: "Relation"
+      relation_member: "Relation Member"
+      relation_tag: "Relation Tag"
+      session: "Session"
+      trace: "Trace"
+      tracepoint: "Trace Point"
+      tracetag: "Trace Tag"
+      user: "User"
+      user_preference: "User Preference"
+      user_token: "User Token"
+      way: "Way"
+      way_node: "Way Node"
+      way_tag: "Way Tag"
+    # Translates all the model attributes, which is used in error handling on the web site
+    # Only the ones that are used on the web site are translated at the moment
+    attributes:
+      diary_comment:
+        body: "Body"
+      diary_entry:
+        user: "User"
+        title: "Title"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        language: "Language"
+      friend:
+        user: "User"
+        friend: "Friend"
+      trace:
+        user: "User"
+        visible: "Visible"
+        name: "Name"
+        size: "Size"
+        latitude: "Latitude"
+        longitude: "Longitude"
+        public: "Public"
+        description: "Description"
+      message:
+        sender: "Sender"
+        title: "Title"
+        body: "Body"
+        recipient: "Recipient"
+      user:
+        email: "Email"
+        active: "Active"
+        display_name: "Display Name"
+        description: "Description"
+        languages: "Languages"
+        pass_crypt: "Password"

   map:
     view: View
     edit: Edit
     coordinates: "Coordinates:"
   browse:
     changeset:
   map:
     view: View
     edit: Edit
     coordinates: "Coordinates:"
   browse:
     changeset:

+      title: "Changeset"

       changeset: "Changeset:"
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       changeset: "Changeset:"
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"


@@ -32,8 +104,130 @@ en:
       loading: "Loading..."
       deleted: "Deleted"
       view_larger_map: "View Larger Map"
       loading: "Loading..."
       deleted: "Deleted"
       view_larger_map: "View Larger Map"

+    node_details:
+      coordinates: "Coordinates: "
+      part_of: "Part of:"
+    node_history:
+      node_history: "Node History"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    node:
+      node: "Node"
+      node_title: "Node: {{node_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      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"
+    relation_details:
+      members: "Members:"
+      part_of: "Part of:"
+    relation_history:
+      relation_history: "Relation History"
+      relation_history_title: "Relation History: {{relation_name}}"
+    relation_member:
+      as: "as"
+    relation:
+      relation: "Relation"
+      relation_title: "Relation: {{relation_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+    start:
+      view_data: "View data for current map view"
+      manually_select: "Manually select a different area"
+    start_rjs:
+      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 quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      load_data: "Load Data"
+      unable_to_load: "Unable to load: Bounding box size of"
+      must_be_smaller: "is too large (must be smaller than 0.25)"
+      loading: "Loading..."
+      show_history: "Show History"
+      wait: "Wait..."
+      history_for: "History for"
+      details: "Details"
+      private_user: "private user"
+      edited_by: "Edited by"
+      at_timestamp: "at"
+    tag_details:
+      tags: "Tags:"
+    way_details:
+      nodes: "Nodes:"
+      part_of: "Part of:"
+      also_part_of:
+        one: "also part of way {{related_ways}}"
+        other: "also part of ways {{related_ways}}"
+    way_history:
+      way_history: "Way History"
+      way_history_title: "Way History: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
+    way:
+      way: "Way"
+      way_title: "Way: {{way_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+  changeset:
+    changeset_paging_nav: 
+      showing_page: "Showing page"
+      of: "of"
+    changeset:
+      still_editing: "(still editing)"
+      anonymous: "Anonymous"
+      no_comment: "(none)"
+      no_edits: "(no edits)"
+      show_area_box: "show area box"
+      big_area: "(big)"
+      view_changeset_details: "View changeset details"
+      more: "more"
+    changesets:
+      id: "ID"
+      saved_at: "Saved at"
+      user: "User"
+      comment: "Comment"
+      area: "Area"
+    list_bbox:
+      history: "History"
+      changesets_within_the_area: "Changesets within the area:"
+      show_area_box: "show area box"
+      no_changesets: "No changesets"
+      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+      no_area_specified: "No area specified"
+      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+      view_the_map: "view the map"
+      view_tab: "view tab"
+      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+    list:
+      recent_changes: "Recent Changes"
+      recently_edited_changesets: "Recently edited changesets:"
+      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+    list_user:
+      edits_by_username: "Edits by {{username_link}}"
+      no_visible_edits_by: "No visible edits by {{name}}."
+      for_all_changes: "For changes by all users see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"

   diary_entry:
   diary_entry:

+    new:
+      title: New Diary Entry

     list:
     list:

+      title: "Users' diaries"
+      user_title: "{{user}}'s diary"

       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries


@@ -41,6 +235,7 @@ en:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:

+      title: "Edit diary entry"

       subject: "Subject: "
       body: "Body: "
       language: "Language: "
       subject: "Subject: "
       body: "Body: "
       language: "Language: "


@@ -50,19 +245,64 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location

+    view:
+      title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
+      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:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     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:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."

-    posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
-    comment_link: Comment on this entry
-    reply_link: Reply to this entry
-    comment_count:
-      one: 1 comment
-      other: "{{count}} comments"
-    edit_link: Edit this entry
-    comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+    diary_entry:
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      comment_link: Comment on this entry
+      reply_link: Reply to this entry
+      comment_count:
+        one: 1 comment
+        other: "{{count}} comments"
+      edit_link: Edit this entry
+    diary_comment:
+      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+  export:
+    start:
+      area_to_export: "Area to Export"
+      manually_select: "Manually select a different area"
+      format_to_export: "Format to Export"
+      osm_xml_data: "OpenStreetMap XML Data"
+      mapnik_image: "Mapnik Image"
+      osmarender_image: "Osmarender Image"
+      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>.'
+      options: "Options"
+      format: "Format"
+      scale: "Scale"
+      max: "max"
+      image_size: "Image Size"
+      zoom: "Zoom"
+      add_marker: "Add a marker to the map"
+      latitude: "Lat:"
+      longitude: "Lon:"
+      output: "Output"
+      paste_html: "Paste HTML to embed in website"
+      export_button: "Export"
+    start_rjs:
+      export: "Export"
+      drag_a_box: "Drag a box on the map to select an area"
+      manually_select: "Manually select a different area"
+      click_add_marker: "Click on the map to add a marker"
+      change_marker: "Change marker position"
+      add_marker: "Add a marker to the map"
+      view_larger_map: "View Larger Map"
+  geocoder:
+    results:
+      results: "Results"
+      type_from_source: "{{type}} from {{source_link}}"
+      no_results: "No results found"

   layouts:
     welcome_user: "Welcome, {{user_link}}"
     inbox: "inbox ({{size}})"
   layouts:
     welcome_user: "Welcome, {{user_link}}"
     inbox: "inbox ({{size}})"


@@ -86,10 +326,101 @@ en:
     help_wiki: "Help &amp; Wiki"
     news_blog: "News blog"
     shop: Shop
     help_wiki: "Help &amp; Wiki"
     news_blog: "News blog"
     shop: Shop

-    sotm: 'Come to the 2009 OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>, July 10-12 in Amsterdam!'
+    sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'

     alt_donation: Make a Donation
     alt_donation: Make a Donation

+  notifier:
+    diary_comment_notification:
+      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}}"
+    friend_notification:
+      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."
+    signup_confirm_plain:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      # next two translations run-on : please word wrap appropriately
+      click_the_link_1: "If this is you, welcome! Please click the link below to confirm your"
+      click_the_link_2: "account and read on for more information about OpenStreetMap."
+      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:"
+      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:"
+      # next four translations are in pairs : please word wrap appropriately
+      user_wiki_1: "It is recommended that you create a user wiki page, which includes"
+      user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]."
+      current_user_1: "A list of current users in categories, based on where in the world"
+      current_user_2: "they are, is available from:"
+    signup_confirm_html:
+      greeting: "Hi there!"
+      hopefully_you: "Someone (hopefully you) would like to create an account over at"
+      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
+      introductory_video: "You can watch an {{introductory_video_link}}."
+      video_to_openstreetmap: "introductory video to OpenStreetMap"
+      more_videos: "There are {{more_videos_link}}."
+      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</p> 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!'
+      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>.'
+  message:
+    inbox:
+      title: "Inbox"
+      my_inbox: "My inbox"
+      outbox: "outbox"
+      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "people mapping nearby" 
+    message_summary:
+      unread_button: "Mark as unread"
+      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"
+      message_sent: "Message sent"
+    no_such_user:
+      no_such_user: "No such user or message"
+      sorry: "Sorry there is no user or message with that name or id"
+    outbox: 
+      title: "Outbox"
+      my_inbox: "My {{inbox_link}}"
+      inbox: "inbox"
+      outbox: "outbox"
+      you_have_sent_messages: "You have {{sent_count}} sent messages"
+      to: "To"
+      subject: "Subject"
+      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"
+    read:
+      title: "Read message"
+      reading_your_messages: "Reading your messages"
+      from: "From"
+      subject: "Subject"
+      date: "Date"
+      reply_button: "Reply"
+      unread_button: "Mark as unread"
+      back_to_inbox: "Back to inbox"
+      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.'
       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.'


@@ -115,28 +446,106 @@ 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"

+  trace:
+    create:
+      upload_trace: "Upload GPS Trace"
+      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+    edit:
+      filename: "Filename:"
+      uploaded_at: "Uploaded at:"
+      points: "Points:"
+      start_coord: "Start coordinate:"
+      edit: "edit"
+      owner: "Owner:"
+      description: "Description:"
+      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."
+    trace_form:
+      upload_gpx: "Upload GPX File"
+      description: "Description"
+      tags: "Tags"
+      public: "Public?"
+      upload_button: "Upload"
+      help: "Help"
+    trace_header:
+      see_just_your_traces: "See just your traces, or upload a trace"
+      see_all_traces: "See all traces"
+      see_your_traces: "See all your traces"
+      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+    trace_optionals:
+      tags: "Tags"
+    view:
+      pending: "PENDING"
+      filename: "Filename:"
+      download: "download"
+      uploaded: "Uploaded at:"
+      points: "Points:"
+      start_coordinates: "Start coordinate:"
+      map: "map"
+      edit: "edit"
+      owner: "Owner:"
+      description: "Description:"
+      tags: "Tags"
+      none: "None"
+      make_public: "Make this track public permanently"
+      edit_track: "Edit this track"
+      delete_track: "Delete this track"
+      viewing_trace: "Viewing trace {{name}}"
+      trace_not_found: "Trace not found!"
+    trace_paging_nav:
+      showing: "Showing page"
+      of: "of"
+    trace:
+      pending: "PENDING"
+      count_points: "{{count}} points"
+      ago: "{{time_in_words_ago}} ago"
+      more: "more"
+      trace_details: "View Trace Details"
+      view_map: "View Map"
+      edit: "edit"
+      edit_map: "Edit Map"
+      public: "PUBLIC"
+      private: "PRIVATE"
+      by: "by"
+      in: "in"
+      map: "map"
+    list:
+      public_traces: "Public GPS traces"
+      your_traces: "Your GPS traces"
+      public_traces_from: "Public GPS traces from {{user}}"
+      tagged_with: " tagged with {{tags}}"
+    delete:
+      scheduled_for_deletion: "Track scheduled for deletion"
+    make_public:
+      made_public: "Track made public"

   user:
     login:
   user:
     login:

-      heading: Login
+      title: "Login"
+      heading: "Login"

       please login: "Please login or {{create_user_link}}."
       please login: "Please login or {{create_user_link}}."

-      create_account: create an account
+      create_account: "create an account"

       email or username: "Email Address or Username: "
       password: "Password: "
       lost password link: "Lost your password?"
       email or username: "Email Address or Username: "
       password: "Password: "
       lost password link: "Lost your password?"

-      login_button: Login
+      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."

     lost_password:
     lost_password:

-      title: lost password
+      title: "lost password"

       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Send me a new password"
       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."
     reset_password:
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Send me a new password"
       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."
     reset_password:

-      title: reset password
+      title: "reset password"

       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:

-      heading: Create a User Account
+      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."
       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."


@@ -148,7 +557,7 @@ en:
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup

-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you\'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'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:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:


@@ -164,6 +573,7 @@ en:
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since: "
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since: "

+      ago: "({{time_in_words_ago}} ago)"

       user image heading: User image
       delete image: Delete Image
       upload an image: Upload an image
       user image heading: User image
       delete image: Delete Image
       upload an image: Upload an image


@@ -183,6 +593,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:


@@ -193,6 +604,7 @@ en:
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
       profile description: "Profile Description: "
         disabled: "Disabled and cannot edit data, all previous edits are anonymous."
         disabled link text: "why can't I edit?"
       profile description: "Profile Description: "

+      preferred languages: "Preferred Languages: "

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


@@ -207,11 +619,22 @@ en:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm

-    confirm email:
+      success: "Confirmed your account, thanks for signing up!"
+      failure: "A user account with this token has already been confirmed."
+    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

+      success: "Confirmed your email address, thanks for signing up!"
+      failure: "An email address has already been confirmed with this token."

     set_home:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     set_home:
       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."