Replace the title in the note popup with a permalink

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 00bc48097aa9d174d256dbed3fd5e88b4e53f938..0114751b69a82cdd8762c882535f44f3758396ad 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:


@@ -158,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:"


@@ -283,8 +286,8 @@ en:
       view_history: "View history"
       edit: "Edit way"
     note:
       view_history: "View history"
       edit: "Edit way"
     note:

-      open_title: "Unresolved issue: %{note_name}"
-      closed_title: "Resolved issue: %{note_name}"
+      open_title: "Unresolved note: %{note_name}"
+      closed_title: "Resolved note: %{note_name}"

       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"


@@ -697,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"


@@ -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"
       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."


@@ -1517,6 +1520,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:


@@ -1533,7 +1537,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?"


@@ -1544,6 +1548,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"


@@ -1568,6 +1573,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:


@@ -1995,6 +2001,9 @@ en:
       closed: "closed note (near %{place})"
       new: "new note (near %{place})"
       comment: "new comment (near %{place})"
       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"
     mine:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"


@@ -2026,10 +2035,10 @@ en:
       createnote_zoom_alert: You must zoom in to add a note to the map
     notes:
       new:
       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:
         add: Add Note
       show:

-        title: Note %{id}
+        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}"
         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}"


@@ -2039,8 +2048,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}"
         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:
         comment: Comment
   redaction:
     edit: