Update tram mapnik map key

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 079f525a00485ceee99261aeff27b0b829f09e1b..3499244b67aa2cf6071cfd36b3225fcdd7dff0f4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -256,6 +256,7 @@ en:
         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
         retain_email: Your email address will be retained.
+        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
         confirm_delete: Are you sure?
         cancel: Cancel
   accounts:
@@ -1731,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:
@@ -2286,10 +2290,13 @@ 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
@@ -2300,22 +2307,35 @@ en:
             - Airport apron
             - terminal
           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
+          glacier: "Glacier"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
@@ -2337,6 +2357,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"
@@ -2382,6 +2404,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: |
@@ -2739,12 +2762,15 @@ en:
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
+        importer: "This user is a importer"
         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"
+          importer: "Grant importer access"
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
+          importer: "Revoke importer access"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
       comments: "Comments"
@@ -3030,6 +3056,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
+      embed_html_disabled: HTML embedding is not available for this map layer
     changesets:
       show:
         comment: "Comment"