X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0bdb6f016261e870d20d4f1752103e573dd509a7..81d47fe50d236b96ed5956597b8c194d4ecb03bc:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96a168f2b..d77c9a0dd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -384,6 +384,7 @@ en:
     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
@@ -421,7 +422,7 @@ en:
     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"
@@ -580,6 +581,7 @@ en:
       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"
@@ -642,6 +644,7 @@ en:
     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:
@@ -778,8 +781,8 @@ en:
       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:
@@ -805,9 +808,9 @@ en:
       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:
-      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."
@@ -839,7 +842,7 @@ en:
       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."
@@ -995,6 +998,9 @@ en:
         enabled link text: "what's this?"
         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 can't 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:"