Merge branch 'master' into notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 09d3ceae0da169b782928a6c992b7a507a3c62b0..5d3e6bbaeef5b980e7100b4745bdcaaba708084d 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:"
@@ -269,8 +271,8 @@ en:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:
-        one: "also part of way %{related_ways}"
-        other: "also part of ways %{related_ways}"
+        one: "part of way %{related_ways}"
+        other: "part of ways %{related_ways}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
@@ -288,6 +290,7 @@ en:
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"
+      at_html: "%{when} ago"
       at_by_html: "%{when} ago by %{user}"
       description: "Description:"
       comments: "Comments:"
@@ -696,6 +699,8 @@ en:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
+        mountain_pass:
+          "yes" : "Mountain Pass"
         natural:
           bay: "Bay"
           beach: "Beach"
@@ -1261,14 +1266,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."
@@ -1532,7 +1535,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?"
@@ -1979,9 +1982,13 @@ en:
       needs_view: "The user needs to log in before this block will be cleared."
   note:
     description:
+      opened_at: "Created %{when} ago"
       opened_at_by: "Created %{when} ago by %{user}"
+      commented_at: "Updated %{when} ago"
       commented_at_by: "Updated %{when} ago by %{user}"
+      closed_at: "Resolved %{when} ago"
       closed_at_by: "Resolved %{when} ago by %{user}"
+      reopened_at: "Reactivated %{when} ago"
       reopened_at_by: "Reactivated %{when} ago by %{user}"
     rss:
       title: "OpenStreetMap Notes"
@@ -1993,9 +2000,13 @@ en:
     mine:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
-      description: "Notes submitted or commented on by %{user}"
+      subheading: "Notes submitted or commented on by %{user}"
       id: "Id"
+      creator: "Creator"
+      description: "Description"
+      created_at: "Created at"
       last_changed: "Last changed"
+      ago_html: "%{when} ago"
   javascripts:
     map:
       base:
@@ -2017,14 +2028,21 @@ 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}
-        event: "%{action} by <a href='%{user_url}'>%{user}</a> at %{time}"
-        anonymous_event: "%{action} by anonymous at %{time}"
-        close: Close
-        comment_and_close: Comment & Close
+        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}"
+        commented_by_anonymous: "comment from anonymous at %{time}"
+        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
+        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}"
+        resolve: Resolve
+        comment_and_resolve: Comment & Resolve
         comment: Comment
   redaction:
     edit: