Fix double escaping of date markup in note feed

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c13ca2c09195f49502503732fbe7557ffdcd02dd..7b5a3d96a35108931d6035ebd3beb83347635df1 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"
   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:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:


@@ -120,6 +121,8 @@ en:
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"
         next_relation_tooltip: "Next relation"
         prev_changeset_tooltip: "Previous changeset"
         next_changeset_tooltip: "Next changeset"

+        prev_note_tooltip: "Previous note"
+        next_note_tooltip: "Next note"

     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"


@@ -156,11 +159,13 @@ en:
         node: "View node on larger map"
         way: "View way on larger map"
         relation: "View relation on larger map"
         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"
       edit:
         area: "Edit area"
         node: "Edit node"
         way: "Edit way"
         relation: "Edit relation"

+        note: "Edit note"

     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"
     node_details:
       coordinates: "Coordinates:"
       part_of: "Part of:"


@@ -220,6 +225,7 @@ en:
       download_xml: "Download XML"
       view_history: "View history"
     start_rjs:
       download_xml: "Download XML"
       view_history: "View history"
     start_rjs:

+      notes_layer_name: "Browse Notes"

       data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"
       data_layer_name: "Browse Map Data"
       data_frame_title: "Data"
       zoom_or_select: "Zoom in or select an area of the map to view"


@@ -279,6 +285,16 @@ en:
       download_xml: "Download XML"
       view_history: "View history"
       edit: "Edit way"
       download_xml: "Download XML"
       view_history: "View history"
       edit: "Edit way"

+    note:
+      open_title: "Unresolved note: %{note_name}"
+      closed_title: "Resolved note: %{note_name}"
+      opened: "Opened:"
+      last_modified: "Last modified:"
+      closed: "Closed:"
+      at_html: "%{when} ago"
+      at_by_html: "%{when} ago by %{user}"
+      description: "Description:"
+      comments: "Comments:"

   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Page %{page}"


@@ -684,6 +700,8 @@ en:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"

+        mountain_pass:
+          "yes" : "Mountain Pass"

         natural:
           bay: "Bay"
           beach: "Beach"
         natural:
           bay: "Bay"
           beach: "Beach"


@@ -1189,6 +1207,20 @@ en:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."

+    note_comment_notification:
+      anonymous: An anonymous user
+      greeting: "Hi,"
+      commented:
+        subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
+        your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
+        commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
+      closed:
+        subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
+        subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
+        your_note: "%{commenter} has resolved one of your map notes near %{place}."
+        commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
+      details: "More details about the note can be found at %{url}."

   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"


@@ -1241,14 +1273,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"
       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"
       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."
       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."


@@ -1265,6 +1295,7 @@ en:
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       permalink: Permalink
       shortlink: Shortlink
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
       permalink: Permalink
       shortlink: Shortlink

+      createnote: Add a note

       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "http://openstreetmap.org/copyright"
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "http://openstreetmap.org/copyright"


@@ -1495,6 +1526,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read your private GPS traces."
       allow_write_gpx:   "upload GPS traces."

+      allow_write_notes: "modify notes."

     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:
     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:


@@ -1511,7 +1543,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) and RSA-SHA1 signatures."

       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"
       edit: "Edit Details"
       delete: "Delete Client"
       confirm: "Are you sure?"


@@ -1522,6 +1554,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."

+      allow_write_notes: "modify notes."

     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"


@@ -1546,6 +1579,7 @@ en:
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."
       allow_write_api:   "modify the map."
       allow_read_gpx:    "read their private GPS traces."
       allow_write_gpx:   "upload GPS traces."

+      allow_write_notes: "modify notes."

     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:


@@ -1675,6 +1709,7 @@ en:
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces

+      my notes: my map notes

       my settings: my settings
       my comments: my comments
       oauth settings: oauth settings
       my settings: my settings
       my comments: my comments
       oauth settings: oauth settings


@@ -1684,6 +1719,7 @@ en:
       diary: diary
       edits: edits
       traces: traces
       diary: diary
       edits: edits
       traces: traces

+      notes: map notes

       remove as friend: unfriend
       add as friend: add friend
       mapper since: "Mapper since:"
       remove as friend: unfriend
       add as friend: add friend
       mapper since: "Mapper since:"


@@ -1954,6 +1990,36 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."

+  note:
+    description:
+      opened_at_html: "Created %{when} ago"
+      opened_at_by_html: "Created %{when} ago by %{user}"
+      commented_at_html: "Updated %{when} ago"
+      commented_at_by_html: "Updated %{when} ago by %{user}"
+      closed_at_html: "Resolved %{when} ago"
+      closed_at_by_html: "Resolved %{when} ago by %{user}"
+      reopened_at_html: "Reactivated %{when} ago"
+      reopened_at_by_html: "Reactivated %{when} ago by %{user}"
+    rss:
+      title: "OpenStreetMap Notes"
+      description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
+      description_item: "An rss feed for note %{id}"
+      closed: "closed note (near %{place})"
+      new: "new note (near %{place})"
+      comment: "new comment (near %{place})"
+    entry:
+      comment: Comment
+      full: Full note
+    mine:
+      title: "Notes submitted or commented on by %{user}"
+      heading: "%{user}'s notes"
+      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:
   javascripts:
     map:
       base:


@@ -1970,6 +2036,28 @@ en:
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
       history_zoom_alert: You must zoom in to view edits for this area

+      createnote_tooltip: Add a note to the map
+      createnote_disabled_tooltip: Zoom in to add a note to the map
+      createnote_zoom_alert: You must zoom in to add a note to the map
+    notes:
+      new:
+        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:
+        permalink: Permalink
+        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}"
+        hide: Hide
+        resolve: Resolve
+        comment_and_resolve: Comment & Resolve
+        comment: Comment

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"