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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25e3b8e1a56dc7bbb77ada726fa284eeb7eb24e8..df3ae37f560513ddef3b1af79b0c5babb9ef64fc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -783,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"
@@ -830,6 +829,7 @@ en:
           trailhead: "Trailhead"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
+          turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           "yes" : "Road"