From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Nov 2021 17:18:02 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3381'
X-Git-Tag: live~1915
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/54a158aef39a6a1bdca4ce030170d6f89fc06994?hp=-c

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

54a158aef39a6a1bdca4ce030170d6f89fc06994
diff --combined config/locales/en.yml
index 25e3b8e1a,7dae05c57..db77a816e
--- a/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"