From 9e08ba58cb08450497b0ce6bd2704960b92eee18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sun, 28 Jul 2024 13:00:38 -0700 Subject: [PATCH 1/8] Copyedited English localization as American English Copyedited the entire English localization. The English localization now uses American English vocabulary and spelling throughout, but without unduly applying U.S. legal norms to interface elements that apply to the whole world. --- config/locales/en.yml | 816 +++++++++++++++++++++--------------------- 1 file changed, 408 insertions(+), 408 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index dc7f1a1c0e..6fd6016fb7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,8 +3,8 @@ en: dir: ltr time: formats: - friendly: "%e %B %Y at %H:%M" - blog: "%e %B %Y" + friendly: "%B %e, %Y, at %I:%M %p" + blog: "%B %e, %Y" count: at_least_pattern: "%{count}+" helpers: @@ -159,7 +159,7 @@ en: trace: tagstring: comma delimited user_block: - reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use layman's terms. + reason: The reason why the user is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use terms that a layperson would understand. needs_view: Does the user need to log in before this block will be cleared? user: new_email: "(never displayed publicly)" @@ -237,8 +237,8 @@ en: rss: title: "OpenStreetMap Notes" description_all: "A list of reported, commented on or closed notes" - description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" - description_item: "An rss feed for note %{id}" + description_area: "A list of notes reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" + description_item: "An RSS feed for note %{id}" opened: "new note (near %{place})" commented: "new comment (near %{place})" closed: "closed note (near %{place})" @@ -250,11 +250,11 @@ en: deletions: show: title: Delete My Account - warning: Warning! The account deletion process is final, and cannot be reversed. + warning: Warning! The account deletion process is final and cannot be reversed. delete_account: Delete Account delete_introduction: "You can delete your OpenStreetMap account using the button below. Please note the following details:" - delete_profile: Your profile information, including your avatar, description and home location will be removed. - delete_display_name: Your display name will be removed, and can be reused by other accounts. + delete_profile: Your profile information, including your avatar, description and home location, will be removed. + delete_display_name: Your display name will be removed and can be reused by other accounts. retain_caveats: "However, some information about you will be retained on OpenStreetMap, even after your account is deleted:" retain_edits: Your edits to the map database, if any, will be retained. retain_traces: Your uploaded traces, if any, will be retained. @@ -371,7 +371,7 @@ en: note: note timeout: title: Timeout Error - sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve." + sorry: "Sorry, the data for the %{type} with the ID %{id} took too long to retrieve." type: node: node way: way @@ -386,7 +386,7 @@ en: way: "way" relation: "relation" start_rjs: - feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?" + feature_warning: "Loading %{num_features} features may make your browser slow or unresponsive. Are you sure you want to display this data?" load_data: "Load Data" loading: "Loading..." tag_details: @@ -398,7 +398,7 @@ en: wikipedia_link: "The %{page} article on Wikipedia" wikimedia_commons_link: "The %{page} item on Wikimedia Commons" telephone_link: "Call %{phone_number}" - colour_preview: "Colour %{colour_value} preview" + colour_preview: "Color %{colour_value} preview" email_link: "Email %{email}" query: title: "Query Features" @@ -459,8 +459,8 @@ en: created_by_html: "Created by %{link_user} on %{created}." no_such_entry: title: "No such changeset" - heading: "No entry with the id: %{id}" - body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." + heading: "No entry with the ID: %{id}" + body: "Sorry, there is no changeset with the ID %{id}. Please check your spelling, or maybe the link you clicked is wrong." show: title: "Changeset: %{id}" created: "Created: %{when}" @@ -685,46 +685,46 @@ en: gondola: "Gondola Lift" magic_carpet: "Magic Carpet Lift" platter: "Platter Lift" - pylon: "Pylon" + pylon: "Aerialway Pylon" station: "Aerialway Station" t-bar: "T-Bar Lift" "yes": "Aerialway" aeroway: - aerodrome: "Aerodrome" + aerodrome: "Airport" airstrip: "Airstrip" apron: "Airport Apron" gate: "Airport Gate" hangar: "Hangar" helipad: "Helipad" - holding_position: "Holding Position" + holding_position: "Aircraft Holding Position" navigationaid: "Aviation Navigation Aid" - parking_position: "Parking Position" + parking_position: "Aircraft Parking Position" runway: "Runway" taxilane: "Taxilane" taxiway: "Taxiway" terminal: "Airport Terminal" windsock: "Windsock" amenity: - animal_boarding: "Animal Boarding" + animal_boarding: "Animal Boarding Facility" animal_shelter: "Animal Shelter" - arts_centre: "Arts Centre" + arts_centre: "Arts Center" atm: "ATM" bank: "Bank" bar: "Bar" - bbq: "BBQ" + bbq: "Barbecue" bench: "Bench" - bicycle_parking: "Cycle Parking" - bicycle_rental: "Cycle Rental" - bicycle_repair_station: "Bicycle Repair Station" - biergarten: "Beer Garden" + bicycle_parking: "Bicycle Parking" + bicycle_rental: "Bicycle Rental" + bicycle_repair_station: "Bicycle Repair Tool Stand" + biergarten: "Biergarten" blood_bank: "Blood Bank" boat_rental: "Boat Rental" brothel: "Brothel" - bureau_de_change: "Bureau de Change" + bureau_de_change: "Currency Exchange" bus_station: "Bus Station" - cafe: "Cafe" + cafe: "Café" car_rental: "Car Rental" - car_sharing: "Car Sharing" + car_sharing: "Car Sharing Station" car_wash: "Car Wash" casino: "Casino" charging_station: "Charging Station" @@ -733,12 +733,12 @@ en: clinic: "Clinic" clock: "Clock" college: "College" - community_centre: "Community Centre" - conference_centre: "Conference Centre" + community_centre: "Community Center" + conference_centre: "Conference Center" courthouse: "Courthouse" crematorium: "Crematorium" dentist: "Dentist" - doctors: "Doctors" + doctors: "Doctor" drinking_water: "Drinking Water" driving_school: "Driving School" embassy: "Embassy" @@ -748,14 +748,14 @@ en: fire_station: "Fire Station" food_court: "Food Court" fountain: "Fountain" - fuel: "Filling Station" - gambling: "Gambling" - grave_yard: "Grave Yard" + fuel: "Gas Station" + gambling: "Gambling Hall" + grave_yard: "Graveyard" grit_bin: "Grit Bin" hospital: "Hospital" hunting_stand: "Hunting Stand" - ice_cream: "Ice Cream" - internet_cafe: "Internet Cafe" + ice_cream: "Ice Cream Parlor" + internet_cafe: "Internet Café" kindergarten: "Kindergarten" language_school: "Language School" library: "Library" @@ -764,19 +764,19 @@ en: marketplace: "Marketplace" mobile_money_agent: "Mobile Money Agent" monastery: "Monastery" - money_transfer: "Money Transfer" + money_transfer: "Money Transfer Station" motorcycle_parking: "Motorcycle Parking" music_school: "Music School" - nightclub: "Night Club" + nightclub: "Nightclub" nursing_home: "Nursing Home" - parking: "Parking" - parking_entrance: "Parking Entrance" + parking: "Parking Lot" + parking_entrance: "Parking Garage Entrance" parking_space: "Parking Space" payment_terminal: "Payment Terminal" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" - post_box: "Post Box" + post_box: "Mail Drop Box" post_office: "Post Office" prison: "Prison" pub: "Pub" @@ -784,41 +784,41 @@ en: public_bookcase: "Public Bookcase" public_building: "Public Building" ranger_station: "Ranger Station" - recycling: "Recycling Point" + recycling: "Recycling" restaurant: "Restaurant" - sanitary_dump_station: "Sanitary Dump Station" + sanitary_dump_station: "RV Toilet Disposal" school: "School" shelter: "Shelter" shower: "Shower" - social_centre: "Social Centre" + social_centre: "Social Center" social_facility: "Social Facility" studio: "Studio" swimming_pool: "Swimming Pool" - taxi: "Taxi" + taxi: "Taxi Stand" telephone: "Public Telephone" - theatre: "Theatre" - toilets: "Toilets" + theatre: "Theater" + toilets: "Restroom" townhall: "Town Hall" training: "Training Facility" university: "University" vehicle_inspection: "Vehicle Inspection" vending_machine: "Vending Machine" - veterinary: "Veterinary Surgery" + veterinary: "Veterinary" village_hall: "Village Hall" - waste_basket: "Waste Basket" - waste_disposal: "Waste Disposal" - waste_dump_site: "Waste Dump Site" + waste_basket: "Trash Can" + waste_disposal: "Garbage Dumpster" + waste_dump_site: "Dump" watering_place: "Watering Place" - water_point: "Water Point" - weighbridge: "Weighbridge" + water_point: "RV Drinking Water" + weighbridge: "Truck Scale" "yes": "Amenity" boundary: - aboriginal_lands: "Aboriginal Lands" + aboriginal_lands: "Indigenous Boundary" administrative: "Administrative Boundary" census: "Census Boundary" national_park: "National Park" political: "Electoral Boundary" - protected_area : "Protected Area" + protected_area: "Protected Area" "yes": "Boundary" bridge: aqueduct: "Aqueduct" @@ -829,26 +829,26 @@ en: "yes": "Bridge" building: apartment: "Apartment" - apartments: "Apartments" + apartments: "Apartment Building" barn: "Barn" bungalow: "Bungalow" cabin: "Cabin" - chapel: "Chapel" + chapel: "Chapel Building" church: "Church Building" civic: "Civic Building" college: "College Building" commercial: "Commercial Building" - construction: "Building under Construction" + construction: "Building Under Construction" cowshed: "Cowshed" detached: "Detached House" dormitory: "Dormitory" duplex: "Duplex House" - farm: "Farm House" - farm_auxiliary: "Auxiliary Farm House" + farm: "Farmhouse" + farm_auxiliary: "Farm Building" garage: "Garage" garages: "Garages" greenhouse: "Greenhouse" - hangar: "Hangar" + hangar: "Hangar Building" hospital: "Hospital Building" hotel: "Hotel Building" house: "House" @@ -856,45 +856,45 @@ en: hut: "Hut" industrial: "Industrial Building" kindergarten: "Kindergarten Building" - manufacture: "Manufacturing Building" + manufacture: "Industrial Production Building" office: "Office Building" public: "Public Building" residential: "Residential Building" retail: "Retail Building" roof: "Roof" - ruins: "Ruined Building" + ruins: "Building Ruins" school: "School Building" - semidetached_house: "Semidetached House" + semidetached_house: "Semi-Detached House" service: "Service Building" shed: "Shed" stable: "Stable" - static_caravan: "Caravan" - sty: "Sty" + static_caravan: "Mobile Home" + sty: "Pigsty" temple: "Temple Building" - terrace: "Terrace Building" + terrace: "Rowhouses" train_station: "Train Station Building" university: "University Building" warehouse: "Warehouse" "yes": "Building" club: - scout: "Scout Group Base" + scout: "Scout Group" sport: "Sports Club" "yes": "Club" craft: beekeeper: "Beekeeper" blacksmith: "Blacksmith" - brewery: "Brewery" + brewery: "Craft Brewery" carpenter: "Carpenter" caterer: "Caterer" - confectionery: "Confectionary" + confectionery: "Candymaker" dressmaker: "Dressmaker" electrician: "Electrician" - electronics_repair: "Electronics Repair" + electronics_repair: "Electronics Repair Shop" gardener: "Gardener" glaziery: "Glaziery" - handicraft: "Handicraft" - hvac: "HVAC Craft" - metal_construction: "Metal Constructioner" + handicraft: "Handicraft Workspace" + hvac: "HVAC Workplace" + metal_construction: "Metalworker" painter: "Painter" photographer: "Photographer" plumber: "Plumber" @@ -907,122 +907,122 @@ en: winery: "Winery" "yes": "Craft Shop" emergency: - access_point: "Access Point" + access_point: "Emergency Access Point" ambulance_station: "Ambulance Station" - assembly_point: "Assembly Point" + assembly_point: "Emergency Assembly Point" defibrillator: "Defibrillator" fire_extinguisher: "Fire Extinguisher" fire_water_pond: "Fire Water Pond" landing_site: "Emergency Landing Site" life_ring: "Emergency Life Ring" phone: "Emergency Phone" - siren: "Emergency Siren" - suction_point: "Emergency Suction Point" - water_tank: "Emergency Water Tank" + siren: "Siren" + suction_point: "Water Drafting Site" + water_tank: "Emergency Water Reservoir" highway: abandoned: "Abandoned Highway" - bridleway: "Bridleway" - bus_guideway: "Guided Bus Lane" + bridleway: "Bridle Path" + bus_guideway: "Guided Busway" bus_stop: "Bus Stop" - construction: "Highway under Construction" - corridor: "Corridor" + construction: "Highway Under Construction" + corridor: "Indoor Corridor" crossing: "Crossing" - cycleway: "Cycle Path" + cycleway: "Bicycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" - emergency_bay: "Emergency Bay" + emergency_bay: "Emergency Stopping Place" footway: "Footpath" ford: "Ford" - give_way: "Give Way Sign" + give_way: "Yield Sign" living_street: "Living Street" milestone: "Milestone" - motorway: "Motorway" - motorway_junction: "Motorway Junction" - motorway_link: "Motorway Road" + motorway: "Controlled-Access Highway" + motorway_junction: "Highway Exit" + motorway_link: "Highway Ramp" passing_place: "Passing Place" path: "Path" - pedestrian: "Pedestrian Way" - platform: "Platform" + pedestrian: "Pedestrian Mall" + platform: "Transit Platform" primary: "Primary Road" - primary_link: "Primary Road" + primary_link: "Primary Link Road" proposed: "Proposed Road" - raceway: "Raceway" + raceway: "Motor Racetrack" residential: "Residential Road" rest_area: "Rest Area" road: "Road" secondary: "Secondary Road" - secondary_link: "Secondary Road" + secondary_link: "Secondary Link Road" service: "Service Road" - services: "Motorway Services" + services: "Service Area" speed_camera: "Speed Camera" - steps: "Steps" + steps: "Stairway" stop: "Stop Sign" street_lamp: "Street Lamp" tertiary: "Tertiary Road" - tertiary_link: "Tertiary Road" - track: "Track" + tertiary_link: "Tertiary Link Road" + track: "Land Management Road or Vehicular Trail" traffic_mirror: "Traffic Mirror" traffic_signals: "Traffic Signals" trailhead: "Trailhead" trunk: "Trunk Road" - trunk_link: "Trunk Road" - turning_circle: "Turning Circle" - turning_loop: "Turning Loop" - unclassified: "Unclassified Road" + trunk_link: "Trunk Link Road" + turning_circle: "Cul-de-Sac" + turning_loop: "Cul-de-Sac" + unclassified: "Minor Road" "yes" : "Road" historic: aircraft: "Historic Aircraft" archaeological_site: "Archaeological Site" - bomb_crater: "Historic Bomb Crater" + bomb_crater: "Bomb Crater" battlefield: "Battlefield" boundary_stone: "Boundary Stone" building: "Historic Building" bunker: "Bunker" - cannon: "Historic Cannon" + cannon: "Cannon" castle: "Castle" - charcoal_pile: "Historic Charcoal Pile" + charcoal_pile: "Charcoal Pile" church: "Church" city_gate: "City Gate" citywalls: "City Walls" fort: "Fort" - heritage: "Heritage Site" + heritage: "Registered Historic Site" hollow_way: "Hollow Way" house: "House" - manor: "Manor" + manor: "Manor House" memorial: "Memorial" milestone: "Historic Milestone" mine: "Mine" - mine_shaft: "Mine Shaft" + mine_shaft: "Mineshaft" monument: "Monument" railway: "Historic Railway" roman_road: "Roman Road" ruins: "Ruins" - rune_stone: "Rune Stone" + rune_stone: "Runestone" stone: "Stone" tomb: "Tomb" - tower: "Tower" + tower: "Historic Tower" wayside_chapel: "Wayside Chapel" wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" - wreck: "Wreck" + wreck: "Shipwreck" "yes": "Historic Site" junction: "yes": "Junction" landuse: - allotments: "Allotments" + allotments: "Garden Allotments" aquaculture: "Aquaculture" basin: "Basin" - brownfield: "Brownfield Land" + brownfield: "Brownfield" cemetery: "Cemetery" commercial: "Commercial Area" conservation: "Conservation Area" construction: "Construction Area" farmland: "Farmland" farmyard: "Farmyard" - forest: "Forest" - garages: "Garages" + forest: "Managed Forest" + garages: "Garage Area" grass: "Grass" - greenfield: "Greenfield Land" + greenfield: "Greenfield" industrial: "Industrial Area" landfill: "Landfill" meadow: "Meadow" @@ -1031,7 +1031,7 @@ en: orchard: "Orchard" plant_nursery: "Plant Nursery" quarry: "Quarry" - railway: "Railway" + railway: "Railroad Right of Way" recreation_ground: "Recreation Ground" religious: "Religious Ground" reservoir: "Reservoir" @@ -1040,39 +1040,39 @@ en: retail: "Retail Area" village_green: "Village Green" vineyard: "Vineyard" - "yes": "Landuse" + "yes": "Land Use Area" leisure: - adult_gaming_centre: "Adult Gaming Centre" + adult_gaming_centre: "Adult Gaming Center" amusement_arcade: "Amusement Arcade" bandstand: "Bandstand" beach_resort: "Beach Resort" bird_hide: "Bird Hide" bleachers: "Bleachers" bowling_alley: "Bowling Alley" - common: "Common Land" + common: "Common" dance: "Dance Hall" dog_park: "Dog Park" firepit: "Fire Pit" - fishing: "Fishing Area" - fitness_centre: "Fitness Centre" - fitness_station: "Fitness Station" + fishing: "Fishing Hole" + fitness_centre: "Fitness Center" + fitness_station: "Outdoor Fitness Station" garden: "Garden" golf_course: "Golf Course" - horse_riding: "Horse Riding Centre" + horse_riding: "Horseback Riding Center" ice_rink: "Ice Rink" marina: "Marina" miniature_golf: "Miniature Golf" - nature_reserve: "Nature Reserve" - outdoor_seating: "Outdoor Seating" + nature_reserve: "Nature Preserve" + outdoor_seating: "Outdoor Seating Area" park: "Park" picnic_table: "Picnic Table" - pitch: "Sports Pitch" + pitch: "Playing Field" playground: "Playground" recreation_ground: "Recreation Ground" resort: "Resort" sauna: "Sauna" - slipway: "Slipway" - sports_centre: "Sports Centre" + slipway: "Boat Ramp" + sports_centre: "Sports Center" stadium: "Stadium" swimming_pool: "Swimming Pool" track: "Running Track" @@ -1080,69 +1080,69 @@ en: "yes": "Leisure" man_made: adit: "Adit" - advertising: "Advertising" + advertising: "Advertisement" antenna: "Antenna" - avalanche_protection: "Avalanche Protection" + avalanche_protection: "Avalanche Control Structure" beacon: "Beacon" beam: "Beam" - beehive: "Bee Hive" + beehive: "Beehive" breakwater: "Breakwater" bridge: "Bridge" - bunker_silo: "Bunker" + bunker_silo: "Bunker Silo" cairn: "Cairn" chimney: "Chimney" - clearcut: "Clearcut" + clearcut: "Clearcut Forest" communications_tower: "Communications Tower" crane: "Crane" cross: "Cross" - dolphin: "Mooring Post" - dyke: "Dyke" + dolphin: "Dolphin" + dyke: "Levee" embankment: "Embankment" flagpole: "Flagpole" gasometer: "Gasometer" - groyne: "Groyne" + groyne: "Groin" kiln: "Kiln" lighthouse: "Lighthouse" manhole: "Manhole" mast: "Mast" mine: "Mine" - mineshaft: "Mine Shaft" + mineshaft: "Mineshaft" monitoring_station: "Monitoring Station" - petroleum_well: "Petroleum Well" + petroleum_well: "Oil Well" pier: "Pier" pipeline: "Pipeline" pumping_station: "Pumping Station" reservoir_covered: "Covered Reservoir" silo: "Silo" - snow_cannon: "Snow Cannon" + snow_cannon: "Snowgun" snow_fence: "Snow Fence" storage_tank: "Storage Tank" street_cabinet: "Street Cabinet" - surveillance: "Surveillance" + surveillance: "Surveillance Equipment" telescope: "Telescope" tower: "Tower" utility_pole: "Utility Pole" wastewater_plant: "Wastewater Plant" - watermill: "Water Mill" + watermill: "Watermill" water_tap: "Water Tap" water_tower: "Water Tower" - water_well: "Well" - water_works: "Water Works" - windmill: "Wind Mill" + water_well: "Water Well" + water_works: "Waterworks" + windmill: "Windmill" works: "Factory" - "yes": "Man-made" + "yes": "Man-Made" military: airfield: "Military Airfield" barracks: "Barracks" bunker: "Bunker" - checkpoint: "Checkpoint" - trench: "Trench" + checkpoint: "Military Checkpoint" + trench: "Military Trench" "yes": "Military" mountain_pass: "yes" : "Mountain Pass" natural: atoll: "Atoll" - bare_rock: "Bare Rock" + bare_rock: "Exposed Rock" bay: "Bay" beach: "Beach" cape: "Cape" @@ -1165,20 +1165,20 @@ en: land: "Land" marsh: "Marsh" moor: "Moor" - mud: "Mud" + mud: "Mudflat" peak: "Peak" peninsula: "Peninsula" point: "Point" reef: "Reef" ridge: "Ridge" - rock: "Rock" + rock: "Boulder" saddle: "Saddle" sand: "Sand" scree: "Scree" scrub: "Scrub" shingle: "Shingle" spring: "Spring" - stone: "Stone" + stone: "Boulder" strait: "Strait" tree: "Tree" tree_row: "Tree Row" @@ -1187,39 +1187,39 @@ en: volcano: "Volcano" water: "Water" wetland: "Wetland" - wood: "Wood" + wood: "Woods" "yes": "Natural Feature" office: - accountant: "Accountant" - administrative: "Administration" + accountant: "Accountant Office" + administrative: "Administrative Office" advertising_agency: "Advertising Agency" - architect: "Architect" - association: "Association" - company: "Company" + architect: "Architect Office" + association: "Nonprofit Organization Office" + company: "Corporate Office" diplomatic: "Diplomatic Office" educational_institution: "Educational Institution" employment_agency: "Employment Agency" energy_supplier: "Energy Supplier Office" - estate_agent: "Estate Agent" + estate_agent: "Real Estate Agent" financial: "Financial Office" government: "Governmental Office" insurance: "Insurance Office" it: "IT Office" - lawyer: "Lawyer" + lawyer: "Law Office" logistics: "Logistics Office" newspaper: "Newspaper Office" ngo: "NGO Office" - notary: "Notary" + notary: "Notary Office" religion: "Religious Office" research: "Research Office" - tax_advisor: "Tax Advisor" - telecommunication: "Telecommunication Office" + tax_advisor: "Tax Advisor Office" + telecommunication: "Telecom Office" travel_agent: "Travel Agency" "yes": "Office" place: - allotments: "Allotments" + allotments: "Garden Allotments" archipelago: "Archipelago" - city: "City" + city: "Major City" city_block: "City Block" country: "Country" county: "County" @@ -1232,187 +1232,187 @@ en: isolated_dwelling: "Isolated Dwelling" locality: "Locality" municipality: "Municipality" - neighbourhood: "Neighbourhood" + neighbourhood: "Neighborhood" plot: "Plot" - postcode: "Postcode" + postcode: "Postal Code" quarter: "Quarter" region: "Region" sea: "Sea" square: "Square" state: "State" subdivision: "Subdivision" - suburb: "Suburb" + suburb: "Urban District" town: "Town" village: "Village" "yes": "Place" railway: - abandoned: "Abandoned Railway" + abandoned: "Abandoned Train Track" buffer_stop: "Buffer Stop" - construction: "Railway under Construction" - disused: "Disused Railway" - funicular: "Funicular Railway" + construction: "Train Track Under Construction" + disused: "Inactive Train Track" + funicular: "Funicular Track" halt: "Train Stop" - junction: "Railway Junction" - level_crossing: "Level Crossing" - light_rail: "Light Rail" - miniature: "Miniature Rail" + junction: "Railroad Junction" + level_crossing: "Railroad Crossing" + light_rail: "Light Rail Track" + miniature: "Miniature Train Track" monorail: "Monorail" - narrow_gauge: "Narrow Gauge Railway" - platform: "Railway Platform" - preserved: "Preserved Railway" - proposed: "Proposed Railway" - rail: "Rail" - spur: "Railway Spur" - station: "Railway Station" - stop: "Railway Stop" - subway: "Subway" + narrow_gauge: "Narrow Gauge Track" + platform: "Train Platform" + preserved: "Preserved Train Track" + proposed: "Proposed Train Track" + rail: "Train Track" + spur: "Spur Track" + station: "Train Station" + stop: "Train Stopping Position" + subway: "Subway Track" subway_entrance: "Subway Entrance" - switch: "Railway Points" - tram: "Tramway" - tram_stop: "Tram Stop" + switch: "Railroad Switch" + tram: "Trolley Track" + tram_stop: "Trolley Stopping Position" turntable: "Turntable" - yard: "Railway Yard" + yard: "Rail Yard" shop: - agrarian: "Agrarian Shop" - alcohol: "Off License" - antiques: "Antiques" - appliance: "Appliances Shop" - art: "Art Shop" - baby_goods: "Baby Goods" - bag: "Bag Shop" + agrarian: "Farm Supply Shop" + alcohol: "Liquor Store" + antiques: "Antique Store" + appliance: "Appliances Store" + art: "Art Store" + baby_goods: "Baby Goods Store" + bag: "Bag Store" bakery: "Bakery" - bathroom_furnishing: "Bathroom Furnishing" - beauty: "Beauty Shop" - bed: "Bedding Products" - beverages: "Beverages Shop" + bathroom_furnishing: "Bathroom Furnishing Store" + beauty: "Beautician" + bed: "Bedding Store" + beverages: "Beverage Store" bicycle: "Bicycle Shop" bookmaker: "Bookmaker" - books: "Book Shop" + books: "Bookstore" boutique: "Boutique" butcher: "Butcher" - car: "Car Shop" - car_parts: "Car Parts" - car_repair: "Car Repair" - carpet: "Carpet Shop" - charity: "Charity Shop" - cheese: "Cheese Shop" - chemist: "Chemist" - chocolate: "Chocolate" - clothes: "Clothes Shop" - coffee: "Coffee Shop" - computer: "Computer Shop" - confectionery: "Confectionery Shop" + car: "Car Dealership" + car_parts: "Car Parts Store" + car_repair: "Car Repair Shop" + carpet: "Carpet Store" + charity: "Charity Store" + cheese: "Cheese Store" + chemist: "Drugstore" + chocolate: "Chocolate Store" + clothes: "Clothing Store" + coffee: "Coffee Store" + computer: "Computer Store" + confectionery: "Candy Store" convenience: "Convenience Store" - copyshop: "Copy Shop" - cosmetics: "Cosmetics Shop" - craft: "Crafts Supply Store" - curtain: "Curtain Shop" - dairy: "Dairy Shop" - deli: "Deli" + copyshop: "Print Center" + cosmetics: "Cosmetics Store" + craft: "Art Supply Store" + curtain: "Curtain Store" + dairy: "Dairy Store" + deli: "Delicatessen" department_store: "Department Store" - discount: "Discount Items Shop" - doityourself: "Do-It-Yourself Shop" - dry_cleaning: "Dry Cleaning" + discount: "Discount Store" + doityourself: "DIY Store" + dry_cleaning: "Dry Cleaner" e-cigarette: "E-Cigarette Shop" - electronics: "Electronics Shop" - erotic: "Erotic Shop" - estate_agent: "Estate Agent" + electronics: "Electronics Store" + erotic: "Erotic Store" + estate_agent: "Real Estate Agent" fabric: "Fabric Store" - farm: "Farm Shop" - fashion: "Fashion Shop" + farm: "Produce Stand" + fashion: "Fashion Store" fishing: "Fishing Supplies Shop" florist: "Florist" - food: "Food Shop" - frame: "Frame Shop" - funeral_directors: "Funeral Directors" - furniture: "Furniture" - garden_centre: "Garden Centre" - gas: "Gas Store" + food: "Food Store" + frame: "Framing Store" + funeral_directors: "Funeral Home" + furniture: "Furniture Store" + garden_centre: "Garden Center" + gas: "Bottled Gas Store" general: "General Store" gift: "Gift Shop" - greengrocer: "Greengrocer" - grocery: "Grocery Shop" + greengrocer: "Produce Store" + grocery: "Grocery Store" hairdresser: "Hairdresser" hardware: "Hardware Store" health_food: "Health Food Store" hearing_aids: "Hearing Aids" herbalist: "Herbalist" - hifi: "Hi-Fi Shop" - houseware: "Houseware Shop" - ice_cream: "Ice Cream Shop" - interior_decoration: "Interior Decoration" - jewelry: "Jewelry Shop" - kiosk: "Kiosk Shop" - kitchen: "Kitchen Shop" + hifi: "Hifi Store" + houseware: "Houseware store" + ice_cream: "Ice Cream Store" + interior_decoration: "Interior Decoration Store" + jewelry: "Jewelry Store" + kiosk: "Kiosk" + kitchen: "Kitchen Design Store" laundry: "Laundry" locksmith: "Locksmith" - lottery: "Lottery" - mall: "Mall" - massage: "Massage" - medical_supply: "Medical Supply Shop" - mobile_phone: "Mobile Phone Shop" - money_lender: "Money Lender" - motorcycle: "Motorcycle Shop" + lottery: "Lottery Retailer" + mall: "Shopping Mall" + massage: "Massage Parlor" + medical_supply: "Medical Supply Store" + mobile_phone: "Mobile Phone Store" + money_lender: "Moneylender" + motorcycle: "Motorcycle Dealership" motorcycle_repair: "Motorcycle Repair Shop" - music: "Music Shop" - musical_instrument: "Musical Instruments" - newsagent: "Newsagent" - nutrition_supplements: "Nutrition Supplements" + music: "Music Store" + musical_instrument: "Musical Instrument Store" + newsagent: "Newsstand" + nutrition_supplements: "Nutritional Supplement Store" optician: "Optician" - organic: "Organic Food Shop" - outdoor: "Outdoor Shop" - paint: "Paint Shop" + organic: "Organic Food Store" + outdoor: "Outdoor Recreation Store" + paint: "Paint Store" pastry: "Pastry Shop" - pawnbroker: "Pawnbroker" - perfumery: "Perfumery" - pet: "Pet Shop" - pet_grooming: "Pet Grooming" + pawnbroker: "Pawnshop" + perfumery: "Perfume Store" + pet: "Pet Store" + pet_grooming: "Pet Groomer" photo: "Photo Shop" - seafood: "Sea Food" - second_hand: "Second-hand Shop" - sewing: "Sewing Shop" - shoes: "Shoe Shop" - sports: "Sports Shop" - stationery: "Stationery Shop" + seafood: "Seafood Store" + second_hand: "Thrift Store" + sewing: "Sewing Supply Store" + shoes: "Shoe Store" + sports: "Sporting Goods Store" + stationery: "Office Supply Store" storage_rental: "Storage Rental" supermarket: "Supermarket" tailor: "Tailor" - tattoo: "Tattoo Shop" - tea: "Tea Shop" - ticket: "Ticket Shop" + tattoo: "Tattoo Parlor" + tea: "Tea Store" + ticket: "Ticket Vendor" tobacco: "Tobacco Shop" - toys: "Toy Shop" + toys: "Toystore" travel_agency: "Travel Agency" - tyres: "Tyre Shop" - vacant: "Vacant Shop" - variety_store: "Variety Store" - video: "Video Shop" + tyres: "Tire Store" + vacant: "Vacant Storefront" + variety_store: "Discount Store" + video: "Video Store" video_games: "Video Game Store" wholesale: "Wholesale Store" wine: "Wine Store" - "yes": "Shop" + "yes": "Store" tourism: - alpine_hut: "Alpine Hut" - apartment: "Holiday Apartment" - artwork: "Artwork" - attraction: "Attraction" + alpine_hut: "Mountain Lodge" + apartment: "Guest Apartment" + artwork: "Work of Art" + attraction: "Tourist Attraction" bed_and_breakfast: "Bed and Breakfast" cabin: "Tourist Cabin" - camp_pitch: "Camp Pitch" - camp_site: "Camp Site" - caravan_site: "Caravan Site" - chalet: "Chalet" - gallery: "Gallery" - guest_house: "Guest House" + camp_pitch: "Campsite" + camp_site: "Campground" + caravan_site: "RV Park" + chalet: "Holiday Home" + gallery: "Art Gallery" + guest_house: "Guesthouse" hostel: "Hostel" hotel: "Hotel" information: "Information" motel: "Motel" museum: "Museum" picnic_site: "Picnic Site" - theme_park: "Theme Park" - viewpoint: "Viewpoint" - wilderness_hut: "Wilderness Hut" + theme_park: "Amusement Park" + viewpoint: "Vista Point" + wilderness_hut: "Backcountry Hut" zoo: "Zoo" tunnel: building_passage: "Building Passage" @@ -1425,7 +1425,7 @@ en: dam: "Dam" derelict_canal: "Derelict Canal" ditch: "Ditch" - dock: "Dock" + dock: "Shipyard Dock" drain: "Drain" lock: "Lock" lock_gate: "Lock Gate" @@ -1435,19 +1435,19 @@ en: stream: "Stream" wadi: "Wadi" waterfall: "Waterfall" - weir: "Weir" + weir: "Low-Head Dam" "yes": "Waterway" admin_levels: - level2: "Country Boundary" - level3: "Region Boundary" - level4: "State Boundary" - level5: "Region Boundary" - level6: "County Boundary" - level7: "Municipality Boundary" - level8: "City Boundary" - level9: "Village Boundary" - level10: "Suburb Boundary" - level11: "Neighbourhood Boundary" + level2: "International Border" + level3: "Regional Administrative Boundary" + level4: "Regional Administrative Boundary" + level5: "Regional Administrative Boundary" + level6: "Local Administrative Boundary" + level7: "Local Administrative Boundary" + level8: "Local Administrative Boundary" + level9: "Sublocal Administrative Boundary" + level10: "Sublocal Administrative Boundary" + level11: "Sublocal Administrative Boundary" types: cities: Cities towns: Towns @@ -1499,11 +1499,11 @@ en: no_other_issues: No other issues against this user. comments_on_this_issue: Comments on this issue resolve: - resolved: Issue status has been set to 'Resolved' + resolved: Issue status has been set to "Resolved" ignore: - ignored: Issue status has been set to 'Ignored' + ignored: Issue status has been set to "Ignored" reopen: - reopened: Issue status has been set to 'Open' + reopened: Issue status has been set to "Open" comments: comment_from_html: "Comment from %{user_link} on %{comment_created_at}" reassign_param: Reassign Issue? @@ -1695,8 +1695,8 @@ en: your_changeset_html: "%{commenter} left a comment at %{time} on one of your changesets" commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}" commented_changeset_html: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}" - partial_changeset_with_comment: "with comment '%{changeset_comment}'" - partial_changeset_with_comment_html: "with comment '%{changeset_comment}'" + partial_changeset_with_comment: 'with comment "%{changeset_comment}"' + partial_changeset_with_comment_html: 'with comment "%{changeset_comment}"' partial_changeset_without_comment: "without comment" details: "Reply or learn more about the changeset at %{url}." details_html: "Reply or learn more about the changeset at %{url}." @@ -1777,14 +1777,14 @@ en: one: "%{count} muted message" other: "You have %{count} muted messages" reply: - wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply." + wrong_user: 'You are logged in as "%{user}", but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.' show: title: "Read message" reply_button: "Reply" unread_button: "Mark as unread" destroy_button: "Delete" back: "Back" - wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it." + wrong_user: 'You are logged in as "%{user}", but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.' sent_message_summary: destroy_button: "Delete" heading: @@ -2014,7 +2014,7 @@ en: data form, you can name and link directly to the license(s). In media where links are not possible (e.g. printed works), we suggest you direct your readers to openstreetmap.org (perhaps by expanding - 'OpenStreetMap' to this full address) and to opendatacommons.org. + "OpenStreetMap" to this full address) and to opendatacommons.org. In this example, the credit appears in the corner of the map. credit_4_1_this_copyright_page: this copyright page attribution_example: @@ -2022,11 +2022,11 @@ en: title: Attribution example more_title_html: Finding out more more_1_1_html: Read more about using our data, and how to credit us, at the %{osmf_licence_page_link}. - more_1_1_osmf_licence_page: OSMF Licence page + more_1_1_osmf_licence_page: OSMF License page more_1_1_osmf_licence_page_url: https://osmfoundation.org/Licence more_2_1_html: | Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-parties. + free-of-charge map API for third parties. See our %{api_usage_policy_link}, %{tile_usage_policy_link} and %{nominatim_usage_policy_link}. more_2_1_api_usage_policy: API Usage Policy more_2_1_api_usage_policy_url: https://operations.osmfoundation.org/policies/api/ @@ -2057,7 +2057,7 @@ en: contributors_au_australia: Australia contributors_au_geoscape_australia: Geoscape Australia contributors_au_geoscape_australia_url: https://geoscape.com.au/legal/data-copyright-and-disclaimer/ - contributors_au_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0) + contributors_au_cc_licence: Creative Commons Attribution 4.0 International license (CC BY 4.0) contributors_au_cc_licence_url: https://creativecommons.org/licenses/by/4.0/ contributors_ca_credit_html: | %{canada}: Contains data from @@ -2070,7 +2070,7 @@ en: %{czechia}: Contains data from the State Administration of Land Surveying and Cadastre licensed under %{cc_licence_link} contributors_cz_czechia: Czechia - contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0) + contributors_cz_cc_licence: Creative Commons Attribution 4.0 International license (CC BY 4.0) contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/ contributors_fi_credit_html: | %{finland}: Contains data from the @@ -2143,7 +2143,7 @@ en: 2010-2023. contributors_gb_united_kingdom: United Kingdom contributors_2_html: | - For further details of these, and other sources that have been used + For further details of these and other sources that have been used to help improve OpenStreetMap, please see the %{contributors_page_link} on the OpenStreetMap Wiki. contributors_2_contributors_page: Contributors page contributors_2_contributors_page_url: https://wiki.openstreetmap.org/wiki/Contributors @@ -2154,7 +2154,7 @@ en: infringement_title_html: Copyright infringement infringement_1_html: | OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without + copyrighted sources (e.g., Google Maps or printed maps) without explicit permission from the copyright holders. infringement_2_1_html: | If you believe that copyrighted material has been inappropriately @@ -2163,7 +2163,7 @@ en: %{online_filing_page_link}. infringement_2_1_takedown_procedure: takedown procedure infringement_2_1_takedown_procedure_url: https://wiki.osmfoundation.org/wiki/Takedown_procedure - infringement_2_1_online_filing_page: on-line filing page + infringement_2_1_online_filing_page: online filing page infringement_2_1_online_filing_page_url: https://dmca.openstreetmap.org/ trademarks_title: Trademarks trademarks_1_1_html: | @@ -2192,7 +2192,7 @@ en: export: title: "Export" manually_select: "Manually select a different area" - licence: "Licence" + licence: "License" licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL). odbl: Open Data Commons Open Database License odbl_url: https://opendatacommons.org/licenses/odbl/1.0/ @@ -2201,13 +2201,13 @@ en: body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." planet: title: "Planet OSM" - description: "Regularly-updated copies of the complete OpenStreetMap database" + description: "Regularly updated copies of the complete OpenStreetMap database" overpass: title: "Overpass API" description: "Download this bounding box from a mirror of the OpenStreetMap database" geofabrik: title: "Geofabrik Downloads" - description: "Regularly-updated extracts of continents, countries, and selected cities" + description: "Regularly updated extracts of continents, countries, and selected cities" other: title: "Other Sources" description: "Additional sources listed on the OpenStreetMap Wiki" @@ -2219,7 +2219,7 @@ en: join_the_community: title: Join the community explanation_html: | - If you have noticed a problem with our map data, for example a road is missing or your address, the best way to + If you have noticed a problem with our map data – for example, if a road or your address is missing – the best way to proceed is to join the OpenStreetMap community and add or repair the data yourself. add_a_note: instructions_1_html: | @@ -2229,7 +2229,7 @@ en: other_concerns: title: Other concerns concerns_html: | - If you have concerns about how our data is being used or about the contents please consult our + If you have concerns about how our data is being used or about the contents, please consult our %{copyright_link} for more legal information, or contact the appropriate %{working_group_link}. copyright: copyright page working_group: OSMF working group @@ -2246,7 +2246,7 @@ en: beginners_guide: url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Beginners' Guide - description: Community maintained guide for beginners. + description: Community-maintained guide for beginners. community: url: https://community.openstreetmap.org/ title: Help & Community Forum @@ -2266,7 +2266,7 @@ en: welcomemat: url: https://welcome.openstreetmap.org/ title: For Organizations - description: With an organization making plans for OpenStreetMap? Find what you need to know in the Welcome Mat. + description: Do you belong to an organization that wants to work with OpenStreetMap? Find what you need to know in the Welcome Mat. wiki: url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki @@ -2283,7 +2283,7 @@ en: paragraph_1_html: | OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics. - %{help_link}. With an organization making plans for OpenStreetMap? %{welcome_mat_link}. + %{help_link}. Do you belong to an organization that wants to work with OpenStreetMap? %{welcome_mat_link}. get_help_here: Get help here welcome_mat: Check out the Welcome Mat welcome_mat_url: https://welcome.openstreetmap.org/ @@ -2303,27 +2303,27 @@ en: key: table: entry: - motorway: "Motorway" + motorway: "Controlled-access highway" main_road: "Main road" trunk: "Trunk road" primary: "Primary road" secondary: "Secondary road" - unclassified: "Unclassified road" - pedestrian: "Pedestrian way" - track: "Track" - bridleway: "Bridleway" - cycleway: "Cycleway" - cycleway_national: "National cycleway" - cycleway_regional: "Regional cycleway" - cycleway_local: "Local cycleway" + unclassified: "Minor road" + pedestrian: "Pedestrian mall" + track: "Land management road or vehicular trail" + bridleway: "Bridle path" + cycleway: "Bicycle path" + cycleway_national: "National bicycle route" + cycleway_regional: "Regional bicycle route" + cycleway_local: "Local bicycle route" cycleway_mtb: "Mountain bike route" - footway: "Footway" - rail: "Railway" + footway: "Footpath" + rail: "Train track" train: "Train" subway: "Subway" ferry: "Ferry" light_rail: "Light rail" - tram: "Tram" + tram: "Trolley" trolleybus: "Trolleybus" bus: "Bus" cable_car: "Cable car" @@ -2333,15 +2333,15 @@ en: apron: "Airport apron" admin: "Administrative boundary" capital: "Capital" - city: "City" + city: "Major city" orchard: "Orchard" vineyard: "Vineyard" - forest: "Forest" - wood: "Wood" + forest: "Managed forest" + wood: "Woods" farmland: "Farmland" grass: "Grass" meadow: "Meadow" - bare_rock: "Bare rock" + bare_rock: "Exposed rock" sand: "Sand" golf: "Golf course" park: "Park" @@ -2360,18 +2360,18 @@ en: reef: "Reef" wetland: "Wetland" farm: "Farm" - brownfield: "Brownfield site" + brownfield: "Brownfield" cemetery: "Cemetery" - allotments: "Allotments" - pitch: "Sports pitch" - centre: "Sports centre" + allotments: "Garden allotments" + pitch: "Playing field" + centre: "Sports center" beach: "Beach" - reserve: "Nature reserve" + reserve: "Nature preserve" military: "Military area" school: "School" university: "University" hospital: "Hospital" - building: "Significant building" + building: "Building" station: "Railway station" summit: "Summit" peak: "Peak" @@ -2379,14 +2379,14 @@ en: bridge: "Black casing = bridge" private: "Private access" destination: "Destination access" - construction: "Roads under construction" + construction: "Road under construction" bus_stop: "Bus stop" stop: "Stop" bicycle_shop: "Bicycle shop" bicycle_rental: "Bicycle rental" bicycle_parking: "Bicycle parking" bicycle_parking_small: "Small bicycle parking" - toilets: "Toilets" + toilets: "Restroom" welcome: title: Welcome! introduction: | @@ -2420,7 +2420,7 @@ en: rules: title: Rules! para_1_html: | - OpenStreetMap has few formal rules but we expect all participants to collaborate + OpenStreetMap has few formal rules, but we expect all participants to collaborate with, and communicate with, the community. If you are considering any activities other than editing by hand, please read and follow the guidelines on %{imports_link} and %{automated_edits_link}. @@ -2431,7 +2431,7 @@ en: start_mapping: Start Mapping continue_authorization: Continue Authorization add_a_note: - title: No Time To Edit? Add a Note! + title: No Time to Edit? Add a Note! para_1: | 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. @@ -2450,17 +2450,17 @@ en: local_chapters: title: Local Chapters about_text: | - Local Chapters are country-level or region-level groups that have taken the formal step of - establishing not-for-profit legal entities. They represent the area's map and mappers when + Local chapters are national or regional groups that have taken the formal step of + establishing nonprofit legal entities. They represent the area's map and mappers when dealing with local government, business, and media. They have also formed an affiliation with the OpenStreetMap Foundation (OSMF), giving them a link to the legal and copyright governing body. list_text: | - The following communities are formally established as Local Chapters: + The following communities are formally established as local chapters: other_groups: title: Other Groups other_groups_html: | - There is no need to formally establish a group to the same extent as the Local Chapters. + There is no need to formally establish a group to the same extent as the local chapters. Indeed many groups exist very sucessfully as an informal gathering of people or as a community group. Anyone can set up or join these. Read more on the %{communities_wiki_link}. communities_wiki: Communities wiki page @@ -2479,11 +2479,11 @@ en: help_url: "https://wiki.openstreetmap.org/wiki/Upload" create: upload_trace: "Upload GPS Trace" - trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion." - upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again" + trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion into the database. This will usually happen within half an hour, and an email will be sent to you upon completion." + upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again." traces_waiting: - one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." - other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users." + one: "You have %{count} trace waiting for upload. Please consider waiting for it to finish before uploading any more, to avoid blocking the queue from other users." + other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, to avoid blocking the queue from other users." edit: cancel: Cancel title: "Editing Trace %{name}" @@ -2573,11 +2573,11 @@ en: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." require_admin: - not_an_admin: You need to be an admin to perform that action. + not_an_admin: You need to be an administrator to perform that action. setup_user_auth: blocked_zero_hour: "You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits." - blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." - need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." + blocked: "Your access to the API has been blocked. Please log in to the web interface to find out more." + need_to_see_terms: "Your access to the API is temporarily suspended. Please log in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." settings_menu: account_settings: Account Settings oauth1_settings: OAuth 1 settings @@ -2631,7 +2631,7 @@ en: permissions: missing: "You have not permitted the application access to this facility" scopes: - openid: Sign-in using OpenStreetMap + openid: Sign in using OpenStreetMap read_prefs: Read user preferences write_prefs: Modify user preferences write_diary: Create diary entries, comments and make friends @@ -2641,7 +2641,7 @@ en: write_notes: Modify notes write_redactions: Redact map data read_email: Read user email address - skip_authorization: Auto approve application + skip_authorization: Auto-approve application for_roles: moderator: This permission is for actions available only to moderators oauth_clients: @@ -2656,7 +2656,7 @@ en: secret: "Consumer Secret:" url: "Request Token URL:" access_url: "Access Token URL:" - authorize_url: "Authorise URL:" + authorize_url: "Authorize URL:" support_notice: "We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures." edit: "Edit Details" delete: "Delete Client" @@ -2664,7 +2664,7 @@ en: requests: "Requesting the following permissions from the user:" index: title: "My OAuth Details" - my_tokens: "My Authorised Applications" + my_tokens: "My Authorized Applications" list_tokens: "The following tokens have been issued to applications in your name:" application: "Application Name" issued_at: "Issued At" @@ -2737,7 +2737,7 @@ en: title: "Sign Up" tab_title: "Sign up" signup_to_authorize_html: "Sign up with OpenStreetMap to access %{client_app_name}." - no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." + no_auto_account_create: "Unfortunately, we are not currently able to create an account for you automatically." please_contact_support_html: 'Please contact %{support_link} to arrange for an account to be created - we will try and deal with the request as quickly as possible.' support: support about: @@ -2745,7 +2745,7 @@ en: paragraph_1: Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use. paragraph_2: Sign up to get started contributing. welcome: "Welcome to OpenStreetMap" - duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account." + duplicate_social_email: "If you already have an OpenStreetMap account and want to use a third-party identity provider, please log in using your password and modify the settings of your account." display name description: "Your publicly displayed username. You can change this later in the preferences." by_signing_up: html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}." @@ -2755,14 +2755,14 @@ en: contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms" contributor_terms: "contributor terms" tou: "terms of use" - external auth: "Third Party Authentication:" + external auth: "Third-Party Authentication:" continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" email_help: privacy_policy: privacy policy privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy privacy_policy_title: OSMF privacy policy including section on email addresses - html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.' + html: 'Your address is not displayed publicly. See our %{privacy_policy_link} for more information.' consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}." consider_pd: "public domain" consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain @@ -2772,7 +2772,7 @@ en: title: "Terms" heading: "Terms" heading_ct: "Contributor terms" - read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the continue button." + read and accept with tou: "Please read the contributor agreement and the terms of use, check both checkboxes when done and then press the Continue button." contributor_terms_explain: "This agreement governs the terms for your existing and future contributions." read_ct: "I have read and agree to the above contributor terms" tou_explain_html: "These %{tou_link} govern the use of the website and other infrastructure provided by the OSMF. Please click on the link, read and agree to the text." @@ -2781,7 +2781,7 @@ en: consider_pd_why: "what's this?" consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain guidance_info_html: "Information to help understand these terms: a %{readable_summary_link} and some %{informal_translations_link}" - readable_summary: human readable summary + readable_summary: human-readable summary informal_translations: informal translations continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" @@ -2791,7 +2791,7 @@ en: legale_names: france: "France" italy: "Italy" - rest_of_world: "Rest of the world" + rest_of_world: "Rest of world" terms_declined_flash: terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. terms_declined_link: this wiki page @@ -2827,14 +2827,14 @@ en: mapper since: "Mapper since:" last map edit: "Last map edit:" no activity yet: "No activity yet" - uid: "User id:" + uid: "User ID:" ct status: "Contributor terms:" ct undecided: Undecided ct declined: Declined email address: "Email address:" created from: "Created from:" status: "Status:" - spam score: "Spam Score:" + spam score: "Spam score:" role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2900,22 +2900,22 @@ en: with your ID in your user settings. user_role: filter: - not_a_role: "The string `%{role}' is not a valid role." + not_a_role: 'The string "%{role}" is not a valid role.' already_has_role: "The user already has role %{role}." doesnt_have_role: "The user does not have role %{role}." not_revoke_admin_current_user: "Cannot revoke administrator role from current user." grant: title: Confirm role granting heading: Confirm role granting - are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?" + are_you_sure: 'Are you sure you want to grant the role "%{role}" to the user "%{name}"?' confirm: "Confirm" - fail: "Could not grant role `%{role}' to user `%{name}'. Please check that the user and role are both valid." + fail: 'Could not grant role "%{role}" to user "%{name}". Please check that the user and role are both valid.' revoke: title: Confirm role revoking heading: Confirm role revoking - are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?" + are_you_sure: 'Are you sure you want to revoke the role "%{role}" from the user "%{name}"?' confirm: "Confirm" - fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid." + fail: 'Could not revoke role "%{role}" from user "%{name}". Please check that the user and role are both valid.' user_blocks: model: non_moderator_update: "Must be a moderator to create or update a block." @@ -2926,16 +2926,16 @@ en: new: title: "Creating block on %{name}" heading_html: "Creating block on %{name}" - period: "How long, starting now, the user will be blocked from the API for." + period: "Duration during which the user will be blocked from the API, starting now." back: "View all blocks" edit: title: "Editing block on %{name}" heading_html: "Editing block on %{name}" - period: "How long, starting now, the user will be blocked from the API for." + period: "Duration during which the user will be blocked from the API, starting now." show: "View this block" back: "View all blocks" filter: - block_period: "The blocking period must be one of the values selectable in the drop-down list." + block_period: "The blocking period must be one of the values selectable in the dropdown list." create: flash: "Created a block on user %{name}." update: @@ -2951,14 +2951,14 @@ en: heading_html: "Revoking block on %{block_on} by %{block_by}" time_future_html: "This block will end in %{time}." past_html: "This block ended %{time} and cannot be revoked now." - confirm: "Are you sure you wish to revoke this block?" + confirm: "Are you sure you want to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." revoke_all: title: "Revoking all blocks on %{block_on}" heading_html: "Revoking all blocks on %{block_on}" empty: "%{name} has no active blocks." - confirm: "Are you sure you wish to revoke %{active_blocks}?" + confirm: "Are you sure you want to revoke %{active_blocks}?" active_blocks: one: "%{count} active block" other: "%{count} active blocks" @@ -3033,8 +3033,8 @@ en: you_have_muted_n_users: one: "You have muted %{count} User" other: "You have muted %{count} users" - user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications." - user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted." + user_mute_explainer: "Messages of muted users are moved into a separate inbox and you won't receive email notifications." + user_mute_admins_and_moderators: "You can mute administrators and moderators, but their messages will not be muted." table: thead: muted_user: "Muted User" @@ -3057,7 +3057,7 @@ en: subheading_submitted: "submitted" subheading_commented: "commented on" no_notes: No notes - id: "Id" + id: "ID" creator: "Creator" description: "Description" created_at: "Created at" @@ -3092,11 +3092,11 @@ en: disappear_date_html: "This resolved note will disappear from the map in %{disappear_in}." new: title: "New Note" - intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." + intro: "Have you spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem." anonymous_warning_html: "You are not logged in. Please %{log_in} or %{sign_up} if you want to receive updates for your note." anonymous_warning_log_in: "log in" anonymous_warning_sign_up: "sign up" - advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." + advice: "Your note is public and may be used to update the map, so don't enter personal information, and don't enter information from copyrighted maps or directory listings." add: Add Note javascripts: close: Close @@ -3195,10 +3195,10 @@ en: distance_km: "%{distance}km" errors: no_route: "Couldn't find a route between those two places." - no_place: "Sorry - couldn't locate '%{place}'." + no_place: 'Sorry - couldn\'t locate "%{place}".' instructions: continue_without_exit: Continue on %{name} - slight_right_without_exit: Slight right onto %{name} + slight_right_without_exit: Make a slight right onto %{name} offramp_right: Take the ramp on the right offramp_right_with_exit: Take exit %{exit} on the right offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name} @@ -3212,13 +3212,13 @@ en: onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions} onramp_right_without_directions: Turn right onto the ramp onramp_right: Turn right onto the ramp - endofroad_right_without_exit: At the end of the road turn right onto %{name} + endofroad_right_without_exit: At the end of the road, turn right onto %{name} merge_right_without_exit: Merge right onto %{name} - fork_right_without_exit: At the fork turn right onto %{name} + fork_right_without_exit: At the fork, bear right onto %{name} turn_right_without_exit: Turn right onto %{name} - sharp_right_without_exit: Sharp right onto %{name} - uturn_without_exit: U-turn along %{name} - sharp_left_without_exit: Sharp left onto %{name} + sharp_right_without_exit: Make a sharp right onto %{name} + uturn_without_exit: Make a U-turn on %{name} + sharp_left_without_exit: Make a sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} offramp_left: Take the ramp on the left offramp_left_with_exit: Take exit %{exit} on the left @@ -3233,22 +3233,22 @@ en: onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions} onramp_left_without_directions: Turn left onto the ramp onramp_left: Turn left onto the ramp - endofroad_left_without_exit: At the end of the road turn left onto %{name} + endofroad_left_without_exit: At the end of the road, turn left onto %{name} merge_left_without_exit: Merge left onto %{name} - fork_left_without_exit: At the fork turn left onto %{name} - slight_left_without_exit: Slight left onto %{name} + fork_left_without_exit: At the fork, turn left onto %{name} + slight_left_without_exit: Make a slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name} - roundabout_without_exit: At roundabout take exit onto %{name} - leave_roundabout_without_exit: Leave roundabout - %{name} - stay_roundabout_without_exit: Stay on roundabout - %{name} + roundabout_without_exit: At the roundabout, exit onto %{name} + leave_roundabout_without_exit: Leave the roundabout - %{name} + stay_roundabout_without_exit: Stay on the roundabout - %{name} start_without_exit: Start on %{name} - destination_without_exit: Reach destination - against_oneway_without_exit: Go against one-way on %{name} - end_oneway_without_exit: End of one-way on %{name} - roundabout_with_exit: At roundabout take exit %{exit} onto %{name} - roundabout_with_exit_ordinal: At roundabout take %{exit} exit onto %{name} - exit_roundabout: Exit roundabout onto %{name} + destination_without_exit: Reach the destination + against_oneway_without_exit: Go against the flow of traffic on %{name} + end_oneway_without_exit: End of the one-way restriction on %{name} + roundabout_with_exit: At the roundabout, take exit %{exit} onto %{name} + roundabout_with_exit_ordinal: At the roundabout, take %{exit} exit onto %{name} + exit_roundabout: Exit the roundabout onto %{name} unnamed: "unnamed road" courtesy: "Directions courtesy of %{link}" exit_counts: @@ -3276,7 +3276,7 @@ en: add_note: Add a note here show_address: Show address query_features: Query features - centre_map: Centre map here + centre_map: Center map here redactions: edit: heading: "Edit Redaction" @@ -3301,7 +3301,7 @@ en: update: flash: "Changes saved." destroy: - not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it." + not_empty: "Redaction is not empty. Please unredact all versions belonging to this redaction before destroying it." flash: "Redaction destroyed." error: "There was an error destroying this redaction." validations: From 54bfe8642bfcb611cd3e269584cac52dfc00d8e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 00:13:03 -0700 Subject: [PATCH 2/8] Try fixing translation load error --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6fd6016fb7..3572fbdede 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3195,7 +3195,7 @@ en: distance_km: "%{distance}km" errors: no_route: "Couldn't find a route between those two places." - no_place: 'Sorry - couldn\'t locate "%{place}".' + no_place: Sorry - couldn't locate "%{place}". instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Make a slight right onto %{name} From 9479aebc121c12c8d10372f831c53df126c8a874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 00:30:10 -0700 Subject: [PATCH 3/8] Updated tests --- test/controllers/geocoder_controller_test.rb | 2 +- test/controllers/messages_controller_test.rb | 4 ++-- test/controllers/user_blocks_controller_test.rb | 4 ++-- test/controllers/user_roles_controller_test.rb | 4 ++-- test/helpers/application_helper_test.rb | 4 ++-- test/helpers/note_helper_test.rb | 4 ++-- test/system/user_blocks_test.rb | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index ac9905589b..8f8a6c83ce 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -381,7 +381,7 @@ def test_search_osm_nominatim post geocoder_search_osm_nominatim_path(:query => "Broxbourne", :zoom => 10, :minlon => -0.559, :minlat => 51.217, :maxlon => 0.836, :maxlat => 51.766), :xhr => true - results_check({ "prefix" => "Suburb", + results_check({ "prefix" => "Urban District", "name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.7265723, "max-lat" => 51.7665723, "min-lon" => -0.0390782, "max-lon" => 0.0009218, diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index b39aed77b2..dc36a6d68c 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -245,7 +245,7 @@ def test_reply # Check that we can't reply to somebody else's message get message_reply_path(message) assert_redirected_to login_path(:referer => message_reply_path(message)) - assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice] + assert_equal "You are logged in as \"#{other_user.display_name}\" but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice] # Login as the right user session_for(recipient_user) @@ -287,7 +287,7 @@ def test_show # Check that we can't read the message get message_path(message) assert_redirected_to login_path(:referer => message_path(message)) - assert_equal "You are logged in as `#{other_user.display_name}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice] + assert_equal "You are logged in as \"#{other_user.display_name}\" but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice] # Login as the message sender session_for(user) diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 2e9d79ef75..ebe77792d2 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -344,7 +344,7 @@ def test_create :user_block_period => "99") end assert_redirected_to new_user_block_path(target_user) - assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] + assert_equal "The blocking period must be one of the values selectable in the dropdown list.", flash[:error] # Check that creating a block works assert_difference "UserBlock.count", 1 do @@ -430,7 +430,7 @@ def test_update put user_block_path(:id => active_block, :user_block_period => "99") end assert_redirected_to edit_user_block_path(active_block) - assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] + assert_equal "The blocking period must be one of the values selectable in the dropdown list.", flash[:error] # Check that updating a block works assert_no_difference "UserBlock.count" do diff --git a/test/controllers/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb index 73b4f04245..e28c432e21 100644 --- a/test/controllers/user_roles_controller_test.rb +++ b/test/controllers/user_roles_controller_test.rb @@ -71,7 +71,7 @@ def test_grant post grant_role_path(target_user, "no_such_role") end assert_redirected_to user_path(target_user) - assert_equal "The string `no_such_role' is not a valid role.", flash[:error] + assert_equal "The string \"no_such_role\" is not a valid role.", flash[:error] end ## @@ -131,7 +131,7 @@ def test_revoke post revoke_role_path(target_user, "no_such_role") end assert_redirected_to user_path(target_user) - assert_equal "The string `no_such_role' is not a valid role.", flash[:error] + assert_equal "The string \"no_such_role\" is not a valid role.", flash[:error] # Revoking administrator role from current user should fail post revoke_role_path(administrator_user, "administrator") diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 24d74c85f3..e92059e6d3 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -57,7 +57,7 @@ def test_dir def test_friendly_date date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23)) - assert_match %r{^$}, date + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 1.hour) assert_match %r{^$}, date @@ -74,7 +74,7 @@ def test_friendly_date def test_friendly_date_ago date = friendly_date_ago(Time.utc(2014, 3, 5, 18, 58, 23)) - assert_match %r{^$}, date + assert_match %r{^$}, date date = friendly_date_ago(Time.now.utc - 1.hour) assert_match %r{^$}, date diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index bee1cdc2c5..6955ddd942 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -8,8 +8,8 @@ def test_note_event date = Time.utc(2014, 3, 5, 21, 37, 45) user = create(:user) - assert_match %r{^Created by anonymous $}, note_event("opened", date, nil) - assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) + assert_match %r{^Created by anonymous $}, note_event("opened", date, nil) + assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) end def test_note_author diff --git a/test/system/user_blocks_test.rb b/test/system/user_blocks_test.rb index f710f74aae..6431d1a3c5 100644 --- a/test/system/user_blocks_test.rb +++ b/test/system/user_blocks_test.rb @@ -48,7 +48,7 @@ class ReportNoteTest < ApplicationSystemTestCase click_on "Revoke all blocks" assert_title "Revoking all blocks on #{blocked_user.display_name}" assert_text "Revoking all blocks on #{blocked_user.display_name}" - assert_unchecked_field "Are you sure you wish to revoke 1 active block?" + assert_unchecked_field "Are you sure you want to revoke 1 active block?" assert_button "Revoke!" end @@ -65,7 +65,7 @@ class ReportNoteTest < ApplicationSystemTestCase click_on "Revoke all blocks" assert_title "Revoking all blocks on #{blocked_user.display_name}" assert_text "Revoking all blocks on #{blocked_user.display_name}" - assert_unchecked_field "Are you sure you wish to revoke 2 active blocks?" + assert_unchecked_field "Are you sure you want to revoke 2 active blocks?" assert_button "Revoke!" end end From 2d6eb49e92c80e40643c98bee27e71cd27dff96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 00:40:54 -0700 Subject: [PATCH 4/8] Fixed tests --- config/locales/en.yml | 2 +- test/controllers/geocoder_controller_test.rb | 2 +- test/controllers/messages_controller_test.rb | 4 ++-- test/helpers/application_helper_test.rb | 4 ++-- test/helpers/note_helper_test.rb | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 3572fbdede..a659746604 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3,7 +3,7 @@ en: dir: ltr time: formats: - friendly: "%B %e, %Y, at %I:%M %p" + friendly: "%B %e, %Y, at %l:%M %p" blog: "%B %e, %Y" count: at_least_pattern: "%{count}+" diff --git a/test/controllers/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb index 8f8a6c83ce..57992ad3bb 100644 --- a/test/controllers/geocoder_controller_test.rb +++ b/test/controllers/geocoder_controller_test.rb @@ -391,7 +391,7 @@ def test_search_osm_nominatim "min-lat" => 51.6808751, "max-lat" => 51.7806237, "min-lon" => -0.114204, "max-lon" => 0.0145267, "type" => "relation", "id" => 2677978 }, - { "prefix" => "Railway Station", + { "prefix" => "Train Station", "name" => "Broxbourne, Stafford Drive, Broxbourne, Hertfordshire, East of England, England, United Kingdom", "min-lat" => 51.7418469, "max-lat" => 51.7518469, "min-lon" => -0.0156773, "max-lon" => -0.0056773, diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index dc36a6d68c..41b3a73616 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -245,7 +245,7 @@ def test_reply # Check that we can't reply to somebody else's message get message_reply_path(message) assert_redirected_to login_path(:referer => message_reply_path(message)) - assert_equal "You are logged in as \"#{other_user.display_name}\" but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice] + assert_equal "You are logged in as \"#{other_user.display_name}\", but the message you have asked to reply to was not sent to that user. Please log in as the correct user in order to reply.", flash[:notice] # Login as the right user session_for(recipient_user) @@ -287,7 +287,7 @@ def test_show # Check that we can't read the message get message_path(message) assert_redirected_to login_path(:referer => message_path(message)) - assert_equal "You are logged in as \"#{other_user.display_name}\" but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice] + assert_equal "You are logged in as \"#{other_user.display_name}\", but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it.", flash[:notice] # Login as the message sender session_for(user) diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index e92059e6d3..e62a85abbe 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -57,7 +57,7 @@ def test_dir def test_friendly_date date = friendly_date(Time.utc(2014, 3, 5, 18, 58, 23)) - assert_match %r{^$}, date + assert_match %r{^$}, date date = friendly_date(Time.now.utc - 1.hour) assert_match %r{^$}, date @@ -74,7 +74,7 @@ def test_friendly_date def test_friendly_date_ago date = friendly_date_ago(Time.utc(2014, 3, 5, 18, 58, 23)) - assert_match %r{^$}, date + assert_match %r{^$}, date date = friendly_date_ago(Time.now.utc - 1.hour) assert_match %r{^$}, date diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index 6955ddd942..a5bdc25510 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -8,7 +8,7 @@ def test_note_event date = Time.utc(2014, 3, 5, 21, 37, 45) user = create(:user) - assert_match %r{^Created by anonymous $}, note_event("opened", date, nil) + assert_match %r{^Created by anonymous $}, note_event("opened", date, nil) assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) end From bdcd9ce35c71c0cf1b485dfb0a11ea54a01f057b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 00:49:27 -0700 Subject: [PATCH 5/8] Fixed tests --- test/helpers/note_helper_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb index a5bdc25510..d70146b140 100644 --- a/test/helpers/note_helper_test.rb +++ b/test/helpers/note_helper_test.rb @@ -9,7 +9,7 @@ def test_note_event user = create(:user) assert_match %r{^Created by anonymous $}, note_event("opened", date, nil) - assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) + assert_match %r{^Resolved by #{user.display_name} $}, note_event("closed", date, user) end def test_note_author From 4fe7f928bcdcf6eca888c2999594b2d57a9f7f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 13:14:16 -0700 Subject: [PATCH 6/8] Update config/locales/en.yml Co-authored-by: Zeke Farwell --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index a659746604..14ac7258d7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1338,7 +1338,7 @@ en: hearing_aids: "Hearing Aids" herbalist: "Herbalist" hifi: "Hifi Store" - houseware: "Houseware store" + houseware: "Houseware Store" ice_cream: "Ice Cream Store" interior_decoration: "Interior Decoration Store" jewelry: "Jewelry Store" From 55ebdd0064b13b242f40307e1044c740899dbe90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 13:20:51 -0700 Subject: [PATCH 7/8] Rolled back some debatable terminology --- config/locales/en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 14ac7258d7..eaf0d22a69 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -786,7 +786,7 @@ en: ranger_station: "Ranger Station" recycling: "Recycling" restaurant: "Restaurant" - sanitary_dump_station: "RV Toilet Disposal" + sanitary_dump_station: "RV Dump Station" school: "School" shelter: "Shelter" shower: "Shower" @@ -955,7 +955,7 @@ en: service: "Service Road" services: "Service Area" speed_camera: "Speed Camera" - steps: "Stairway" + steps: "Steps" stop: "Stop Sign" street_lamp: "Street Lamp" tertiary: "Tertiary Road" @@ -1019,7 +1019,7 @@ en: construction: "Construction Area" farmland: "Farmland" farmyard: "Farmyard" - forest: "Managed Forest" + forest: "Forest" garages: "Garage Area" grass: "Grass" greenfield: "Greenfield" @@ -1411,7 +1411,7 @@ en: museum: "Museum" picnic_site: "Picnic Site" theme_park: "Amusement Park" - viewpoint: "Vista Point" + viewpoint: "Viewpoint" wilderness_hut: "Backcountry Hut" zoo: "Zoo" tunnel: From e844e3caa466449af7e3db2f3426cb09bc062fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 29 Jul 2024 13:30:56 -0700 Subject: [PATCH 8/8] More rollbacks --- config/locales/en.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index eaf0d22a69..be499c41df 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -769,7 +769,7 @@ en: music_school: "Music School" nightclub: "Nightclub" nursing_home: "Nursing Home" - parking: "Parking Lot" + parking: "Parking" parking_entrance: "Parking Garage Entrance" parking_space: "Parking Space" payment_terminal: "Payment Terminal" @@ -1219,7 +1219,7 @@ en: place: allotments: "Garden Allotments" archipelago: "Archipelago" - city: "Major City" + city: "City" city_block: "City Block" country: "Country" county: "County" @@ -2333,7 +2333,7 @@ en: apron: "Airport apron" admin: "Administrative boundary" capital: "Capital" - city: "Major city" + city: "City" orchard: "Orchard" vineyard: "Vineyard" forest: "Managed forest"