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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 84a967c6da0bdeb8de1583ab79b5ab82c2011bd1..036f8de35d6aab5c1aa5d292496a8558aeba4028 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -382,12 +382,19 @@ en:
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"
           chair_lift: "Chair Lift"
           drag_lift: "Drag Lift"
           gondola: "Gondola Lift"

+          platter: "Platter Lift"
+          pylon: "Pylon"

           station: "Aerialway Station"
           station: "Aerialway Station"

+          t-bar: "T-Bar Lift"

         aeroway:
           aerodrome: "Aerodrome"
         aeroway:
           aerodrome: "Aerodrome"

+          airstrip: "Airstrip"

           apron: "Apron"
           gate: "Gate"
           apron: "Apron"
           gate: "Gate"

+          hangar: "Hangar"

           helipad: "Helipad"
           helipad: "Helipad"

+          holding_position: "Holding Position"
+          parking_position: "Parking Position"

           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"
           runway: "Runway"
           taxiway: "Taxiway"
           terminal: "Terminal"


@@ -422,37 +429,32 @@ en:
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"
           crematorium: "Crematorium"
           dentist: "Dentist"
           doctors: "Doctors"

-          dormitory: "Dormitory"

           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"
           drinking_water: "Drinking Water"
           driving_school: "Driving School"
           embassy: "Embassy"

-          emergency_phone: "Emergency Phone"

           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"
           fast_food: "Fast Food"
           ferry_terminal: "Ferry Terminal"

-          fire_hydrant: "Fire Hydrant"

           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"
           fire_station: "Fire Station"
           food_court: "Food Court"
           fountain: "Fountain"
           fuel: "Fuel"
           gambling: "Gambling"
           grave_yard: "Grave Yard"

-          gym: "Fitness Centre / Gym"
-          health_centre: "Health Centre"
+          grit_bin: "Grit Bin"

           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"
           hospital: "Hospital"
           hunting_stand: "Hunting Stand"
           ice_cream: "Ice Cream"
           kindergarten: "Kindergarten"
           library: "Library"

-          market: "Market"

           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"
           marketplace: "Marketplace"
           monastery: "Monastery"
           motorcycle_parking: "Motorcycle Parking"
           nightclub: "Night Club"

-          nursery: "Nursery"

           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"
           nursing_home: "Nursing Home"
           office: "Office"
           parking: "Parking"
           parking_entrance: "Parking Entrance"

+          parking_space: "Parking Space"

           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"
           pharmacy: "Pharmacy"
           place_of_worship: "Place of Worship"
           police: "Police"


@@ -462,7 +464,6 @@ en:
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"
           prison: "Prison"
           pub: "Pub"
           public_building: "Public Building"

-          reception_area: "Reception Area"

           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"
           recycling: "Recycling Point"
           restaurant: "Restaurant"
           retirement_home: "Retirement Home"


@@ -487,6 +488,7 @@ en:
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"
           village_hall: "Village Hall"
           waste_basket: "Waste Basket"
           waste_disposal: "Waste Disposal"

+          water_point: "Water Point"

           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"
           youth_centre: "Youth Centre"
         boundary:
           administrative: "Administrative Boundary"


@@ -495,6 +497,7 @@ en:
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"
           protected_area : "Protected Area"
         bridge:
           aqueduct: "Aqueduct"

+          boardwalk: "Boardwalk"

           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"
           suspension: "Suspension Bridge"
           swing: "Swing Bridge"
           viaduct: "Viaduct"


@@ -514,25 +517,31 @@ en:
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"
           "yes": "Craft Shop"
         emergency:
           ambulance_station: "Ambulance Station"

+          assembly_point: "Assembly Point"

           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"
           defibrillator: "Defibrillator"
           landing_site: "Emergency Landing Site"
           phone: "Emergency Phone"

+          water_tank: "Emergency Water Tank"
+          "yes": "Emergency"

         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"
         highway:
           abandoned: "Abandoned Highway"
           bridleway: "Bridleway"
           bus_guideway: "Guided Bus Lane"
           bus_stop: "Bus Stop"
           construction: "Highway under Construction"

+          corridor: "Corridor"

           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"
           cycleway: "Cycle Path"
           elevator: "Elevator"
           emergency_access_point: "Emergency Access Point"
           footway: "Footpath"
           ford: "Ford"

+          give_way: "Give Way Sign"

           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"
           living_street: "Living Street"
           milestone: "Milestone"
           motorway: "Motorway"
           motorway_junction: "Motorway Junction"
           motorway_link: "Motorway Road"

