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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c3e048f83d0ed2042d3f447858b2e2ae1ce4e1a1..7bcaf4f448592ef701d001eaf8c83df15e8d9980 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -822,7 +822,6 @@ en:
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"
           window_construction: "Window Construction"
           winery: "Winery"
           "yes": "Craft Shop"

-        crossing: "Crossing"

         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"
         emergency:
           access_point: "Access Point"
           ambulance_station: "Ambulance Station"


@@ -843,6 +842,7 @@ en:
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
           corridor: "Corridor"

+          crossing: "Crossing"

           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"


@@ -2195,6 +2195,7 @@ en:
           common:
             - Common
             - meadow
           common:
             - Common
             - meadow

+            - garden

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"