Break up the "copyright and license" text into smaller pieces
This commit is contained in:
Tom Hughes
parent
17cbdb3698
commit
e885c1249b
2 changed files with 85 additions and 78 deletions
|
|
@ -41,4 +41,32 @@
|
|||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<%= raw t('license_page.legal_babble', :locale => @locale) %>
|
||||
<h2><%= t "license_page.legal_babble.title_html", :locale => @locale %></h2>
|
||||
|
||||
<p><%= t "license_page.legal_babble.intro_1_html", :locale => @locale %></p>
|
||||
<p><%= t "license_page.legal_babble.intro_2_html", :locale => @locale %></p>
|
||||
|
||||
<h3><%= t "license_page.legal_babble.credit_title_html", :locale => @locale %></h3>
|
||||
<p><%= t "license_page.legal_babble.credit_1_html", :locale => @locale %></p>
|
||||
<p><%= t "license_page.legal_babble.credit_2_html", :locale => @locale %></p>
|
||||
|
||||
<h3><%= t "license_page.legal_babble.more_title_html", :locale => @locale %></h3>
|
||||
<p><%= t "license_page.legal_babble.more_1_html", :locale => @locale %></p>
|
||||
<p><%= t "license_page.legal_babble.more_2_html", :locale => @locale %></p>
|
||||
<p><%= t "license_page.legal_babble.more_3_html", :locale => @locale %></p>
|
||||
|
||||
<h3><%= t "license_page.legal_babble.contributors_title_html", :locale => @locale %></h3>
|
||||
<p><%= t "license_page.legal_babble.contributors_intro_html", :locale => @locale %></p>
|
||||
<ul id="contributors">
|
||||
<li><%= t "license_page.legal_babble.contributors_au_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_at_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_ca_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_fr_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_nl_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_nz_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_pl_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_za_html", :locale => @locale %></li>
|
||||
<li><%= t "license_page.legal_babble.contributors_gb_html", :locale => @locale %></li>
|
||||
</ul>
|
||||
<p><%= t "license_page.legal_babble.contributors_footer_1_html", :locale => @locale %></p>
|
||||
<p><%= t "license_page.legal_babble.contributors_footer_2_html", :locale => @locale %></p>
|
||||
|
|
|
|||
|
|
@ -1021,14 +1021,13 @@ en:
|
|||
text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
|
||||
native_link: THIS_LANGUAGE_NAME_HERE version
|
||||
mapping_link: start mapping
|
||||
legal_babble: |
|
||||
<h2>Copyright and License</h2>
|
||||
<p>
|
||||
OpenStreetMap is <i>open data</i>, licensed under the <a
|
||||
href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
|
||||
Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
|
||||
</p>
|
||||
<p>
|
||||
legal_babble:
|
||||
title_html: Copyright and License
|
||||
intro_1_html: |
|
||||
OpenStreetMap is <i>open data</i>, licensed under the <a
|
||||
href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
|
||||
Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
|
||||
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
|
||||
|
|
@ -1036,17 +1035,14 @@ en:
|
|||
full <a
|
||||
href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
|
||||
code</a> explains your rights and responsibilities.
|
||||
</p>
|
||||
|
||||
<h3>How to credit OpenStreetMap</h3>
|
||||
<p>
|
||||
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”.
|
||||
</p>
|
||||
<p>
|
||||
credit_2_html: |
|
||||
Where possible, OpenStreetMap should be hyperlinked to <a
|
||||
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
|
||||
and CC BY-SA to <a
|
||||
|
|
@ -1056,30 +1052,23 @@ en:
|
|||
www.openstreetmap.org (perhaps by expanding
|
||||
‘OpenStreetMap’ to this full address) and to
|
||||
www.creativecommons.org.
|
||||
</p>
|
||||
|
||||
<h3>Finding out more</h3>
|
||||
<p>
|
||||
more_title_html: Finding out more
|
||||
more_1_html: |
|
||||
Read more about using our data at the <a
|
||||
href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
|
||||
FAQ</a>.
|
||||
</p>
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
<p>
|
||||
more_3_html: |
|
||||
Although OpenStreetMap is open data, we cannot provide a
|
||||
free-of-charge map API for third-party developers.
|
||||
|
||||
See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
|
||||
<a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
|
||||
and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
|
||||
</p>
|
||||
|
||||
<h3>Our contributors</h3>
|
||||
<p>
|
||||
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
|
||||
|
|
@ -1088,63 +1077,53 @@ en:
|
|||
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.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
Information for page editors
|
||||
|
||||
The following lists only those organisations who require attribution
|
||||
as a condition of their data being used in OpenStreetMap. It is not a
|
||||
general catalogue of imports, and must not be used except when
|
||||
attribution is required to comply with the licence of the imported
|
||||
data.
|
||||
|
||||
Any additions here must be discussed with OSM sysadmins first.
|
||||
-->
|
||||
|
||||
<ul id="contributors">
|
||||
<li><strong>Australia</strong>: Contains suburb data based
|
||||
on Australian Bureau of Statistics data.</li>
|
||||
<li><strong>Austria</strong>: Contains data from
|
||||
<a href="http://data.wien.gv.at/">Stadt Wien</a> (under
|
||||
<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
|
||||
<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
|
||||
Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).</li>
|
||||
<li><strong>Canada</strong>: Contains data from
|
||||
GeoBase®, GeoGratis (© Department of Natural
|
||||
Resources Canada), CanVec (© Department of Natural
|
||||
Resources Canada), and StatCan (Geography Division,
|
||||
Statistics Canada).</li>
|
||||
<li><strong>France</strong>: Contains data sourced from
|
||||
Direction Générale des Impôts.</li>
|
||||
<li><strong>Netherlands</strong>: Contains © AND data, 2007
|
||||
(<a href="http://www.and.com">www.and.com</a>)</li>
|
||||
<li><strong>New Zealand</strong>: Contains data sourced from
|
||||
Land Information New Zealand. Crown Copyright reserved.</li>
|
||||
<li><strong>Poland</strong>: Contains data from <a
|
||||
href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
|
||||
UMP-pcPL contributors.
|
||||
<a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing">
|
||||
More about OSM's use of UMP data</a></li>
|
||||
<li><strong>South Africa</strong>: Contains data sourced from
|
||||
<a href="http://www.ngi.gov.za/">Chief Directorate:
|
||||
National Geo-Spatial Information</a>, State copyright reserved.</li>
|
||||
<li><strong>United Kingdom</strong>: Contains Ordnance
|
||||
Survey data © Crown copyright and database right
|
||||
2010.</li>
|
||||
</ul>
|
||||
|
||||
<p>
|
||||
contributors_au_html: |
|
||||
<strong>Australia</strong>: Contains suburb data based
|
||||
on Australian Bureau of Statistics data.
|
||||
contributors_at_html: |
|
||||
<strong>Austria</strong>: Contains data from
|
||||
<a href="http://data.wien.gv.at/">Stadt Wien</a> (under
|
||||
<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
|
||||
<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
|
||||
Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).
|
||||
contributors_ca_html: |
|
||||
<strong>Canada</strong>: Contains data from
|
||||
GeoBase®, GeoGratis (© Department of Natural
|
||||
Resources Canada), CanVec (© Department of Natural
|
||||
Resources Canada), and StatCan (Geography Division,
|
||||
Statistics Canada).
|
||||
contributors_fr_html: |
|
||||
<strong>France</strong>: Contains data sourced from
|
||||
Direction Générale des Impôts.
|
||||
contributors_nl_html: |
|
||||
<strong>Netherlands</strong>: Contains © AND data, 2007
|
||||
(<a href="http://www.and.com">www.and.com</a>)
|
||||
contributors_nz_html: |
|
||||
<strong>New Zealand</strong>: Contains data sourced from
|
||||
Land Information New Zealand. Crown Copyright reserved.
|
||||
contributors_pl_html: |
|
||||
<strong>Poland</strong>: Contains data from <a
|
||||
href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
|
||||
UMP-pcPL contributors.
|
||||
<a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing">
|
||||
More about OSM's use of UMP data</a>
|
||||
contributors_za_html: |
|
||||
<strong>South Africa</strong>: Contains data sourced from
|
||||
<a href="http://www.ngi.gov.za/">Chief Directorate:
|
||||
National Geo-Spatial Information</a>, State copyright reserved.
|
||||
contributors_gb_html: |
|
||||
<strong>United Kingdom</strong>: Contains Ordnance
|
||||
Survey data © Crown copyright and database right
|
||||
2010.
|
||||
contributors_footer_1_html: |
|
||||
For further details of these, and other sources that have been used
|
||||
to help improve OpenStreetMap, please see the <a
|
||||
href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
|
||||
page</a> on the OpenStreetMap Wiki.
|
||||
</p>
|
||||
<p>
|
||||
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.
|
||||
</p>
|
||||
notifier:
|
||||
diary_comment_notification:
|
||||
subject: "[OpenStreetMap] %{user} commented on your diary entry"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue