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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b8b9a0ffce8158084bb2adf321e6368bbf6fc5c1..3da8d38ab6ed607a9de27463dbfbf9c994077ac4 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1482,12 +1482,7 @@ en-GB:
         for this feature.
     export:
       title: Export
         for this feature.
     export:
       title: Export

-      area_to_export: Area to Export

       manually_select: Manually select a different area
       manually_select: Manually select a different area

-      format_to_export: Format to Export
-      osm_xml_data: OpenStreetMap XML Data
-      map_image: Map Image (shows standard layer)
-      embeddable_html: Embeddable HTML

       licence: Licence
       too_large:
         advice: 'If the above export fails, please consider using one of the sources
       licence: Licence
       too_large:
         advice: 'If the above export fails, please consider using one of the sources


@@ -1509,17 +1504,6 @@ en-GB:
         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki
         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki

-      options: Options
-      format: Format
-      scale: Scale
-      max: max
-      image_size: Image Size
-      zoom: Zoom
-      add_marker: Add a marker to the map
-      latitude: 'Lat:'
-      longitude: 'Lon:'
-      output: Output
-      paste_html: Paste HTML to embed in website

       export_button: Export
     fixthemap:
       title: Report a problem/Fix the map
       export_button: Export
     fixthemap:
       title: Report a problem/Fix the map


@@ -1595,30 +1579,24 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway

-          cable:
-          - Cable car
-          - chairlift
-          runway:
-          - Airport Runway
-          - taxiway
-          apron_only: Airport apron
+          cable_car: Cable car
+          chair_lift: chairlift
+          runway: Airport Runway
+          taxiway: taxiway
+          apron: Airport apron

           admin: Administrative boundary
           admin: Administrative boundary

-          forest:
-          - Forest
-          - Wood
+          forest: Forest
+          wood: Wood

           golf: Golf course
           park: Park
           golf: Golf course
           park: Park

-          common:
-          - Common
-          - meadow
+          common: Common

           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland
           resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland

-          lake:
-          - Lake
-          - reservoir
+          lake: Lake
+          reservoir: reservoir

           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery


@@ -1627,14 +1605,12 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school:
-          - School
-          - university
+          school: School
+          university: university

           building: Significant building
           station: Railway station
           building: Significant building
           station: Railway station

-          summit:
-          - Summit
-          - peak
+          summit: Summit
+          peak: peak

           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access