X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3ddda7319c5e9f146a03ab86f1de8e32d9bae3ef..77e8a16a153752b919a9153c1c9ded9834d387f7:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 46fe41d10..30fae4945 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -79,7 +79,7 @@ en: printable_name: with_id: "%{id}" with_version: "%{id}, v%{version}" - with_name: "%{name} (%{id})" + with_name_html: "%{name} (%{id})" editor: default: "Default (currently %{name})" potlatch: @@ -121,11 +121,16 @@ en: way_paginated: "Ways (%{x}-%{y} of %{count})" 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" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" + join_discussion: "Log in to join the discussion" + discussion: Discussion node: title: "Node: %{name}" history_title: "Node History: %{name}" @@ -180,10 +185,13 @@ en: wiki_link: key: "The wiki description page for the %{key} tag" tag: "The wiki description page for the %{key}=%{value} tag" + wikidata_link: "The %{page} item on Wikidata" wikipedia_link: "The %{page} article on Wikipedia" + telephone_link: "Call %{phone_number}" note: title: "Note: %{id}" new_note: "New Note" + description: "Description" open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" @@ -196,6 +204,11 @@ en: reopened_by: "Reactivated by %{user} %{when} ago" reopened_by_anonymous: "Reactivated by anonymous %{when} ago" hidden_by: "Hidden by %{user} %{when} ago" + query: + title: "Query Features" + introduction: "Click on the map to find nearby features." + nearby: "Nearby features" + enclosing: "Enclosing features" changeset: changeset_paging_nav: showing_page: "Page %{page}" @@ -225,6 +238,13 @@ en: load_more: "Load more" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." + rss: + 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: new: title: New Diary Entry @@ -355,8 +375,10 @@ en: prefix_format: "%{name}" prefix: aerialway: + cable_car: "Cable Car" chair_lift: "Chair Lift" drag_lift: "Drag Lift" + gondola: "Gondola Lift" station: "Aerialway Station" aeroway: aerodrome: "Aerodrome" @@ -367,11 +389,9 @@ en: taxiway: "Taxiway" terminal: "Terminal" amenity: - airport: "Airport" + animal_shelter: "Animal Shelter" arts_centre: "Arts Centre" - artwork: "Artwork" atm: "ATM" - auditorium: "Auditorium" bank: "Bank" bar: "Bar" bbq: "BBQ" @@ -379,6 +399,7 @@ en: bicycle_parking: "Cycle Parking" bicycle_rental: "Cycle Rental" biergarten: "Beer Garden" + boat_rental: "Boat Rental" brothel: "Brothel" bureau_de_change: "Bureau de Change" bus_station: "Bus Station" @@ -388,9 +409,10 @@ en: car_wash: "Car Wash" casino: "Casino" charging_station: "Charging Station" + childcare: "Childcare" cinema: "Cinema" clinic: "Clinic" - club: "Club" + clock: "Clock" college: "College" community_centre: "Community Centre" courthouse: "Courthouse" @@ -409,25 +431,25 @@ en: food_court: "Food Court" fountain: "Fountain" fuel: "Fuel" + gambling: "Gambling" grave_yard: "Grave Yard" gym: "Fitness Centre / Gym" - hall: "Hall" health_centre: "Health Centre" hospital: "Hospital" - hotel: "Hotel" hunting_stand: "Hunting Stand" ice_cream: "Ice Cream" kindergarten: "Kindergarten" library: "Library" market: "Market" marketplace: "Marketplace" - mountain_rescue: "Mountain Rescue" + monastery: "Monastery" + motorcycle_parking: "Motorcycle Parking" nightclub: "Night Club" nursery: "Nursery" nursing_home: "Nursing Home" office: "Office" - park: "Park" parking: "Parking" + parking_entrance: "Parking Entrance" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" @@ -437,7 +459,6 @@ en: prison: "Prison" pub: "Pub" public_building: "Public Building" - public_market: "Public Market" reception_area: "Reception Area" recycling: "Recycling Point" restaurant: "Restaurant" @@ -446,13 +467,11 @@ en: school: "School" shelter: "Shelter" shop: "Shop" - shopping: "Shopping" shower: "Shower" social_centre: "Social Centre" social_club: "Social Club" social_facility: "Social Facility" studio: "Studio" - supermarket: "Supermarket" swimming_pool: "Swimming Pool" taxi: "Taxi" telephone: "Public Telephone" @@ -464,8 +483,7 @@ en: veterinary: "Veterinary Surgery" village_hall: "Village Hall" waste_basket: "Waste Basket" - wifi: "WiFi Access" - WLAN: "WiFi Access" + waste_disposal: "Waste Disposal" youth_centre: "Youth Centre" boundary: administrative: "Administrative Boundary" @@ -480,22 +498,35 @@ en: "yes": "Bridge" building: "yes": "Building" + craft: + brewery: "Brewery" + carpenter: "Carpenter" + electrician: "Electrician" + gardener: "Gardener" + painter: "Painter" + photographer: "Photographer" + plumber: "Plumber" + shoemaker: "Shoemaker" + tailor: "Tailor" + "yes": "Craft Shop" emergency: - fire_hydrant: "Fire Hydrant" + ambulance_station: "Ambulance Station" + defibrillator: "Defibrillator" + landing_site: "Emergency Landing Site" phone: "Emergency Phone" highway: + abandoned: "Abandoned Highway" bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" bus_stop: "Bus Stop" - byway: "Byway" construction: "Highway under Construction" cycleway: "Cycle Path" + elevator: "Elevator" emergency_access_point: "Emergency Access Point" footway: "Footpath" ford: "Ford" living_street: "Living Street" milestone: "Milestone" - minor: "Minor Road" motorway: "Motorway" motorway_junction: "Motorway Junction" motorway_link: "Motorway Road" @@ -506,7 +537,7 @@ en: primary_link: "Primary Road" proposed: "Proposed Road" raceway: "Raceway" - residential: "Residential" + residential: "Residential Road" rest_area: "Rest Area" road: "Road" secondary: "Secondary Road" @@ -516,37 +547,44 @@ en: speed_camera: "Speed Camera" steps: "Steps" street_lamp: "Street Lamp" - stile: "Stile" tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" track: "Track" + traffic_signals: "Traffic Signals" trail: "Trail" trunk: "Trunk Road" trunk_link: "Trunk Road" unclassified: "Unclassified Road" unsurfaced: "Unsurfaced Road" + "yes" : "Road" historic: archaeological_site: "Archaeological Site" battlefield: "Battlefield" boundary_stone: "Boundary Stone" - building: "Building" + building: "Historic Building" + bunker: "Bunker" castle: "Castle" church: "Church" + city_gate: "City Gate" citywalls: "City Walls" fort: "Fort" + heritage: "Heritage Site" house: "House" icon: "Icon" manor: "Manor" memorial: "Memorial" mine: "Mine" monument: "Monument" - museum: "Museum" + roman_road: "Roman Road" ruins: "Ruins" + stone: "Stone" tomb: "Tomb" tower: "Tower" wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" wreck: "Wreck" + junction: + "yes": "Junction" landuse: allotments: "Allotments" basin: "Basin" @@ -568,9 +606,6 @@ en: military: "Military Area" mine: "Mine" orchard: "Orchard" - nature_reserve: "Nature Reserve" - park: "Park" - piste: "Piste" quarry: "Quarry" railway: "Railway" recreation_ground: "Recreation Ground" @@ -581,16 +616,19 @@ en: road: "Road Area" village_green: "Village Green" vineyard: "Vineyard" - wetland: "Wetland" - wood: "Wood" + "yes": "Landuse" leisure: beach_resort: "Beach Resort" bird_hide: "Bird Hide" + club: "Club" common: "Common Land" + dog_park: "Dog Park" fishing: "Fishing Area" + fitness_centre: "Fitness Centre" fitness_station: "Fitness Station" garden: "Garden" golf_course: "Golf Course" + horse_riding: "Horse Riding" ice_rink: "Ice Rink" marina: "Marina" miniature_golf: "Miniature Golf" @@ -599,6 +637,7 @@ en: pitch: "Sports Pitch" playground: "Playground" recreation_ground: "Recreation Ground" + resort: "Resort" sauna: "Sauna" slipway: "Slipway" sports_centre: "Sports Centre" @@ -606,6 +645,13 @@ en: swimming_pool: "Swimming Pool" track: "Running Track" water_park: "Water Park" + "yes": "Leisure" + man_made: + lighthouse: "Lighthouse" + pipeline: "Pipeline" + tower: "Tower" + works: "Factory" + "yes": "Man-made" military: airfield: "Military Airfield" barracks: "Barracks" @@ -617,16 +663,15 @@ en: beach: "Beach" cape: "Cape" cave_entrance: "Cave Entrance" - channel: "Channel" cliff: "Cliff" crater: "Crater" dune: "Dune" - feature: "Feature" fell: "Fell" fjord: "Fjord" forest: "Forest" geyser: "Geyser" glacier: "Glacier" + grassland: "Grassland" heath: "Heath" hill: "Hill" island: "Island" @@ -638,11 +683,11 @@ en: point: "Point" reef: "Reef" ridge: "Ridge" - river: "River" rock: "Rock" + saddle: "Saddle" + sand: "Sand" scree: "Scree" scrub: "Scrub" - shoal: "Shoal" spring: "Spring" stone: "Stone" strait: "Strait" @@ -651,10 +696,10 @@ en: volcano: "Volcano" water: "Water" wetland: "Wetland" - wetlands: "Wetlands" wood: "Wood" office: accountant: "Accountant" + administrative: "Administration" architect: "Architect" company: "Company" employment_agency: "Employment Agency" @@ -667,6 +712,8 @@ en: travel_agent: "Travel Agency" "yes": "Office" place: + allotments: "Allotments" + block: "Block" airport: "Airport" city: "City" country: "Country" @@ -691,6 +738,7 @@ en: town: "Town" unincorporated_area: "Unincorporated Area" village: "Village" + "yes": "Place" railway: abandoned: "Abandoned Railway" construction: "Railway under Construction" @@ -716,7 +764,6 @@ en: switch: "Railway Points" tram: "Tramway" tram_stop: "Tram Stop" - yard: "Railway Yard" shop: alcohol: "Off License" antiques: "Antiques" @@ -795,6 +842,7 @@ en: "yes": "Shop" tourism: alpine_hut: "Alpine Hut" + apartment: "Apartment" artwork: "Artwork" attraction: "Attraction" bed_and_breakfast: "Bed and Breakfast" @@ -802,16 +850,15 @@ en: camp_site: "Camp Site" caravan_site: "Caravan Site" chalet: "Chalet" + gallery: "Gallery" guest_house: "Guest House" hostel: "Hostel" hotel: "Hotel" information: "Information" - lean_to: "Lean To" motel: "Motel" museum: "Museum" picnic_site: "Picnic Site" theme_park: "Theme Park" - valley: "Valley" viewpoint: "Viewpoint" zoo: "Zoo" tunnel: @@ -821,7 +868,6 @@ en: artificial: "Artificial Waterway" boatyard: "Boatyard" canal: "Canal" - connector: "Waterway Connector" dam: "Dam" derelict_canal: "Derelict Canal" ditch: "Ditch" @@ -829,16 +875,14 @@ en: drain: "Drain" lock: "Lock" lock_gate: "Lock Gate" - mineral_spring: "Mineral Spring" mooring: "Mooring" rapids: "Rapids" river: "River" - riverbank: "Riverbank" stream: "Stream" wadi: "Wadi" waterfall: "Waterfall" - water_point: "Water Point" weir: "Weir" + "yes": "Waterway" admin_levels: level2: "Country Boundary" level4: "State Boundary" @@ -858,19 +902,6 @@ en: results: no_results: "No results found" more_results: "More results" - distance: - zero: "less than 1km" - one: "about 1km" - other: "about %{count}km" - direction: - south_west: "south-west" - south: "south" - south_east: "south-east" - east: "east" - north_east: "north-east" - north: "north" - north_west: "north-west" - west: "west" layouts: project_name: # in @@ -1227,6 +1258,16 @@ en: your_note: "%{commenter} has reactivated one of your map notes near %{place}." commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}." details: "More details about the note can be found at %{url}." + changeset_comment_notification: + greeting: "Hi," + 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}" + 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}." message: inbox: title: "Inbox" @@ -1627,7 +1668,7 @@ en: login_button: "Login" register now: Register now with username: "Already have an OpenStreetMap account? Please login with your username and password:" - with openid: "Alternatively, use OpenID to login:" + with external: "Alternatively, use a third party to login:" new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. create account minute: Create an account. It only takes a minute. @@ -1635,10 +1676,8 @@ en: account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>." account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this. auth failure: "Sorry, could not log in with those details." - openid missing provider: "Sorry, could not contact your OpenID provider" - openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID" - openid_providers: + auth_providers: openid: title: Login with OpenID alt: Login with an OpenID URL @@ -1648,9 +1687,6 @@ en: yahoo: title: Login with Yahoo alt: Login with a Yahoo OpenID - myopenid: - title: Login with myOpenID - alt: Login with a myOpenID OpenID wordpress: title: Login with Wordpress alt: Login with a Wordpress OpenID @@ -1693,19 +1729,19 @@ en: not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)' display name: "Display Name:" display name description: "Your publicly displayed username. You can change this later in the preferences." - openid: "%{logo} OpenID:" + external auth: "Third Party Authentication:" password: "Password:" confirm password: "Confirm Password:" - use openid: "Alternatively, use %{logo} OpenID to login" - openid no password: "With OpenID a password is not required, but some extra tools or server may still need one." - openid association: | - <p>Your OpenID is not associated with a OpenStreetMap account yet.</p> + use external auth: "Alternatively, use a third party to login" + auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one." + auth association: | + <p>Your ID is not associated with a OpenStreetMap account yet.</p> <ul> <li>If you are new to OpenStreetMap, please create a new account using the form below.</li> <li> If you already have an account, you can login to your account using your username and password and then associate the account - with your OpenID in your user settings. + with your ID in your user settings. </li> </ul> continue: Sign Up @@ -1808,8 +1844,8 @@ en: current email address: "Current Email Address:" new email address: "New Email Address:" email never displayed publicly: "(never displayed publicly)" + external auth: "External Authentication:" openid: - openid: "OpenID:" link: "http://wiki.openstreetmap.org/wiki/OpenID" link text: "what is this?" public editing: @@ -1861,6 +1897,7 @@ en: Confirm your account by clicking on the link in the email and you'll be able to start mapping. press confirm button: "Press the confirm button below to activate your account." button: Confirm + success: "Confirmed your account, thanks for signing up!" already active: "This account has already been confirmed." unknown token: "That confirmation code has expired or does not exist." reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>." @@ -1871,8 +1908,9 @@ en: heading: Confirm a change of email address press confirm button: "Press the confirm button below to confirm your new email address." button: Confirm - success: "Confirmed your email address, thanks for signing up!" + success: "Confirmed your change of email address!" failure: "An email address has already been confirmed with this token." + unknown_token: "That confirmation code has expired or does not exist." set_home: flash success: "Home location saved successfully" go_public: @@ -1914,6 +1952,9 @@ en: This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this. </p> + auth_failure: + connection_failed: Connection to authentication provider failed + invalid_credentials: Invalid authentication credentials user_role: filter: not_an_administrator: "Only administrators can perform user role management, and you are not an administrator." @@ -2106,9 +2147,18 @@ en: createnote_disabled_tooltip: Zoom in to add a note to the map map_notes_zoom_in_tooltip: Zoom in to see map notes map_data_zoom_in_tooltip: Zoom in to see map data + queryfeature_tooltip: Query features + queryfeature_disabled_tooltip: Zoom in to query features + changesets: + show: + comment: "Comment" + subscribe: "Subscribe" + unsubscribe: "Unsubscribe" + hide_comment: "hide" + unhide_comment: "unhide" notes: new: - intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)" add: Add Note show: anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@ -2120,33 +2170,46 @@ en: edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: engines: - graphhopper_bike: "Bicycle (GraphHopper)" - mapquest_bike: "Bicycle (MapQuest)" + graphhopper_bicycle: "Bicycle (GraphHopper)" + graphhopper_foot: "Foot (GraphHopper)" + mapquest_bicycle: "Bicycle (MapQuest)" + mapquest_car: "Car (MapQuest)" + mapquest_foot: "Foot (MapQuest)" osrm_car: "Car (OSRM)" - cloudmade_foot: "Foot (Cloudmade)" directions: "Directions" + distance: "Distance" errors: no_route: "Couldn't find a route between those two places." no_place: "Sorry - couldn't find that place." instructions: - continue_on: "Continue on " - slight_right: "Slight right onto " - turn_right: "Turn right onto " - sharp_right: "Sharp right onto " - uturn: "U-turn along " - sharp_left: "Sharp left onto " - turn_left: "Turn left onto " - slight_left: "Slight left onto " - via_point: "(via point) " - follow: "Follow " - roundabout: "At roundabout take " - leave_roundabout: "Leave roundabout - " - stay_roundabout: "Stay on roundabout - " - start: "Start at end of " - destination: "Reach destination" - against_oneway: "Go against one-way on " - end_oneway: "End of one-way on " + continue_on: Continue on + slight_right: Slight right onto + turn_right: Turn right onto + sharp_right: Sharp right onto + uturn: U-turn along + sharp_left: Sharp left onto + turn_left: Turn left onto + slight_left: Slight left onto + via_point: (via point) + follow: Follow + roundabout: At roundabout take + leave_roundabout: Leave roundabout - + stay_roundabout: Stay on roundabout - + start: Start at end of + destination: Reach destination + against_oneway: Go against one-way on + end_oneway: End of one-way on + exit: exit %{exit} unnamed: "(unnamed)" + courtesy: "Directions courtesy of %{link}" + time: "Time" + query: + node: Node + way: Way + relation: Relation + nothing_found: No features found + error: "Error contacting %{server}: %{error}" + timeout: "Timeout contacting %{server}" redaction: edit: description: "Description"