+          passing_place: "Passing Place"

           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"
           path: "Path"
           pedestrian: "Pedestrian Way"
           platform: "Platform"


@@ -549,6 +558,7 @@ en:
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"
           services: "Motorway Services"
           speed_camera: "Speed Camera"
           steps: "Steps"

+          stop: "Stop Sign"

           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"
           street_lamp: "Street Lamp"
           tertiary: "Tertiary Road"
           tertiary_link: "Tertiary Road"


@@ -557,8 +567,8 @@ en:
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"
           trail: "Trail"
           trunk: "Trunk Road"
           trunk_link: "Trunk Road"

+          turning_loop: "Turning Loop"

           unclassified: "Unclassified Road"
           unclassified: "Unclassified Road"

-          unsurfaced: "Unsurfaced Road"

           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"
           "yes" : "Road"
         historic:
           archaeological_site: "Archaeological Site"


@@ -577,6 +587,7 @@ en:
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"
           manor: "Manor"
           memorial: "Memorial"
           mine: "Mine"

+          mine_shaft: "Mine Shaft"

           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"
           monument: "Monument"
           roman_road: "Roman Road"
           ruins: "Ruins"


@@ -586,6 +597,7 @@ en:
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
           wreck: "Wreck"

+          "yes": "Historic Site"

         junction:
           "yes": "Junction"
         landuse:
         junction:
           "yes": "Junction"
         landuse:


@@ -623,9 +635,9 @@ en:
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"
         leisure:
           beach_resort: "Beach Resort"
           bird_hide: "Bird Hide"

-          club: "Club"

           common: "Common Land"
           dog_park: "Dog Park"
           common: "Common Land"
           dog_park: "Dog Park"

+          firepit: "Fire Pit"

           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"
           fishing: "Fishing Area"
           fitness_centre: "Fitness Centre"
           fitness_station: "Fitness Station"


@@ -650,15 +662,46 @@ en:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:
           water_park: "Water Park"
           "yes": "Leisure"
         man_made:

+          adit: "Adit"
+          beacon: "Beacon"
+          beehive: "Bee Hive"
+          breakwater: "Breakwater"
+          bridge: "Bridge"
+          bunker_silo: "Bunker"
+          chimney: "Chimney"
+          crane: "Crane"
+          dolphin: "Mooring Post"
+          dyke: "Dyke"
+          embankment: "Embankment"
+          flagpole: "Flagpole"
+          gasometer: "Gasometer"
+          groyne: "Groyne"
+          kiln: "Kiln"

           lighthouse: "Lighthouse"
           lighthouse: "Lighthouse"

+          mast: "Mast"
+          mine: "Mine"
+          mineshaft: "Mine Shaft"
+          monitoring_station: "Monitoring Station"
+          petroleum_well: "Petroleum Well"
+          pier: "Pier"

           pipeline: "Pipeline"
           pipeline: "Pipeline"

+          silo: "Silo"
+          storage_tank: "Storage Tank"
+          surveillance: "Surveillance"

           tower: "Tower"
           tower: "Tower"

+          wastewater_plant: "Wastewater Plant"
+          watermill: "Water Mill"
+          water_tower: "Water Tower"
+          water_well: "Well"
+          water_works: "Water Works"
+          windmill: "Wind Mill"

           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"
           works: "Factory"
           "yes": "Man-made"
         military:
           airfield: "Military Airfield"
           barracks: "Barracks"
           bunker: "Bunker"

+          "yes": "Military"

         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:


@@ -704,11 +747,14 @@ en:
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"
           accountant: "Accountant"
           administrative: "Administration"
           architect: "Architect"

+          association: "Association"

           company: "Company"
           company: "Company"

+          educational_institution: "Educational Institution"

           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"
           employment_agency: "Employment Agency"
           estate_agent: "Estate Agent"
           government: "Governmental Office"
           insurance: "Insurance Office"

+          it: "IT Office"

           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"
           lawyer: "Lawyer"
           ngo: "NGO Office"
           telecommunication: "Telecommunication Office"


@@ -716,9 +762,8 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
           "yes": "Office"
         place:
           allotments: "Allotments"

-          block: "Block"
-          airport: "Airport"

           city: "City"
           city: "City"

+          city_block: "City Block"

           country: "Country"
           county: "County"
           farm: "Farm"
           country: "Country"
           county: "County"
           farm: "Farm"


@@ -729,12 +774,13 @@ en:
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"
           islet: "Islet"
           isolated_dwelling: "Isolated Dwelling"
           locality: "Locality"

-          moor: "Moor"

           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"
           municipality: "Municipality"
           neighbourhood: "Neighbourhood"
           postcode: "Postcode"

+          quarter: "Quarter"

           region: "Region"
           sea: "Sea"
           region: "Region"
           sea: "Sea"

+          square: "Square"

           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"
           state: "State"
           subdivision: "Subdivision"
           suburb: "Suburb"


@@ -746,10 +792,8 @@ en:
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"
           abandoned: "Abandoned Railway"
           construction: "Railway under Construction"
           disused: "Disused Railway"

-          disused_station: "Disused Railway Station"

           funicular: "Funicular Railway"
           halt: "Train Stop"
           funicular: "Funicular Railway"
           halt: "Train Stop"

-          historic_station: "Historic Railway Station"

           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"
           junction: "Railway Junction"
           level_crossing: "Level Crossing"
           light_rail: "Light Rail"


@@ -775,6 +819,7 @@ en:
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"
           beauty: "Beauty Shop"
           beverages: "Beverages Shop"
           bicycle: "Bicycle Shop"

+          bookmaker: "Bookmaker"

           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"
           books: "Book Shop"
           boutique: "Boutique"
           butcher: "Butcher"


@@ -813,12 +858,16 @@ en:
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"
           hairdresser: "Hairdresser"
           hardware: "Hardware Store"
           hifi: "Hi-Fi"

-          insurance: "Insurance"
+          houseware: "Houseware Shop"
+          interior_decoration: "Interior Decoration"

           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"
           jewelry: "Jewelry Shop"
           kiosk: "Kiosk Shop"

+          kitchen: "Kitchen Shop"

           laundry: "Laundry"
           laundry: "Laundry"

+          lottery: "Lottery"

           mall: "Mall"
           market: "Market"
           mall: "Mall"
           market: "Market"

+          massage: "Massage"

           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"
           mobile_phone: "Mobile Phone Shop"
           motorcycle: "Motorcycle Shop"
           music: "Music Shop"


@@ -826,21 +875,27 @@ en:
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"
           optician: "Optician"
           organic: "Organic Food Shop"
           outdoor: "Outdoor Shop"

+          paint: "Paint Shop"
+          pawnbroker: "Pawnbroker"

           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"
           pet: "Pet Shop"
           pharmacy: "Pharmacy"
           photo: "Photo Shop"

-          salon: "Salon"
+          seafood: "Sea Food"

           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"
           second_hand: "Second-hand Shop"
           shoes: "Shoe Shop"

-          shopping_centre: "Shopping Centre"

           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"
           sports: "Sports Shop"
           stationery: "Stationery Shop"
           supermarket: "Supermarket"
           tailor: "Tailor"

+          ticket: "Ticket Shop"
+          tobacco: "Tobacco Shop"

           toys: "Toy Shop"
           travel_agency: "Travel Agency"
           toys: "Toy Shop"
           travel_agency: "Travel Agency"

+          tyres: "Tyre Shop"
+          vacant: "Vacant Shop"
+          variety_store: "Variety Store"

           video: "Video Shop"
           video: "Video Shop"

-          wine: "Off License"
+          wine: "Wine Store"

           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"
           "yes": "Shop"
         tourism:
           alpine_hut: "Alpine Hut"


@@ -864,6 +919,7 @@ en:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:
           viewpoint: "Viewpoint"
           zoo: "Zoo"
         tunnel:

+          building_passage: "Building Passage"

           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:
           culvert: "Culvert"
           "yes": "Tunnel"
         waterway:


@@ -1079,7 +1135,7 @@ en:
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
       trademarks_title_html: <span id="trademarks"></span>Trademarks
       trademarks_1_html: |

-        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please send your questions to the <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence Working Group</a>.
+        OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>.

   welcome_page:
     title: Welcome!
     introduction_html: |
   welcome_page:
     title: Welcome!
     introduction_html: |


@@ -1229,7 +1285,9 @@ en:
       Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
       <br> 
       Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 
       Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>
       <br> 
       Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> 

-      if you have licensing, copyright or other legal questions and issues.
+      if you have licensing, copyright or other legal questions.
+      <br>
+      OpenStreetMap, the magnifying glass logo and State of the Map are <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">registered trademarks of the OSMF</a>.

     partners_title: Partners
   notifier:
     diary_comment_notification:
     partners_title: Partners
   notifier:
     diary_comment_notification:


@@ -1425,6 +1483,7 @@ en:
       where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
       where_am_i: "Where is this?"
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"

+      reverse_directions_text: "Reverse Directions"

     key:
       table:
         entry:
     key:
       table:
         entry: