Stellarium Skycultures

Merge lp:~alexwolf/stellarium-skycultures/inca into lp:stellarium-skycultures

  1. inca
  2. Merge into trunk
Proposed by Alexander Wolf
Status: Merged
Approved by: Alexander Wolf
Approved revision: 2
Merge reported by: Alexander Wolf
Merged at revision: not available
Proposed branch: lp:~alexwolf/stellarium-skycultures/inca
Merge into: lp:stellarium-skycultures
Diff against target: 127 lines (+59/-0)
9 files modified
CMakeLists.txt (+1/-0)
inca/CMakeLists.txt (+4/-0)
inca/constellation_names.eng.fab (+8/-0)
inca/constellationsart.fab (+10/-0)
inca/constellationship.fab (+8/-0)
inca/description.en.utf8 (+11/-0)
inca/description.ru.utf8 (+12/-0)
inca/info.ini (+4/-0)
inca/star_names.fab (+1/-0)
To merge this branch: bzr merge lp:~alexwolf/stellarium-skycultures/inca
Reviewer Review Type Date Requested Status
Alexander Wolf Approve
Review via email: mp+61522@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2011-05-19 08:51:03 +0000
+++ CMakeLists.txt 2011-05-19 09:37:43 +0000
@@ -1,6 +1,7 @@
1ADD_SUBDIRECTORY( aztec )1ADD_SUBDIRECTORY( aztec )
2ADD_SUBDIRECTORY( chinese ) 2ADD_SUBDIRECTORY( chinese )
3ADD_SUBDIRECTORY( egyptian ) 3ADD_SUBDIRECTORY( egyptian )
4ADD_SUBDIRECTORY( inca )
4ADD_SUBDIRECTORY( inuit ) 5ADD_SUBDIRECTORY( inuit )
5ADD_SUBDIRECTORY( korean ) 6ADD_SUBDIRECTORY( korean )
6ADD_SUBDIRECTORY( lakota ) 7ADD_SUBDIRECTORY( lakota )
78
=== added directory 'inca'
=== added file 'inca/CMakeLists.txt'
--- inca/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ inca/CMakeLists.txt 2011-05-19 09:37:43 +0000
@@ -0,0 +1,4 @@
1
2########### install files ###############
3
4INSTALL(FILES info.ini constellation_names.eng.fab constellationsart.fab constellationship.fab star_names.fab description.en.utf8 description.ru.utf8 baby.png fox.png quail1.png quail2.png snake.png toad.png herder.png lama.png DESTINATION share/${PACKAGE}/skycultures/inca)
05
=== added file 'inca/baby.png'
1Binary files inca/baby.png 1970-01-01 00:00:00 +0000 and inca/baby.png 2011-05-19 09:37:43 +0000 differ6Binary files inca/baby.png 1970-01-01 00:00:00 +0000 and inca/baby.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/constellation_names.eng.fab'
--- inca/constellation_names.eng.fab 1970-01-01 00:00:00 +0000
+++ inca/constellation_names.eng.fab 2011-05-19 09:37:43 +0000
@@ -0,0 +1,8 @@
1001 "Mama Llama" _("Mama Llama")
2002 "Baby Llama" _("Baby Llama")
3003 "Toad" _("Toad")
4004 "Quail" _("Quail")
5005 "Quail" _("Quail")
6006 "Fox" _("Fox")
7007 "Herder" _("Herder")
8008 "Snake" _("Snake")
09
=== added file 'inca/constellationsart.fab'
--- inca/constellationsart.fab 1970-01-01 00:00:00 +0000
+++ inca/constellationsart.fab 2011-05-19 09:37:43 +0000
@@ -0,0 +1,10 @@
1001 lama.png 1 1 71665 1024 1 63802 1 300 76001
2002 baby.png 1 512 87389 1 1 86551 512 512 79790
3003 toad.png 174 23 56069 485 233 53210 325 473 53787
4004 quail1.png 464 312 60601 224 21 62732 105 207 64737
5005 quail2.png 271 58 90135 422 130 90096 61 97 90967
6006 fox.png 426 275 84551 55 229 86744 138 465 86892
7007 herder.png 1 1 84792 512 1 83541 1 512 89630
8008 snake.png 53 16 46594 313 192 43473 465 498 38120
9
10
011
=== added file 'inca/constellationship.fab'
--- inca/constellationship.fab 1970-01-01 00:00:00 +0000
+++ inca/constellationship.fab 2011-05-19 09:37:43 +0000
@@ -0,0 +1,8 @@
1001 1 76829 76829
2002 1 85162 85162
3003 1 54574 54574
4004 1 60601 60601
5005 1 90135 90135
6006 1 84551 84551
7007 1 84970 84970
8008 1 46594 46594
09
=== added file 'inca/description.en.utf8'
--- inca/description.en.utf8 1970-01-01 00:00:00 +0000
+++ inca/description.en.utf8 2011-05-19 09:37:43 +0000
@@ -0,0 +1,11 @@
1<h2>Inca</h2>
2<p>The night sky of Incas not similar on anything else. Constellations of the Incas could not contain any of the stars&nbsp;&mdash; a constellations of light and dark clouds.</p>
3
4<h3>External links</h3>
5<ul>
6<li><a href="http://en.wikipedia.org/wiki/Inca_civilization" class='external text'>Inca civilization</a> article at Wikipedia</li>
7<li><a href="http://www.astronomy.pomona.edu/archeo/andes/inca.nightsky.html" class='external text'>The Incan View of the Night Sky: Stars, Constellations, and Dark Clouds</a></li>
8</ul>
9
10<h3>Author</h3>
11<p>Artwork by <em>Madeleine Ebacher</em>, created for Digitalis Education Solutions, Inc., 2010. This sky culture was ported from Nightshade and modified by <em>Alexander Wolf</em>.</p>
012
=== added file 'inca/description.ru.utf8'
--- inca/description.ru.utf8 1970-01-01 00:00:00 +0000
+++ inca/description.ru.utf8 2011-05-19 09:37:43 +0000
@@ -0,0 +1,12 @@
1<h2>Инков</h2>
2<p>Ночное небо инков ни на что не похоже. Созвездия у инков могли вообще не содержать ни одной звезды&nbsp;&mdash; созвездия светлых и тёмных облаков.</p>
3
4<h3>Внешние ссылки</h3>
5<ul>
6<li><a href="http://en.wikipedia.org/wiki/Inca_civilization" class='external text'>Цивилизация инков</a> &mdash; английская статья в Википедии</li>
7<li><a href="http://ru.wikipedia.org/wiki/Империя_Инков" class='external text'>Империя Инков</a> &mdash; русская статья в Википедии</li>
8<li><a href="http://www.astronomy.pomona.edu/archeo/andes/inca.nightsky.html" class='external text'>Представление инков о ночном небе: звёзды, созвездия и тёмные облака</a></li>
9</ul>
10
11<h3>Автор</h3>
12<p>Изображения нарисованы <em>Мэдэлин Эбачер (Madeleine Ebacher)</em> для Digitalis Education Solutions, Inc., в 2010 г. Эту культуру неба перенёс из Nightshade и модифицировал <em>Александр Вольф (Alexander Wolf)</em>.</p>
013
=== added file 'inca/fox.png'
1Binary files inca/fox.png 1970-01-01 00:00:00 +0000 and inca/fox.png 2011-05-19 09:37:43 +0000 differ14Binary files inca/fox.png 1970-01-01 00:00:00 +0000 and inca/fox.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/herder.png'
2Binary files inca/herder.png 1970-01-01 00:00:00 +0000 and inca/herder.png 2011-05-19 09:37:43 +0000 differ15Binary files inca/herder.png 1970-01-01 00:00:00 +0000 and inca/herder.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/info.ini'
--- inca/info.ini 1970-01-01 00:00:00 +0000
+++ inca/info.ini 2011-05-19 09:37:43 +0000
@@ -0,0 +1,4 @@
1[info]
2name = Inca
3credit = Artwork by Madeleine Ebacher, created for Digitalis Education Solutions, Inc., 2010
4license = Distributed under GPLv3+ license.
05
=== added file 'inca/lama.png'
1Binary files inca/lama.png 1970-01-01 00:00:00 +0000 and inca/lama.png 2011-05-19 09:37:43 +0000 differ6Binary files inca/lama.png 1970-01-01 00:00:00 +0000 and inca/lama.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/quail1.png'
2Binary files inca/quail1.png 1970-01-01 00:00:00 +0000 and inca/quail1.png 2011-05-19 09:37:43 +0000 differ7Binary files inca/quail1.png 1970-01-01 00:00:00 +0000 and inca/quail1.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/quail2.png'
3Binary files inca/quail2.png 1970-01-01 00:00:00 +0000 and inca/quail2.png 2011-05-19 09:37:43 +0000 differ8Binary files inca/quail2.png 1970-01-01 00:00:00 +0000 and inca/quail2.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/snake.png'
4Binary files inca/snake.png 1970-01-01 00:00:00 +0000 and inca/snake.png 2011-05-19 09:37:43 +0000 differ9Binary files inca/snake.png 1970-01-01 00:00:00 +0000 and inca/snake.png 2011-05-19 09:37:43 +0000 differ
=== added file 'inca/star_names.fab'
--- inca/star_names.fab 1970-01-01 00:00:00 +0000
+++ inca/star_names.fab 2011-05-19 09:37:43 +0000
@@ -0,0 +1,1 @@
1 32349|_("Hatun Coyllur")
02
=== added file 'inca/toad.png'
1Binary files inca/toad.png 1970-01-01 00:00:00 +0000 and inca/toad.png 2011-05-19 09:37:43 +0000 differ3Binary files inca/toad.png 1970-01-01 00:00:00 +0000 and inca/toad.png 2011-05-19 09:37:43 +0000 differ

Subscribers

People subscribed via source and target branches