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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-05-19 08:51:03 +0000
3+++ CMakeLists.txt 2011-05-19 09:37:43 +0000
4@@ -1,6 +1,7 @@
5 ADD_SUBDIRECTORY( aztec )
6 ADD_SUBDIRECTORY( chinese )
7 ADD_SUBDIRECTORY( egyptian )
8+ADD_SUBDIRECTORY( inca )
9 ADD_SUBDIRECTORY( inuit )
10 ADD_SUBDIRECTORY( korean )
11 ADD_SUBDIRECTORY( lakota )
12
13=== added directory 'inca'
14=== added file 'inca/CMakeLists.txt'
15--- inca/CMakeLists.txt 1970-01-01 00:00:00 +0000
16+++ inca/CMakeLists.txt 2011-05-19 09:37:43 +0000
17@@ -0,0 +1,4 @@
18+
19+########### install files ###############
20+
21+INSTALL(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)
22
23=== added file 'inca/baby.png'
24Binary files inca/baby.png 1970-01-01 00:00:00 +0000 and inca/baby.png 2011-05-19 09:37:43 +0000 differ
25=== added file 'inca/constellation_names.eng.fab'
26--- inca/constellation_names.eng.fab 1970-01-01 00:00:00 +0000
27+++ inca/constellation_names.eng.fab 2011-05-19 09:37:43 +0000
28@@ -0,0 +1,8 @@
29+001 "Mama Llama" _("Mama Llama")
30+002 "Baby Llama" _("Baby Llama")
31+003 "Toad" _("Toad")
32+004 "Quail" _("Quail")
33+005 "Quail" _("Quail")
34+006 "Fox" _("Fox")
35+007 "Herder" _("Herder")
36+008 "Snake" _("Snake")
37
38=== added file 'inca/constellationsart.fab'
39--- inca/constellationsart.fab 1970-01-01 00:00:00 +0000
40+++ inca/constellationsart.fab 2011-05-19 09:37:43 +0000
41@@ -0,0 +1,10 @@
42+001 lama.png 1 1 71665 1024 1 63802 1 300 76001
43+002 baby.png 1 512 87389 1 1 86551 512 512 79790
44+003 toad.png 174 23 56069 485 233 53210 325 473 53787
45+004 quail1.png 464 312 60601 224 21 62732 105 207 64737
46+005 quail2.png 271 58 90135 422 130 90096 61 97 90967
47+006 fox.png 426 275 84551 55 229 86744 138 465 86892
48+007 herder.png 1 1 84792 512 1 83541 1 512 89630
49+008 snake.png 53 16 46594 313 192 43473 465 498 38120
50+
51+
52
53=== added file 'inca/constellationship.fab'
54--- inca/constellationship.fab 1970-01-01 00:00:00 +0000
55+++ inca/constellationship.fab 2011-05-19 09:37:43 +0000
56@@ -0,0 +1,8 @@
57+001 1 76829 76829
58+002 1 85162 85162
59+003 1 54574 54574
60+004 1 60601 60601
61+005 1 90135 90135
62+006 1 84551 84551
63+007 1 84970 84970
64+008 1 46594 46594
65
66=== added file 'inca/description.en.utf8'
67--- inca/description.en.utf8 1970-01-01 00:00:00 +0000
68+++ inca/description.en.utf8 2011-05-19 09:37:43 +0000
69@@ -0,0 +1,11 @@
70+<h2>Inca</h2>
71+<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>
72+
73+<h3>External links</h3>
74+<ul>
75+<li><a href="http://en.wikipedia.org/wiki/Inca_civilization" class='external text'>Inca civilization</a> article at Wikipedia</li>
76+<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>
77+</ul>
78+
79+<h3>Author</h3>
80+<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>
81
82=== added file 'inca/description.ru.utf8'
83--- inca/description.ru.utf8 1970-01-01 00:00:00 +0000
84+++ inca/description.ru.utf8 2011-05-19 09:37:43 +0000
85@@ -0,0 +1,12 @@
86+<h2>Инков</h2>
87+<p>Ночное небо инков ни на что не похоже. Созвездия у инков могли вообще не содержать ни одной звезды&nbsp;&mdash; созвездия светлых и тёмных облаков.</p>
88+
89+<h3>Внешние ссылки</h3>
90+<ul>
91+<li><a href="http://en.wikipedia.org/wiki/Inca_civilization" class='external text'>Цивилизация инков</a> &mdash; английская статья в Википедии</li>
92+<li><a href="http://ru.wikipedia.org/wiki/Империя_Инков" class='external text'>Империя Инков</a> &mdash; русская статья в Википедии</li>
93+<li><a href="http://www.astronomy.pomona.edu/archeo/andes/inca.nightsky.html" class='external text'>Представление инков о ночном небе: звёзды, созвездия и тёмные облака</a></li>
94+</ul>
95+
96+<h3>Автор</h3>
97+<p>Изображения нарисованы <em>Мэдэлин Эбачер (Madeleine Ebacher)</em> для Digitalis Education Solutions, Inc., в 2010 г. Эту культуру неба перенёс из Nightshade и модифицировал <em>Александр Вольф (Alexander Wolf)</em>.</p>
98
99=== added file 'inca/fox.png'
100Binary files inca/fox.png 1970-01-01 00:00:00 +0000 and inca/fox.png 2011-05-19 09:37:43 +0000 differ
101=== added file 'inca/herder.png'
102Binary files inca/herder.png 1970-01-01 00:00:00 +0000 and inca/herder.png 2011-05-19 09:37:43 +0000 differ
103=== added file 'inca/info.ini'
104--- inca/info.ini 1970-01-01 00:00:00 +0000
105+++ inca/info.ini 2011-05-19 09:37:43 +0000
106@@ -0,0 +1,4 @@
107+[info]
108+name = Inca
109+credit = Artwork by Madeleine Ebacher, created for Digitalis Education Solutions, Inc., 2010
110+license = Distributed under GPLv3+ license.
111
112=== added file 'inca/lama.png'
113Binary files inca/lama.png 1970-01-01 00:00:00 +0000 and inca/lama.png 2011-05-19 09:37:43 +0000 differ
114=== added file 'inca/quail1.png'
115Binary files inca/quail1.png 1970-01-01 00:00:00 +0000 and inca/quail1.png 2011-05-19 09:37:43 +0000 differ
116=== added file 'inca/quail2.png'
117Binary files inca/quail2.png 1970-01-01 00:00:00 +0000 and inca/quail2.png 2011-05-19 09:37:43 +0000 differ
118=== added file 'inca/snake.png'
119Binary files inca/snake.png 1970-01-01 00:00:00 +0000 and inca/snake.png 2011-05-19 09:37:43 +0000 differ
120=== added file 'inca/star_names.fab'
121--- inca/star_names.fab 1970-01-01 00:00:00 +0000
122+++ inca/star_names.fab 2011-05-19 09:37:43 +0000
123@@ -0,0 +1,1 @@
124+ 32349|_("Hatun Coyllur")
125
126=== added file 'inca/toad.png'
127Binary 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