X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb4aa310485cc287a89c3b9c393fb5afeef75bf0..94dc8cd8d72515c4698e83093b5fd34f2dcbda4f:/config/locales/en.yml?ds=inline diff --git a/config/locales/en.yml b/config/locales/en.yml index f538502e8..37d6f99e9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -6,6 +6,8 @@ en: friendly: "%e %B %Y at %H:%M" blog: "%e %B %Y" helpers: + file: + prompt: Choose file submit: diary_comment: create: Save @@ -18,7 +20,7 @@ en: create: Send client_application: create: Register - update: Edit + update: Update redaction: create: Create redaction update: Save redaction @@ -73,6 +75,18 @@ en: # Translates all the model attributes, which is used in error handling on the web site # Only the ones that are used on the web site are translated at the moment attributes: + client_application: + name: Name (Required) + url: Main Application URL (Required) + callback_url: Callback URL + support_url: Support URL + allow_read_prefs: read their user preferences + allow_write_prefs: modify their user preferences + allow_write_diary: create diary entries, comments and make friends + allow_write_api: modify the map + allow_read_gpx: read their private GPS traces + allow_write_gpx: upload GPS traces + allow_write_notes: modify notes diary_comment: body: "Body" diary_entry: @@ -93,11 +107,18 @@ en: longitude: "Longitude" public: "Public" description: "Description" + name: Filename + gpx_file: Upload GPX File + visibility: Visibility + tagstring: Tags message: sender: "Sender" title: "Subject" body: "Body" recipient: "Recipient" + report: + category: Select a reason for your report + details: Please provide some more details about the problem (required). user: email: "Email" active: "Active" @@ -105,6 +126,10 @@ en: description: "Description" languages: "Languages" pass_crypt: "Password" + pass_crypt_confirmation: "Confirm Password" + help: + trace: + tagstring: comma delimited datetime: distance_in_words_ago: about_x_hours: @@ -207,10 +232,18 @@ en: anonymous: "anonymous" no_comment: "(no comment)" part_of: "Part of" + part_of_relations: + one: 1 relation + other: "%{count} relations" + part_of_ways: + one: 1 way + other: "%{count} ways" download_xml: "Download XML" view_history: "View History" view_details: "View Details" location: "Location:" + common_details: + coordinates_html: "%{latitude}, %{longitude}" changeset: title: "Changeset: %{id}" belongs_to: "Author" @@ -221,8 +254,8 @@ en: relation: "Relations (%{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})" comment: "Comments (%{count})" - hidden_commented_by: "Hidden comment from %{user} %{when}" - commented_by: "Comment from %{user} %{when}" + hidden_commented_by_html: "Hidden comment from %{user} %{when}" + commented_by_html: "Comment from %{user} %{when}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -238,6 +271,8 @@ en: title_html: "Way: %{name}" history_title_html: "Way History: %{name}" nodes: "Nodes" + nodes_count: + other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" @@ -245,6 +280,9 @@ en: title_html: "Relation: %{name}" history_title_html: "Relation History: %{name}" members: "Members" + members_count: + one: 1 member + other: "%{count} members" relation_member: entry_html: "%{type} %{name}" entry_role_html: "%{type} %{name} as %{role}" @@ -256,6 +294,7 @@ en: entry_html: "Relation %{relation_name}" entry_role_html: "Relation %{relation_name} (as %{relation_role})" not_found: + title: Not Found sorry: "Sorry, %{type} #%{id} could not be found." type: node: node @@ -264,6 +303,7 @@ en: changeset: changeset note: note timeout: + title: Timeout Error sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve." type: node: node @@ -299,16 +339,17 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - opened_by: "Created by %{user} %{when}" - opened_by_anonymous: "Created by anonymous %{when}" - commented_by: "Comment from %{user} %{when}" - commented_by_anonymous: "Comment from anonymous %{when}" - closed_by: "Resolved by %{user} %{when}" - closed_by_anonymous: "Resolved by anonymous %{when}" - reopened_by: "Reactivated by %{user} %{when}" - reopened_by_anonymous: "Reactivated by anonymous %{when}" - hidden_by: "Hidden by %{user} %{when}" + opened_by_html: "Created by %{user} %{when}" + opened_by_anonymous_html: "Created by anonymous %{when}" + commented_by_html: "Comment from %{user} %{when}" + commented_by_anonymous_html: "Comment from anonymous %{when}" + closed_by_html: "Resolved by %{user} %{when}" + closed_by_anonymous_html: "Resolved by anonymous %{when}" + reopened_by_html: "Reactivated by %{user} %{when}" + reopened_by_anonymous_html: "Reactivated by anonymous %{when}" + hidden_by_html: "Hidden by %{user} %{when}" report: Report this note + coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" introduction: "Click on the map to find nearby features." @@ -394,7 +435,7 @@ en: diary_entry: posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}" comment_link: Comment on this entry - reply_link: Reply to this entry + reply_link: Send a message to the author comment_count: zero: No comments one: "%{count} comment" @@ -414,6 +455,7 @@ en: location: "Location:" view: "View" edit: "Edit" + coordinates: "%{latitude}; %{longitude}" feed: user: title: "OpenStreetMap diary entries for %{user}" @@ -460,10 +502,12 @@ en: 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" @@ -472,11 +516,15 @@ en: hangar: "Hangar" helipad: "Helipad" holding_position: "Holding Position" + navigationaid: "Aviation Navigation aid" parking_position: "Parking Position" runway: "Runway" + taxilane: "Taxilane" taxiway: "Taxiway" terminal: "Terminal" + windsock: "Windsock" amenity: + animal_boarding: "Animal Boarding" animal_shelter: "Animal Shelter" arts_centre: "Arts Centre" atm: "ATM" @@ -486,7 +534,9 @@ en: bench: "Bench" bicycle_parking: "Cycle Parking" bicycle_rental: "Cycle Rental" + bicycle_repair_station: "Bicycle Repair Station" biergarten: "Beer Garden" + blood_bank: "Blood Bank" boat_rental: "Boat Rental" brothel: "Brothel" bureau_de_change: "Bureau de Change" @@ -503,6 +553,7 @@ en: clock: "Clock" college: "College" community_centre: "Community Centre" + conference_centre: "Conference Centre" courthouse: "Courthouse" crematorium: "Crematorium" dentist: "Dentist" @@ -510,6 +561,7 @@ en: drinking_water: "Drinking Water" driving_school: "Driving School" embassy: "Embassy" + events_venue: "Events Venue" fast_food: "Fast Food" ferry_terminal: "Ferry Terminal" fire_station: "Fire Station" @@ -522,36 +574,42 @@ en: hospital: "Hospital" hunting_stand: "Hunting Stand" ice_cream: "Ice Cream" + internet_cafe: "Internet Cafe" kindergarten: "Kindergarten" + language_school: "Language school" library: "Library" + loading_dock: "Loading Dock" + love_hotel: "Love Hotel" marketplace: "Marketplace" + mobile_money_agent: "Mobile Money Agent" monastery: "Monastery" + money_transfer: "Money Transfer" motorcycle_parking: "Motorcycle Parking" + music_school: "Music School" nightclub: "Night Club" nursing_home: "Nursing Home" - office: "Office" parking: "Parking" parking_entrance: "Parking Entrance" parking_space: "Parking Space" + payment_terminal: "Payment Terminal" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" post_box: "Post Box" post_office: "Post Office" - preschool: "Pre-School" prison: "Prison" pub: "Pub" + public_bath: "Public Bath" + public_bookcase: "Public Bookcase" public_building: "Public Building" + ranger_station: "Ranger Station" recycling: "Recycling Point" restaurant: "Restaurant" - retirement_home: "Retirement Home" - sauna: "Sauna" + sanitary_dump_station: "Sanitary Dump Station" school: "School" shelter: "Shelter" - shop: "Shop" shower: "Shower" social_centre: "Social Centre" - social_club: "Social Club" social_facility: "Social Facility" studio: "Studio" swimming_pool: "Swimming Pool" @@ -560,19 +618,27 @@ en: theatre: "Theatre" toilets: "Toilets" townhall: "Town Hall" + training: "Training Facility" university: "University" + vehicle_inspection: "Vehicle Inspection" vending_machine: "Vending Machine" veterinary: "Veterinary Surgery" village_hall: "Village Hall" waste_basket: "Waste Basket" waste_disposal: "Waste Disposal" + waste_dump_site: "Waste Dump Site" + watering_place: "Watering Place" water_point: "Water Point" - youth_centre: "Youth Centre" + weighbridge: "Weighbridge" + "yes": "Amenity" boundary: + aboriginal_lands: "Aboriginal Lands" administrative: "Administrative Boundary" census: "Census Boundary" national_park: "National Park" + political: "Electoral Boundary" protected_area : "Protected Area" + "yes": "Boundary" bridge: aqueduct: "Aqueduct" boardwalk: "Boardwalk" @@ -581,24 +647,94 @@ en: viaduct: "Viaduct" "yes": "Bridge" building: + apartment: "Apartment" + apartments: "Apartments" + barn: "Barn" + bungalow: "Bungalow" + cabin: "Cabin" + chapel: "Chapel" + church: "Church Building" + civic: "Civic Building" + college: "College Building" + commercial: "Commercial Building" + construction: "Building under Construction" + detached: "Detached House" + dormitory: "Dormitory" + duplex: "Duplex House" + farm: "Farm House" + farm_auxiliary: "Auxiliary Farm House" + garage: "Garage" + garages: "Garages" + greenhouse: "Greenhouse" + hangar: "Hangar" + hospital: "Hospital Building" + hotel: "Hotel Building" + house: "House" + houseboat: "Houseboat" + hut: "Hut" + industrial: "Industrial Building" + kindergarten: "Kindergarden Building" + manufacture: "Manufacturing Building" + office: "Office Building" + public: "Public Building" + residential: "Residential Building" + retail: "Retail Building" + roof: "Roof" + ruins: "Ruined Building" + school: "School Building" + semidetached_house: "Semidetached House" + service: "Service Building" + shed: "Shed" + stable: "Stable" + static_caravan: "Caravan" + temple: "Temple Building" + terrace: "Terrace Building" + train_station: "Train Station Building" + university: "University Building" + warehouse: "Warehouse" "yes": "Building" + club: + scout: "Scout Group Base" + sport: "Sportsclub" + "yes": "Club" craft: + beekeper: "Beekeeper" + blacksmith: "Blacksmith" brewery: "Brewery" carpenter: "Carpenter" + caterer: "Caterer" + confectionery: "Confectionary" + dressmaker: "Dressmaker" electrician: "Electrician" + electronics_repair: "Electronics Repair" gardener: "Gardener" + glaziery: "Glaziery" + handicraft: "Handicraft" + hvac: "HVAC Craft" + metal_construction: "Metal Constructioner" painter: "Painter" photographer: "Photographer" plumber: "Plumber" + roofer: "Roofer" + sawmill: "Sawmill" shoemaker: "Shoemaker" + stonemason: "Stonemason" tailor: "Tailor" + window_construction: "Window Construction" + winery: "Winery" "yes": "Craft Shop" emergency: + access_point: "Access Point" ambulance_station: "Ambulance Station" assembly_point: "Assembly Point" defibrillator: "Defibrillator" + fire_xtinguisher: "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" "yes": "Emergency" highway: @@ -611,6 +747,7 @@ en: cycleway: "Cycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" + emergency_bay: "Emergency Bay" footway: "Footpath" ford: "Ford" give_way: "Give Way Sign" @@ -641,37 +778,45 @@ en: tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" track: "Track" + traffic_mirror: "Traffic Mirror" traffic_signals: "Traffic Signals" - trail: "Trail" + trailhead: "Trailhead" trunk: "Trunk Road" trunk_link: "Trunk Road" turning_loop: "Turning Loop" unclassified: "Unclassified Road" "yes" : "Road" historic: + aircraft: "Historic Aircraft" archaeological_site: "Archaeological Site" + bomb_crater: "Historic Bomb Crater" battlefield: "Battlefield" boundary_stone: "Boundary Stone" building: "Historic Building" bunker: "Bunker" + cannon: "Historic Cannon" castle: "Castle" + charcoal_pile: "Historic Charcoal Pile" church: "Church" city_gate: "City Gate" citywalls: "City Walls" fort: "Fort" heritage: "Heritage Site" + hollow_way: "Hollow Way" house: "House" - icon: "Icon" manor: "Manor" memorial: "Memorial" + milestone: "Historic Milestone" mine: "Mine" mine_shaft: "Mine Shaft" monument: "Monument" + railway: "Historic Railway" roman_road: "Roman Road" ruins: "Ruins" stone: "Stone" tomb: "Tomb" tower: "Tower" + wayside_chapel: "Wayside Chapel" wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" wreck: "Wreck" @@ -680,6 +825,7 @@ en: "yes": "Junction" landuse: allotments: "Allotments" + aquaculture: "Aquaculture" basin: "Basin" brownfield: "Brownfield Land" cemetery: "Cemetery" @@ -699,21 +845,28 @@ en: military: "Military Area" mine: "Mine" orchard: "Orchard" + plant_nursery: "Plant Nursery" quarry: "Quarry" railway: "Railway" recreation_ground: "Recreation Ground" + religious: "Religious Ground" reservoir: "Reservoir" reservoir_watershed: "Reservoir Watershed" residential: "Residential Area" retail: "Retail" - road: "Road Area" village_green: "Village Green" vineyard: "Vineyard" "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" @@ -726,7 +879,9 @@ en: marina: "Marina" miniature_golf: "Miniature Golf" nature_reserve: "Nature Reserve" + outdoor_seating: "Outdoor Seating" park: "Park" + picnic_table: "Picnic Table" pitch: "Sports Pitch" playground: "Playground" recreation_ground: "Recreation Ground" @@ -741,13 +896,21 @@ en: "yes": "Leisure" man_made: adit: "Adit" + advertising: "Advertising" + antenna: "Antenna" + avalanche_protection: "Avalanche Protection" beacon: "Beacon" + beam: "Beam" beehive: "Bee Hive" breakwater: "Breakwater" bridge: "Bridge" bunker_silo: "Bunker" + cairn: "Cairn" chimney: "Chimney" + clearcut: "Clearcut" + communications_tower: "Communications Tower" crane: "Crane" + cross: "Cross" dolphin: "Mooring Post" dyke: "Dyke" embankment: "Embankment" @@ -756,6 +919,7 @@ en: groyne: "Groyne" kiln: "Kiln" lighthouse: "Lighthouse" + manhole: "Manhole" mast: "Mast" mine: "Mine" mineshaft: "Mine Shaft" @@ -763,12 +927,20 @@ en: petroleum_well: "Petroleum Well" pier: "Pier" pipeline: "Pipeline" + pumping_station: "Pumping Station" + reservoir_covered: "Covered Reservoir" silo: "Silo" + snow_cannon: "Snow Cannon" + snow_fence: "Snow Fence" storage_tank: "Storage Tank" + street_cabinet: "Street Cabinet" surveillance: "Surveillance" + telescope: "Telescope" tower: "Tower" + utility_pole: "Utility Pole" wastewater_plant: "Wastewater Plant" watermill: "Water Mill" + water_tap: "Water Tap" water_tower: "Water Tower" water_well: "Well" water_works: "Water Works" @@ -779,10 +951,13 @@ en: airfield: "Military Airfield" barracks: "Barracks" bunker: "Bunker" + checkpoint: "Checkpoint" + trench: "Trench" "yes": "Military" mountain_pass: "yes" : "Mountain Pass" natural: + bare_rock: "Bare Rock" bay: "Bay" beach: "Beach" cape: "Cape" @@ -798,6 +973,7 @@ en: grassland: "Grassland" heath: "Heath" hill: "Hill" + hot_spring: "Hot Spring" island: "Island" land: "Land" marsh: "Marsh" @@ -821,20 +997,31 @@ en: water: "Water" wetland: "Wetland" wood: "Wood" + "yes": "Natural Feature" office: accountant: "Accountant" administrative: "Administration" + advertising_agency: "Advertising Agency" architect: "Architect" association: "Association" company: "Company" + diplomatic: "Diplomatic Office" educational_institution: "Educational Institution" employment_agency: "Employment Agency" + energy_supplier: "Energy Supplier Office" estate_agent: "Estate Agent" + financial: "Financial Office" government: "Governmental Office" insurance: "Insurance Office" it: "IT Office" lawyer: "Lawyer" + logistics: "Logistics Office" + newspaper: "Newspaper Office" ngo: "NGO Office" + notary: "Notary" + religion: "Religious Office" + research: "Research Office" + tax_advisor: "Tax Advisor" telecommunication: "Telecommunication Office" travel_agent: "Travel Agency" "yes": "Office" @@ -854,6 +1041,7 @@ en: locality: "Locality" municipality: "Municipality" neighbourhood: "Neighbourhood" + plot: "Plot" postcode: "Postcode" quarter: "Quarter" region: "Region" @@ -863,7 +1051,6 @@ en: subdivision: "Subdivision" suburb: "Suburb" town: "Town" - unincorporated_area: "Unincorporated Area" village: "Village" "yes": "Place" railway: @@ -889,12 +1076,19 @@ en: switch: "Railway Points" tram: "Tramway" tram_stop: "Tram Stop" + yard: "Railway Yard" shop: + agrarian: "Agrarian Shop" alcohol: "Off License" antiques: "Antiques" + appliance: "Appliances Shop" art: "Art Shop" + baby_goods: "Baby Goods" + bag: "Bag Shop" bakery: "Bakery" + bathroom_furnishing: "Bathroom Furnishing" beauty: "Beauty Shop" + bed: "Bedding Products" beverages: "Beverages Shop" bicycle: "Bicycle Shop" bookmaker: "Bookmaker" @@ -906,65 +1100,90 @@ en: 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" 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" + 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" 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" paint: "Paint Shop" + pastry: "Pastry Shop" pawnbroker: "Pawnbroker" + perfumery: "Perfumery" pet: "Pet Shop" - pharmacy: "Pharmacy" + pet_grooming: "Pet Grooming" photo: "Photo Shop" seafood: "Sea Food" second_hand: "Second-hand Shop" + sewing: "Sewing Shop" shoes: "Shoe Shop" sports: "Sports Shop" stationery: "Stationery Shop" + storage_rental: "Storage Rental" supermarket: "Supermarket" tailor: "Tailor" + tattoo: "Tattoo Shop" + tea: "Tea Shop" ticket: "Ticket Shop" tobacco: "Tobacco Shop" toys: "Toy Shop" @@ -973,6 +1192,8 @@ en: vacant: "Vacant Shop" variety_store: "Variety Store" video: "Video Shop" + video_games: "Video Game Store" + wholesale: "Wholesale Store" wine: "Wine Store" "yes": "Shop" tourism: @@ -982,6 +1203,7 @@ en: attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" cabin: "Cabin" + camp_pitch: "Camp Pitch" camp_site: "Camp Site" caravan_site: "Caravan Site" chalet: "Chalet" @@ -995,6 +1217,7 @@ en: picnic_site: "Picnic Site" theme_park: "Theme Park" viewpoint: "Viewpoint" + wilderness_hut: "Wilderness Hut" zoo: "Zoo" tunnel: building_passage: "Building Passage" @@ -1027,10 +1250,6 @@ en: level8: "City Boundary" level9: "Village Boundary" level10: "Suburb Boundary" - description: - title: - osm_nominatim: 'Location from OpenStreetMap Nominatim' - geonames: 'Location from GeoNames' types: cities: Cities towns: Towns @@ -1109,8 +1328,6 @@ en: new: title_html: "Report %{link}" missing_params: "Cannot create a new report" - details: Please provide some more details about the problem (required). - select: "Select a reason for your report:" disclaimer: intro: "Before sending your report to the site moderators, please ensure that:" not_just_mistake: You are certain that the problem is not just a mistake @@ -1192,17 +1409,17 @@ en: text: Make a Donation learn_more: "Learn More" more: More - notifier: + user_mailer: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" - footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}" + footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" message_notification: subject_header: "[OpenStreetMap] %{subject}" hi: "Hi %{to_user}," header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" - footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}" + footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" friendship_notification: hi: "Hi %{to_user}," subject: "[OpenStreetMap] %{user} added you as a friend" @@ -1355,7 +1572,7 @@ en: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" + used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1419,26 +1636,30 @@ en: may distribute the result only under the same licence. The full legal code explains your rights and responsibilities. - intro_3_html: | - The cartography in our map tiles, and our documentation, are - licensed under the Creative - Commons Attribution-ShareAlike 2.0 license (CC BY-SA). + intro_3_1_html: | + Our documentation is licensed under the + Creative + Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). credit_title_html: How to credit OpenStreetMap credit_1_html: | We require that you use the credit “© OpenStreetMap contributors”. - credit_2_html: | + credit_2_1_html: | You must also make it clear that the data is available under the Open - Database License, and if using our map tiles, that the cartography is - licensed as CC BY-SA. You may do this by linking to + Database License. You may do this by linking to this copyright page. Alternatively, and as a requirement if you are distributing OSM in a 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), to opendatacommons.org, and - if relevant, to creativecommons.org. - credit_3_html: | + 'OpenStreetMap' to this full address) and to opendatacommons.org. + credit_3_1_html: | + The map tiles in the “standard style” at www.openstreetmap.org are a + Produced Work by the OpenStreetMap Foundation using OpenStreetMap data + under the Open Database License. If you are using these tiles please use + the following attribution: + “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + credit_4_html: | For a browsable electronic map, the credit should appear in the corner of the map. For example: attribution_example: @@ -1819,11 +2040,6 @@ en: identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)" new: upload_trace: "Upload GPS Trace" - upload_gpx: "Upload GPX File:" - description: "Description:" - tags: "Tags:" - tags_help: "comma delimited" - visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" help: "Help" @@ -1836,20 +2052,9 @@ en: 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." edit: + cancel: Cancel title: "Editing trace %{name}" heading: "Editing trace %{name}" - filename: "Filename:" - download: "download" - uploaded_at: "Uploaded:" - points: "Points:" - start_coord: "Start coordinate:" - map: "map" - edit: "edit" - owner: "Owner:" - description: "Description:" - tags: "Tags:" - tags_help: "comma delimited" - visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" update: @@ -1865,6 +2070,7 @@ en: uploaded: "Uploaded:" points: "Points:" start_coordinates: "Start coordinate:" + coordinates_html: "%{latitude}; %{longitude}" map: "map" edit: "edit" owner: "Owner:" @@ -1975,13 +2181,6 @@ en: delete: "Delete Client" confirm: "Are you sure?" requests: "Requesting the following permissions from the user:" - allow_read_prefs: "read their user preferences." - allow_write_prefs: "modify their user preferences." - allow_write_diary: "create diary entries, comments and make friends." - allow_write_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - allow_write_notes: "modify notes." index: title: "My OAuth Details" my_tokens: "My Authorised Applications" @@ -1995,19 +2194,7 @@ en: registered_apps: "You have the following client applications registered:" register_new: "Register your application" form: - name: "Name" - required: "Required" - url: "Main Application URL" - callback_url: "Callback URL" - support_url: "Support URL" requests: "Request the following permissions from the user:" - allow_read_prefs: "read their user preferences." - allow_write_prefs: "modify their user preferences." - allow_write_diary: "create diary entries, comments and make friends." - allow_write_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - allow_write_notes: "modify notes." not_found: sorry: "Sorry, that %{type} could not be found." create: @@ -2080,8 +2267,6 @@ en: reset_password: title: "Reset password" heading: "Reset Password for %{user}" - password: "Password:" - confirm password: "Confirm Password:" reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Did not find that token, check the URL maybe?" @@ -2095,7 +2280,6 @@ en:

Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.

Sign up to get started contributing. We'll send an email to confirm your account.

- license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' email address: "Email Address:" confirm email address: "Confirm Email Address:" not_displayed_publicly_html: 'Your address is not displayed publicly, see our privacy policy for more information' @@ -2271,7 +2455,7 @@ en: unknown token: "That confirmation code has expired or does not exist." reconfirm_html: "If you need us to resend the confirmation email, click here." confirm_resend: - success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests." + success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests." failure: "User %{name} not found." confirm_email: heading: Confirm a change of email address @@ -2388,10 +2572,10 @@ en: revoke: "Revoke!" flash: "This block has been revoked." helper: - time_future: "Ends in %{time}." + time_future_html: "Ends in %{time}." until_login: "Active until the user logs in." - time_future_and_until_login: "Ends in %{time} and after the user has logged in." - time_past: "Ended %{time}." + time_future_and_until_login_html: "Ends in %{time} and after the user has logged in." + time_past_html: "Ended %{time}." block_duration: hours: one: "1 hour" @@ -2444,7 +2628,7 @@ en: next: "Next »" previous: "« Previous" notes: - mine: + index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" subheading_html: "Notes submitted or commented on by %{user}"