Merge branch 'master' into notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 00bc48097aa9d174d256dbed3fd5e88b4e53f938..ba23b11df7047423548488484b51b9dbabb1df3d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -4,6 +4,7 @@ en:
   time:
     formats:
       friendly: "%e %B %Y at %H:%M"
+      blog: "%e %B %Y"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -158,11 +159,13 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
+        note: "View note on larger map"
       edit:
         area: "Edit area"
         node: "Edit node"
         way: "Edit way"
         relation: "Edit relation"
+        note: "Edit note"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
@@ -697,6 +700,8 @@ en:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
+        mountain_pass:
+          "yes" : "Mountain Pass"
         natural:
           bay: "Bay"
           beach: "Beach"
@@ -1262,14 +1267,12 @@ en:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     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"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
@@ -1533,7 +1536,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) and RSA-SHA1 signatures."
       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"
@@ -2026,7 +2029,7 @@ en:
       createnote_zoom_alert: You must zoom in to add a note to the map
     notes:
       new:
-        intro: "Move the marker to the correct position and add your comment in the box below:"
+        intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
         add: Add Note
       show:
         title: Note %{id}
@@ -2039,8 +2042,9 @@ en:
         closed_by_anonymous: "resolved by anonymous at %{time}"
         reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
         reopened_by_anonymous: "reactivated by anonymous at %{time}"
-        close: Close
-        comment_and_close: Comment & Close
+        hide: Hide
+        resolve: Resolve
+        comment_and_resolve: Comment & Resolve
         comment: Comment
   redaction:
     edit: