From: Jesse Weinstein Date: Mon, 25 Apr 2022 02:06:10 +0000 (-0400) Subject: Merge branch 'master' into HEAD X-Git-Tag: live~1153^2~1 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82 Merge branch 'master' into HEAD --- 550c4a3a45814fde5c809334c85f1ebc47659a82 diff --cc config/locales/en.yml index 3841eeb94,6e6906c0d..ca88099b8 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -454,20 -596,37 +596,37 @@@ en search_osm_nominatim: prefix_format: "%{name}" prefix: + aerialway: + cable_car: "Cable Car" + chair_lift: "Chair Lift" + drag_lift: "Drag Lift" + gondola: "Gondola Lift" + magic_carpet: "Magic Carpet Lift" + platter: "Platter Lift" + pylon: "Pylon" + station: "Aerialway Station" + t-bar: "T-Bar Lift" + "yes": "Aerialway" aeroway: aerodrome: "Aerodrome" + airstrip: "Airstrip" - apron: "Apron" - gate: "Gate" + apron: "Airport Apron" + gate: "Airport Gate" + hangar: "Hangar" helipad: "Helipad" + holding_position: "Holding Position" + navigationaid: "Aviation Navigation Aid" + parking_position: "Parking Position" runway: "Runway" + taxilane: "Taxilane" taxiway: "Taxiway" - terminal: "Terminal" + terminal: "Airport Terminal" + windsock: "Windsock" amenity: - airport: "Airport" + animal_boarding: "Animal Boarding" + animal_shelter: "Animal Shelter" arts_centre: "Arts Centre" - artwork: "Artwork" atm: "ATM" - auditorium: "Auditorium" bank: "Bank" bar: "Bar" bbq: "BBQ" @@@ -496,34 -660,37 +660,37 @@@ drinking_water: "Drinking Water" driving_school: "Driving School" embassy: "Embassy" - emergency_phone: "Emergency Phone" + events_venue: "Events Venue" - fast_food: "Fast Food" + fast_food: "Fast Food Restaurant" ferry_terminal: "Ferry Terminal" - fire_hydrant: "Fire Hydrant" fire_station: "Fire Station" food_court: "Food Court" fountain: "Fountain" - fuel: "Fuel" + fuel: "Filling Station" + gambling: "Gambling" grave_yard: "Grave Yard" - gym: "Fitness Centre / Gym" - hall: "Hall" - health_centre: "Health Centre" + grit_bin: "Grit Bin" hospital: "Hospital" - hotel: "Hotel" hunting_stand: "Hunting Stand" ice_cream: "Ice Cream" + internet_cafe: "Internet Cafe" kindergarten: "Kindergarten" + language_school: "Language School" library: "Library" - market: "Market" + loading_dock: "Loading Dock" + love_hotel: "Love Hotel" marketplace: "Marketplace" - mountain_rescue: "Mountain Rescue" + mobile_money_agent: "Mobile Money Agent" + monastery: "Monastery" + money_transfer: "Money Transfer" + motorcycle_parking: "Motorcycle Parking" + music_school: "Music School" nightclub: "Night Club" - nursery: "Nursery" nursing_home: "Nursing Home" - office: "Office" - park: "Park" parking: "Parking" + parking_entrance: "Parking Entrance" + parking_space: "Parking Space" + payment_terminal: "Payment Terminal" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" @@@ -579,15 -841,17 +841,17 @@@ bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" bus_stop: "Bus Stop" - byway: "Byway" - construction: "Highway under Construction" + construction: "Road under Construction" + corridor: "Corridor" cycleway: "Cycle Path" + elevator: "Elevator" emergency_access_point: "Emergency Access Point" + emergency_bay: "Emergency Bay" footway: "Footpath" ford: "Ford" + give_way: "Give Way Sign" living_street: "Living Street" milestone: "Milestone" - minor: "Minor Road" motorway: "Motorway" motorway_junction: "Motorway Junction" motorway_link: "Motorway Road" @@@ -665,17 -954,24 +954,24 @@@ reservoir: "Reservoir" reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" - retail: "Retail" + retail: "Retail Area" - road: "Road Area" village_green: "Village Green" vineyard: "Vineyard" - wetland: "Wetland" - wood: "Wood" + "yes": "Landuse" leisure: + adult_gaming_centre: "Adult Gaming Centre" + amusement_arcade: "Amusement Arcade" + bandstand: "Bandstand" beach_resort: "Beach Resort" bird_hide: "Bird Hide" + bleachers: "Bleachers" + bowling_alley: "Bowling Alley" common: "Common Land" + dance: "Dance Hall" + dog_park: "Dog Park" + firepit: "Fire Pit" fishing: "Fishing Area" + fitness_centre: "Fitness Centre" fitness_station: "Fitness Station" garden: "Garden" golf_course: "Golf Course" @@@ -822,38 -1222,59 +1222,59 @@@ convenience: "Convenience Store" copyshop: "Copy Shop" cosmetics: "Cosmetics Shop" + craft: "Crafts Supply Store" + curtain: "Curtain Shop" + dairy: "Dairy Shop" + deli: "Deli" department_store: "Department Store" discount: "Discount Items Shop" - doityourself: "Do-It-Yourself" - dry_cleaning: "Dry Cleaning" + doityourself: "Do-It-Yourself Shop" + dry_cleaning: "Dry Cleaner" + e-cigarette: "E-Cigarette Shop" electronics: "Electronics Shop" + erotic: "Erotic Shop" estate_agent: "Estate Agent" + fabric: "Fabric Store" farm: "Farm Shop" fashion: "Fashion Shop" - fish: "Fish Shop" + fishing: "Fishing Supplies Shop" florist: "Florist" food: "Food Shop" + frame: "Frame Shop" funeral_directors: "Funeral Directors" furniture: "Furniture" - gallery: "Gallery" garden_centre: "Garden Centre" + gas: "Gas Store" general: "General Store" gift: "Gift Shop" greengrocer: "Greengrocer" grocery: "Grocery Shop" hairdresser: "Hairdresser" hardware: "Hardware Store" + health_food: "Health Food Store" + hearing_aids: "Hearing Aids" + herbalist: "Herbalist" - hifi: "Hi-Fi" + hifi: "Hi-Fi Shop" - insurance: "Insurance" + houseware: "Houseware Shop" + ice_cream: "Ice Cream Shop" + interior_decoration: "Interior Decoration" jewelry: "Jewelry Shop" kiosk: "Kiosk Shop" + kitchen: "Kitchen Shop" laundry: "Laundry" + locksmith: "Locksmith" + lottery: "Lottery" mall: "Mall" - market: "Market" + massage: "Massage" + medical_supply: "Medical Supply Shop" mobile_phone: "Mobile Phone Shop" + money_lender: "Money Lender" motorcycle: "Motorcycle Shop" + motorcycle_repair: "Motorcycle Repair Shop" music: "Music Shop" + musical_instrument: "Musical Instruments" newsagent: "Newsagent" + nutrition_supplements: "Nutrition Supplements" optician: "Optician" organic: "Organic Food Shop" outdoor: "Outdoor Shop" @@@ -874,7 -1314,8 +1314,8 @@@ artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" - cabin: "Cabin" + cabin: "Tourist Cabin" + camp_pitch: "Camp Pitch" camp_site: "Camp Site" caravan_site: "Caravan Site" chalet: "Chalet"