From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Jun 2022 18:44:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3557'
X-Git-Tag: live~2243
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/edf20e5f92c129332ba289e5d1d8276bf8bf27f5?hp=92fa101c7c6ae0f634da1840926779d996e6ccf6

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0aa0ad555..7bcaf4f44 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -822,7 +822,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
-        crossing: "Crossing"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
@@ -843,6 +842,7 @@ en:
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"
+          crossing: "Crossing"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"