Allow arrays of names in map key entries

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 56d722f4331da17cd17d9145258f48c8f698a9f5..1fecd2a241247a59218c212367621a5fdfbde6c1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1732,18 +1732,21 @@ en:
     destroy:
       destroyed: "Message deleted"
   passwords:
     destroy:
       destroyed: "Message deleted"
   passwords:

-    lost_password:
+    new:

       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."

+    create:

       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Could not find that email address, sorry."
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Could not find that email address, sorry."

-    reset_password:
+    edit:

       title: "Reset password"
       heading: "Reset Password for %{user}"
       reset: "Reset Password"
       title: "Reset password"
       heading: "Reset Password for %{user}"
       reset: "Reset Password"

+      flash token bad: "Did not find that token, check the URL maybe?"
+    update:

       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:


@@ -2279,6 +2282,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

+          pedestrian: "Pedestrian way"

           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"


@@ -2287,36 +2291,44 @@ en:
           cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"
           cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"

+          train: "Train"

           subway: "Subway"
           subway: "Subway"

-          tram:
-            - Light rail
-            - tram
-          cable:
-            - Cable car
-            - chair lift
-          runway:
-            - Airport Runway
-            - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          ferry: "Ferry"
+          light_rail: "Light rail"
+          tram_only: "Tram"
+          trolleybus: "Trolleybus"
+          bus: "Bus"
+          cable_car: "Cable car"
+          chair_lift: "Chair lift"
+          runway_only: "Airport Runway"
+          taxiway: "Taxiway"
+          apron_only: "Airport apron"

           admin: "Administrative boundary"
           admin: "Administrative boundary"

-          forest: "Forest"
+          orchard_only: "Orchard"
+          vineyard: "Vineyard"
+          forest_only: "Forest"

           wood: "Wood"
           wood: "Wood"

+          farmland: "Farmland"
+          grass_only: "Grass"
+          meadow: "Meadow"
+          bare_rock: "Bare rock"
+          sand: "Sand"

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

+          common_only: "Common"
+          built_up: "Built-up area"

           resident: "Residential area"
           resident: "Residential area"

-          common:
-            - Common
-            - meadow
-            - garden

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

-          lake:
-            - Lake
-            - reservoir
+          scrubland: "Scrubland"
+          lake_only: "Lake"
+          reservoir: "Reservoir"
+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"

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


@@ -2325,19 +2337,20 @@ en:
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"
           centre: "Sports centre"
           reserve: "Nature reserve"
           military: "Military area"

-          school:
-            - School
-            - university
+          school_only: "School"
+          university: "University"
+          hospital: "Hospital"

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

-          summit:
-            - Summit
-            - peak
+          summit_only: "Summit"
+          peak: "Peak"

           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"

+          bus_stop: "Bus stop"
+          stop: "Stop"

           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"


@@ -2383,6 +2396,7 @@ en:
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping

+      continue_authorization: Continue Authorization

       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |
       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |


@@ -3034,6 +3048,7 @@ en:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features

+      embed_html_disabled: HTML embedding is not available for this map layer

     changesets:
       show:
         comment: "Comment"
     changesets:
       show:
         comment: "Comment"