Merge branch 'master' into notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 217c43306c14ed680b5921bb4ab7a9502d26600e..3ff65904dfd9271d2420886558314501f0fc78e8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -158,11 +158,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:"
@@ -1262,14 +1264,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."
@@ -2004,6 +2004,7 @@ en:
       description: "Description"
       created_at: "Created at"
       last_changed: "Last changed"
+      ago_html: "%{when} ago"
   javascripts:
     map:
       base:
@@ -2029,6 +2030,7 @@ en:
         add: Add Note
       show:
         title: Note %{id}
+        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
         opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
         opened_by_anonymous: "created by anonymous at %{time}"
         commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
@@ -2037,8 +2039,8 @@ 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
+        resolve: Resolve
+        comment_and_resolve: Comment & Resolve
         comment: Comment
   redaction:
     edit: