X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db39876dd6f0bccb36e4cdde0e1a0da81a05fcfe..e2892ecae75ac7706a3d9d52aeef0bd534f74a60:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 5bc88547a..44501aa10 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5,7 +5,36 @@ en: formats: friendly: "%e %B %Y at %H:%M" blog: "%e %B %Y" + helpers: + file: + prompt: Choose file + submit: + diary_comment: + create: Save + diary_entry: + create: "Publish" + update: "Update" + issue_comment: + create: Add Comment + message: + create: Send + client_application: + create: Register + update: Update + redaction: + create: Create redaction + update: Save redaction + trace: + create: Upload + update: Save Changes + user_block: + create: Create block + update: Update block activerecord: + errors: + messages: + invalid_email_address: does not appear to be a valid e-mail address + email_address_not_routable: is not routable # Translates all the model names, which is used in error handling on the web site models: acl: "Access Control List" @@ -15,6 +44,7 @@ en: diary_comment: "Diary Comment" diary_entry: "Diary Entry" friend: "Friend" + issue: "Issue" language: "Language" message: "Message" node: "Node" @@ -31,6 +61,7 @@ en: relation: "Relation" relation_member: "Relation Member" relation_tag: "Relation Tag" + report: "Report" session: "Session" trace: "Trace" tracepoint: "Trace Point" @@ -44,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: @@ -64,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" @@ -76,6 +126,48 @@ en: description: "Description" languages: "Languages" pass_crypt: "Password" + help: + trace: + tagstring: comma delimited + datetime: + distance_in_words_ago: + about_x_hours: + one: about 1 hour ago + other: about %{count} hours ago + about_x_months: + one: about 1 month ago + other: about %{count} months ago + about_x_years: + one: about 1 year ago + other: about %{count} years ago + almost_x_years: + one: almost 1 year ago + other: almost %{count} years ago + half_a_minute: half a minute ago + less_than_x_seconds: + one: less than 1 second ago + other: less than %{count} seconds ago + less_than_x_minutes: + one: less than a minute ago + other: less than %{count} minutes ago + over_x_years: + one: over 1 year ago + other: over %{count} years ago + x_seconds: + one: 1 second ago + other: "%{count} seconds ago" + x_minutes: + one: 1 minute ago + other: "%{count} minutes ago" + x_days: + one: 1 day ago + other: "%{count} days ago" + x_months: + one: 1 month ago + other: "%{count} months ago" + x_years: + one: 1 year ago + other: "%{count} years ago" printable_name: with_id: "%{id}" with_version: "%{id}, v%{version}" @@ -94,15 +186,46 @@ en: remote: name: "Remote Control" description: "Remote Control (JOSM or Merkaartor)" + auth: + providers: + none: None + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia + api: + notes: + comment: + opened_at_html: "Created %{when}" + opened_at_by_html: "Created %{when} by %{user}" + commented_at_html: "Updated %{when}" + commented_at_by_html: "Updated %{when} by %{user}" + closed_at_html: "Resolved %{when}" + closed_at_by_html: "Resolved %{when} by %{user}" + reopened_at_html: "Reactivated %{when}" + reopened_at_by_html: "Reactivated %{when} by %{user}" + rss: + title: "OpenStreetMap 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}" + opened: "new note (near %{place})" + commented: "new comment (near %{place})" + closed: "closed note (near %{place})" + reopened: "reactivated note (near %{place})" + entry: + comment: Comment + full: Full note browse: created: "Created" closed: "Closed" - created_html: "Created %{time} ago" - closed_html: "Closed %{time} ago" - created_by_html: "Created %{time} ago by %{user}" - deleted_by_html: "Deleted %{time} ago by %{user}" - edited_by_html: "Edited %{time} ago by %{user}" - closed_by_html: "Closed %{time} ago by %{user}" + created_html: "Created %{time}" + closed_html: "Closed %{time}" + created_by_html: "Created %{time} by %{user}" + deleted_by_html: "Deleted %{time} by %{user}" + edited_by_html: "Edited %{time} by %{user}" + closed_by_html: "Closed %{time} by %{user}" version: "Version" in_changeset: "Changeset" anonymous: "anonymous" @@ -112,6 +235,8 @@ en: view_history: "View History" view_details: "View Details" location: "Location:" + common_details: + coordinates_html: "%{latitude}, %{longitude}" changeset: title: "Changeset: %{id}" belongs_to: "Author" @@ -122,8 +247,8 @@ en: relation: "Relations (%{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})" comment: "Comments (%{count})" - hidden_commented_by: "Hidden comment from %{user} %{when} ago" - commented_by: "Comment from %{user} %{when} ago" + hidden_commented_by: "Hidden comment from %{user} %{when}" + commented_by: "Comment from %{user} %{when}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -133,29 +258,29 @@ en: discussion: Discussion still_open: "Changeset still open - discussion will open once the changeset is closed." node: - title: "Node: %{name}" - history_title: "Node History: %{name}" + title_html: "Node: %{name}" + history_title_html: "Node History: %{name}" way: - title: "Way: %{name}" - history_title: "Way History: %{name}" + title_html: "Way: %{name}" + history_title_html: "Way History: %{name}" nodes: "Nodes" - also_part_of: + also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" relation: - title: "Relation: %{name}" - history_title: "Relation History: %{name}" + title_html: "Relation: %{name}" + history_title_html: "Relation History: %{name}" members: "Members" relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} as %{role}" + entry_html: "%{type} %{name}" + entry_role_html: "%{type} %{name} as %{role}" type: node: "Node" way: "Way" relation: "Relation" containing_relation: - entry: "Relation %{relation_name}" - entry_role: "Relation %{relation_name} (as %{relation_role})" + entry_html: "Relation %{relation_name}" + entry_role_html: "Relation %{relation_name} (as %{relation_role})" not_found: sorry: "Sorry, %{type} #%{id} could not be found." type: @@ -190,7 +315,9 @@ en: tag: "The wiki description page for the %{key}=%{value} tag" wikidata_link: "The %{page} item on Wikidata" 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" note: title: "Note: %{id}" new_note: "New Note" @@ -198,22 +325,23 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - open_by: "Created by %{user} %{when} ago" - open_by_anonymous: "Created by anonymous %{when} ago" - commented_by: "Comment from %{user} %{when} ago" - commented_by_anonymous: "Comment from anonymous %{when} ago" - closed_by: "Resolved by %{user} %{when} ago" - closed_by_anonymous: "Resolved by anonymous %{when} ago" - reopened_by: "Reactivated by %{user} %{when} ago" - reopened_by_anonymous: "Reactivated by anonymous %{when} ago" - hidden_by: "Hidden by %{user} %{when} ago" + 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}" report: Report this note + coordinates_html: "%{latitude}, %{longitude}" query: title: "Query Features" introduction: "Click on the map to find nearby features." nearby: "Nearby features" enclosing: "Enclosing features" - changeset: + changesets: changeset_paging_nav: showing_page: "Page %{page}" next: "Next »" @@ -228,7 +356,7 @@ en: user: "User" comment: "Comment" area: "Area" - list: + index: title: "Changesets" title_user: "Changesets by %{user}" title_friend: "Changesets by my friends" @@ -242,18 +370,29 @@ en: load_more: "Load more" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." - rss: + changeset_comments: + comment: + comment: "New comment on changeset #%{changeset_id} by %{author}" + commented_at_by_html: "Updated %{when} by %{user}" + comments: + comment: "New comment on changeset #%{changeset_id} by %{author}" + index: title_all: OpenStreetMap changeset discussion title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" - comment: "New comment on changeset #%{changeset_id} by %{author}" - commented_at_html: "Updated %{when} ago" - commented_at_by_html: "Updated %{when} ago by %{user}" - full: Full discussion - diary_entry: + timeout: + sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + diary_entries: new: title: New Diary Entry - publish_button: "Publish" - list: + form: + subject: "Subject:" + body: "Body:" + language: "Language:" + location: "Location:" + latitude: "Latitude:" + longitude: "Longitude:" + use_map_link: "use map" + index: title: "Users' diaries" title_friends: "Friends' diaries" title_nearby: "Nearby Users' diaries" @@ -261,53 +400,48 @@ en: in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: "Recent diary entries" older_entries: Older Entries newer_entries: Newer Entries edit: - title: "Edit diary entry" - subject: "Subject:" - body: "Body:" - language: "Language:" - location: "Location:" - latitude: "Latitude:" - longitude: "Longitude:" - use_map_link: "use map" - save_button: "Save" + title: Edit Diary Entry marker_text: Diary entry location - view: + show: title: "%{user}'s diary | %{title}" user_title: "%{user}'s diary" leave_a_comment: "Leave a comment" - login_to_leave_a_comment: "%{login_link} to leave a comment" + login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Login" - save_button: "Save" no_such_entry: title: "No such diary entry" heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: - posted_by: "Posted by %{link_user} on %{created} in %{language_link}" + 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" other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry + unhide_link: Unhide this entry confirm: Confirm report: Report this entry diary_comment: - comment_from: "Comment from %{link_user} on %{comment_created_at}" + comment_from_html: "Comment from %{link_user} on %{comment_created_at}" hide_link: Hide this comment + unhide_link: Unhide this comment confirm: Confirm report: Report this comment location: location: "Location:" view: "View" edit: "Edit" + coordinates: "%{latitude}; %{longitude}" feed: user: title: "OpenStreetMap diary entries for %{user}" @@ -323,18 +457,29 @@ en: post: Post when: When comment: Comment - ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" + friendships: + make_friend: + heading: "Add %{user} as a friend?" + button: "Add as friend" + success: "%{name} is now your friend!" + failed: "Sorry, failed to add %{name} as a friend." + already_a_friend: "You are already friends with %{name}." + remove_friend: + heading: "Unfriend %{user}?" + button: "Unfriend" + success: "%{name} was removed from your friends." + not_a_friend: "%{name} is not one of your friends." geocoder: search: title: - latlon: 'Results from Internal' - ca_postcode: 'Results from Geocoder.CA' - osm_nominatim: 'Results from OpenStreetMap Nominatim' - geonames: 'Results from GeoNames' - osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim' - geonames_reverse: 'Results from GeoNames' + latlon_html: 'Results from Internal' + ca_postcode_html: 'Results from Geocoder.CA' + osm_nominatim_html: 'Results from OpenStreetMap Nominatim' + geonames_html: 'Results from GeoNames' + osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + geonames_reverse_html: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -343,10 +488,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" @@ -355,11 +502,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" @@ -369,7 +520,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" @@ -386,6 +539,7 @@ en: clock: "Clock" college: "College" community_centre: "Community Centre" + conference_centre: "Conference Centre" courthouse: "Courthouse" crematorium: "Crematorium" dentist: "Dentist" @@ -393,6 +547,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" @@ -405,36 +560,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" @@ -443,19 +604,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" @@ -464,24 +633,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: @@ -494,6 +733,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" @@ -524,37 +764,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" @@ -563,6 +811,7 @@ en: "yes": "Junction" landuse: allotments: "Allotments" + aquaculture: "Aquaculture" basin: "Basin" brownfield: "Brownfield Land" cemetery: "Cemetery" @@ -582,21 +831,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" @@ -609,7 +865,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" @@ -624,13 +882,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" @@ -639,6 +905,7 @@ en: groyne: "Groyne" kiln: "Kiln" lighthouse: "Lighthouse" + manhole: "Manhole" mast: "Mast" mine: "Mine" mineshaft: "Mine Shaft" @@ -646,12 +913,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" @@ -662,10 +937,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" @@ -681,6 +959,7 @@ en: grassland: "Grassland" heath: "Heath" hill: "Hill" + hot_spring: "Hot Spring" island: "Island" land: "Land" marsh: "Marsh" @@ -704,20 +983,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" @@ -737,6 +1027,7 @@ en: locality: "Locality" municipality: "Municipality" neighbourhood: "Neighbourhood" + plot: "Plot" postcode: "Postcode" quarter: "Quarter" region: "Region" @@ -746,7 +1037,6 @@ en: subdivision: "Subdivision" suburb: "Suburb" town: "Town" - unincorporated_area: "Unincorporated Area" village: "Village" "yes": "Place" railway: @@ -772,12 +1062,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" @@ -789,65 +1086,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" @@ -856,15 +1178,18 @@ 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: alpine_hut: "Alpine Hut" - apartment: "Apartment" + apartment: "Holiday Apartment" artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" cabin: "Cabin" + camp_pitch: "Camp Pitch" camp_site: "Camp Site" caravan_site: "Caravan Site" chalet: "Chalet" @@ -878,6 +1203,7 @@ en: picnic_site: "Picnic Site" theme_park: "Theme Park" viewpoint: "Viewpoint" + wilderness_hut: "Wilderness Hut" zoo: "Zoo" tunnel: building_passage: "Building Passage" @@ -936,8 +1262,8 @@ en: status: Status reports: Reports last_updated: Last Updated - last_updated_time_html: "%{time} ago" - last_updated_time_user_html: "%{time} ago by %{user}" + last_updated_time_html: "%{time}" + last_updated_time_user_html: "%{time} by %{user}" link_to_reports: View Reports reported_user: Reported User reports_count: @@ -977,11 +1303,10 @@ en: reopen: reopened: Issue status has been set to 'Open' comments: - created_at: "On %{datetime}" + comment_from_html: "Comment from %{user_link} on %{comment_created_at}" reassign_param: Reassign Issue? reports: - updated_at: "On %{datetime}" - reported_by_html: "Reported as %{category} by %{user}" + reported_by_html: "Reported as %{category} by %{user} on %{updated_at}" helper: reportable_title: diary_comment: "%{entry_title}, comment #%{comment_id}" @@ -993,8 +1318,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 @@ -1024,7 +1347,7 @@ en: other_label: Other create: successful_report: Your report has been registered sucessfully - provide_details: Please provide the required details + provide_details: Please provide the required details layouts: project_name: # in @@ -1055,11 +1378,11 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" - partners_ic: "Imperial College London" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" + tou: "Terms of Use" osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." @@ -1081,13 +1404,13 @@ en: 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}" - friend_notification: + 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" had_added_you: "%{user} has added you as a friend on OpenStreetMap." @@ -1107,7 +1430,9 @@ en: import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures" success: subject: "[OpenStreetMap] GPX Import success" - loaded_successfully: loaded successfully with %{trace_points} out of a possible %{possible_points} points. + loaded_successfully: + one: loaded successfully with %{trace_points} out of a possible 1 point. + other: loaded successfully with %{trace_points} out of a possible %{possible_points} points. signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" @@ -1159,8 +1484,8 @@ en: commented: subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets" subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in" - your_changeset: "%{commenter} has left a comment on one of your changesets created at %{time}" - commented_changeset: "%{commenter} has left a comment on a map changeset you are watching created by %{changeset_author} at %{time}" + your_changeset: "%{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}" partial_changeset_with_comment: "with comment '%{changeset_comment}'" partial_changeset_without_comment: "without comment" details: "More details about the changeset can be found at %{url}." @@ -1180,7 +1505,7 @@ en: from: "From" subject: "Subject" date: "Date" - no_messages_yet: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" people_mapping_nearby: "people mapping nearby" message_summary: unread_button: "Mark as unread" @@ -1189,11 +1514,11 @@ en: destroy_button: "Delete" new: title: "Send message" - send_message_to: "Send a new message to %{name}" + send_message_to_html: "Send a new message to %{name}" subject: "Subject" body: "Body" - send_button: "Send" back_to_inbox: "Back to inbox" + create: message_sent: "Message sent" limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more." no_such_message: @@ -1202,7 +1527,7 @@ en: body: "Sorry there is no message with that id." outbox: title: "Outbox" - my_inbox: "My %{inbox_link}" + my_inbox_html: "My %{inbox_link}" inbox: "inbox" outbox: "outbox" messages: @@ -1211,7 +1536,7 @@ en: to: "To" subject: "Subject" date: "Date" - no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" + no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?" people_mapping_nearby: "people mapping nearby" 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 login as the correct user in order to reply." @@ -1237,7 +1562,7 @@ en: about: next: Next copyright_html: <span>©</span>OpenStreetMap<br>contributors - used_by: "%{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. @@ -1265,13 +1590,13 @@ en: under the same licence. See the <a href='%{copyright_path}'>Copyright and License page</a> for details. legal_title: Legal - legal_html: | + legal_1_html: | This site and many other related services are formally operated by the <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy"> - Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a> - <br> + to our <a href="https://wiki.osmfoundation.org/wiki/Terms_of_Use">Terms of Use</a>, <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy"> + Acceptable Use Policies</a> and our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Privacy Policy</a>. + legal_2_html: | Please <a href='https://osmfoundation.org/Contact'>contact the OSMF</a> if you have licensing, copyright or other legal questions. <br> @@ -1280,11 +1605,11 @@ en: copyright: foreign: title: About this translation - text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence + html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence english_link: the English original native: title: About this page - text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. + html: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping legal_babble: @@ -1301,26 +1626,30 @@ en: may distribute the result only under the same licence. The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal code</a> explains your rights and responsibilities. - intro_3_html: | - The cartography in our map tiles, and our documentation, are - licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative - Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA). + intro_3_1_html: | + Our documentation is licensed under the + <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative + Commons Attribution-ShareAlike 2.0</a> 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 <a href="https://www.openstreetmap.org/copyright">this copyright page</a>. 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: @@ -1347,6 +1676,11 @@ en: <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>). + contributors_au_html: | + <strong>Australia</strong>: Contains data sourced from + <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a> + licensed by the Commonwealth of Australia under + <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>. contributors_ca_html: | <strong>Canada</strong>: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -1374,6 +1708,11 @@ en: <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a> (public information of Slovenia). + contributors_es_html: | + <strong>Spain</strong>: Contains data sourced from the + Spanish National Geographic Institute (<a href="http://www.ign.es/">IGN</a>) and + National Cartographic System (<a href="http://www.scne.es/">SCNE</a>) + licensed for reuse under <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>. contributors_za_html: | <strong>South Africa</strong>: Contains data sourced from <a href="http://www.ngi.gov.za/">Chief Directorate: @@ -1381,7 +1720,7 @@ en: contributors_gb_html: | <strong>United Kingdom</strong>: Contains Ordnance Survey data © Crown copyright and database right - 2010-12. + 2010-19. contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the <a @@ -1401,7 +1740,7 @@ en: added to the OpenStreetMap database or this site, please refer to our <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown procedure</a> or file directly at our - <a href="http://dmca.openstreetmap.org/">on-line filing page</a>. + <a href="https://dmca.openstreetmap.org/">on-line filing page</a>. trademarks_title_html: <span id="trademarks"></span>Trademarks trademarks_1_html: | OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OpenStreetMap Foundation. If you have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark Policy</a>. @@ -1418,12 +1757,12 @@ en: remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: not_public: "You have not set your edits to be public." - not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}." + not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}." user_page_link: user page - anon_edits: "(%{link})" + anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." - flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.' + flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.' potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)" potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information" potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)" @@ -1438,7 +1777,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).' + export_details_html: 'OpenStreetMap data is licensed under the <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).' too_large: advice: "If the above export fails, please consider using one of the sources listed below:" 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." @@ -1496,7 +1835,7 @@ en: and collaboratively discussing and documenting mapping topics. welcome: url: /welcome - title: Welcome to OSM + title: Welcome to OpenStreetMap description: Start with this quick guide covering the OpenStreetMap basics. beginners_guide: url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide @@ -1504,8 +1843,8 @@ en: description: Community maintained guide for beginners. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer site. + title: Help Forum + description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. mailing_lists: url: https://lists.openstreetmap.org/ title: Mailing Lists @@ -1522,10 +1861,14 @@ en: url: https://switch2osm.org/ title: switch2osm description: Help for companies and organisations switching to OpenStreetMap based maps and other services. + 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. wiki: url: https://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. + title: OpenStreetMap Wiki + description: Browse the wiki for in-depth OpenStreetMap documentation. sidebar: search_results: Search Results close: Close @@ -1613,7 +1956,7 @@ en: edit: Edit preview: Preview markdown_help: - title_html: Parsed with <a href="https://daringfireball.net/projects/markdown/">Markdown</a> + title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a> headings: Headings heading: Heading subheading: Subheading @@ -1668,7 +2011,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. - <a href='%{help_url}'>Get help here</a>. + <a href='%{help_url}'>Get help here</a>. With an organization making plans for OpenStreetMap? <a href='https://welcome.openstreetmap.org/'>Check out the Welcome Mat</a>. start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! @@ -1687,14 +2030,8 @@ 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" - upload_button: "Upload" help: "Help" help_url: "https://wiki.openstreetmap.org/wiki/Upload" create: @@ -1705,26 +2042,16 @@ 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" - save_button: "Save Changes" - visibility: "Visibility:" visibility_help: "what does this mean?" visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + update: + updated: Trace updated trace_optionals: tags: "Tags" - view: + show: title: "Viewing trace %{name}" heading: "Viewing trace %{name}" pending: "PENDING" @@ -1733,14 +2060,15 @@ en: uploaded: "Uploaded:" points: "Points:" start_coordinates: "Start coordinate:" + coordinates_html: "%{latitude}; %{longitude}" map: "map" edit: "edit" owner: "Owner:" description: "Description:" tags: "Tags:" none: "None" - edit_track: "Edit this trace" - delete_track: "Delete this trace" + edit_trace: "Edit this trace" + delete_trace: "Delete this trace" trace_not_found: "Trace not found!" visibility: "Visibility:" confirm_delete: "Delete this trace?" @@ -1750,8 +2078,9 @@ en: newer: "Newer Traces" trace: pending: "PENDING" - count_points: "%{count} points" - ago: "%{time_in_words_ago} ago" + count_points: + one: "1 point" + other: "%{count} points" more: "more" trace_details: "View Trace Details" view_map: "View Map" @@ -1764,7 +2093,7 @@ en: by: "by" in: "in" map: "map" - list: + index: public_traces: "Public GPS traces" my_traces: "My GPS traces" public_traces_from: "Public GPS traces from %{user}" @@ -1774,7 +2103,7 @@ en: upload_trace: "Upload a trace" see_all_traces: "See all traces" see_my_traces: "See my traces" - delete: + destroy: scheduled_for_deletion: "Trace scheduled for deletion" make_public: made_public: "Trace made public" @@ -1791,14 +2120,11 @@ en: other: "GPX file with %{count} points from %{user}" description_without_count: "GPX file from %{user}" application: + permission_denied: You do not have permission to access that action 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. - require_moderator: - not_a_moderator: "You need to be a moderator to perform that action." - require_moderator_or_admin: - not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action setup_user_auth: blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. 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." @@ -1806,7 +2132,7 @@ en: oauth: authorize: title: "Authorize access to your account" - request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." + request_access_html: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." allow_to: "Allow the client application to:" allow_read_prefs: "read your user preferences." allow_write_prefs: "modify your user preferences." @@ -1818,7 +2144,7 @@ en: grant_access: "Grant Access" authorize_success: title: "Authorization request allowed" - allowed: "You have granted application %{app_name} access to your account." + allowed_html: "You have granted application %{app_name} access to your account." verification: "The verification code is %{code}." authorize_failure: title: "Authorization request failed" @@ -1831,10 +2157,8 @@ en: oauth_clients: new: title: "Register a new application" - submit: "Register" edit: title: "Edit your application" - submit: "Edit" show: title: "OAuth details for %{app_name}" key: "Consumer Key:" @@ -1847,13 +2171,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" @@ -1862,23 +2179,12 @@ en: issued_at: "Issued At" revoke: "Revoke!" my_apps: "My Client Applications" - no_apps: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service." + no_apps_html: "Do you have an application you would like to register for use with us using the %{oauth} standard? You must register your web application before it can make OAuth requests to this service." + oauth: OAuth 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: @@ -1887,13 +2193,13 @@ en: flash: "Updated the client information successfully" destroy: flash: "Destroyed the client application registration" - user: + users: login: title: "Login" heading: "Login" email or username: "Email Address or Username:" password: "Password:" - openid: "%{logo} OpenID:" + openid_html: "%{logo} OpenID:" remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" @@ -1959,7 +2265,7 @@ en: new: title: "Sign Up" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.' + contact_webmaster_html: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.' about: header: Free and editable html: | @@ -1969,7 +2275,7 @@ en: license_agreement: 'When you confirm your account you will need to agree to the <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.' email address: "Email Address:" confirm email address: "Confirm Email Address:" - not displayed publicly: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information' + not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." external auth: "Third Party Authentication:" @@ -1982,14 +2288,19 @@ en: terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>." terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: "Contributor terms" - heading: "Contributor terms" - read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions." - consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain" + 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." + 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." + read_tou: "I have read and agree to the Terms of Use" + consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>' - agree: Agree + guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human readable summary</a> and some <a href="%{translations}">informal translations</a>' + continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." @@ -2003,7 +2314,7 @@ en: heading: "The user %{user} does not exist" body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong." deleted: "deleted" - view: + show: my diary: My Diary new diary entry: new diary entry my edits: My Edits @@ -2024,19 +2335,17 @@ en: remove as friend: Unfriend add as friend: Add Friend mapper since: "Mapper since:" - ago: "(%{time_in_words_ago} ago)" ct status: "Contributor terms:" ct undecided: Undecided ct declined: Declined - ct accepted: Accepted %{ago} ago - latest edit: "Latest edit %{ago}:" + latest edit: "Latest edit (%{ago}):" email address: "Email address:" created from: "Created from:" status: "Status:" spam score: "Spam Score:" description: Description user location: User location - if set location: "Set your home location on the %{settings_link} page to see nearby users." + if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users." settings_link_text: settings my friends: My friends no friends: You have not added any friends yet. @@ -2092,7 +2401,7 @@ en: disabled link text: "why can't I edit?" public editing note: heading: "Public editing" - text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>" + html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>" contributor terms: heading: "Contributor Terms:" agreed: "You have agreed to the new Contributor Terms." @@ -2152,27 +2461,14 @@ en: flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." - make_friend: - heading: "Add %{user} as a friend?" - button: "Add as friend" - success: "%{name} is now your friend!" - failed: "Sorry, failed to add %{name} as a friend." - already_a_friend: "You are already friends with %{name}." - remove_friend: - heading: "Unfriend %{user}?" - button: "Unfriend" - success: "%{name} was removed from your friends." - not_a_friend: "%{name} is not one of your friends." - filter: - not_an_administrator: "You need to be an administrator to perform that action." - list: + index: title: Users heading: Users showing: one: Page %{page} (%{first_item} of %{items}) other: Page %{page} (%{first_item}-%{last_item} of %{items}) - summary: "%{name} created from %{ip_address} on %{date}" - summary_no_ip: "%{name} created on %{date}" + summary_html: "%{name} created from %{ip_address} on %{date}" + summary_no_ip_html: "%{name} created on %{date}" confirm: Confirm Selected Users hide: Hide Selected Users empty: No matching users found @@ -2180,7 +2476,7 @@ en: title: Account Suspended heading: Account Suspended webmaster: webmaster - body: | + body_html: | <p> Sorry, your account has been automatically suspended due to suspicious activity. @@ -2206,7 +2502,6 @@ en: with your ID in your user settings. user_role: filter: - not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." 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}." @@ -2232,20 +2527,18 @@ en: back: "Back to index" new: title: "Creating block on %{name}" - heading: "Creating block on %{name}" + heading_html: "Creating block on %{name}" reason: "The reason why %{name} 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 laymans terms." period: "How long, starting now, the user will be blocked from the API for." - submit: "Create block" tried_contacting: "I have contacted the user and asked them to stop." tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications." needs_view: "User needs to log in before this block will be cleared" back: "View all blocks" edit: title: "Editing block on %{name}" - heading: "Editing block on %{name}" + heading_html: "Editing block on %{name}" reason: "The reason why %{name} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation. Bear in mind that not all users understand the community jargon, so please try to use laymans terms." period: "How long, starting now, the user will be blocked from the API for." - submit: "Update block" show: "View this block" back: "View all blocks" needs_view: "Does the user need to log in before this block will be cleared?" @@ -2265,35 +2558,45 @@ en: empty: "No blocks have been made yet." revoke: title: "Revoking block on %{block_on}" - heading: "Revoking block on %{block_on} by %{block_by}" + heading_html: "Revoking block on %{block_on} by %{block_by}" time_future: "This block will end in %{time}." - past: "This block ended %{time} ago and cannot be revoked now." + past: "This block ended %{time} and cannot be revoked now." confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." - period: - one: "1 hour" - other: "%{count} hours" helper: time_future: "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} ago." + time_past: "Ended %{time}." + block_duration: + hours: + one: "1 hour" + other: "%{count} hours" + days: + one: "1 day" + other: "%{count} days" + weeks: + one: "1 week" + other: "%{count} weeks" + months: + one: "1 month" + other: "%{count} months" + years: + one: "1 year" + other: "%{count} years" blocks_on: title: "Blocks on %{name}" - heading: "List of blocks on %{name}" + heading_html: "List of blocks on %{name}" empty: "%{name} has not been blocked yet." blocks_by: title: "Blocks by %{name}" - heading: "List of blocks by %{name}" + heading_html: "List of blocks by %{name}" empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" - heading: "%{block_on} blocked by %{block_by}" - time_future: "Ends in %{time}" - time_past: "Ended %{time} ago" + heading_html: "%{block_on} blocked by %{block_by}" created: "Created" - ago: "%{time} ago" status: "Status" show: "Show" edit: "Edit" @@ -2318,36 +2621,15 @@ en: next: "Next »" previous: "« Previous" notes: - comment: - opened_at_html: "Created %{when} ago" - opened_at_by_html: "Created %{when} ago by %{user}" - commented_at_html: "Updated %{when} ago" - commented_at_by_html: "Updated %{when} ago by %{user}" - closed_at_html: "Resolved %{when} ago" - closed_at_by_html: "Resolved %{when} ago by %{user}" - reopened_at_html: "Reactivated %{when} ago" - reopened_at_by_html: "Reactivated %{when} ago by %{user}" - rss: - title: "OpenStreetMap 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}" - opened: "new note (near %{place})" - commented: "new comment (near %{place})" - closed: "closed note (near %{place})" - reopened: "reactivated note (near %{place})" - entry: - comment: Comment - full: Full note - mine: + index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" - subheading: "Notes submitted or commented on by %{user}" + subheading_html: "Notes submitted or commented on by %{user}" id: "Id" creator: "Creator" description: "Description" created_at: "Created at" last_changed: "Last changed" - ago_html: "%{when} ago" javascripts: close: Close share: @@ -2382,12 +2664,18 @@ en: out: Zoom Out locate: title: Show My Location - popup: You are within {distance} {unit} of this point + metersPopup: + one: You are within one meter of this point + other: You are within %{count} meters of this point + feetPopup: + one: You are within one foot of this point + other: You are within %{count} feet of this point base: standard: Standard cycle_map: Cycle Map transport_map: Transport Map hot: Humanitarian + opnvkarte: ÖPNVKarte layers: header: Map Layers notes: Map Notes @@ -2397,6 +2685,10 @@ en: title: "Layers" copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>" donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>" + terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>" + thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>" + opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>" + hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map @@ -2429,13 +2721,12 @@ en: directions: ascend: "Ascend" engines: + fossgis_osrm_bike: "Bicycle (OSRM)" + fossgis_osrm_car: "Car (OSRM)" + fossgis_osrm_foot: "Foot (OSRM)" graphhopper_bicycle: "Bicycle (GraphHopper)" graphhopper_car: "Car (GraphHopper)" graphhopper_foot: "Foot (GraphHopper)" - mapquest_bicycle: "Bicycle (MapQuest)" - mapquest_car: "Car (MapQuest)" - mapquest_foot: "Foot (MapQuest)" - osrm_car: "Car (OSRM)" descend: "Descend" directions: "Directions" distance: "Distance" @@ -2527,7 +2818,6 @@ en: edit: description: "Description" heading: "Edit redaction" - submit: "Save redaction" title: "Edit redaction" index: empty: "No redactions to show." @@ -2536,7 +2826,6 @@ en: new: description: "Description" heading: "Enter information for new redaction" - submit: "Create redaction" title: "Creating new redaction" show: description: "Description:" @@ -2554,3 +2843,8 @@ en: not_empty: "Redaction is not empty. Please un-redact all versions belonging to this redaction before destroying it." flash: "Redaction destroyed." error: "There was an error destroying this redaction." + validations: + leading_whitespace: "has leading whitespace" + trailing_whitespace: "has trailing whitespace" + invalid_characters: "contains invalid characters" + url_characters: "contains special URL characters (%{characters})"