X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b078b6b10bdb33121a02a1bd23038c4fef199be5..b5679e16dbd338731c5205bd71c0f5c4f344e6ed:/config/locales/en-GB.yml?ds=inline diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 8c835dd89..5858dd57c 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -220,7 +220,6 @@ en-GB: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live github: GitHub wikipedia: Wikipedia api: @@ -280,12 +279,6 @@ en-GB: 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 @@ -305,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: @@ -430,6 +421,7 @@ en-GB: 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 @@ -528,13 +520,6 @@ 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 - osm_nominatim_html: Results from OpenStreetMap - Nominatim - osm_nominatim_reverse_html: Results from OpenStreetMap - Nominatim search_osm_nominatim: prefix: aerialway: @@ -1194,10 +1179,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' @@ -1368,7 +1349,6 @@ en-GB: 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 @@ -1404,7 +1384,7 @@ en-GB: facebook: title: Login with Facebook alt: Login with a Facebook Account - windowslive: + microsoft: title: Login with Windows Live alt: Login with a Windows Live Account github: @@ -1426,7 +1406,6 @@ en-GB: site: about: next: Next - copyright_html: ©OpenStreetMap
contributors 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. @@ -1436,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: @@ -1470,86 +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_4_html: |- - To make clear that the data is available under the Open - Database License, you may link 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) and to opendatacommons.org. - In this example, the credit appears in the corner of the map. 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. @@ -1557,11 +1450,6 @@ 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. @@ -1631,11 +1519,6 @@ 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 help: @@ -1820,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: @@ -2002,7 +1884,6 @@ 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:' @@ -2112,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. @@ -2178,15 +2059,6 @@ en-GB: 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 @@ -2247,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