Merge branch 'master' into notes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 37d5c395a9d333b5ac7db428fdc3ba2405dff697..c3fc981eacbdaedc1c220a8a63e51079506741eb 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:"
-      at_by: "%{when} ago by %{user}"
+      at_by_html: "%{when} ago by %{user}"
       description: "Description:"
       comments: "Comments:"
   changeset:
@@ -1006,7 +1006,6 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
-    sotm2012: 'Come to the 2012 United States OpenStreetMap Conference, The State of the Map US, October 13-14th in Portland, Oregon!'
     make_a_donation:
       title: Support OpenStreetMap with a monetary donation
       text: Make a Donation
@@ -2020,26 +2019,6 @@ en:
       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
-    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
     notes:
       new:
         intro_1: Move the marker to the correct position and
@@ -2047,7 +2026,10 @@ en:
         add: Add Note
       show:
         title: Note %{id}
-        comment: "%{action} by %{user} at %{time}"
+        event: "%{action} by %{user} at %{time}"
+        close: Close
+        comment_and_close: Comment & Close
+        comment: Comment
   redaction:
     edit:
       description: "Description"