X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..4b2d6436cee11c0b3d751ef15cace053e26fbf3d:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2aca19795..2a87a59b7 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -11,6 +11,7 @@ # Author: E THP # Author: EdLoach # Author: Eduard Popov +# Author: Gravitystorm # Author: IknowJoseph # Author: Jagwar # Author: Jguthrie100 @@ -1065,10 +1066,9 @@ en-GB: subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets' subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset you are interested in' - your_changeset: '%{commenter} has left a comment on one of your changesets - created at %{time}' - commented_changeset: '%{commenter} has left a comment on a map changeset you - are watching created by %{changeset_author} at %{time}' + your_changeset: '%{commenter} left a comment at %{time} on one of your changesets' + commented_changeset: '%{commenter} left a comment at %{time} on a changeset + you are watching created by %{changeset_author}' partial_changeset_with_comment: with comment '%{changeset_comment}' partial_changeset_without_comment: without comment details: More details about the changeset can be found at %{url}. @@ -1166,7 +1166,7 @@ en-GB: 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 user diaries, community blogs, and the OSM Foundation website. + 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 @@ -1203,17 +1203,17 @@ en-GB: title_html: Copyright and Licence 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 code - explains your rights and responsibilities. + The full legal + code explains your rights and responsibilities. intro_3_html: |- The cartography in our map tiles, and our documentation, are - licenced under the Creative + licenced under the Creative Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: |- @@ -1223,7 +1223,7 @@ en-GB: 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 licenced 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 licence(s). In media where links are not possible (e.g. printed works), we suggest you @@ -1239,9 +1239,7 @@ en-GB: 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 and the community Legal - FAQ. + 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. @@ -1290,7 +1288,7 @@ en-GB: 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 + 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, @@ -1301,15 +1299,14 @@ en-GB: 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 + href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">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. + 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. @@ -1406,7 +1403,7 @@ en-GB: 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 + for more legal information, or contact the appropriate \nOSMF working group." help: title: Getting Help @@ -1415,16 +1412,16 @@ en-GB: mapping topics. welcome: url: /welcome - title: Welcome to OSM + title: Welcome to OpenStreetMap 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: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Ask a question or look up answers on OSM's question-and-answer + title: Help Forum + description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. mailing_lists: title: Mailing Lists @@ -1442,9 +1439,9 @@ en-GB: description: Help for companies and organisations switching to OpenStreetMap based maps and other services. wiki: - url: http://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Browse the wiki for in-depth OSM documentation. + url: https://wiki.openstreetmap.org/ + title: OpenStreetMap Wiki + description: Browse the wiki for in-depth OpenStreetMap documentation. sidebar: search_results: Search Results close: Close @@ -1576,8 +1573,8 @@ en-GB: 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 + on \nImports + and \nAutomated Edits." questions: title: Any questions? @@ -1607,9 +1604,9 @@ en-GB: 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 help: Help - help_url: http://wiki.openstreetmap.org/wiki/Upload + help_url: https://wiki.openstreetmap.org/wiki/Upload create: upload_trace: Upload GPS Trace trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in @@ -1666,7 +1663,9 @@ en-GB: newer: Newer Traces trace: pending: PENDING - count_points: '%{count} points' + count_points: + one: 1 point + other: '%{count} points' more: more trace_details: View Trace Details view_map: View Map @@ -1685,7 +1684,7 @@ en-GB: 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 + or learn more about GPS tracing on the wiki page. upload_trace: Upload a trace see_all_traces: See all traces @@ -1898,7 +1897,7 @@ en-GB: 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 display name: 'Display Name:' @@ -1914,7 +1913,7 @@ en-GB: 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: Terms heading: Terms @@ -1924,7 +1923,7 @@ en-GB: consider_pd_why_url: http://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' - 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. @@ -2014,12 +2013,12 @@ en-GB: 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? @@ -2028,7 +2027,7 @@ en-GB: 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 + only public users can edit map data. (find out why). @@ -2048,7 +2047,7 @@ en-GB: 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.