Fix indentation.

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

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


@@ -163,6 +163,9 @@ en:
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
     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}}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: {{way_name}}"


@@ -216,8 +219,11 @@ en:
       for_all_changes: "For changes by all users see {{recent_changes_link}}"
       recent_changes: "Recent Changes"
   diary_entry:
       for_all_changes: "For changes by all users see {{recent_changes_link}}"
       recent_changes: "Recent Changes"
   diary_entry:

+    new:
+      title: New Diary Entry

     list:
       title: "Users' diaries"
     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


@@ -235,19 +241,26 @@ 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"
+      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"
   export:
     start:
       area_to_export: "Area to Export"


@@ -310,7 +323,7 @@ en:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:

-    diary:
+    diary_comment_notification:

       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"


@@ -349,6 +362,7 @@ en:
       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:
       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"
       my_inbox: "My inbox"
       outbox: "outbox"
       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"


@@ -362,15 +376,18 @@ 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 or message"
       sorry: "Sorry there is no user or message with that name or id"
     outbox: 
     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"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"


@@ -381,6 +398,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"


@@ -391,8 +409,12 @@ 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.'
       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.'


@@ -421,6 +443,7 @@ en:
   trace:
     create:
       upload_trace: "Upload GPS Trace"
   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:"
     edit:
       filename: "Filename:"
       uploaded_at: "Uploaded at:"


@@ -463,11 +486,15 @@ en:
       make_public: "Make this track public permanently"
       edit_track: "Edit this track"
       delete_track: "Delete this track"
       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"
     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"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"


@@ -477,8 +504,19 @@ en:
       private: "PRIVATE"
       by: "by"
       in: "in"
       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:

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


@@ -486,6 +524,8 @@ en:
       password: "Password: "
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password: "
       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."

     lost_password:
       title: "lost password"
       heading: "Forgotten Password?"
     lost_password:
       title: "lost password"
       heading: "Forgotten Password?"


@@ -498,6 +538,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. '


@@ -510,7 +551,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:


@@ -546,6 +587,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:


@@ -571,11 +613,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."