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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 046bddc7dce54079552c2d8e38eed9e72c13ed94..47de3c43139097238f1fe14a7ba9660fb409508a 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -507,7 +507,6 @@ en-GB:
         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'
       post: Post
       when: When
       comment: Comment
@@ -706,7 +705,6 @@ en-GB:
           landing_site: Emergency Landing Site
           phone: Emergency Phone
           water_tank: Emergency Water Tank
-          "yes": Emergency
         highway:
           abandoned: Abandoned Highway
           bridleway: Bridleway