[Marble-commits] KDE/kdeedu/marble
Dennis Nienhüser
earthwings at gentoo.org
Fri Apr 2 17:08:39 CEST 2010
SVN commit 1110245 by nienhueser:
Add openrouteservice data origin and license notice. Change <br> tags to <br />, add ending </html> tag (to have xmllint validate it).
M +19 -13 data/credits_data.html
M +38 -32 src/lib/MarbleAboutDialog.cpp
--- trunk/KDE/kdeedu/marble/data/credits_data.html #1110244:1110245
@@ -11,23 +11,23 @@
<H4>Maps</H4>
<p>
- <i>Blue Marble Next Generation (500 m / pixel)</i><br>
+ <i>Blue Marble Next Generation (500 m / pixel)</i><br />
NASA Goddard Space Flight Center Earth Observatory <a href="http://earthobservatory.nasa.gov/Newsroom/BlueMarble/">http://earthobservatory.nasa.gov/Newsroom/BlueMarble/</a>
</p>
<p>
- <i>Earth's City Lights</i><br>
+ <i>Earth's City Lights</i><br />
Data courtesy Marc Imhoff of NASA GSFC and Christopher Elvidge of NOAA NGDC. Image by Craig Mayhew and Robert Simmon, NASA GSFC.
</p>
<p>
- <i>Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )</i><br>
+ <i>Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )</i><br />
NASA Jet Propulsion Laboratory <a href="http://www2.jpl.nasa.gov/srtm/">http://www2.jpl.nasa.gov/srtm/</a>
</p>
<p>
- <i>Micro World Data Bank in Polygons ("MWDB-POLY / MWDBII")</i><br>
+ <i>Micro World Data Bank in Polygons ("MWDB-POLY / MWDBII")</i><br />
CIA ; Global Associates, Ltd.; Fred Pospeschil and Antonio Rivera
</p>
<p>
- <i>Temperature and Precipitation Maps (July and December)</i><br>
+ <i>Temperature and Precipitation Maps (July and December)</i><br />
A combination of two datasets:
<ul>
<li>Legates, D.R. and Willmott, C.J. 1989. Average Monthly Surface Air Temperature and
@@ -42,41 +42,47 @@
<H4>Street Map</H4>
<p>
- <i>OpenStreetMap</i><br>
- The street maps used in Marble via download are provided by the <a href="http://www.openstreetmap.org">OpenStreetMap</a> Project ("OSM"). OSM is an open community which creates free editable maps.
+ <i>OpenStreetMap</i><br />
+ The street maps used in Marble via download are provided by the <a href="http://www.openstreetmap.org">OpenStreetMap</a> Project ("OSM"). OSM is an open community which creates free editable maps.<br />
<i>License</i>: OpenStreetMap data can be used freely under the terms of the <a href="http://wiki.openstreetmap.org/index.php/OpenStreetMap_License">Creative Commons Attribution-ShareAlike 2.0 license</a>.
</p>
+ <p>
+ <i>OpenStreetMap</i><br />
+ The routes used in Marble via download are provided by the <a href="http://www.openrouteservice.org">OpenRouteService</a> Project ("ORS").<br />
+ <i>License</i>: OpenRouteService data can be used freely under the terms of the <a href="http://wiki.openstreetmap.org/index.php/OpenStreetMap_License">Creative Commons Attribution-ShareAlike 2.0 license</a>.
+ </p>
<H4>Cities and Locations</H4>
<p>
- <i>World Gazetteer</i><br>
+ <i>World Gazetteer</i><br />
Stefan Helders <a href="http://www.world-gazetteer.com">http://www.world-gazetteer.com</a>
</p>
<p>
- <i>Geonames.org</i><br>
+ <i>Geonames.org</i><br />
<a href="http://www.geonames.org/">http://www.geonames.org/</a>
<i>License</i>: Geonames.org data can be used freely under the terms of the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>.
</p>
<p>
- <i>Czech Statistical Office</i><br>
+ <i>Czech Statistical Office</i><br />
Public database <a href="http://www.czso.cz/eng/redakce.nsf/i/home">http://www.czso.cz</a>
</p>
<H4>Flags</H4>
<p>
- <i>Flags of the World</i><br>
+ <i>Flags of the World</i><br />
The flags were taken from Wikipedia (<a href="http://www.wikipedia.org">http://www.wikipedia.org</a>) which in turn took a subset from <a href="http://www.openclipart.org">http://www.openclipart.org</a> and reworked them. All flags are under the public domain (see comments inside the svg files).
</p>
<H4>Stars</H4>
<p>
- <i>The Bright Star Catalogue</i><br>
+ <i>The Bright Star Catalogue</i><br />
5th Revised Ed. (Preliminary Version)
Hoffleit D., Warren Jr W.H.,
Astronomical Data Center, NSSDC/ADC (1991)
<a href="http://adc.gsfc.nasa.gov/adc-cgi/cat.pl?/catalogs/5/5050">http://adc.gsfc.nasa.gov</a>
</p>
-<br>
+<br />
</body>
+</html>
--- trunk/KDE/kdeedu/marble/src/lib/MarbleAboutDialog.cpp #1110244:1110245
@@ -94,26 +94,26 @@
d->authorsLoaded = true;
browser = d->uiWidget.m_pMarbleAuthorsBrowser;
browser->setHtml( tr("<b>Active Development Team of Marble 0.10</b>")+
- tr("<p>Torsten Rahn <a href=\"mailto:rahn at kde.org\">rahn at kde.org</a><br>"
+ tr("<p>Torsten Rahn <a href=\"mailto:rahn at kde.org\">rahn at kde.org</a><br />"
"<i>Core Developer and Original Author</i></p>")+
- tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br>"
+ tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br />"
"<i>Core Developer: KML and Windows support</i></p>")+
- tr("<p>Jens-Michael Hoffmann <a href=\"mailto:jensmh at gmx.de\">jensmh at gmx.de</a><br>"
+ tr("<p>Jens-Michael Hoffmann <a href=\"mailto:jensmh at gmx.de\">jensmh at gmx.de</a><br />"
"<i>Core Developer: OpenStreetMap support, Download Management</i></p>")+
- tr("<p>Henry de Valence <a href=\"mailto:hdevalence at gmail.com\">hdevalence at gmail.com</a><br>"
+ tr("<p>Henry de Valence <a href=\"mailto:hdevalence at gmail.com\">hdevalence at gmail.com</a><br />"
"<i>Core Developer: Marble Runners, World-Clock Plasmoid</i></p>")+
- tr("<p>Bastian Holst, <a href=\"mailto:bastianholst at gmx.de\">bastianholst at gmx.de</a><br>"
+ tr("<p>Bastian Holst, <a href=\"mailto:bastianholst at gmx.de\">bastianholst at gmx.de</a><br />"
"<i>Online Services support</i></p>")+
- tr("<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br>"
+ tr("<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br />"
"<i>Proxy support</i></p>")+
- tr("<p>Pino Toscano <a href=\"mailto:pino at kde.org\">pino at kde.org</a><br>"
+ tr("<p>Pino Toscano <a href=\"mailto:pino at kde.org\">pino at kde.org</a><br />"
"<i>Network plugins</i></p>")+
- tr("<p>Harshit Jain <a href=\"mailto:sonu.itbhu at googlemail.com\">sonu.itbhu at googlemail.com</a><br>"
+ tr("<p>Harshit Jain <a href=\"mailto:sonu.itbhu at googlemail.com\">sonu.itbhu at googlemail.com</a><br />"
"<i>Planet Filter, bugfixes</i></p>")+
- tr("<p>Médéric Boquien <a href=\"mailto:mboquien at free.fr\">mboquien at free.fr</a><br>"
+ tr("<p>Médéric Boquien <a href=\"mailto:mboquien at free.fr\">mboquien at free.fr</a><br />"
"<i>Astronomical Observatories</i></p>")+
- tr("<p> Magnus Valle<br><i>Historical Maps</i></p>")+
- tr("<p>Eckhart Wörner <a href=\"mailto:kde at ewsoftware.de\">kde at ewsoftware.de</a><br>"
+ tr("<p> Magnus Valle<br /><i>Historical Maps</i></p>")+
+ tr("<p>Eckhart Wörner <a href=\"mailto:kde at ewsoftware.de\">kde at ewsoftware.de</a><br />"
"<i>Bugfixes</i></p>")+
tr("<b>Join us</b>")+
tr("<p>You can reach the developers of the Marble Project at <a href=\"mailto:marble-devel at kde.org\">marble-devel at kde.org</a></p>")+
@@ -121,25 +121,25 @@
tr("<p> The Marble Team would like to thank its members who participated "
"in the Google Summer of Code for their successful work on Marble:</p>")+
tr( "<p><b>2009</b></p>" ) +
- tr( "<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br>"
+ tr( "<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br />"
"<i>Project: OSM Annotation</i></p>" ) +
- tr( "<p>Bastian Holst <a href=\"mailto:bastianholst at gmx.de\">bastianholst at gmx.de</a><br>"
+ tr( "<p>Bastian Holst <a href=\"mailto:bastianholst at gmx.de\">bastianholst at gmx.de</a><br />"
"<i>Project: Online Services</i></p>" ) +
tr("<p><b>2008</b></p>")+
- tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br>"
+ tr("<p>Patrick Spendrin <a href=\"pspendrin at gmail.com\">pspendrin at gmail.com</a><br />"
"<i>Project: Vector Tiles for Marble</i></p>")+
- tr("<p>Shashank Singh <a href=\"mailto:shashank.personal at gmail.com\">shashank.personal at gmail.com</a><br>"
+ tr("<p>Shashank Singh <a href=\"mailto:shashank.personal at gmail.com\">shashank.personal at gmail.com</a><br />"
"<i>Project: Panoramio / Wikipedia -photo support for Marble</i></p>")+
tr("<b>2007</b>")+
- tr("<p>Carlos Licea <a href=\"mailto:carlos.licea at kdemail.net\">carlos.licea at kdemail.net</a><br>"
+ tr("<p>Carlos Licea <a href=\"mailto:carlos.licea at kdemail.net\">carlos.licea at kdemail.net</a><br />"
"<i>Project: Equirectangular Projection (\"Flat Map\")</i></p>")+
- tr("<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br>"
+ tr("<p>Andrew Manson <a href=\"mailto:g.real.ate at gmail.com\">g.real.ate at gmail.com</a><br />"
"<i>Project: GPS Support for Marble</i></p>")+
- tr("<p>Murad Tagirov <a href=\"mailto:tmurad at gmail.com\">tmurad at gmail.com</a><br>"
+ tr("<p>Murad Tagirov <a href=\"mailto:tmurad at gmail.com\">tmurad at gmail.com</a><br />"
"<i>Project: KML Support for Marble</i></p>")+
tr("<p>... and of course we'd like to thank the people at Google Inc. for making these projects possible.</p>")+
tr("<b>Developers</b>")+
- tr("<p>Inge Wallin <a href=\"mailto:inge at lysator.liu.se\">inge at lysator.liu.se</a><br>"
+ tr("<p>Inge Wallin <a href=\"mailto:inge at lysator.liu.se\">inge at lysator.liu.se</a><br />"
"<i>Core Developer and Co-Maintainer</i></p>")+
tr("<p><i>Development & Patches:</i> Simon Schmeisser, Claudiu Covaci, David Roberts, Nikolas Zimmermann, Jan Becker, "
"Stefan Asserhäll, Laurent Montel, Prashanth Udupa, Anne-Marie Mahfouf, Josef Spillner, Frerich Raabe, "
@@ -163,19 +163,19 @@
d->dataLoaded = true;
browser = d->uiWidget.m_pMarbleDataBrowser;
browser->setHtml( tr("<b>Maps</b>")+
- tr("<p><i>Blue Marble Next Generation (500 m / pixel)</i><br>"
+ tr("<p><i>Blue Marble Next Generation (500 m / pixel)</i><br />"
"NASA Goddard Space Flight Center Earth Observatory "
"<a href=\"http://earthobservatory.nasa.gov/Newsroom/BlueMarble/\">"
"http://earthobservatory.nasa.gov/Newsroom/BlueMarble/</a></p>")+
- tr("<p><i>Earth's City Lights</i><br>"
+ tr("<p><i>Earth's City Lights</i><br />"
"Data courtesy Marc Imhoff of NASA GSFC and Christopher Elvidge of NOAA NGDC. "
"Image by Craig Mayhew and Robert Simmon, NASA GSFC.</p>")+
- tr("<p><i>Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )</i><br>"
+ tr("<p><i>Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )</i><br />"
"NASA Jet Propulsion Laboratory <a href=\"http://www2.jpl.nasa.gov/srtm/\">"
"http://www2.jpl.nasa.gov/srtm/</a></p>")+
- tr("<p><i>Micro World Data Bank in Polygons (\"MWDB-POLY / MWDBII\")</i><br>"
+ tr("<p><i>Micro World Data Bank in Polygons (\"MWDB-POLY / MWDBII\")</i><br />"
"CIA ; Global Associates, Ltd.; Fred Pospeschil and Antonio Rivera</p>")+
- tr("<p><i>Temperature and Precipitation Maps (July and December)</i><br>"
+ tr("<p><i>Temperature and Precipitation Maps (July and December)</i><br />"
"A combination of two datasets:"
"<ul>"
"<li>Legates, D.R. and Willmott, C.J. 1989. Average Monthly Surface Air Temperature and "
@@ -188,30 +188,36 @@
"<a href=\"http://www.cru.uea.ac.uk/cru/data/hrg\">"
"http://www.cru.uea.ac.uk/cru/data/hrg</a></li></ul></p>")+
tr("<b>Street Map</b>")+
- tr("<p><i>OpenStreetMap</i><br>"
+ tr("<p><i>OpenStreetMap</i><br />"
"The street maps used in Marble via download are provided by the <a href=\""
"http://www.openstreetmap.org\">OpenStreetMap</a> Project (\"OSM\"). "
- "OSM is an open community which creates free editable maps."
+ "OSM is an open community which creates free editable maps.<br />"
"<i>License</i>: OpenStreetMap data can be used freely under the terms of the "
"<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
- "Creative Commons Attribution-ShareAlike 2.0license</a>.</p>")+
+ "Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>")+
+ tr("<p><i>OpenRouteService</i><br />"
+ "The routes used in Marble via download are provided by the <a href=\""
+ "http://www.openrouteservice.org\">OpenRouteService</a> Project (\"ORS\"). <br />"
+ "<i>License</i>: OpenRouteService data can be used freely under the terms of the "
+ "<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
+ "Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>")+
tr("<b>Cities and Locations</b>")+
- tr("<p><i>World Gazetteer</i><br>Stefan Helders "
+ tr("<p><i>World Gazetteer</i><br />Stefan Helders "
"<a href=\"http://www.world-gazetteer.com\">http://www.world-gazetteer.com</a></p>")+
- tr("<p><i>Geonames.org</i><br>"
+ tr("<p><i>Geonames.org</i><br />"
"<a href=\"http://www.geonames.org/\">http://www.geonames.org/</a>"
"<i>License</i>: Geonames.org data can be used freely under the terms of the "
"<a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>.</p>")+
- tr("<p><i>Czech Statistical Office</i><br>Public database "
+ tr("<p><i>Czech Statistical Office</i><br />Public database "
"<a href=\"http://www.czso.cz/eng/redakce.nsf/i/home\">http://www.czso.cz</a></p>")+
tr("<b>Flags</b>")+
- tr("<p><i>Flags of the World</i><br>The flags were taken from Wikipedia "
+ tr("<p><i>Flags of the World</i><br />The flags were taken from Wikipedia "
"(<a href=\"http://www.wikipedia.org\">http://www.wikipedia.org</a>) "
"which in turn took a subset from <a href=\"http://www.openclipart.org\">"
"http://www.openclipart.org</a> and reworked them. "
"All flags are under the public domain (see comments inside the svg files).</p>")+
tr("<b>Stars</b>")+
- tr("<p><i>The Bright Star Catalogue</i><br>5th Revised Ed. (Preliminary Version) "
+ tr("<p><i>The Bright Star Catalogue</i><br />5th Revised Ed. (Preliminary Version) "
"Hoffleit D., Warren Jr W.H., Astronomical Data Center, NSSDC/ADC (1991)"
"<a href=\"http://adc.gsfc.nasa.gov/adc-cgi/cat.pl?/catalogs/5/5050\"> "
"http://adc.gsfc.nasa.gov</a></p>") );
More information about the Marble-commits
mailing list