X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5be5155e03b9e7989d2c8d3d244511c0b9b13eb7..7751f7a04b385642f6e38bfab084d902c7651b99:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2751c6e66..4cec17f77 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -16,6 +16,7 @@ # Author: EdLoach # Author: Eduard Popov # Author: Gravitystorm +# Author: Hufkratzer # Author: IknowJoseph # Author: Jagwar # Author: Jguthrie100 @@ -43,8 +44,6 @@ en-GB: file: prompt: Choose file submit: - diary_comment: - create: Save diary_entry: create: Publish update: Update @@ -82,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 @@ -125,7 +123,7 @@ en-GB: title: Subject latitude: Latitude longitude: Longitude - language: Language + language_code: Language friend: user: User friend: Friend @@ -262,15 +260,6 @@ en-GB: 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. @@ -281,7 +270,9 @@ en-GB: in the Public Domain. link text: what is this? save changes button: Save Changes - make edits public button: Make all my edits public + 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. @@ -389,22 +380,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} query: title: Query Features introduction: Click on the map to find nearby features. @@ -556,13 +531,10 @@ en-GB: 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: aerialway: @@ -840,7 +812,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 @@ -1162,10 +1134,8 @@ en-GB: 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 @@ -1195,8 +1165,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 @@ -1226,10 +1194,6 @@ en-GB: failed_to_import: 'failed to import. Here is the error:' 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' @@ -1303,8 +1267,6 @@ en-GB: 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: failure: User %{name} not found. confirm_email: @@ -1340,8 +1302,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 @@ -1368,14 +1328,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. @@ -1430,17 +1386,8 @@ en-GB: 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. auth failure: Sorry, could not log in with those details. openid_logo_alt: Log in with an OpenID auth_providers: @@ -1519,79 +1466,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_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. @@ -1599,15 +1483,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. - 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 @@ -1633,8 +1511,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:' @@ -1652,9 +1528,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 @@ -1686,10 +1559,6 @@ en-GB: 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, @@ -1710,9 +1579,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: - 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. @@ -1723,6 +1589,8 @@ en-GB: wiki: title: OpenStreetMap Wiki description: Browse the wiki for in-depth OpenStreetMap documentation. + any_questions: + title: Any questions? sidebar: search_results: Search Results close: Close @@ -1808,52 +1676,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) @@ -1926,9 +1764,6 @@ 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 destroy: scheduled_for_deletion: Trace scheduled for deletion @@ -2034,12 +1869,6 @@ en-GB: account for you automatically. 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:' @@ -2055,8 +1884,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' decline: Decline you need to accept or decline: Please read and then either accept or decline the new Contributor Terms to continue. @@ -2076,7 +1903,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 @@ -2102,8 +1928,6 @@ en-GB: created from: 'Created from:' status: 'Status:' spam score: 'Spam Score:' - description: Description - user location: User location role: administrator: This user is an administrator moderator: This user is a moderator @@ -2118,14 +1942,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 - 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: @@ -2189,9 +2010,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} @@ -2204,10 +2022,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. @@ -2279,6 +2093,36 @@ 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}' + 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} + 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: @@ -2342,22 +2186,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: