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 5d3e6bbaeef5b980e7100b4745bdcaaba708084d..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"
+      blog: "%e %B %Y"
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -285,8 +286,8 @@ en:
       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:"
@@ -1519,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_notes: "modify notes."
     revoke:
       flash: "You've revoked the token for %{application}"
   oauth_clients:
@@ -1546,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_notes: "modify notes."
     index:
       title: "My OAuth Details"
       my_tokens: "My Authorised Applications"
@@ -1570,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_notes: "modify notes."
     not_found:
       sorry: "Sorry, that %{type} could not be found."
     create:
@@ -1997,6 +2001,9 @@ en:
       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"
@@ -2031,7 +2038,7 @@ en:
         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}
+        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}"
@@ -2041,6 +2048,7 @@ 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}"
+        hide: Hide
         resolve: Resolve
         comment_and_resolve: Comment & Resolve
         comment: Comment