X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/901de4a56a58b4967eec5f2a20e241e3d1c088e9..56fd5c4d90c7d3757fb97ff16c40aaa307ae1d22:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5115342fd..794d72cbb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -471,6 +471,10 @@ en:
     search_osm_nominatim:
       prefix_format: "%{name}"
       prefix:
+        aerialway:
+          chair_lift: "Chair Lift"
+          drag_lift: "Drag Lift"
+          station: "Aerialway Station"
         aeroway:
           aerodrome: "Aerodrome"
           apron: "Apron"
@@ -563,6 +567,7 @@ en:
           shower: "Shower"
           social_centre: "Social Centre"
           social_club: "Social Club"
+          social_facility: "Social Facility"
           studio: "Studio"
           supermarket: "Supermarket"
           swimming_pool: "Swimming Pool"
@@ -592,6 +597,9 @@ en:
           "yes": "Bridge"
         building:
           "yes": "Building"
+        emergency:
+          fire_hydrant: "Fire Hydrant"
+          phone: "Emergency Phone"
         highway:
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
@@ -613,6 +621,7 @@ en:
           platform: "Platform"
           primary: "Primary Road"
           primary_link: "Primary Road"
+          proposed: "Proposed Road"
           raceway: "Raceway"
           residential: "Residential"
           rest_area: "Rest Area"
@@ -623,6 +632,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
+          street_lamp: "Street Lamp"
           stile: "Stile"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
@@ -639,6 +649,7 @@ en:
           building: "Building"
           castle: "Castle"
           church: "Church"
+          citywalls: "City Walls"
           fort: "Fort"
           house: "House"
           icon: "Icon"
@@ -786,6 +797,7 @@ en:
           locality: "Locality"
           moor: "Moor"
           municipality: "Municipality"
+          neighbourhood: "Neighbourhood"
           postcode: "Postcode"
           region: "Region"
           sea: "Sea"
@@ -811,8 +823,10 @@ en:
           narrow_gauge: "Narrow Gauge Railway"
           platform: "Railway Platform"
           preserved: "Preserved Railway"
+          proposed: "Proposed Railway"
           spur: "Railway Spur"
           station: "Railway Station"
+          stop: "Railway Stop"
           subway: "Subway Station"
           subway_entrance: "Subway Entrance"
           switch: "Railway Points"
@@ -828,9 +842,11 @@ en:
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           books: "Book Shop"
+          boutique: "Boutique"
           butcher: "Butcher"
           car: "Car Shop"
           car_parts: "Car Parts"
+          car_repair: "Car Repair"
           carpet: "Carpet Shop"
           car_repair: "Car Repair"
           charity: "Charity Shop"
@@ -841,6 +857,7 @@ en:
           convenience: "Convenience Store"
           copyshop: "Copy Shop"
           cosmetics: "Cosmetics Shop"
+          deli: "Deli"
           department_store: "Department Store"
           discount: "Discount Items Shop"
           doityourself: "Do-It-Yourself"
@@ -877,17 +894,21 @@ en:
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           pet: "Pet Shop"
+          pharmacy: "Pharmacy"
           photo: "Photo Shop"
           salon: "Salon"
+          second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
           shopping_centre: "Shopping Centre"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
+          tailor: "Tailor"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           video: "Video Shop"
           wine: "Off License"
+          "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
           artwork: "Artwork"
@@ -910,6 +931,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
+          culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
           artificial: "Artificial Waterway"
@@ -1189,7 +1211,7 @@ en:
         If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
         easy to add a note.
       paragraph_2_html: |
-        Just go to <a href='http://www.openstreetmap.org/'>the map</a> and click the note icon:
+        Just go to <a href='%{map_url}'>the map</a> and click the note icon:
         <span class='icon note'></span>. This will add a marker to the map, which you can move
         by dragging. Add your message, then click save, and other mappers will investigate.
   notifier:
@@ -1880,7 +1902,7 @@ en:
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
       already active: "This account has already been confirmed."
-      unknown token: "That token doesn't seem to exist."
+      unknown token: "That confirmation code has expired or does not exist."
       reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
     confirm_resend:
       success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
@@ -2144,6 +2166,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
+    edit_help: Move the map and zoom in on a location you want to edit, then click here.
   redaction:
     edit:
       description: "Description"