X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9786b716aa9b906049ecb12ee2cd07b5ec64f0f5..aeb4271a27f3a331d65973f3c279cbc5bfa8a8dc:/config/locales/en-GB.yml?ds=inline diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 7b2558ca2..5858dd57c 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -11,10 +11,12 @@ # Author: Caliburn # Author: Captaindogfish # Author: Chase me ladies, I'm the Cavalry +# Author: Danieldegroot2 # Author: E THP # Author: EdLoach # Author: Eduard Popov # Author: Gravitystorm +# Author: Hufkratzer # Author: IknowJoseph # Author: Jagwar # Author: Jguthrie100 @@ -31,21 +33,17 @@ # Author: Smsm1 # Author: Tlubenov # Author: TomH +# Author: Wehwei # Author: ديفيد --- en-GB: - html: - dir: ltr time: 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 @@ -83,7 +81,6 @@ en-GB: message: Message node: Node node_tag: Node Tag - notifier: Notifier old_node: Old Node old_node_tag: Old Node Tag old_relation: Old Relation @@ -126,7 +123,7 @@ en-GB: title: Subject latitude: Latitude longitude: Longitude - language: Language + language_code: Language friend: user: User friend: Friend @@ -209,9 +206,6 @@ en-GB: x_years: one: 1 year ago other: '%{count} years ago' - printable_name: - with_version: '%{id}, v%{version}' - with_name_html: '%{name} (%{id})' editor: default: Default (currently %{name}) id: @@ -226,7 +220,6 @@ en-GB: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live github: GitHub wikipedia: Wikipedia api: @@ -252,15 +245,40 @@ en-GB: entry: comment: Comment full: Full note + accounts: + edit: + title: Edit account + my settings: My settings + current email address: Current Email Address + external auth: External Authentication + openid: + link text: what is this? + public editing: + heading: Public editing + enabled: Enabled. Not anonymous and can edit data. + 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? + 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 text: what is this? + save changes button: Save Changes + go_public: + heading: Public editing + make_edits_public_button: Make all my edits public + update: + success_confirm_needed: User information updated successfully. Check your email + for a note to confirm your new email address. + success: User information updated successfully. browse: created: Created closed: Closed - 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 @@ -270,8 +288,6 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' - common_details: - coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Changeset: %{id}' belongs_to: Author @@ -282,8 +298,6 @@ en-GB: relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) comment: Comments (%{count}) - hidden_commented_by_html: Hidden comment from %{user} %{when} - commented_by_html: Comment from %{user} %{when} changesetxml: Changeset XML osmchangexml: osmChange XML feed: @@ -308,7 +322,6 @@ en-GB: history_title_html: 'Relation History: %{name}' members: Members relation_member: - entry_html: '%{type} %{name}' entry_role_html: '%{type} %{name} as %{role}' type: node: Node @@ -358,24 +371,6 @@ en-GB: 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 - description: Description - open_title: 'Unresolved note #%{note_name}' - closed_title: 'Resolved note #%{note_name}' - hidden_title: 'Hidden note #%{note_name}' - opened_by_html: Created by %{user} %{when} - opened_by_anonymous_html: Created by anonymous %{when} - commented_by_html: Comment from %{user} %{when} - commented_by_anonymous_html: Comment from anonymous %{when} - closed_by_html: Resolved by %{user} %{when} - closed_by_anonymous_html: Resolved by anonymous %{when} - reopened_by_html: Reactivated by %{user} %{when} - reopened_by_anonymous_html: Reactivated by anonymous %{when} - hidden_by_html: Hidden by %{user} %{when} - report: Report this note - coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -422,6 +417,23 @@ en-GB: timeout: sorry: Sorry, the list of changeset comments you requested took too long to retrieve. + dashboards: + contact: + km away: '%{count}km away' + m away: '%{count}m away' + latest_edit_html: 'Latest edit (%{ago}):' + popup: + your location: Your location + nearby mapper: Nearby mapper + friend: Friend + show: + no friends: You have not added any friends yet. + nearby users: Other nearby users + no nearby users: There are no other users who admit to mapping nearby yet. + friends_changesets: friends' changesets + friends_diaries: friends' diary entries + nearby_changesets: nearby user changesets + nearby_diaries: nearby user diary entries diary_entries: new: title: New Diary Entry @@ -490,7 +502,6 @@ en-GB: title: OpenStreetMap diary entries description: Recent diary entries from users of OpenStreetMap comments: - has_commented_on: '%{display_name} has commented on the following diary entries' post: Post when: When comment: Comment @@ -509,18 +520,7 @@ en-GB: success: '%{name} was removed from your friends.' not_a_friend: '%{name} is not one of your friends.' geocoder: - search: - title: - 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: aerialway: cable_car: Cable Car @@ -535,15 +535,12 @@ en-GB: 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 amenity: animal_shelter: Animal Shelter arts_centre: Arts Centre @@ -587,7 +584,6 @@ en-GB: fire_station: Fire Station food_court: Food Court fountain: Fountain - fuel: Fuel gambling: Gambling grave_yard: Graveyard grit_bin: Grit Bin @@ -596,7 +592,6 @@ en-GB: ice_cream: Ice Cream internet_cafe: Internet Cafe kindergarten: Nursery School - language_school: Language school library: Library loading_dock: Loading Dock love_hotel: Love Hotel @@ -689,7 +684,6 @@ en-GB: landing_site: Emergency Landing Site phone: Emergency Phone water_tank: Emergency Water Tank - "yes": Emergency highway: abandoned: Abandoned Highway bridleway: Bridleway @@ -771,9 +765,6 @@ en-GB: brownfield: Brownfield Land cemetery: Cemetery commercial: Commercial Area - conservation: Conservation - construction: Construction - farm: Farm farmland: Farmland farmyard: Farmyard forest: Forest @@ -792,7 +783,6 @@ en-GB: reservoir: Reservoir reservoir_watershed: Reservoir Watershed residential: Residential Area - retail: Retail village_green: Village Green vineyard: Vineyard "yes": Landuse @@ -807,7 +797,7 @@ en-GB: fitness_station: Fitness Station garden: Garden golf_course: Golf Course - horse_riding: Horse Riding + horse_riding: Horse Riding Centre ice_rink: Ice Rink marina: Marina miniature_golf: Miniature Golf @@ -1012,7 +1002,7 @@ en-GB: deli: Delicatessen department_store: Department Store discount: Discount Items Shop - doityourself: DIY store + doityourself: DIY Shop dry_cleaning: Dry Cleaning electronics: Electronics Shop estate_agent: Estate Agent @@ -1029,7 +1019,6 @@ en-GB: grocery: Grocery Shop hairdresser: Hairdresser hardware: Hardware Store - hifi: Hi-Fi houseware: Houseware Shop interior_decoration: Interior Decoration jewelry: Jewellers @@ -1070,7 +1059,6 @@ en-GB: artwork: Artwork attraction: Attraction bed_and_breakfast: Bed and Breakfast - cabin: Cabin camp_site: Camp Site caravan_site: Caravan Site chalet: Chalet @@ -1126,18 +1114,13 @@ en-GB: index: reports: Reports layouts: - project_name: - title: OpenStreetMap - h1: OpenStreetMap logo: alt_text: OpenStreetMap logo home: Go to Home Location logout: Log Out log_in: Log In - log_in_tooltip: Log in with an existing account sign_up: Sign Up start_mapping: Start Mapping - sign_up_tooltip: Create an account for editing edit: Edit history: History export: Export @@ -1167,8 +1150,6 @@ en-GB: community: Community community_blogs: Community Blogs community_blogs_title: Blogs from members of the OpenStreetMap community - foundation: Foundation - foundation_title: The OpenStreetMap Foundation make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -1196,13 +1177,8 @@ en-GB: befriend_them: You can also add them as a friend at %{befriendurl}. gpx_failure: failed_to_import: 'failed to import. Here is the error:' - import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures subject: '[OpenStreetMap] GPX Import failure' gpx_success: - 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. subject: '[OpenStreetMap] GPX Import success' signup_confirm: subject: '[OpenStreetMap] Welcome to OpenStreetMap' @@ -1265,6 +1241,27 @@ en-GB: details: More details about the changeset can be found at %{url}. unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe". + confirmations: + confirm: + heading: Check your email! + introduction_1: We sent you a confirmation email. + introduction_2: 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. + confirm_resend: + failure: User %{name} not found. + confirm_email: + heading: Confirm a change of e-mail address + press confirm button: Press the confirm button below to confirm your new e-mail + address. + button: Confirm + success: Confirmed your change of email address! + failure: An e-mail address has already been confirmed with this token. + unknown_token: That confirmation code has expired or does not exist. messages: inbox: title: Inbox @@ -1290,8 +1287,6 @@ en-GB: new: title: Send message send_message_to_html: Send a new message to %{name} - subject: Subject - body: Body back_to_inbox: Back to inbox create: message_sent: Message sent @@ -1318,14 +1313,10 @@ en-GB: to reply. show: title: Read message - from: From - subject: Subject - date: Date reply_button: Reply unread_button: Mark as unread destroy_button: Delete back: Back - to: To wrong_user: You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it. @@ -1336,12 +1327,85 @@ en-GB: as_unread: Message marked as unread destroy: destroyed: Message deleted + passwords: + lost_password: + title: Lost password + heading: Forgotten Password? + email address: E-mail address + new password button: Reset password + help_text: Enter the e-mail 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: Could not find that email address, sorry. + reset_password: + title: Reset password + heading: Reset Password for %{user} + reset: Reset Password + flash changed: Your password has been changed. + flash token bad: Did not find that token, check the URL maybe? + profiles: + edit: + image: Image + gravatar: + gravatar: Use Gravatar + disabled: Gravatar has been disabled. + enabled: Display of your Gravatar has been enabled. + 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. + update home location on click: Update home location when I click on the map? + sessions: + new: + title: Login + heading: Login + email or username: 'E-mail Address or Username:' + password: 'Password:' + openid_html: '%{logo} OpenID:' + remember: Remember me + lost password link: Lost your password? + login_button: Login + register now: Register now + with external: 'Alternatively, use a third party to login:' + no account: Don't have an account? + auth failure: Sorry, could not log in with those details. + openid_logo_alt: Log in with an OpenID + auth_providers: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + microsoft: + title: Login with Windows Live + alt: Login with a Windows Live Account + github: + title: Login with GitHub + alt: Login with a GitHub Account + wikipedia: + title: Login with Wikipedia + alt: Login with a Wikipedia Account + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID + destroy: + title: Logout + heading: Logout of OpenStreetMap + logout_button: Logout site: about: next: Next - copyright_html: ©OpenStreetMap
contributors - 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. @@ -1351,24 +1415,8 @@ en-GB: aerial imagery, GPS devices, and low-tech field maps to verify that OSM is accurate and up to date. community_driven_title: Community Driven - community_driven_html: |- - OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more. - To learn more about the community, see the OpenStreetMap Blog, user diaries, 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 - as long as you credit OpenStreetMap and its contributors. If you alter or - build upon the data in certain ways, you may distribute the result only - under the same licence. See the Copyright and - Licence page for details. legal_title: Legal - legal_1_html: "This site and many other related services are formally operated - by the \nOpenStreetMap Foundation - (OSMF) \non behalf of the community. Use of all OSMF operated services is - subject \nto our Terms - of Use, \nAcceptable - Use Policies and our Privacy - Policy." partners_title: Partners copyright: foreign: @@ -1385,93 +1433,16 @@ en-GB: mapping_link: start mapping legal_babble: title_html: Copyright and Licence - intro_1_html: |- - OpenStreetMap® is open data, licensed under the Open Data - Commons Open Database License (ODbL) by the 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 - code explains your rights and responsibilities. - intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons - Attribution-ShareAlike 2.0 licence (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_1_html: |- - You must also make it clear that the data is available under the Open - Database Licence, 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. - Alternatively, and as a requirement if you are distributing OSM in a - data form, you can name and link directly to the licence(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_4_html: |- - For a browsable electronic map, the credit should appear in the corner of the map. - For example: attribution_example: alt: Example of how to attribute OpenStreetMap on a webpage title: Attribution example 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. - more_2_html: |- - Although OpenStreetMap is open data, we cannot provide a - free-of-charge map API for third-parties. - See our API Usage Policy, - Tile Usage Policy - and Nominatim Usage Policy. contributors_title_html: Our contributors contributors_intro_html: |- Our contributors are thousands of individuals. We also include openly-licenced data from national mapping agencies 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). - contributors_ca_html: |- - Canada: Contains data from - GeoBase®, GeoGratis (© Department of Natural - Resources Canada), CanVec (© Department of Natural - Resources Canada), and StatCan (Geography Division, - Statistics Canada). - contributors_fi_html: |- - Finland: Contains data from the - National Land Survey of Finland's Topographic Database - and other datasets, under the - NLSFI Licence. - 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)' - contributors_nz_html: |- - New Zealand: Contains data sourced from the - LINZ Data Service and - licensed for reuse under - CC BY 4.0. - contributors_si_html: |- - Slovenia: Contains data from the - Surveying and Mapping Authority and - Ministry of Agriculture, Forestry and Food - (public information of Slovenia). - contributors_za_html: 'South Africa: Contains data sourced - from Chief Directorate: National Geo-Spatial - Information, State copyright reserved.' - contributors_gb_html: 'United Kingdom: Contains Ordnance - Survey data © Crown copyright and database right 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 Contributors - page on the OpenStreetMap Wiki. contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. @@ -1479,20 +1450,9 @@ en-GB: infringement_1_html: OSM contributors are reminded never to add data from any copyrighted sources (e.g. Google Maps or printed maps) without explicit permission from the copyright holders. - 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 - 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 see our Trademark - Policy. index: 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 slippery map. permalink: Permalink shortlink: Shortlink createnote: Add a note @@ -1505,7 +1465,6 @@ en-GB: 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_html: (%{link}) anon_edits_link_text: Find out why this is the case. id_not_configured: iD has not been configured no_iframe_support: Your browser doesn't support HTML iframes, which are necessary @@ -1519,8 +1478,6 @@ en-GB: map_image: Map Image (shows standard layer) embeddable_html: Embeddable HTML licence: Licence - export_details_html: OpenStreetMap data is licenced under the Open - Data Commons Open Database Licence (ODbL). too_large: advice: 'If the above export fails, please consider using one of the sources listed below:' @@ -1538,9 +1495,6 @@ en-GB: title: Geofabrik Downloads description: Regularly-updated extracts of continents, countries, and selected cities - metro: - title: Metro Extracts - description: Extracts for major world cities and their surrounding areas other: title: Other Sources description: Additional sources listed on the OpenStreetMap wiki @@ -1565,17 +1519,8 @@ en-GB: explanation_html: If you have noticed a problem with our map data, for example a road is missing or your address, the best way to proceed is to join the OpenStreetMap community and add or repair the data yourself. - add_a_note: - instructions_html: Just click or the same icon - on the map display. This will add a marker to the map, which you can move - by dragging. Add your message, then click save, and other mappers will - investigate. other_concerns: title: Other concerns - explanation_html: "If you have concerns about how our data is being used or - about the contents please consult our\ncopyright page - for more legal information, or contact the appropriate \nOSMF - working group." help: title: Getting Help introduction: OpenStreetMap has several resources for learning about the project, @@ -1586,11 +1531,9 @@ en-GB: 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 title: Beginners' Guide description: Community maintained guide for beginners. help: - url: https://help.openstreetmap.org/ title: Help Forum description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. @@ -1598,10 +1541,6 @@ en-GB: title: Mailing Lists description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - forums: - title: Forums - description: Questions and discussions for those that prefer a bulletin board - style interface. irc: title: IRC description: Interactive chat in many different languages and on many topics. @@ -1610,9 +1549,10 @@ en-GB: description: Help for companies and organisations switching to OpenStreetMap based maps and other services. wiki: - url: https://wiki.openstreetmap.org/ title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. + any_questions: + title: Any questions? sidebar: search_results: Search Results close: Close @@ -1698,52 +1638,22 @@ en-GB: toilets: Toilets welcome: title: Welcome! - introduction_html: Welcome to OpenStreetMap, the free and editable map of the - world. Now that you're signed up, you're all set to get started mapping. Here's - a quick guide with the most important things you need to know. + introduction: Welcome to OpenStreetMap, the free and editable map of the world. + Now that you're signed up, you're all set to get started mapping. Here's a + quick guide with the most important things you need to know. whats_on_the_map: title: What's on the Map - on_html: OpenStreetMap is a place for mapping things that are both real - and current - it includes millions of buildings, roads, and other details - about places. You can map whatever real-world features are interesting to - you. - off_html: What it doesn't include is opinionated data like ratings, - historical or hypothetical features, and data from copyrighted sources. - Unless you have special permission, don't copy from online or paper maps. basic_terms: title: Basic Terms For Mapping - paragraph_1_html: OpenStreetMap has some of its own lingo. Here are a few - key words that'll come in handy. - editor_html: An editor is a program or website you can use - to edit the map. - node_html: A node is a point on the map, like a single restaurant - or a tree. - way_html: A way is a line or area, like a road, stream, lake - or building. - tag_html: A tag is a bit of data about a node or way, like - a restaurant's name or a road's speed limit. + paragraph_1: OpenStreetMap has some of its own lingo. Here are a few key words + that'll come in handy. rules: title: Rules! - paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants - to collaborate\nwith, and communicate with, the community. If you are considering\nany - activities other than editing by hand, please read and follow the guidelines - on \nImports - and \nAutomated - Edits." - questions: - title: Any questions? - paragraph_1_html: |- - OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics. - Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat. start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! - paragraph_1_html: If you just want something small fixed and don't have the - time to sign up and learn how to edit, it's easy to add a note. - paragraph_2_html: 'Just go to the map and click - the note icon: . This will add a marker - to the map, which you can move by dragging. Add your message, then click - save, and other mappers will investigate.' + para_1: If you just want something small fixed and don't have the time to + sign up and learn how to edit, it's easy to add a note. traces: visibility: private: Private (only shared as anonymous, unordered points) @@ -1753,7 +1663,6 @@ en-GB: points with timestamps) new: visibility_help: what does this mean? - visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces help: Help help_url: https://wiki.openstreetmap.org/wiki/Upload create: @@ -1772,7 +1681,6 @@ en-GB: title: Editing trace %{name} heading: Editing trace %{name} visibility_help: what does this mean? - visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_optionals: tags: Tags show: @@ -1795,7 +1703,6 @@ en-GB: trace_not_found: Trace not found! visibility: 'Visibility:' trace_paging_nav: - showing_page: Page %{page} older: Older Traces newer: Newer Traces trace: @@ -1818,11 +1725,7 @@ en-GB: public_traces_from: Public GPS traces from %{user} description: Browse recent GPS track 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. upload_trace: Upload a trace - see_all_traces: See all traces destroy: scheduled_for_deletion: Trace scheduled for deletion make_public: @@ -1844,8 +1747,6 @@ en-GB: cookies_needed: You appear to have cookies disabled - please enable cookies in your browser before continuing. 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. need_to_see_terms: Your access to the API is temporarily suspended. Please log-in @@ -1919,96 +1820,16 @@ en-GB: flash: Updated the client information successfully destroy: flash: Destroyed the client application registration + oauth2_applications: + new: + title: Register a new application users: - login: - title: Login - heading: Login - email or username: 'E-mail Address or Username:' - password: 'Password:' - openid_html: '%{logo} OpenID:' - remember: Remember me - lost password link: Lost your password? - login_button: Login - register now: Register now - with username: 'Already have an OpenStreetMap account? Please login with your - username and password:' - 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. - no account: Don't have an account? - account not active: Sorry, your account is not active yet.
Please use the - link in the account confirmation email to activate your account, or request - a new confirmation email. - account is suspended: Sorry, your account has been suspended due to suspicious - activity.
Please contact the webmaster if - you wish to discuss this. - auth failure: Sorry, could not log in with those details. - openid_logo_alt: Log in with an OpenID - auth_providers: - openid: - title: Login with OpenID - alt: Login with an OpenID URL - google: - title: Login with Google - alt: Login with a Google OpenID - facebook: - title: Login with Facebook - alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account - github: - title: Login with GitHub - alt: Login with a GitHub Account - wikipedia: - title: Login with Wikipedia - alt: Login with a Wikipedia Account - yahoo: - title: Login with Yahoo - alt: Login with a Yahoo OpenID - wordpress: - title: Login with Wordpress - alt: Login with a Wordpress OpenID - aol: - title: Login with AOL - alt: Login with an AOL OpenID - logout: - title: Logout - heading: Logout of OpenStreetMap - logout_button: Logout - lost_password: - title: Lost password - heading: Forgotten Password? - email address: E-mail address - new password button: Reset password - help_text: Enter the e-mail 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: Could not find that email address, sorry. - reset_password: - title: Reset password - heading: Reset Password for %{user} - reset: Reset Password - flash changed: Your password has been changed. - flash token bad: Did not find that token, check the URL maybe? new: title: Sign Up no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically. - contact_webmaster_html: Please contact the webmaster - 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: |- -

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.

- email address: 'Email Address:' - confirm email address: 'Confirm Email Address:' - display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' @@ -2017,9 +1838,6 @@ en-GB: but some extra tools or server may still need one. 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: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: title: Terms heading: Terms @@ -2027,9 +1845,6 @@ en-GB: 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 - guidance_html: 'Information to help understand these terms: a human - readable summary and some informal translations' - 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. @@ -2038,6 +1853,9 @@ en-GB: france: France italy: Italy rest_of_world: Rest of the world + terms_declined_flash: + terms_declined_html: We are sorry that you have decided to not accept the new + Contributor Terms. For more information, please see %{terms_declined_link}. no_such_user: title: No such user heading: The user %{user} does not exist @@ -2046,7 +1864,6 @@ en-GB: deleted: deleted show: my diary: My Diary - new diary entry: new diary entry my edits: My Edits my traces: My Traces my notes: My Notes @@ -2054,7 +1871,6 @@ en-GB: my profile: My Profile my settings: My Settings my comments: My Comments - oauth settings: oauth settings blocks on me: Blocks on Me blocks by me: Blocks by Me send message: Send Message @@ -2068,21 +1884,10 @@ en-GB: ct status: 'Contributor terms:' ct undecided: Undecided ct declined: Declined - 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_html: Set your home location on the %{settings_link} page to - see nearby users. - settings_link_text: settings - no friends: You have not added any friends yet. - km away: '%{count}km away' - m away: '%{count}m away' - 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 @@ -2097,103 +1902,11 @@ en-GB: comments: Comments create_block: Block this User activate_user: Activate this User - deactivate_user: Deactivate this User confirm_user: Confirm this user hide_user: Hide this User unhide_user: Unhide this User delete_user: Delete this User confirm: Confirm - friends_changesets: friends' changesets - friends_diaries: friends' diary entries - nearby_changesets: nearby user changesets - nearby_diaries: nearby user diary entries - 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 - external auth: External Authentication - 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: 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 - 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. 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 text: what is this? - image: Image - gravatar: - gravatar: Use Gravatar - link: https://wiki.openstreetmap.org/wiki/Gravatar - disabled: Gravatar has been disabled. - enabled: Display of your Gravatar has been enabled. - 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. - update home location on click: Update home location when I click on the map? - save changes button: Save Changes - make edits public button: Make all my edits public - return to profile: Return to profile - flash update success confirm needed: User information updated successfully. - Check your email for a note to confirm your new email address. - flash update success: User information updated successfully. - confirm: - heading: Check your email! - introduction_1: We sent you a confirmation email. - introduction_2: 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, click - here. - confirm_resend: - success_html: We've sent a new confirmation note to %{email} and as soon as - you confirm your account you'll be able to get mapping.

If you - use an antispam system which sends confirmation requests then please make - sure you whitelist %{sender} as we are unable to reply to any confirmation - requests. - failure: User %{name} not found. - confirm_email: - heading: Confirm a change of e-mail address - press confirm button: Press the confirm button below to confirm your new e-mail - address. - button: Confirm - success: Confirmed your change of email address! - failure: An e-mail 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: flash success: All your edits are now public, and you are now allowed to edit. index: @@ -2210,14 +1923,6 @@ en-GB: suspended: title: Account Suspended heading: Account Suspended - webmaster: webmaster - body_html: |- -

- Sorry, your account has been automatically suspended due to suspicious activity. -

-

- This decision will be reviewed by an administrator shortly, or you may contact the %{webmaster} if you wish to discuss this. -

auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials @@ -2265,9 +1970,6 @@ en-GB: title: Creating block on %{name} heading_html: Creating block on %{name} period: How long, starting now, the user will be blocked from the API for. - 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. back: View all blocks edit: title: Editing block on %{name} @@ -2280,10 +1982,6 @@ en-GB: block_period: The blocking period must be one of the values selectable in the drop-down list. create: - try_contacting: Please try contacting the user before blocking them and giving - them a reasonable time to respond. - try_waiting: Please try giving the user a reasonable time to respond before - blocking them. flash: Created a block on user %{name}. update: only_creator_can_edit: Only the moderator who created this block can edit it. @@ -2295,8 +1993,8 @@ en-GB: revoke: title: Revoking block on %{block_on} heading_html: Revoking block on %{block_on} by %{block_by} - time_future: This block will end in %{time}. - past: This block ended %{time} and cannot be revoked now. + time_future_html: This block will end in %{time}. + past_html: 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. @@ -2321,8 +2019,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke! @@ -2355,6 +2053,27 @@ en-GB: description: Description created_at: Created at last_changed: Last changed + show: + title: 'Note: %{id}' + description: Description + open_title: 'Unresolved note #%{note_name}' + closed_title: 'Resolved note #%{note_name}' + hidden_title: 'Hidden note #%{note_name}' + anonymous_warning: This note includes comments from anonymous users which should + be independently verified. + hide: Hide + resolve: Resolve + reactivate: Reactivate + comment_and_resolve: Comment & Resolve + comment: Comment + new: + title: New Note + 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 javascripts: close: Close share: @@ -2400,8 +2119,6 @@ en-GB: gps: Public GPS Traces overlays: Enable overlays for troubleshooting the map title: Layers - copyright: © OpenStreetMap contributors - donate_link_text: site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map @@ -2418,22 +2135,6 @@ en-GB: unsubscribe: Unsubscribe hide_comment: hide 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. - 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. - hide: Hide - resolve: Resolve - reactivate: Reactivate - comment_and_resolve: Comment & Resolve - comment: Comment edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: