Fix up issues with notes in the data browser

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index de129f7662fe0be3d814ec1075dbfc4c74eab8ea..bacf8a4e630983c95a718f880e400930a3886be9 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -291,7 +291,7 @@ en:
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"
       opened: "Opened:"
       last_modified: "Last modified:"
       closed: "Closed:"

-      at_by: "%{when} ago by %{user}"
+      at_by_html: "%{when} ago by %{user}"

       description: "Description:"
       comments: "Comments:"
   changeset:
       description: "Description:"
       comments: "Comments:"
   changeset:


@@ -1053,6 +1053,12 @@ en:
         direct your readers to openstreetmap.org (perhaps by expanding 
         'OpenStreetMap' to this full address), to opendatacommons.org, and 
         if relevant, to creativecommons.org.
         direct your readers to openstreetmap.org (perhaps by expanding 
         'OpenStreetMap' to this full address), to opendatacommons.org, and 
         if relevant, to creativecommons.org.

+      credit_3_html: |
+        For a browsable electronic map, the credit should appear in the corner of the map.
+        For example:
+      attribution_example:
+        alt: Example of how to attribute OpenStreetMap on a webpage
+        title: Attribution example

       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a


@@ -1207,13 +1213,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."
       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:
+    note_comment_notification:

       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}."
       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}."
+      details: "More details about the note can be found at %{url}."

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


@@ -1290,6 +1296,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"


@@ -2010,26 +2017,20 @@ 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

-    note:
-      closed: Closed Note
-      open: Open Note
-      details: Details
-      permalink: Permalink
-      description: Description
-      comment: Comment
-      render_warning: This error has been fixed already. However, it might take a couple of days before the map image is updated.
-      update: Update
-      nickname: Nickname
-      login: Login
-      add_comment: Add Comment
-      close: Close
-      cancel: Cancel
-      create: Create Note
-      create_title: Report a problem with the map
-      create_help1: Please drag the marker to the location of the problem
-      create_help2: and descripe it as accurate as possible
-      report: Report Problem
-      edityourself: You can also edit the map directly your self
+      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_1: Move the marker to the correct position and
+        intro_2: "add your comment in the box below:"
+        add: Add Note
+      show:
+        title: Note %{id}
+        event: "%{action} by %{user} at %{time}"
+        close: Close
+        comment_and_close: Comment & Close
+        comment: Comment

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