Merge branch 'master' into openstreetbugs

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d8d7c13b32ae3538944b4eaa717eb935afe759c1..3c743aac686e7a207e73a71930bb07ca6cc995be 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -277,6 +277,17 @@ en:
       download_xml: "Download XML"
       view_history: "view history"
       edit: "edit"
+    note:
+      open_title: "Unresolved issue: {{note_name}}"
+      closed_title: "Resolved issue: {{note_name}}"
+      created_at: "Created at:"
+      edited_at: "Edited at:"
+      closed_at: "Closed at:"
+      opened_by: "Opened by:"
+      description: "Description:"
+      comment_by: "Comment by: "
+      comment: "Comment:"
+      date: "Date:"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page {{page}}"
@@ -1167,6 +1178,13 @@ 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."
+    note_plain:
+      subject_own: "[OpenStreetMap] {{commenter}} has commented on one of your notes"
+      subject_other: "[OpenStreetMap] {{commenter}} has commented on a note you are interested in"
+      greeting: "Hi,"
+      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}}."
+      details: "More details about the note can be found at {{URL}}."
   message:
     inbox:
       title: "Inbox"
@@ -1598,6 +1616,7 @@ en:
       new diary entry: new diary entry
       my edits: my edits
       my traces: my traces
+      my notes: my map notes
       my settings: my settings
       oauth settings: oauth settings
       blocks on me: blocks on me
@@ -1606,6 +1625,7 @@ en:
       diary: diary
       edits: edits
       traces: traces
+      notes: map notes
       remove as friend: remove as friend
       add as friend: add as friend
       mapper since: "Mapper since:"
@@ -1853,6 +1873,21 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
+  note:
+    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}})"
+    mine:
+      title: "Notes submitted or commented on by {{user}}"
+      heading: "{{user}}'s notes"
+      description: "Notes submitted or commented on by {{user}}"
+      id: "Id"
+      last_changed: "Last changed"
+
   javascripts:
     map:
       base:
@@ -1869,3 +1904,25 @@ 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
+    osb:
+      Fixed Error: Fixed Error
+      Unresolved Error: Unresolved Error
+      Description: Description
+      Comment: Comment
+      Has been fixed: This error has been fixed already. However, it might take a couple of days before the map image is updated.
+      Comment/Close: Comment/Close
+      Nickname: Nickname
+      Add comment: Add comment
+      Mark as fixed: Mark as fixed
+      Cancel: Cancel
+      Create OpenStreetBug: Create OpenStreetBug
+      Create bug: Report a problem with the map
+      Bug description: Problem description
+      Create: Report problem
+      Permalink: Permalink
+      Login: Login
+      Details: Details
+      edityourself: You can also edit the map directly your self
+      draghelp1: Please drag the marker to the location of the problem
+      draghelp2: and descripe it as accurate as possible
+