projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3527394
)
Correct misspellings of CC BY[-SA]
author
Siebrand Mazeland
<s.mazeland@xs4all.nl>
Sat, 25 Feb 2012 14:56:30 +0000
(15:56 +0100)
committer
Siebrand Mazeland
<s.mazeland@xs4all.nl>
Sat, 25 Feb 2012 14:56:30 +0000
(15:56 +0100)
config/locales/en.yml
patch
|
blob
|
history
diff --git
a/config/locales/en.yml
b/config/locales/en.yml
index 1ab8ef90d8232adf8bc2a6ec6e9fe9c4d12ce4de..bf194bc6a865d6881df28d05e93dc1b0025a4086 100644
(file)
--- a/
config/locales/en.yml
+++ b/
config/locales/en.yml
@@
-968,7
+968,7
@@
en:
foundation_title: The OpenStreetMap Foundation
sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
license:
foundation_title: The OpenStreetMap Foundation
sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
license:
- alt: CC
by-sa
2.0
+ 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
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
@@
-989,7
+989,7
@@
en:
<p>
OpenStreetMap is <i>open data</i>, licensed under the <a
href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
<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).
+ Commons Attribution-ShareAlike 2.0</a> licence (CC
BY-SA).
</p>
<p>
You are free to copy, distribute, transmit and adapt our maps
</p>
<p>
You are free to copy, distribute, transmit and adapt our maps
@@
-1005,14
+1005,14
@@
en:
<p>
If you are using OpenStreetMap map images, we request that
your credit reads at least “© OpenStreetMap
<p>
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,
+ contributors, CC
BY-SA”. If you are using map data only,
we request “Map data © OpenStreetMap contributors,
we request “Map data © OpenStreetMap contributors,
- CC
-
BY-SA”.
+ CC
BY-SA”.
</p>
<p>
Where possible, OpenStreetMap should be hyperlinked to <a
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
</p>
<p>
Where possible, OpenStreetMap should be hyperlinked to <a
href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
- and CC
-
BY-SA to <a
+ and CC
BY-SA to <a
href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If
you are using a medium where links are not possible (e.g. a
printed work), we suggest you direct your readers to
href="http://creativecommons.org/licenses/by-sa/2.0/">http://creativecommons.org/licenses/by-sa/2.0/</a>. If
you are using a medium where links are not possible (e.g. a
printed work), we suggest you direct your readers to
@@
-1043,7
+1043,7
@@
en:
<h3>Our contributors</h3>
<p>
<h3>Our contributors</h3>
<p>
- Our CC
-
BY-SA licence requires you to “give the Original
+ 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
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
@@
-1070,7
+1070,7
@@
en:
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
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>.</li>
+ <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
BY</a>.</li>
<li><strong>Canada</strong>: Contains data from
GeoBase®, GeoGratis (© Department of Natural
Resources Canada), CanVec (© Department of Natural
<li><strong>Canada</strong>: Contains data from
GeoBase®, GeoGratis (© Department of Natural
Resources Canada), CanVec (© Department of Natural