X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e0faf6843746464d85a0cfbfc071226c2d62148d..aaaeb211dea4711fd6bff4d79c1339e82a43ebcd:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f52cc4e69..65c490e8d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -131,7 +131,7 @@ en: title_comment: "Changeset %{id} - %{comment}" join_discussion: "Log in to join the discussion" discussion: Discussion - report: Report this changeset? + still_open: "Changeset still open - discussion will open once the changeset is closed." node: title: "Node: %{name}" history_title: "Node History: %{name}" @@ -336,7 +336,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (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." @@ -370,12 +370,11 @@ en: geocoder: search: title: - latlon: 'Results from Internal' - uk_postcode: 'Results from NPEMap / FreeThe Postcode' - ca_postcode: 'Results from Geocoder.CA' - osm_nominatim: 'Results from OpenStreetMap Nominatim' + 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' + osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim' geonames_reverse: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" @@ -385,12 +384,19 @@ en: chair_lift: "Chair Lift" drag_lift: "Drag Lift" gondola: "Gondola Lift" + platter: "Platter Lift" + pylon: "Pylon" station: "Aerialway Station" + t-bar: "T-Bar Lift" aeroway: aerodrome: "Aerodrome" + airstrip: "Airstrip" apron: "Apron" gate: "Gate" + hangar: "Hangar" helipad: "Helipad" + holding_position: "Holding Position" + parking_position: "Parking Position" runway: "Runway" taxiway: "Taxiway" terminal: "Terminal" @@ -425,37 +431,32 @@ en: 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" food_court: "Food Court" fountain: "Fountain" fuel: "Fuel" gambling: "Gambling" grave_yard: "Grave Yard" - gym: "Fitness Centre / Gym" - health_centre: "Health Centre" + grit_bin: "Grit Bin" hospital: "Hospital" hunting_stand: "Hunting Stand" ice_cream: "Ice Cream" kindergarten: "Kindergarten" library: "Library" - market: "Market" marketplace: "Marketplace" monastery: "Monastery" motorcycle_parking: "Motorcycle Parking" nightclub: "Night Club" - nursery: "Nursery" nursing_home: "Nursing Home" office: "Office" parking: "Parking" parking_entrance: "Parking Entrance" + parking_space: "Parking Space" pharmacy: "Pharmacy" place_of_worship: "Place of Worship" police: "Police" @@ -465,7 +466,6 @@ en: prison: "Prison" pub: "Pub" public_building: "Public Building" - reception_area: "Reception Area" recycling: "Recycling Point" restaurant: "Restaurant" retirement_home: "Retirement Home" @@ -490,6 +490,7 @@ en: village_hall: "Village Hall" waste_basket: "Waste Basket" waste_disposal: "Waste Disposal" + water_point: "Water Point" youth_centre: "Youth Centre" boundary: administrative: "Administrative Boundary" @@ -498,6 +499,7 @@ en: protected_area : "Protected Area" bridge: aqueduct: "Aqueduct" + boardwalk: "Boardwalk" suspension: "Suspension Bridge" swing: "Swing Bridge" viaduct: "Viaduct" @@ -517,25 +519,31 @@ en: "yes": "Craft Shop" emergency: ambulance_station: "Ambulance Station" + assembly_point: "Assembly Point" defibrillator: "Defibrillator" landing_site: "Emergency Landing Site" phone: "Emergency Phone" + water_tank: "Emergency Water Tank" + "yes": "Emergency" highway: abandoned: "Abandoned Highway" bridleway: "Bridleway" bus_guideway: "Guided Bus Lane" bus_stop: "Bus Stop" construction: "Highway under Construction" + corridor: "Corridor" cycleway: "Cycle Path" elevator: "Elevator" emergency_access_point: "Emergency Access Point" footway: "Footpath" ford: "Ford" + give_way: "Give Way Sign" living_street: "Living Street" milestone: "Milestone" motorway: "Motorway" motorway_junction: "Motorway Junction" motorway_link: "Motorway Road" + passing_place: "Passing Place" path: "Path" pedestrian: "Pedestrian Way" platform: "Platform" @@ -552,6 +560,7 @@ en: services: "Motorway Services" speed_camera: "Speed Camera" steps: "Steps" + stop: "Stop Sign" street_lamp: "Street Lamp" tertiary: "Tertiary Road" tertiary_link: "Tertiary Road" @@ -560,8 +569,8 @@ en: trail: "Trail" trunk: "Trunk Road" trunk_link: "Trunk Road" + turning_loop: "Turning Loop" unclassified: "Unclassified Road" - unsurfaced: "Unsurfaced Road" "yes" : "Road" historic: archaeological_site: "Archaeological Site" @@ -580,6 +589,7 @@ en: manor: "Manor" memorial: "Memorial" mine: "Mine" + mine_shaft: "Mine Shaft" monument: "Monument" roman_road: "Roman Road" ruins: "Ruins" @@ -589,6 +599,7 @@ en: wayside_cross: "Wayside Cross" wayside_shrine: "Wayside Shrine" wreck: "Wreck" + "yes": "Historic Site" junction: "yes": "Junction" landuse: @@ -626,9 +637,9 @@ en: leisure: beach_resort: "Beach Resort" bird_hide: "Bird Hide" - club: "Club" common: "Common Land" dog_park: "Dog Park" + firepit: "Fire Pit" fishing: "Fishing Area" fitness_centre: "Fitness Centre" fitness_station: "Fitness Station" @@ -653,15 +664,46 @@ en: water_park: "Water Park" "yes": "Leisure" man_made: + adit: "Adit" + beacon: "Beacon" + beehive: "Bee Hive" + breakwater: "Breakwater" + bridge: "Bridge" + bunker_silo: "Bunker" + chimney: "Chimney" + crane: "Crane" + dolphin: "Mooring Post" + dyke: "Dyke" + embankment: "Embankment" + flagpole: "Flagpole" + gasometer: "Gasometer" + groyne: "Groyne" + kiln: "Kiln" lighthouse: "Lighthouse" + mast: "Mast" + mine: "Mine" + mineshaft: "Mine Shaft" + monitoring_station: "Monitoring Station" + petroleum_well: "Petroleum Well" + pier: "Pier" pipeline: "Pipeline" + silo: "Silo" + storage_tank: "Storage Tank" + surveillance: "Surveillance" tower: "Tower" + wastewater_plant: "Wastewater Plant" + watermill: "Water Mill" + water_tower: "Water Tower" + water_well: "Well" + water_works: "Water Works" + windmill: "Wind Mill" works: "Factory" "yes": "Man-made" military: airfield: "Military Airfield" barracks: "Barracks" bunker: "Bunker" + "yes": "Military" mountain_pass: "yes" : "Mountain Pass" natural: @@ -707,11 +749,14 @@ en: accountant: "Accountant" administrative: "Administration" architect: "Architect" + association: "Association" company: "Company" + educational_institution: "Educational Institution" employment_agency: "Employment Agency" estate_agent: "Estate Agent" government: "Governmental Office" insurance: "Insurance Office" + it: "IT Office" lawyer: "Lawyer" ngo: "NGO Office" telecommunication: "Telecommunication Office" @@ -719,9 +764,8 @@ en: "yes": "Office" place: allotments: "Allotments" - block: "Block" - airport: "Airport" city: "City" + city_block: "City Block" country: "Country" county: "County" farm: "Farm" @@ -732,12 +776,13 @@ en: islet: "Islet" isolated_dwelling: "Isolated Dwelling" locality: "Locality" - moor: "Moor" municipality: "Municipality" neighbourhood: "Neighbourhood" postcode: "Postcode" + quarter: "Quarter" region: "Region" sea: "Sea" + square: "Square" state: "State" subdivision: "Subdivision" suburb: "Suburb" @@ -749,10 +794,8 @@ en: 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" @@ -778,6 +821,7 @@ en: beauty: "Beauty Shop" beverages: "Beverages Shop" bicycle: "Bicycle Shop" + bookmaker: "Bookmaker" books: "Book Shop" boutique: "Boutique" butcher: "Butcher" @@ -816,12 +860,16 @@ en: hairdresser: "Hairdresser" hardware: "Hardware Store" hifi: "Hi-Fi" - insurance: "Insurance" + houseware: "Houseware Shop" + interior_decoration: "Interior Decoration" jewelry: "Jewelry Shop" kiosk: "Kiosk Shop" + kitchen: "Kitchen Shop" laundry: "Laundry" + lottery: "Lottery" mall: "Mall" market: "Market" + massage: "Massage" mobile_phone: "Mobile Phone Shop" motorcycle: "Motorcycle Shop" music: "Music Shop" @@ -829,21 +877,27 @@ en: optician: "Optician" organic: "Organic Food Shop" outdoor: "Outdoor Shop" + paint: "Paint Shop" + pawnbroker: "Pawnbroker" pet: "Pet Shop" pharmacy: "Pharmacy" photo: "Photo Shop" - salon: "Salon" + seafood: "Sea Food" second_hand: "Second-hand Shop" shoes: "Shoe Shop" - shopping_centre: "Shopping Centre" sports: "Sports Shop" stationery: "Stationery Shop" supermarket: "Supermarket" tailor: "Tailor" + ticket: "Ticket Shop" + tobacco: "Tobacco Shop" toys: "Toy Shop" travel_agency: "Travel Agency" + tyres: "Tyre Shop" + vacant: "Vacant Shop" + variety_store: "Variety Store" video: "Video Shop" - wine: "Off License" + wine: "Wine Store" "yes": "Shop" tourism: alpine_hut: "Alpine Hut" @@ -867,6 +921,7 @@ en: viewpoint: "Viewpoint" zoo: "Zoo" tunnel: + building_passage: "Building Passage" culvert: "Culvert" "yes": "Tunnel" waterway: @@ -898,7 +953,7 @@ en: level10: "Suburb Boundary" description: title: - osm_nominatim: 'Location from OpenStreetMap Nominatim' + osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities @@ -913,61 +968,96 @@ en: ignore: Ignore reopen: Reopen index: - search: - user_not_found: User does not exist - issues_not_found: No such issues found + title: Issues + select_status: Select Status + select_type: Select Type + select_last_updated_by: Select Last Updated By + reported_user: Reported User + not_updated: Not Updated + search: Search + search_guidance: "Search Issues:" + user_not_found: User does not exist + issues_not_found: No such issues found + status: Status + reports: Reports + last_updated: Last Updated + last_updated_time_html: "%{time} ago" + last_updated_time_user_html: "%{time} ago by %{user}" + link_to_reports: View Reports + reported_user: Reported User + reports_count: + one: "1 Report" + other: "%{count} Reports" + reported_item: Reported Item create: successful_report: Your report has been registered sucessfully provide_details: Please provide the required details update: - new_report: Your report been registered sucessfully + new_report: Your report has been registered sucessfully successful_update: Your report has been updated successfully provide_details: Please provide the required details new: - details: Please provide some more details into the problem. (This field cannot be left blank!) - select: Select a reason for your report + details: Please provide some more details about the problem (required). + select: "Select a reason for your report:" disclaimer: - intro: Before sending in a report for official action, be sure that - not_just_mistake: You are sure that the problem is not just a mistake - unable_to_fix: You are unable to fix the problem yourself - resolve_with_user: You have tried to resolve the problem with the user + 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 + unable_to_fix: You are unable to fix the problem yourself or with the help of your fellow community members + resolve_with_user: You have already tried to resolve the problem with the user concerned show: + title: "%{status} Issue #%{issue_id}" + reports: + zero: No reports + one: 1 report + other: "%{count} reports" + report_created_at: "First reported at %{datetime}" + last_resolved_at: "Last resolved at %{datetime}" + last_updated_at: "Last updated at %{datetime} by %{displayname}" + reports_of_this_issue: Reports of this Issue + read_reports: Read Reports + new_reports: New Reports + other_issues_against_this_user: Other issues against this user + no_other_issues: No other issues against this user. + comments_on_this_issue: Comments on this issue comments: reassign_param: Reassign Issue? comment: provide_details: Please provide the required details comment_created: Your comment was successfully created + comments: + created_at: "On %{datetime}" + reports: + updated_at: "On %{datetime}" + reported_by_html: "Reported as %{category} by %{user_name}" resolved: Issue status has been set to 'Resolved' ignored: Issue status has been set to 'Ignored' reopened: Issue status has been set to 'Open' + states: + ignored: Ignored + open: Open + resolved: Resolved reports: + new: + title_html: "Report %{link}" categories: - DiaryEntry: - spam: This Diary Entry is/contains spam - offensive: This Diary Entry is obscene/offensive - threat: This Diary Entry contains a threat - other: Other - DiaryComment: - spam: This Diary Comment is/contains spam - offensive: This Diary Comment is obscene/offensive - threat: This Diary Comment contains a threat + diary_entry: + spam: This diary entry is/contains spam + offensive: This diary entry is obscene/offensive + threat: This diary entry contains a threat other: Other - User: - spam: This User profile is/contains spam - offensive: This User profile is obscene/offensive - threat: This User profile contains a threat - vandal: This User is a vandal + diary_comment: + spam: This diary comment is/contains spam + offensive: This diary comment is obscene/offensive + threat: This diary comment contains a threat other: Other - Changeset: - undiscussed_import: This changeset is an undiscussed import - mechanical_edit: This changeset is a mechanical edit - edit_error: This changeset contains a newbie or an editor error - spam: This changeset is/contains spam - vandalism: This changeset is/contains vandalism + user: + spam: This user profile is/contains spam + offensive: This user profile is obscene/offensive + threat: This user profile contains a threat + vandal: This user is a vandal other: Other - Note: + note: spam: This note is spam - vandalism: This note is vandalism personal: This note contains personal data abusive: This note is abusive other: Other @@ -1036,19 +1126,19 @@ en: title_html: Copyright and License intro_1_html: | OpenStreetMap® is open data, licensed under the Open Data + href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License (ODbL) by the OpenStreetMap Foundation (OSMF). + href="https://osmfoundation.org/">OpenStreetMap Foundation (OSMF). intro_2_html: | You are free to copy, distribute, transmit and adapt our data, as long as you credit OpenStreetMap and its contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal + full legal code explains your rights and responsibilities. intro_3_html: | The cartography in our map tiles, and our documentation, are - licensed under the Creative + licensed under the Creative Commons Attribution-ShareAlike 2.0 license (CC BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: | @@ -1058,7 +1148,7 @@ en: 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 - this copyright page. + this copyright page. Alternatively, and as a requirement if you are distributing OSM in a data form, you can name and link directly to the license(s). In media where links are not possible (e.g. printed works), we suggest you @@ -1074,7 +1164,7 @@ en: more_title_html: Finding out more more_1_html: | Read more about using our data, and how to credit us, at the OSMF Licence page. + href="https://osmfoundation.org/Licence">OSMF Licence page. more_2_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-parties. @@ -1088,10 +1178,10 @@ en: and other sources, among them: contributors_at_html: | Austria: Contains data from - Stadt Wien (under - CC BY), - Land Vorarlberg and - Land Tirol (under CC BY AT with amendments). + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC BY AT with amendments). contributors_ca_html: | Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -1102,13 +1192,13 @@ en: Finland: Contains data from the National Land Survey of Finland's Topographic Database and other datasets, under the - NLSFI License. + NLSFI License. contributors_fr_html: | France: Contains data sourced from Direction Générale des Impôts. contributors_nl_html: | Netherlands: Contains © AND data, 2007 - (www.and.com) + (www.and.com) contributors_nz_html: | New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved. @@ -1128,7 +1218,7 @@ en: contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the Contributors + href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors page on the OpenStreetMap Wiki. contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original @@ -1142,12 +1232,12 @@ en: infringement_2_html: | If you believe that copyrighted material has been inappropriately added to the OpenStreetMap database or this site, please refer - to our takedown + to our takedown procedure or file directly at our on-line filing page. trademarks_title_html: 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 send your questions to the Licence Working Group. + 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 Trademark Policy. welcome_page: title: Welcome! introduction_html: | @@ -1183,8 +1273,8 @@ en: OpenStreetMap has few formal rules but we expect all participants to collaborate with, and communicate with, the community. If you are considering any activities other than editing by hand, please read and follow the guidelines on - Imports and - Automated Edits. + Imports and + Automated Edits. questions: title: Any questions? paragraph_1_html: | @@ -1220,7 +1310,7 @@ en: explanation_html: | If you have concerns about how our data is being used or about the contents please consult our copyright page for more legal information, or contact the appropriate - OSMF working group. + OSMF working group. help_page: title: Getting Help introduction: | @@ -1231,7 +1321,7 @@ en: title: Welcome to OSM description: Start with this quick guide covering the OpenStreetMap basics. beginners_guide: - url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Beginners' Guide description: Community maintained guide for beginners. help: @@ -1239,15 +1329,15 @@ en: title: help.openstreetmap.org description: Ask a question or look up answers on OSM's question-and-answer site. mailing_lists: - url: http://lists.openstreetmap.org/ + url: https://lists.openstreetmap.org/ title: Mailing Lists description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: - url: http://forum.openstreetmap.org/ + url: https://forum.openstreetmap.org/ title: Forums description: Questions and discussions for those that prefer a bulletin board style interface. irc: - url: http://irc.openstreetmap.org/ + url: https://irc.openstreetmap.org/ title: IRC description: Interactive chat in many different languages and on many topics. switch2osm: @@ -1255,7 +1345,7 @@ en: title: switch2osm description: Help for companies and organisations switching to OpenStreetMap based maps and other services. wiki: - url: http://wiki.openstreetmap.org/ + url: https://wiki.openstreetmap.org/ title: wiki.openstreetmap.org description: Browse the wiki for in-depth OSM documentation. about_page: @@ -1279,8 +1369,8 @@ en: To learn more about the community, see the OpenStreetMap Blog, user diaries, - community blogs, and - the OSM Foundation website. + community blogs, and + the OSM Foundation website. open_data_title: Open Data open_data_html: | OpenStreetMap is open data: you are free to use it for any purpose @@ -1291,13 +1381,15 @@ en: legal_title: Legal legal_html: | This site and many other related services are formally operated by the - OpenStreetMap Foundation (OSMF) + OpenStreetMap Foundation (OSMF) on behalf of the community. Use of all OSMF operated services is subject - to our - Acceptable Use Policies and our Privacy Policy + to our + Acceptable Use Policies and our Privacy Policy
- Please contact the OSMF + Please contact the OSMF if you have licensing, copyright or other legal questions and issues. +
+ OpenStreetMap, the magnifying glass logo and State of the Map are registered trademarks of the OSMF. partners_title: Partners notifier: diary_comment_notification: @@ -1327,7 +1419,7 @@ en: 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" + 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. @@ -1465,19 +1557,19 @@ en: createnote: Add a note license: copyright: "Copyright OpenStreetMap and contributors, under an open license" - license_url: "http://openstreetmap.org/copyright" - project_url: "http://openstreetmap.org" + license_url: "https://openstreetmap.org/copyright" + project_url: "https://openstreetmap.org" 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}." user_page_link: user page anon_edits: "(%{link})" - anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" + 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 download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' + flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options 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 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information" + 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.)" id_not_configured: "iD has not been configured" no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." @@ -1493,6 +1585,7 @@ en: where_am_i: "Where is this?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" + reverse_directions_text: "Reverse Directions" key: table: entry: @@ -1567,7 +1660,7 @@ en: edit: Edit preview: Preview markdown_help: - title_html: Parsed with Markdown + title_html: Parsed with Markdown headings: Headings heading: Heading subheading: Subheading @@ -1606,7 +1699,7 @@ en: save_button: "Save Changes" visibility: "Visibility:" visibility_help: "what does this mean?" - visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" trace_form: upload_gpx: "Upload GPX File:" description: "Description:" @@ -1614,10 +1707,10 @@ en: tags_help: "comma delimited" visibility: "Visibility:" visibility_help: "what does this mean?" - visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" upload_button: "Upload" help: "Help" - help_url: "http://wiki.openstreetmap.org/wiki/Upload" + help_url: "https://wiki.openstreetmap.org/wiki/Upload" trace_header: upload_trace: "Upload a trace" see_all_traces: "See all traces" @@ -1670,9 +1763,9 @@ en: public_traces: "Public GPS traces" your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" - description: "Browse recent GPS track uploads" + description: "Browse recent GPS trace uploads" tagged_with: " tagged with %{tags}" - empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." + empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1863,10 +1956,10 @@ en:

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

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

- license_agreement: 'When you confirm your account you will need to agree to the contributor terms.' + 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: 'Your address is not displayed publicly, see our privacy policy for more information' + not displayed publicly: 'Your address is not displayed publicly, see our privacy policy 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:" @@ -1877,17 +1970,17 @@ en: continue: Sign Up terms accepted: "Thanks for accepting the new contributor terms!" terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." - terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined + 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" consider_pd_why: "what's this?" - consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain + 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 human readable summary and some informal translations' agree: Agree - declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" + 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." legale_select: "Country of residence:" @@ -1978,25 +2071,25 @@ en: email never displayed publicly: "(never displayed publicly)" external auth: "External Authentication:" openid: - link: "http://wiki.openstreetmap.org/wiki/OpenID" + link: "https://wiki.openstreetmap.org/wiki/OpenID" link text: "what is this?" public editing: heading: "Public editing:" enabled: "Enabled. Not anonymous and can edit data." - enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits" + enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" 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 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)." + 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)." contributor terms: heading: "Contributor Terms:" agreed: "You have agreed to the new Contributor Terms." not yet agreed: "You have not yet agreed to the new Contributor Terms." review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms." agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain." - link: "http://www.osmfoundation.org/wiki/License/Contributor_Terms" + link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms" link text: "what is this?" profile description: "Profile Description:" preferred languages: "Preferred Languages:" @@ -2004,7 +2097,7 @@ en: image: "Image:" gravatar: gravatar: "Use Gravatar" - link: "http://wiki.openstreetmap.org/wiki/Gravatar" + link: "https://wiki.openstreetmap.org/wiki/Gravatar" link text: "what is this?" disabled: "Gravatar has been disabled." enabled: "Display of your Gravatar has been enabled." @@ -2107,6 +2200,7 @@ en: not_a_role: "The string `%{role}' is not a valid role." already_has_role: "The user already has role %{role}." doesnt_have_role: "The user does not have role %{role}." + not_revoke_admin_current_user: "Cannot revoke administrator role from current user." grant: title: Confirm role granting heading: Confirm role granting @@ -2311,7 +2405,8 @@ en: unhide_comment: "unhide" notes: new: - 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.)" + 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." + advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings." add: Add Note show: anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@ -2331,9 +2426,6 @@ en: mapquest_car: "Car (MapQuest)" mapquest_foot: "Foot (MapQuest)" osrm_car: "Car (OSRM)" - mapzen_bicycle: "Bicycle (Mapzen)" - mapzen_car: "Car (Mapzen)" - mapzen_foot: "Foot (Mapzen)" descend: "Descend" directions: "Directions" distance: "Distance" @@ -2343,8 +2435,18 @@ en: instructions: continue_without_exit: Continue on %{name} slight_right_without_exit: Slight right onto %{name} - offramp_right_without_exit: Take the ramp on the right onto %{name} + offramp_right: Take the ramp on the right + offramp_right_with_exit: Take exit %{exit} on the right + offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name} + offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions} + offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions} + offramp_right_with_name: Take the ramp on the right onto %{name} + offramp_right_with_directions: Take the ramp on the right towards %{directions} + offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions} onramp_right_without_exit: Turn right on the ramp onto %{name} + onramp_right_with_directions: Turn right onto the ramp towards %{directions} + onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions} + onramp_right_without_directions: Turn right onto the ramp endofroad_right_without_exit: At the end of the road turn right onto %{name} merge_right_without_exit: Merge right onto %{name} fork_right_without_exit: At the fork turn right onto %{name} @@ -2353,18 +2455,28 @@ en: uturn_without_exit: U-turn along %{name} sharp_left_without_exit: Sharp left onto %{name} turn_left_without_exit: Turn left onto %{name} - offramp_left_without_exit: Take the ramp on the left onto %{name} + offramp_left: Take the ramp on the left + offramp_left_with_exit: Take exit %{exit} on the left + offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name} + offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions} + offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions} + offramp_left_with_name: Take the ramp on the left onto %{name} + offramp_left_with_directions: Take the ramp on the left towards %{directions} + offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions} onramp_left_without_exit: Turn left on the ramp onto %{name} + onramp_left_with_directions: Turn left onto the ramp towards %{directions} + onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions} + onramp_left_without_directions: Turn left onto the ramp endofroad_left_without_exit: At the end of the road turn left onto %{name} merge_left_without_exit: Merge left onto %{name} fork_left_without_exit: At the fork turn left onto %{name} slight_left_without_exit: Slight left onto %{name} via_point_without_exit: (via point) follow_without_exit: Follow %{name} - roundabout_without_exit: At roundabout take %{name} + roundabout_without_exit: At roundabout take exit onto %{name} leave_roundabout_without_exit: Leave roundabout - %{name} stay_roundabout_without_exit: Stay on roundabout - %{name} - start_without_exit: Start at end of %{name} + start_without_exit: Start on %{name} destination_without_exit: Reach destination against_oneway_without_exit: Go against one-way on %{name} end_oneway_without_exit: End of one-way on %{name}