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

diff --combined config/locales/en.yml
index 25e3b8e1a56dc7bbb77ada726fa284eeb7eb24e8,7dae05c57215ba085643ee4610fa1ab6ef439242..db77a816e4d9cf44e4c399f66a89c15838ba0cae
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -504,9 -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
@@@ -783,7 -781,6 +783,6 @@@
            siren: "Emergency Siren"
            suction_point: "Emergency Suction Point"
            water_tank: "Emergency Water Tank"
-           "yes": "Emergency"
          highway:
            abandoned: "Abandoned Highway"
            bridleway: "Bridleway"