Split sentence.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96a168f2be5097d8505eec37dd471d70d1cea5e2..d37c4a574277e50018f33c022cf2a79bc3248219 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -205,19 +205,19 @@ en:
         type:
           node: "Node"
           way: "Way"
         type:
           node: "Node"
           way: "Way"

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

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

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

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

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

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


@@ -384,6 +384,7 @@ en:
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'

+        osm_twain: 'Location from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'

         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities
         geonames: 'Location from <a href="http://www.geonames.org/">GeoNames</a>'
       types:
         cities: Cities


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

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

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


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

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

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


@@ -580,6 +581,7 @@ en:
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       message_sent: "Message sent"

+      limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."

     no_such_user:
       title: "No such user or message"
       heading: "No such user or message"
     no_such_user:
       title: "No such user or message"
       heading: "No such user or message"


@@ -616,7 +618,7 @@ en:
       deleted: "Message deleted"
   site:
     index:
       deleted: "Message deleted"
   site:
     index:

-      js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript."
+      js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."

       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'
       permalink: Permalink
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'
       permalink: Permalink


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

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

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


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

+      where_am_i_title: Describe the current location using the search engine

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


@@ -778,8 +781,8 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
       description: "Description:"
       tags: "Tags:"
       none: "None"

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

       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
     trace_paging_nav:


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

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

     make_public:
     make_public:

-      made_public: "Track made public"
+      made_public: "Trace made public"

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


@@ -839,7 +842,7 @@ en:
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"
       url: "Request Token URL:"
       access_url: "Access Token URL:"
       authorize_url: "Authorise URL:"

-      support_notice: "We support hmac-sha1 (recommended) as well as plain text in ssl mode."
+      support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in ssl mode."

       edit: "Edit Details"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."
       edit: "Edit Details"
       requests: "Requesting the following permissions from the user:"
       allow_read_prefs:  "read their user preferences."


@@ -891,15 +894,15 @@ en:
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."
       lost password link: "Lost your password?"
       login_button: "Login"
       account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

-      auth failure: "Sorry, couldn't log in with those details."
+      auth failure: "Sorry, could not log in with those details."

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

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

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

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

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


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

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

     new:
       title: "Create account"
       heading: "Create a User Account"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
     new:
       title: "Create account"
       heading: "Create a User Account"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'

-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
+      fill_form: "Fill in the form and we will send you a quick email to activate your account."

       license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
       license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"


@@ -923,7 +926,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 will be mapping in no time :-)<br /><br />Please note that you will not be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."

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


@@ -992,9 +995,12 @@ en:
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"
         heading: "Public editing:"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits"

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

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

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

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


@@ -1035,7 +1041,7 @@ en:
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."

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

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


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

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

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

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

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