Merge remote-tracking branch 'upstream/pull/3381'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index caee480d9448425f5a0b38aa01e916a7e4ad7bf5..db77a816e4d9cf44e4c399f66a89c15838ba0cae 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -504,7 +504,9 @@ en:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
-      has_commented_on: "%{display_name} has commented on the following diary entries"
+      title: "Diary Comments added by %{user}"
+      heading: "%{user}'s Diary Comments"
+      subheading_html: "Diary Comments added by %{user}"
       no_comments: "No diary comments"
       post: Post
       when: When
@@ -781,7 +783,6 @@ en:
           siren: "Emergency Siren"
           suction_point: "Emergency Suction Point"
           water_tank: "Emergency Water Tank"
-          "yes": "Emergency"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"