X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3787918d68354ef37deee29081712eee8373676c..42b20c5e0f041f5af02eda44f20ba99c571c676e:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index c4704fa3b..cef8431cc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -407,7 +407,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: heading: "Area Too Large" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." @@ -1003,9 +1003,6 @@ en: community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - license: - alt: CC BY-SA 2.0 - title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation @@ -1024,43 +1021,40 @@ en: title_html: Copyright and License intro_1_html: | OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). + href="http://opendatacommons.org/licenses/odbl/">Open Data + Commons Open Database License (ODbL). intro_2_html: | - You are free to copy, distribute, transmit and adapt our maps - and data, as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our maps or data, you + 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 + Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). credit_title_html: How to credit OpenStreetMap credit_1_html: | - If you are using OpenStreetMap map images, we request that - your credit reads at least “© OpenStreetMap - contributors, CC BY-SA”. If you are using map data only, - we request “Map data © OpenStreetMap contributors, - CC BY-SA”. + We require that you use the credit “© OpenStreetMap + contributors”. credit_2_html: | - Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. + 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. + 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 + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and + if relevant, to creativecommons.org. more_title_html: Finding out more more_1_html: | - Read more about using our data at the Legal FAQ. more_2_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. - more_3_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. See our API Usage Policy, @@ -1068,17 +1062,9 @@ en: and Nominatim Usage Policy. contributors_title_html: Our contributors contributors_intro_html: | - Our CC BY-SA licence requires you to “give the Original - Author credit reasonable to the medium or means You are - utilising”. Individual OSM mappers do not request a - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - agency or other major source has been included in - OpenStreetMap, it may be reasonable to credit them by directly - reproducing their credit or by linking to it on this page. - contributors_au_html: | - Australia: Contains suburb data based - on Australian Bureau of Statistics data. + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: contributors_at_html: | Austria: Contains data from Stadt Wien (under @@ -1100,12 +1086,6 @@ en: contributors_nz_html: | New Zealand: Contains data sourced from Land Information New Zealand. Crown Copyright reserved. - contributors_pl_html: | - Poland: Contains data from UMP-pcPL maps. Copyright - UMP-pcPL contributors. - - More about OSM's use of UMP data contributors_za_html: | South Africa: Contains data sourced from Chief Directorate: @@ -1113,7 +1093,7 @@ en: contributors_gb_html: | United Kingdom: Contains Ordnance Survey data © Crown copyright and database right - 2010. + 2010-12. contributors_footer_1_html: | For further details of these, and other sources that have been used to help improve OpenStreetMap, please see the takedown + procedure or file directly at our + on-line filing page. notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1289,10 +1280,8 @@ en: permalink: Permalink shortlink: Shortlink license: - notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors." - license_name: "Creative Commons Attribution-Share Alike 2.0" - license_url: "http://creativecommons.org/licenses/by-sa/2.0/" - project_name: "OpenStreetMap project" + copyright: "Copyright OpenStreetMap and contributors, under an open license" + license_url: "http://openstreetmap.org/copyright" project_url: "http://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: @@ -1598,8 +1587,6 @@ en: 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." - notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)" - notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.

Please log in, then take a few seconds to review and accept the new terms. Thank you!" openid missing provider: "Sorry, could not contact your OpenID provider" openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID"