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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 546bf669c1a8ae353076efee24fa290f77a2ad85..18beafa1355a0062daaf5cf53f6d3008f409e82a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1732,18 +1732,21 @@ en:
     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."
+    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."
-    reset_password:
+    edit:
       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:
@@ -2279,6 +2282,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
+          pedestrian: "Pedestrian way"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
@@ -2287,36 +2291,53 @@ en:
           cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"
+          train: "Train"
           subway: "Subway"
-          tram:
-            - Light rail
-            - tram
+          ferry: "Ferry"
+          light_rail: "Light rail"
+          tram_only: "Tram"
+          trolleybus: "Trolleybus"
+          bus: "Bus"
           cable:
             - Cable car
             - chair lift
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
-          forest: "Forest"
-          wood: "Wood"
+          orchard:
+            - Orchard
+            - vineyard
+          forest:
+            - Forest
+            - wood
+          farmland: "Farmland"
+          grass:
+            - Grass
+            - meadow
+          bare_rock: "Bare rock"
+          sand: "Sand"
           golf: "Golf course"
           park: "Park"
-          resident: "Residential area"
           common:
             - Common
             - meadow
             - garden
+          built_up: "Built-up area"
+          resident: "Residential area"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
+          scrubland: "Scrubland"
           lake:
             - Lake
             - reservoir
+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
@@ -2328,6 +2349,7 @@ en:
           school:
             - School
             - university
+            - hospital
           building: "Significant building"
           station: "Railway station"
           summit:
@@ -2338,6 +2360,8 @@ en:
           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"
@@ -2383,6 +2407,7 @@ en:
         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: |