X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2d7fa37bd26ae700a3e59f3377d0dc6aa596789a..b99e8702912226ffc9264efaeede2d4d2e3c7156:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 1c0171c2c..3cf5a9c10 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,6 +1,9 @@ en: html: dir: ltr + time: + formats: + friendly: "%e %B %Y at %H:%M" activerecord: # Translates all the model names, which is used in error handling on the web site models: @@ -76,10 +79,6 @@ en: with_id: "{{id}}" with_version: "{{id}}, v{{version}}" with_name: "{{name}} ({{id}})" - map: - view: View - edit: Edit - coordinates: "Coordinates:" browse: changeset: title: "Changeset" @@ -91,6 +90,13 @@ en: title: "Changeset {{id}}" title_comment: "Changeset {{id}} - {{comment}}" changeset_navigation: + paging: + user: + prev: "« {{id}}" + next: "{{id}} »" + all: + prev: "« {{id}}" + next: "{{id}} »" user: name_tooltip: "View edits by {{user}}" prev_tooltip: "Previous edit by {{user}}" @@ -155,6 +161,13 @@ en: way: way relation: relation changeset: changeset + timeout: + sorry: "Sorry, the data for the {{type}} with the id {{id}}, took too long to retrieve." + type: + node: node + way: way + relation: relation + changeset: changeset paging_nav: showing_page: "Showing page" of: "of" @@ -205,19 +218,19 @@ en: type: node: "Node" way: "Way" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers api: "Retrieve this area from the API" details: "Details" selected: type: node: "Node [[id]]" way: "Way [[id]]" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers history: type: node: "Node [[id]]" way: "Way [[id]]" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" way_details: @@ -241,8 +254,9 @@ en: edit: "edit" changeset: changeset_paging_nav: - showing_page: "Showing page" - of: "of" + showing_page: "Showing page {{page}}" + next: "Next »" + previous: "« Previous" changeset: id: "#{{id}}" still_editing: "(still editing)" @@ -298,7 +312,7 @@ en: save_button: "Save" marker_text: Diary entry location view: - title: "Users' diaries | {{user}}" + 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" @@ -313,15 +327,23 @@ 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." diary_entry: - posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}" + posted_by: "Posted by {{link_user}} on {{created}} in {{language_link}}" comment_link: Comment on this entry reply_link: Reply to this entry comment_count: one: 1 comment other: "{{count}} comments" edit_link: Edit this entry + hide_link: Hide this entry + confirm: Confirm diary_comment: - comment_from: "Comment from {{link_user}} at {{comment_created_at}}" + comment_from: "Comment from {{link_user}} on {{comment_created_at}}" + hide_link: Hide this comment + confirm: Confirm + location: + location: "Location:" + view: "View" + edit: "Edit" feed: user: title: "OpenStreetMap diary entries for {{user}}" @@ -343,6 +365,9 @@ en: embeddable_html: "Embeddable HTML" licence: "Licence" export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + too_large: + heading: "Area Too Large" + body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." options: "Options" format: "Format" scale: "Scale" @@ -371,20 +396,453 @@ en: uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' osm_namefinder: 'Results from OpenStreetMap Namefinder' - osm_twain: 'Results from OpenStreetMap Twain' + osm_nominatim: 'Results from OpenStreetMap Nominatim' geonames: 'Results from GeoNames' search_osm_namefinder: prefix: "{{type}}" suffix_place: ", {{distance}} {{direction}} of {{placename}}" suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})" suffix_suburb: "{{suffix}}, {{parentname}}" - search_osm_twain: - prefix_highway: "{{type}} road" - prefix_other: "{{type}}" + search_osm_nominatim: + prefix: + amenity: + airport: "Airport" + arts_centre: "Arts Centre" + atm: "ATM" + auditorium: "Auditorium" + bank: "Bank" + bar: "Bar" + bench: "Bench" + bicycle_parking: "Cycle Parking" + bicycle_rental: "Cycle Rental" + brothel: "Brothel" + bureau_de_change: "Bureau de Change" + bus_station: "Bus Station" + cafe: "Cafe" + car_rental: "Car Rental" + car_sharing: "Car Sharing" + car_wash: "Car Wash" + casino: "Casino" + cinema: "Cinema" + clinic: "Clinic" + club: "Club" + college: "College" + community_centre: "Community Centre" + courthouse: "Courthouse" + crematorium: "Crematorium" + dentist: "Dentist" + doctors: "Doctors" + dormitory: "Dormitory" + drinking_water: "Drinking Water" + driving_school: "Driving School" + embassy: "Embassy" + emergency_phone: "Emergency Phone" + fast_food: "Fast Food" + ferry_terminal: "Ferry Terminal" + fire_hydrant: "Fire Hydrant" + fire_station: "Fire Station" + fountain: "Fountain" + fuel: "Fuel" + 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" + nightclub: "Night Club" + nursery: "Nursery" + nursing_home: "Nursing Home" + office: "Office" + park: "Park" + parking: "Parking" + 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_building: "Public Building" + public_market: "Public Market" + reception_area: "Reception Area" + recycling: "Recycling Point" + restaurant: "Restaurant" + retirement_home: "Retirement Home" + sauna: "Sauna" + school: "School" + shelter: "Shelter" + shop: "Shop" + shopping: "Shopping" + social_club: "Social Club" + studio: "Studio" + supermarket: "Supermarket" + taxi: "Taxi" + telephone: "Public Telephone" + theatre: "Theatre" + toilets: "Toilets" + townhall: "Town Hall" + university: "University" + vending_machine: "Vending Machine" + veterinary: "Veterinary Surgery" + village_hall: "Village Hall" + waste_basket: "Waste Basket" + wifi: "WiFi Access" + youth_centre: "Youth Centre" + boundary: + administrative: "Administrative Boundary" + building: + apartments: "Apartment Block" + block: "Building Block" + bunker: "Bunker" + chapel: "Chapel" + church: "Church" + city_hall: "City Hall" + commercial: "Commercial Building" + dormitory: "Dormitory" + entrance: "Building Entrance" + faculty: "Faculty Building" + farm: "Farm Building" + flats: "Flats" + garage: "Garage" + hall: "Hall" + hospital: "Hospital Building" + hotel: "Hotel" + house: "House" + industrial: "Industrial Building" + office: "Office Building" + public: "Public Building" + residential: "Residential Building" + retail: "Retail Building" + school: "School Building" + shop: "Shop" + stadium: "Stadium" + store: "Store" + terrace: "Terrace" + tower: "Tower" + train_station: "Railway Station" + university: "University Building" + yes: "Building" + highway: + bridleway: "Bridleway" + bus_guideway: "Guided Bus Lane" + bus_stop: "Bus Stop" + byway: "Byway" + construction: "Highway under Construction" + cycleway: "Cycle Path" + distance_marker: "Distance Marker" + emergency_access_point: "Emergency Access Point" + footway: "Footpath" + ford: "Ford" + gate: "Gate" + living_street: "Living Street" + minor: "Minor Road" + motorway: "Motorway" + motorway_junction: "Motorway Junction" + motorway_link: "Motorway Road" + path: "Path" + pedestrian: "Pedestrian Way" + platform: "Platform" + primary: "Primary Road" + primary_link: "Primary Road" + raceway: "Raceway" + residential: "Residential" + road: "Road" + secondary: "Secondary Road" + secondary_link: "Secondary Road" + service: "Service Road" + services: "Motorway Services" + steps: "Steps" + stile: "Stile" + tertiary: "Tertiary Road" + track: "Track" + trail: "Trail" + trunk: "Trunk Road" + trunk_link: "Trunk Road" + unclassified: "Unclassified Road" + unsurfaced: "Unsurfaced Road" + historic: + archaeological_site: "Archaeological Site" + battlefield: "Battlefield" + boundary_stone: "Boundary Stone" + building: "Building" + castle: "Castle" + church: "Church" + house: "House" + icon: "Icon" + manor: "Manor" + memorial: "Memorial" + mine: "Mine" + monument: "Monument" + museum: "Museum" + ruins: "Ruins" + tower: "Tower" + wayside_cross: "Wayside Cross" + wayside_shrine: "Wayside Shrine" + wreck: "Wreck" + landuse: + allotments: "Allotments" + basin: "Basin" + brownfield: "Brownfield Land" + cemetery: "Cemetery" + commercial: "Commercial Area" + conservation: "Conservation" + construction: "Construction" + farm: "Farm" + farmland: "Farmland" + farmyard: "Farmyard" + forest: "Forest" + grass: "Grass" + greenfield: "Greenfield Land" + industrial: "Industrial Area" + landfill: "Landfill" + meadow: "Meadow" + military: "Military Area" + mine: "Mine" + mountain: "Mountain" + nature_reserve: "Nature Reserve" + park: "Park" + piste: "Piste" + plaza: "Plaza" + quarry: "Quarry" + railway: "Railway" + recreation_ground: "Recreation Ground" + reservoir: "Reservoir" + residential: "Residential Area" + retail: "Retail" + village_green: "Village Green" + vineyard: "Vineyard" + wetland: "Wetland" + wood: "Wood" + leisure: + beach_resort: "Beach Resort" + common: "Common Land" + fishing: "Fishing Area" + garden: "Garden" + golf_course: "Golf Course" + ice_rink: "Ice Rink" + marina: "Marina" + miniature_golf: "Miniature Golf" + nature_reserve: "Nature Reserve" + park: "Park" + pitch: "Sports Pitch" + playground: "Playground" + recreation_ground: "Recreation Ground" + slipway: "Slipway" + sports_centre: "Sports Centre" + stadium: "Stadium" + swimming_pool: "Swimming Pool" + track: "Running Track" + water_park: "Water Park" + natural: + bay: "Bay" + beach: "Beach" + cape: "Cape" + cave_entrance: "Cave Entrance" + channel: "Channel" + cliff: "Cliff" + coastline: "Coastline" + crater: "Crater" + feature: "Feature" + fell: "Fell" + fjord: "Fjord" + geyser: "Geyser" + glacier: "Glacier" + heath: "Heath" + hill: "Hill" + island: "Island" + land: "Land" + marsh: "Marsh" + moor: "Moor" + mud: "Mud" + peak: "Peak" + point: "Point" + reef: "Reef" + ridge: "Ridge" + river: "River" + rock: "Rock" + scree: "Scree" + scrub: "Scrub" + shoal: "Shoal" + spring: "Spring" + strait: "Strait" + tree: "Tree" + valley: "Valley" + volcano: "Volcano" + water: "Water" + wetland: "Wetland" + wetlands: "Wetlands" + wood: "Wood" + place: + airport: "Airport" + city: "City" + country: "Country" + county: "County" + farm: "Farm" + hamlet: "Hamlet" + house: "House" + houses: "Houses" + island: "Island" + islet: "Islet" + locality: "Locality" + moor: "Moor" + municipality: "Municipality" + postcode: "Postcode" + region: "Region" + sea: "Sea" + state: "State" + subdivision: "Subdivision" + suburb: "Suburb" + town: "Town" + unincorporated_area: "Unincorporated Area" + village: "Village" + railway: + abandoned: "Abandoned Railway" + construction: "Railway under Construction" + disused: "Disused Railway" + disused_station: "Disused Railway Station" + funicular: "Funicular Railway" + halt: "Train Stop" + historic_station: "Historic Railway Station" + junction: "Railway Junction" + level_crossing: "Level Crossing" + light_rail: "Light Rail" + monorail: "Monorail" + narrow_gauge: "Narrow Gauge Railway" + platform: "Railway Platform" + preserved: "Preserved Railway" + spur: "Railway Spur" + station: "Railway Station" + subway: "Subway Station" + subway_entrance: "Subway Entrance" + switch: "Railway Points" + tram: "Tramway" + tram_stop: "Tram Stop" + yard: "Railway Yard" + shop: + alcohol: "Off License" + apparel: "Apparel Shop" + art: "Art Shop" + bakery: "Bakery" + beauty: "Beauty Shop" + beverages: "Beverages Shop" + bicycle: "Bicycle Shop" + books: "Book Shop" + butcher: "Butcher" + car: "Car Shop" + car_dealer: "Car Dealer" + car_parts: "Car Parts" + carpet: "Carpet Shop" + car_repair: "Car Repair" + charity: "Charity Shop" + chemist: "Chemist" + clothes: "Clothes Shop" + computer: "Computer Shop" + confectionery: "Confectionery Shop" + convenience: "Convenience Store" + copyshop: "Copy Shop" + cosmetics: "Cosmetics Shop" + department_store: "Department Store" + discount: "Discount Items Shop" + doityourself: "Do-It-Yourself" + drugstore: "Drugstore" + dry_cleaning: "Dry Cleaning" + electronics: "Electronics Shop" + estate_agent: "Estate Agent" + farm: "Farm Shop" + fashion: "Fashion Shop" + fish: "Fish Shop" + florist: "Florist" + food: "Food Shop" + funeral_directors: "Funeral Directors" + furniture: "Furniture" + gallery: "Gallery" + garden_centre: "Garden Centre" + general: "General Store" + gift: "Gift Shop" + greengrocer: "Greengrocer" + grocery: "Grocery Shop" + hairdresser: "Hairdresser" + hardware: "Hardware Store" + hifi: "Hi-Fi" + insurance: "Insurance" + jewelry: "Jewelry Shop" + kiosk: "Kiosk Shop" + laundry: "Laundry" + mall: "Mall" + market: "Market" + mobile_phone: "Mobile Phone Shop" + motorcycle: "Motorcycle Shop" + music: "Music Shop" + newsagent: "Newsagent" + optician: "Optician" + organic: "Organic Food Shop" + outdoor: "Outdoor Shop" + pet: "Pet Shop" + photo: "Photo Shop" + salon: "Salon" + shoes: "Shoe Shop" + shopping_centre: "Shopping Centre" + sports: "Sports Shop" + stationery: "Stationery Shop" + supermarket: "Supermarket" + toys: "Toy Shop" + travel_agency: "Travel Agency" + video: "Video Shop" + wine: "Off License" + tourism: + alpine_hut: "Alpine Hut" + artwork: "Artwork" + attraction: "Attraction" + bed_and_breakfast: "Bed and Breakfast" + cabin: "Cabin" + camp_site: "Camp Site" + caravan_site: "Caravan Site" + chalet: "Chalet" + 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" + waterway: + boatyard: "Boatyard" + canal: "Canal" + connector: "Waterway Connector" + dam: "Dam" + derelict_canal: "Derelict Canal" + ditch: "Ditch" + dock: "Dock" + 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" description: title: osm_namefinder: '{{types}} from OpenStreetMap Namefinder' - osm_twain: 'Location from OpenStreetMap Twain' + osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities @@ -394,6 +852,7 @@ en: prefix: "{{distance}} {{direction}} of {{type}}" results: no_results: "No results found" + more_results: "More results" distance: zero: "less than 1km" one: "about 1km" @@ -431,23 +890,23 @@ en: sign_up: sign up sign_up_tooltip: Create an account for editing view: View - view_tooltip: View maps + view_tooltip: View the map edit: Edit - edit_tooltip: Edit maps history: History - history_tooltip: Changeset history export: Export export_tooltip: Export map data gps_traces: GPS Traces - gps_traces_tooltip: Manage traces + gps_traces_tooltip: Manage GPS traces user_diaries: User Diaries user_diaries_tooltip: View user diaries tag_line: The Free Wiki World Map intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you." intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth." - intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}." + intro_3: "OpenStreetMap's hosting is kindly supported by the {{ucl}} and {{bytemark}}. Other supporters of the project are listed in the {{partners}}." intro_3_ucl: "UCL VR Centre" intro_3_bytemark: "bytemark" + intro_3_partners: "wiki" + intro_3_partners_url: "http://wiki.openstreetmap.org/wiki/Partners" 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." @@ -470,15 +929,11 @@ en: notifier: diary_comment_notification: subject: "[OpenStreetMap] {{user}} commented on your diary entry" - banner1: "* Please do not reply to this email. *" - banner2: "* Use the OpenStreetMap web site to reply. *" hi: "Hi {{to_user}}," header: "{{from_user}} has commented on your recent 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}}" message_notification: subject: "[OpenStreetMap] {{user}} sent you a new message" - banner1: "* Please do not reply to this email. *" - banner2: "* Use the OpenStreetMap web site to reply. *" hi: "Hi {{to_user}}," header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:" footer1: "You can also read the message at {{readurl}}" @@ -486,7 +941,8 @@ en: friend_notification: subject: "[OpenStreetMap] {{user}} added you as a friend" had_added_you: "{{user}} has added you as a friend on OpenStreetMap." - see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish." + see_their_profile: "You can see their profile at {{userurl}}." + befriend_them: "You can also add them as a friend at {{befriendurl}}." gpx_notification: greeting: "Hi," your_gpx_file: "It looks like your GPX file" @@ -495,7 +951,7 @@ en: and_no_tags: "and no tags." failure: subject: "[OpenStreetMap] GPX Import failure" - failed_to_import: "failed to import. Here's the error:" + failed_to_import: "failed to import. Here is the error:" more_info_1: "More information about GPX import failures and how to avoid" more_info_2: "them can be found at:" import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures" @@ -581,10 +1037,15 @@ en: send_button: "Send" back_to_inbox: "Back to inbox" 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_user: - title: "No such user or message" - heading: "No such user or message" - body: "Sorry there is no user or message with that name or id" + title: "No such user" + heading: "No such user" + body: "Sorry there is no user with that name." + no_such_message: + title: "No such message" + heading: "No such message" + body: "Sorry there is no message with that id." outbox: title: "Outbox" my_inbox: "My {{inbox_link}}" @@ -596,6 +1057,8 @@ en: date: "Date" no_sent_messages: "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." read: title: "Read message" reading_your_messages: "Reading your messages" @@ -608,6 +1071,7 @@ en: reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" + wrong_user: "You are logged in as `{{user}}' but the message you have asked to read to was not sent by or to that user. Please login as the correct user in order to read it." sent_message_summary: delete_button: "Delete" mark: @@ -617,7 +1081,7 @@ en: deleted: "Message deleted" site: index: - js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript." + js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript." js_2: "OpenStreetMap uses JavaScript for its slippy map." js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable JavaScript.' permalink: Permalink @@ -629,7 +1093,7 @@ en: project_name: "OpenStreetMap project" project_url: "http://openstreetmap.org" edit: - not_public: "You haven't set your edits to be public." + 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}}." user_page_link: user page anon_edits: "({{link}})" @@ -730,7 +1194,7 @@ en: heading: "Editing trace {{name}}" filename: "Filename:" download: "download" - uploaded_at: "Uploaded at:" + uploaded_at: "Uploaded:" points: "Points:" start_coord: "Start coordinate:" map: "map" @@ -771,7 +1235,7 @@ en: pending: "PENDING" filename: "Filename:" download: "download" - uploaded: "Uploaded at:" + uploaded: "Uploaded:" points: "Points:" start_coordinates: "Start coordinate:" map: "map" @@ -785,8 +1249,9 @@ en: trace_not_found: "Trace not found!" visibility: "Visibility:" trace_paging_nav: - showing: "Showing page" - of: "of" + showing_page: "Showing page {{page}}" + next: "Next »" + previous: "« Previous" trace: pending: "PENDING" count_points: "{{count}} points" @@ -797,7 +1262,9 @@ en: edit: "edit" edit_map: "Edit Map" public: "PUBLIC" + identifiable: "IDENTIFIABLE" private: "PRIVATE" + trackable: "TRACKABLE" by: "by" in: "in" map: "map" @@ -810,6 +1277,11 @@ en: scheduled_for_deletion: "Trace scheduled for deletion" make_public: made_public: "Trace made public" + offline_warning: + message: "The GPX file upload system is currently unavailable" + offline: + heading: "GPX Storage Offline" + message: "The GPX file storage and upload system is currently unavailable." application: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." @@ -890,18 +1362,23 @@ en: create_account: "create an account" email or username: "Email Address or Username:" password: "Password:" + remember: "Remember me:" lost password link: "Lost your password?" login_button: "Login" account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." - auth failure: "Sorry, couldn't log in with those details." + auth failure: "Sorry, could not log in with those details." + logout: + title: "Logout" + heading: "Logout from OpenStreetMap" + logout_button: "Logout" lost_password: title: "Lost password" heading: "Forgotten Password?" email address: "Email Address:" new password button: "Reset password" - help_text: "Enter the email address you used to sign up, we'll send a link to it that you can use to reset your password." + help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password." notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." - notice email cannot find: "Couldn't find that email address, sorry." + notice email cannot find: "Could not find that email address, sorry." reset_password: title: "Reset password" heading: "Reset Password for {{user}}" @@ -909,14 +1386,14 @@ en: confirm password: "Confirm Password:" reset: "Reset Password" flash changed: "Your password has been changed." - flash token bad: "Didn't find that token, check the URL maybe?" + flash token bad: "Did not find that token, check the URL maybe?" new: title: "Create account" heading: "Create a User Account" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' - fill_form: "Fill in the form and we'll send you a quick email to activate your account." - license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' + fill_form: "Fill in the form and we will send you a quick email to activate 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: 'Not displayed publicly (see privacy policy)' @@ -925,7 +1402,7 @@ en: password: "Password:" confirm password: "Confirm Password:" signup: Signup - flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)

Please note that you won't be able to login until you've received and confirmed your email address.

If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." + flash create success message: "User was successfully created. Check your email for a confirmation note, and you will be mapping in no time :-)

Please note that you will not be able to login until you've received and confirmed your email address.

If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." no_such_user: title: "No such user" heading: "The user {{user}} does not exist" @@ -936,6 +1413,7 @@ en: my edits: my edits my traces: my traces my settings: my settings + oauth settings: oauth settings blocks on me: blocks on me blocks by me: blocks by me send message: send message @@ -948,23 +1426,16 @@ en: ago: "({{time_in_words_ago}} ago)" email address: "Email address:" created from: "Created from:" - user image heading: User image - delete image: Delete Image - upload an image: Upload an image - add image: Add Image description: Description user location: User location - no home location: "No home location has been set." - if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page." + if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your {{settings_link}} page." settings_link_text: settings your friends: Your friends no friends: You have not added any friends yet. km away: "{{count}}km away" m away: "{{count}}m away" - nearby users: "Nearby users:" - no nearby users: "There are no users who admit to mapping nearby yet." - change your settings: change your settings - my_oauth_details: "View my OAuth details" + nearby users: "Other nearby users" + no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -983,25 +1454,34 @@ en: unhide_user: "unhide this user" delete_user: "delete this user" confirm: "Confirm" - friend_map: - your location: Your location - nearby mapper: "Nearby mapper: [[nearby_user]]" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" account: title: "Edit account" my settings: My settings + current email address: "Current Email Address:" + new email address: "New Email Address:" email never displayed publicly: "(never displayed publicly)" public editing: heading: "Public editing:" enabled: "Enabled. Not anonymous and can edit data." enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits" - enabled link text: "what's this?" + enabled link text: "what is this?" disabled: "Disabled and cannot edit data, all previous edits are anonymous." disabled link text: "why can't I edit?" public editing note: heading: "Public editing" - text: "Currently your edits are anonymous and people can't 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. Since the 0.6 API changeover, only public users can edit map data. (find out why)." + 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. Since the 0.6 API changeover, only public users can edit map data. (find out why)." profile description: "Profile Description:" preferred languages: "Preferred Languages:" + image: "Image:" + new image: "Add an image" + keep image: "Keep the current image" + delete image: "Remove the current image" + replace image: "Replace the current image" + image size hint: "(square images at least 100x100 work best)" home location: "Home Location:" no home location: "You have not entered your home location." latitude: "Latitude:" @@ -1014,8 +1494,9 @@ en: flash update success: "User information updated successfully." confirm: heading: Confirm a user account - press confirm button: "Press the confirm button below to activate your account." - button: Confirm + press confirm button: "Please read the agreement below and press the agree button to activate your account." + consider_pd: "I consider my contributions to be in the Public Domain." + button: Agree success: "Confirmed your account, thanks for signing up!" failure: "A user account with this token has already been confirmed." confirm_email: @@ -1040,7 +1521,7 @@ en: 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}}' isn't a valid role." + not_a_role: "The string `{{role}}' is not a valid role." already_has_role: "The user already has role {{role}}." doesnt_have_role: "The user does not have role {{role}}." grant: @@ -1048,13 +1529,13 @@ en: heading: Confirm role granting are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?" confirm: "Confirm" - fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid." + fail: "Could not grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid." revoke: title: Confirm role revoking heading: Confirm role revoking are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?" confirm: "Confirm" - fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid." + fail: "Could not revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid." user_block: model: non_moderator_update: "Must be a moderator to create or update a block." @@ -1154,5 +1635,9 @@ en: overlays: maplint: Maplint site: + edit_tooltip: Edit the map + edit_disabled_tooltip: Zoom in to edit the map edit_zoom_alert: You must zoom in to edit the map - history_zoom_alert: You must zoom in to see the editing history + history_tooltip: View edits for this area + history_disabled_tooltip: Zoom in to view edits for this area + history_zoom_alert: You must zoom in to view edits for this area