Merge lp:~stellarium/stellarium/gz_constellations-allow-nativeName into lp:stellarium

[Alexander Wolf]

Enabled switching sky culture language in the GUI.
Allowed alternatively display of constellation abbreviations or nativeName.
Corrected adherence to sky culture language for stars and planets.
Added solid rework of lightweight (correctly art-free) H.A.Rey sky culture.

[Alexander Wolf (alexwolf)]

SolarSystem should has both translators - one for standard GUI strings, and one for names. Plus you should split src/translations.h file to 2 separate files.

review: Needs Fixing

[Alexander Wolf (alexwolf)]

Oops... This is more correct phrase:

SolarSystem should contains the both translators - one for standard GUI strings, and one for names. Plus you should split src/translations.h file to 2 separate files.

[Alexander Wolf (alexwolf)]

src/gui/viewDialog.ui has conflicts

review: Needs Fixing

[gzotti (georg-zotti)]

Sorry, please explain further.

1) Where are planet/solarsystem names used in the GUI?

2) How and why should I split translations.h?

G.

On So, 23.11.2014, 15:52, Alexander Wolf wrote:
> Review: Needs Fixing
>
> SolarSystem should has both translators - one for standard GUI strings,
> and one for names. Plus you should split src/translations.h file to 2
> separate files.

[Alexander Wolf (alexwolf)]

OK.

The proper names of the objects of Solar system is stored in src/translations.h file - if you want use this names in SkyCultureTranslator you should enable this file in po/stellarium-skycultures/POTFILES.in file. But src/translations.h file contains geographical locations, scripts names, landscapes, etc. also - it should be split to 2 separate files - one file with celestial objects from Solar system, and one file for other strings. Next point can be got from one simple question - how Stellarium will translate info in left top corner? And a final point - some starlore may contain a native names for planets.

[Alexander Wolf (alexwolf)]

Oh! Don't forget - the planet names also used in the Locations dialog - it should use the both translators too.

[gzotti (georg-zotti)]

Looks like I needed more understanding of the translation system... I was not aware these are also separated in the collection of words. :-0 Thanks for pointing that out, it explains english planet names on screen...

Is it OK to have planet names in translation.h and translation_planet.h? Or extract the planet names into a separate translation_planet.h and include translation.h and translation_planet.h in po/stellarium/POTFILES.in, and include only translation_planet.h in po/stellarium-skycultures/POTFILES.in ?

For the case where a skyculture brings its own planet names, do you think a file <skyculturename>/planet_names.fab and some QMap(englishName, nativeName) in SkyCultureMgr can help?
I think this just adheres to planets and the Moon, sorry for comets and minor bodies.
Of course, then there is a handful of deepsky objects which may have proper names (Pleiades, eta Car, coalsack?), but these names can be linked to HIP stars.

For the object label indeed there may be need for some special case. For now, I think just App language is OK, as usually orig. name is visible on screen as well.

[Alexander Wolf (alexwolf)]

>Is it OK to have planet names in translation.h and translation_planet.h? Or extract the planet names into a separate translation_planet.h and include translation.h and translation_planet.h in po/stellarium/POTFILES.in, and include only translation_planet.h in po/stellarium-skycultures/POTFILES.in ?

No, po/stellarium/POTFILES.in should contains translation.h only, po/stellarium-skycultures/POTFILES.in should contains translations_skycultures.h only.

SolarSystem, Planet, MinorPlanet, Comet, Supernova and LocationDialog should use SkyTranslator for names of celestial bodies, and AppStelTranslator for other strings.

P.S. N_("Tycho's Supernova"); should be contains in both *.h file - in translation.h as script name and in translations_skycultures.h as celestial object name

> For the case where a skyculture brings its own planet names, do you think a file <skyculturename>/planet_names.fab and some QMap(englishName, nativeName) in SkyCultureMgr can help?

I think it will be more complicated, because planet names should be translated within SolarSystem and Planet classes. Yes, if some <skyculturename> has planet_names.fab file then info from this file should be use for names. Format of file... englishName nativeName _("nativeName") X, where X can be 0, -1 or 1 - 0 for outer planets, -1 for evening visibility of inner planets, 1 for morning visibility of inner planets?

[gzotti (georg-zotti)]

OK, I changed ownership on this to stellarium team and switched state back to "Development". If you find time, can you maybe help me on this to get the split right? I may not be able to do much until next weekend. I hope it's clear what I want to achieve (see also branch description): properly working language split for GUI (including upper-left text for selected object) and labels shown in the sky display, with those labels even optionally showing untranslated names or abbreviations. It seems in parts to be a reawakening/completion job of a clever feature started some time ago by somebody else (split language).

The planet_names.fab extra on 0/-1/1 is also a good idea!

[Alexander Wolf (alexwolf)]

Hm. How I can a fast determine type of visibility of inner planets?

[gzotti (georg-zotti)]

do you mean evening/morning appearance? simply planet_longitude-solar_longitude ?
(maybe test sign(sin(planet_longitude-solar_longitude)) )

[Alexander Wolf (alexwolf)]

I think this feature is ready for testing.

planet_names.fab format:
englishName<--space/tab-->"nativeName"<--space/tab-->_("nativeName")

Boorong, Tongan and Mongolian cultures supported it already =)

[lp:~stellarium/stellarium/gz_constellations-allow-nativeName]

7160. By Alexander Wolf on 2014-11-26

typo fix

7161. By Alexander Wolf on 2014-11-26

typo fix

7162. By gzotti on 2014-11-26

typofixes and new translation in skycultures

7163. By gzotti on 2014-11-26

fixed comment

7164. By gzotti on 2014-11-26

added comment

[gzotti (georg-zotti)]

Very nice, thank you!

There is a file planet_names.native.fab in boorong skyculture dir. Is this a leftover from intermediate tries? Actually in the current way of thinking I think this should be planet_names.fab, and the other I think should go away.

I think now we need the translated strings before fine tuning of which strings go where may be applied, e.g. maybe a selected object should better have native+translated in top-left display? But the translation may contain the original in the first place already...

Did you manage to get the morning/evening different names - I cannot see it. (but can be added later, I think)

And all of this needs a good description in the user guide wiki. I can do that.

review: Approve

[Alexander Wolf (alexwolf)]

>There is a file planet_names.native.fab in boorong skyculture dir. Is this a leftover from intermediate tries? Actually in the current way of thinking I think this should be planet_names.fab, and the other I think should go away.

I made two version of planet_names.fab because I don't know which version should be use by default.

>Did you manage to get the morning/evening different names - I cannot see it. (but can be added later, I think)

I removed it, because:
1) we don't have cultures with two names for one planet
2) this feature will be generate many calls for setting native name and translation those names - I really don't like it.

>And all of this needs a good description in the user guide wiki. I can do that.

It will be very nice!

Maybe we should introduce new option for sky cultures manager to make available to users of usage previous behaviour for planet names?

[Alexander Wolf (alexwolf)]

review: Abstain

=== modified file 'plugins/Supernovae/src/Supernova.cpp'
--- plugins/Supernovae/src/Supernova.cpp	2014-11-08 20:24:59 +0000
+++ plugins/Supernovae/src/Supernova.cpp	2014-11-26 23:45:42 +0000
@@ -86,8 +86,9 @@
 QString Supernova::getNameI18n(void) const
 {
 	QString name = designation;
+	const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
 	if (note.size()!=0)
-		name = QString("%1 (%2)").arg(name).arg(q_(note));
+		name = QString("%1 (%2)").arg(name).arg(trans.qtranslate(note));
 
 	return name;
 }
@@ -96,7 +97,7 @@
 {
 	QString name = designation;
 	if (note.size()!=0)
-		name = QString("%1 (%2)").arg(name).arg(note);
+		name = QString("%1 (%2)").arg(name).arg(note);	
 
 	return name;
 }
@@ -119,11 +120,7 @@
 
 	if (flags&Name)
 	{
-		oss << "<h2>" << designation;
-		if (note.size()!=0)
-		    oss << " (" << q_(note) << ")";
-		
-		oss << "</h2>";
+		oss << "<h2>" << getNameI18n() << "</h2>";
 	}
 
 	if (flags&ObjectType)

=== modified file 'po/stellarium-skycultures/CMakeLists.txt'
--- po/stellarium-skycultures/CMakeLists.txt	2014-05-04 12:54:32 +0000
+++ po/stellarium-skycultures/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -9,7 +9,9 @@
 		${GETTEXT_XGETTEXT_EXECUTABLE}
 			-o stellarium-skycultures.pot
 			--keyword=_
+			--keyword=N_
 			-C
+			--add-comments=TRANSLATORS:
 			--directory=${PROJECT_SOURCE_DIR}
 			--files-from=POTFILES.in
 			--copyright-holder=Stellarium's\ team

=== modified file 'po/stellarium-skycultures/POTFILES.in'
--- po/stellarium-skycultures/POTFILES.in	2014-09-08 14:18:01 +0000
+++ po/stellarium-skycultures/POTFILES.in	2014-11-26 23:45:42 +0000
@@ -1,10 +1,15 @@
+# Proper names of celestial bodies
+src/translations_skycultures.h
+# Proper names of deep-sky objects
 nebulae/default/ngc2000names.dat
+# Sky cultures (include proper names of the stars)
 skycultures/arabic/constellation_names.eng.fab
 skycultures/arabic/star_names.fab
 skycultures/aztec/constellation_names.eng.fab
 skycultures/aztec/star_names.fab
 skycultures/boorong/constellation_names.eng.fab
 skycultures/boorong/star_names.fab
+skycultures/boorong/planet_names.fab
 skycultures/chinese/constellation_names.eng.fab
 skycultures/chinese/star_names.fab
 skycultures/egyptian/constellation_names.eng.fab
@@ -21,6 +26,7 @@
 skycultures/maori/star_names.fab
 skycultures/mongolian/constellation_names.eng.fab
 skycultures/mongolian/star_names.fab
+skycultures/mongolian/planet_names.fab
 skycultures/navajo/constellation_names.eng.fab
 skycultures/navajo/star_names.fab
 skycultures/norse/constellation_names.eng.fab
@@ -33,7 +39,10 @@
 skycultures/sami/star_names.fab
 skycultures/tongan/constellation_names.eng.fab
 skycultures/tongan/star_names.fab
+skycultures/tongan/planet_names.fab
 skycultures/tupi/constellation_names.eng.fab
 skycultures/tupi/star_names.fab
 skycultures/western/constellation_names.eng.fab
 skycultures/western/star_names.fab
+skycultures/western_rey/constellation_names.eng.fab
+skycultures/western_rey/star_names.fab

=== modified file 'skycultures/CMakeLists.txt'
--- skycultures/CMakeLists.txt	2014-09-08 14:18:01 +0000
+++ skycultures/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -17,3 +17,4 @@
 ADD_SUBDIRECTORY( tongan ) 
 ADD_SUBDIRECTORY( tupi ) 
 ADD_SUBDIRECTORY( western ) 
+ADD_SUBDIRECTORY( western_rey ) 

=== modified file 'skycultures/boorong/CMakeLists.txt'
--- skycultures/boorong/CMakeLists.txt	2014-09-08 14:18:01 +0000
+++ skycultures/boorong/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -1,12 +1,13 @@
 
 ########### install files ###############
 
-# install info.ini and star_names.fab
-INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/boorong )
+# install info.ini
+INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/boorong )
 
-# install constellations data, artwork and descriptions
+# install constellations data, proper names data, artwork and descriptions
 INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/boorong
 	FILES_MATCHING PATTERN "constellation*" 
+	PATTERN "*_names.fab" 
 	PATTERN "*.png" 
 	PATTERN "description.*.utf8" 
 	PATTERN "CMakeFiles" EXCLUDE )

=== added file 'skycultures/boorong/planet_names.fab'
--- skycultures/boorong/planet_names.fab	1970-01-01 00:00:00 +0000
+++ skycultures/boorong/planet_names.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,9 @@
+# TRANSLATORS: Native name of the Sun in Boorong culture (in English words)
+Sun	"Day"	_("Day")
+# TRANSLATORS: Native name of the Moon in Boorong culture (in English words)
+Moon	"Quoll"	_("Quoll")
+# TRANSLATORS: Native name of Venus in Boorong culture (in English words)
+Venus	"Elder sister"	_("Elder sister")
+# TRANSLATORS: Native name of Jupiter in Boorong culture (in English words)
+Jupiter	"Sulphur-crested white cockatoo"	_("Sulphur-crested white cockatoo")
+

=== added file 'skycultures/boorong/planet_names.native.fab'
--- skycultures/boorong/planet_names.native.fab	1970-01-01 00:00:00 +0000
+++ skycultures/boorong/planet_names.native.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,8 @@
+# TRANSLATORS: Native name of the Sun in Boorong culture
+Sun	"Gnowee"	_("Gnowee")
+# TRANSLATORS: Native name of the Moon in Boorong culture
+Moon	"Mityan"	_("Mityan")
+# TRANSLATORS: Native name of Venus in Boorong culture
+Venus	"Chargee Gnowee"	_("Chargee Gnowee")
+# TRANSLATORS: Native name of Jupiter in Boorong culture
+Jupiter	"Ginabongbearp"	_("Ginabongbearp")

=== modified file 'skycultures/inuit/constellation_names.eng.fab'
--- skycultures/inuit/constellation_names.eng.fab	2010-04-21 16:57:58 +0000
+++ skycultures/inuit/constellation_names.eng.fab	2014-11-26 23:45:42 +0000
@@ -1,11 +1,11 @@
-001	"" _("Two Sunbeams")
-002	"" _("Two Placed Far Apart")
-003	"" _("Dogs")
-004	"" _("Collarbones")
-005	"" _("Lamp Stand")
-006	"" _("Caribou")
-007	"" _("Two in Front")
-008	"" _("Breastbone")
-009	"" _("Runners")
-010	"" _("Blubber Container")
-011	"" _("The One Behind")
+001	"Aagjuuk" _("Two Sunbeams")
+002	"Akkuttujuuk" _("Two Placed Far Apart")
+003	"Qimmiitt" _("Dogs")
+004	"Quturjuuk" _("Collarbones")
+005	"Pituaq" _("Lamp Stand")
+006	"Tukturjuit" _("Caribou")
+007	"Sivulliik" _("Two in Front")
+008	"Sakiattiak" _("Breastbone")
+009	"Ullaktut" _("Runners")
+010	"Uqsuutaattiaq" _("Blubber Container")
+011	"Kingulliq" _("The One Behind")

=== modified file 'skycultures/mongolian/CMakeLists.txt'
--- skycultures/mongolian/CMakeLists.txt	2014-10-21 10:13:05 +0000
+++ skycultures/mongolian/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -1,12 +1,13 @@
 
 ########### install files ###############
 
-# install info.ini and star_names.fab
-INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/mongolian )
+# install info.ini
+INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/mongolian )
 
-# install constellations data, artwork and descriptions
+# install constellations data, proper names data, artwork and descriptions
 INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/mongolian
 	FILES_MATCHING PATTERN "constellation*" 
+	PATTERN "*_names.fab" 
 	PATTERN "*.png" 
 	PATTERN "description.*.utf8" 
 	PATTERN "CMakeFiles" EXCLUDE )

=== added file 'skycultures/mongolian/planet_names.fab'
--- skycultures/mongolian/planet_names.fab	1970-01-01 00:00:00 +0000
+++ skycultures/mongolian/planet_names.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,22 @@
+# TRANSLATORS: Native name of the Sun in Mongolian culture
+Sun	"Nar"	_("Nar")
+# TRANSLATORS: Native name of the Moon in Mongolian culture
+Moon	"Sar"	_("Sar")
+# TRANSLATORS: Native name of Mercury in Mongolian culture
+Mercury	"Bud"	_("Bud")
+# TRANSLATORS: Native name of Venus in Mongolian culture
+Venus	"Sugar"	_("Sugar")
+# TRANSLATORS: Native name of Earth in Mongolian culture
+Earth	"Delkhii"	_("Delkhii")
+# TRANSLATORS: Native name of Mars in Mongolian culture
+Mars	"Angarag"	_("Angarag")
+# TRANSLATORS: Native name of Jupiter in Mongolian culture
+Jupiter	"Barhasbadi"	_("Barhasbadi")
+# TRANSLATORS: Native name of Saturn in Mongolian culture
+Saturn	"Sanchir"	_("Sanchir")
+# TRANSLATORS: Native name of Uranus in Mongolian culture
+Uranus	"Tengeriin-van"	_("Tengeriin-van")
+# TRANSLATORS: Native name of Neptune in Mongolian culture
+Neptune	"Dalai-van"	_("Dalai-van")
+# TRANSLATORS: Native name of Pluto in Mongolian culture
+Pluto	"Dalkhii-van"	_("Dalkhii-van")

=== modified file 'skycultures/polynesian/constellation_names.eng.fab'
--- skycultures/polynesian/constellation_names.eng.fab	2008-04-28 23:18:57 +0000
+++ skycultures/polynesian/constellation_names.eng.fab	2014-11-26 23:45:42 +0000
@@ -1,3 +1,4 @@
+# The native names are missing. Please fill the second column with an english transcript.
 001	"" _("Bailer")
 002	"" _("Cat's Cradle")
 004	"" _("Voice of Joy")

=== modified file 'skycultures/tongan/CMakeLists.txt'
--- skycultures/tongan/CMakeLists.txt	2013-04-24 06:43:39 +0000
+++ skycultures/tongan/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -1,12 +1,13 @@
 
 ########### install files ###############
 
-# install info.ini and star_names.fab
-INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/tongan )
+# install info.ini
+INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/tongan )
 
-# install constellations data, artwork and descriptions
+# install constellations data, proper names data, artwork and descriptions
 INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/tongan
 	FILES_MATCHING PATTERN "constellation*" 
+	PATTERN "*_names.fab" 
 	PATTERN "*.png" 
 	PATTERN "description.*.utf8" 
 	PATTERN "CMakeFiles" EXCLUDE )

=== added file 'skycultures/tongan/description.de.utf8'
--- skycultures/tongan/description.de.utf8	1970-01-01 00:00:00 +0000
+++ skycultures/tongan/description.de.utf8	2014-11-26 23:45:42 +0000
@@ -0,0 +1,94 @@
+<h2>Tongaisch (Tonga)</h2>
+
+<p>Wie alle polynesischen Himmelsmythen geht auch die Tongaische
+Sternbildkultur aus der praktischen Anwendung der astronomischen
+Navigation hervor. In einigen Fällen kann zwischen einem Stern und
+seinem Sternbilderzug nicht unterschieden werden. Ein Stern kann mehrere Namen tragen, 
+<ol>
+<li>wenn er Mitglied in mehreren Sternbilderzügen ist</li>
+<li>je nachdem, auf welcher Inselgruppe man nach seinem Namen fragt.</li>
+</ol>
+Die Bezeichnung der Sterne hier ist mangels Ressourcen für
+umfassendere Recherche nur eine ungefähre Übersicht.</p>
+
+<p>Während die bekanntesten und auffälligsten Sterne und Sternbilder
+(z.B. Orion, Plejaden, Kreuz) in der Tongaischen Bilderwelt vorkommen,
+gibt es zwei bemerkenswerte Ausnahmen: 
+
+<ol><li>Auffällig ist das Fehlen eines Namens für den Polarstern
+(Polaris: &alpha; UMi). Das ist angesichts der geringen Südbreite doch
+erstaunlich, wäre doch bei Fahrten über den Äquator dieser Stern an
+siener prominenten Stelle aufgefallen. </li>
+
+<li>Das Sternbild Skorpion bzw. Teile daraus sind in den Bilder der
+Tongaer nicht enthalten.  Das ist überraschend, kommt doch in den
+meisten Sternbildkulturen &ndash; global und polynesisch &ndash; der
+Skorpion als wichtiges Sternbild vor, da es einfach identifiziert werden
+kann und auch, da es dem Orion fast genau gegenübersteht. </li>
+</ol>[Stellarium wüßte gerne mehr über dieses Fehlen der Objekte.]</p>
+
+<p>Ein gemeinsamer Ursprung der polynesischen Sterngeschichten zeigt
+sich klar in Ähnlichkeiten in der Bezeichnung der Sterne. Zum Beispiel
+heißen die Plejaden <em>Mataliki</em> auf Tongaisch, <em>Matariki</em>
+auf Maori und <em>Makali`i</em> auf Hawaiianisch.  </p>
+
+<h3>Literatur</h3>
+<ul>
+<li>Velt Kik, <em>Ko E Ngaahi fetu'u 'o, Stars over tonga</em>,  1990 
+'Atenisi University, Nuku'alofa , Tonga Government printing department.</li>
+<li>T.H Fale, <em>Tongan astronomy</em>,  1990
+Polynesian Eyes foundation, Nuku'alofa, Tonga
+Choice printing.</li>
+<li>E. E. V. Collocott, <em>Tongan astronomy and calendar</em>, 1992
+Occasional Papers of the Bernice Pauahi Bishop Museum of
+Polynesian ethnology and Natural History, Vol.8, No. 4
+Honolulu, Hawaii, Bishop Museum Press 1922, p. 157-173. </li>
+</ul>
+
+<h3>Nomenklatur</h3>
+<table class="nomenclature">
+<tr><th>Tongaischer Begriff</th><th>Bedeutung</th></tr>
+<tr><td>Humu</td><td>Kohlensack</td></tr>
+<tr><td>Kaniva</td><td>Milchstraße</td></tr>
+<tr><td>Ma'afulele</td><td>Große Magellan'sche Wolke</td></tr>
+<tr><td>Ma'afutoka</td><td>Kleine Magellan'sche Wolke</td></tr>
+<tr><td>'otu Ma'afu</td><td>Magellan'sche Wolken (beide)</td></tr>
+<tr><td>Ha'amonga</td><td>Ekliptik</td></tr>
+<tr><td>Mahina</td><td>Mond</td></tr>
+<tr><td>La'a</td><td>Sonne</td></tr>
+<tr><td>Fetu'u</td><td>Stern (allgemein)</td></tr>
+<tr><td>Fetu'ufuka</td><td>Komet</td></tr>
+<tr><td>'Umata</td><td>Regenbogen</td></tr>
+<tr><td>Fetu'u'Esiafi</td><td>Sternschnuppe</td></tr>
+<tr><td>tapukitea</td><td>Venus</td></tr>
+<tr><td>Matamemea</td><td>Mars</td></tr>
+<tr><td>Ma'afutoka (wie SMC)</td><td>Canopus</td></tr>
+<tr><td>Ma'afulele (wie LMC)</td><td>Sirius</td></tr>
+<tr><td>Velitoa hififo</td><td>Rigel</td></tr>
+<tr><td>Velitoa hahake</td><td>Betelgeuse</td></tr>
+<tr><td>Hikule'o</td><td>Arcturus</td></tr>
+<tr><td>Monuafe</td><td>Meissa</td></tr>
+<tr><td>Motuliki</td><td>Plejaden</td></tr>
+<tr><td>Tu'ulalupe</td><td>Hyaden</td></tr>
+<tr><td>Toloatonga</td><td>Kreuz des Südens</td></tr>
+<tr><td>Toloalahi</td><td>Falsches Kreuz</td></tr>
+</table>
+
+<strong>Tongaische Sternbilder</strong>
+<table class="nomenclature">
+<tr><th>Tongaischer Name</th><th>Bedeutung oder Anmerkung</th></tr>
+<tr><td>Tuinga ika</td><td>Teil des Orion: Gürtel und Schwert</td></tr>
+<tr><td>Ae e'Uvea</td><td>Corona Borealis (<em>Spekulativ</em>)</td></tr>
+<tr><td>Fatanalua</td><td>Coma Berenices (<em>Spekulativ</em>)</td></tr>
+<tr><td>Kapakau'o'tafahi</td><td>Cassiopeia (<em>Spekulativ</em>)</td></tr>
+<tr><td>Toloa</td><td>Gürtel des Orion</td></tr>
+<tr><td>Lua tangata</td><td>Castor und/oder Pollux</td></tr>
+<tr><td>Fungasia</td><td>Toliman und/oder Agena</td></tr>
+<tr><td>Houmatoloa (Toloa, toloatonga, toloalahi)</td><td>&mdash;</td></tr>
+</table>
+
+<h3>Autor</h3> 
+
+<p>Diese Sternbildkultur wurde durch den Stellarium-Anwender <i>Dan
+Smale</i>, d.smale(at)niwa.co.nz, bereitgestellt. Deutsche
+Bearbeitung: Georg Zotti.</p>
\ No newline at end of file

=== added file 'skycultures/tongan/planet_names.fab'
--- skycultures/tongan/planet_names.fab	1970-01-01 00:00:00 +0000
+++ skycultures/tongan/planet_names.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,8 @@
+# TRANSLATORS: Native name of the Sun in Tongan culture
+Sun	"La'a"	_("La'a")
+# TRANSLATORS: Native name of the Moon in Tongan culture
+Moon	"Mahina"	_("Mahina")
+# TRANSLATORS: Native name of Venus in Tongan culture
+Venus	"Tapukitea"	_("Tapukitea")
+# TRANSLATORS: Native name of Mars in Tongan culture
+Mars	"Matamemea"	_("Matamemea")

=== added directory 'skycultures/western_rey'
=== added file 'skycultures/western_rey/CMakeLists.txt'
--- skycultures/western_rey/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -0,0 +1,12 @@
+
+########### install files ###############
+
+# install info.ini and star_names.fab
+INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/western_rey )
+
+# install constellations data, artwork and descriptions
+INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western_rey
+	FILES_MATCHING PATTERN "constellation*" 
+	PATTERN "*.png" 
+	PATTERN "description.*.utf8" 
+	PATTERN "CMakeFiles" EXCLUDE )

=== added file 'skycultures/western_rey/Rey_cover.png'
Binary files skycultures/western_rey/Rey_cover.png	1970-01-01 00:00:00 +0000 and skycultures/western_rey/Rey_cover.png	2014-11-26 23:45:42 +0000 differ
=== added file 'skycultures/western_rey/constellation_names.eng.fab'
--- skycultures/western_rey/constellation_names.eng.fab	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/constellation_names.eng.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,193 @@
+# H.A. Rey: Names for Stellarium. 2014-11 G. Zotti
+# Rey gives capitalized constellation names in English and additional small-letter descriptions.
+# In the text, the internationally fixed Latin names are also given. 
+# These are the basis for translation.
+# chart 1
+BgD	"BIG DIPPER"	_("Big Dipper")
+.UMaP	"Pointers"	_("Pointers")
+UMi	"LITTLE DIPPER"	_("Little Dipper")
+.UMiG	"Guardians"     _("Guardians")
+Dra	"DRAGON"	_("Draco")
+.DraF	"feet" 		_("feet")
+.DraH	"head"		_("head")
+.DraT	"tail"		_("tail")
+# chart 2
+Cas	"CASSIOPEIA"	_("Cassiopeia")
+Cep	"CEPHEUS"	_("Cepheus")
+Cam	"GIRAFFE"	_("Camelopardalis")
+# chart 3
+UMa	"GREAT BEAR"	_("Ursa Major")
+.UMah	"head" 		_("head")
+.UMap1	"paws"		_("paws")
+.UMap2	"paws"		_("paws")
+Leo	"LION"		_("Leo")
+.Leoh	"head"		_("head")
+.Leot 	"tail"		_("tail")
+Cvn	"HUNTING DOGS"	_("Canes Venatici")
+LMi	"LITTLE LION"	_("Leo Minor")
+# chart 4
+Boo	"HERDSMAN"	_("Bootes")
+.Boob	"body"		_("body")
+.Booh	"head"		_("head")
+.Boop	"pipe"		_("pipe")
+CrB	"NORTHERN CROWN"	_("Corona Borealis")
+Com	"BERENICE'S HAIR"	_("Coma Berenices")
+# chart 5
+Cyg	"SWAN"		_("Cygnus")
+.Cygw1	"wing"		_("wing")
+.Cygw2	"wing"		_("wing")
+.Cygf	"feet"		_("feet")
+.Cygn	"outstretched neck" _("outstretched neck")
+Lyr	"LYRE"	      	_("Lyra")
+Vul	"L.FOX"		_("Vulpecula")
+Her	"HERCULES"	_("Hercules")
+.Herc	"club"		_("club")
+.Herk	"Keystone"	_("Keystone")
+# chart 6
+Lac	"LIZARD"	_("Lacerta")
+Tri	"TRIANGLE"	_("Triangulum")
+And	"ANDROMEDA"	_("Andromeda")
+.Andc	"the chain"	_("the chain")
+GSq	"GREAT SQUARE"	_("Great Square")
+Peg	"PEGASUS"	_("Pegasus")
+.Pegh	"head"		_("head")
+.Pegt	"tail"		_("tail")
+.Pegw	"wing"		_("wing")
+# chart 7
+Per	"PERSEUS"	_("Perseus")
+Ari	"RAM"		_("Aries")
+.Arih	"head"		_("head")
+.Arit	"tail"		_("tail")
+Tau	"BULL"		_("Taurus")
+.Tauh	"head"		_("head")
+.Tauc1	"horn"		_("horn")
+.Tauc2	"horn"		_("horn")
+.Taut	"tail"		_("tail")
+# chart 8
+Aur	"CHARIOTEER"	_("Auriga")
+Lyn	"LYNX"		_("Lynx")
+Gem	"TWINS"		_("Gemini")
+CMi	"LITTLE DOG"	_("Canis Minor")
+Cnc	"CRAB"		_("Cancer")
+# chart 9
+Mon	"UNICORN"	_("Monoceros")
+Ori	"ORION"		_("Orion")
+.Orib	"belt"		_("belt")
+.Oric	"club"		_("club")
+.Oris	"shield"	_("shield")
+Lep	"HARE"		_("Lepus")
+CMa	"BIG DOG"	_("Canis Major")
+Eri	"RIVER ERIDANUS" _("Eridanus")
+# chart 10
+Hya	"HYDRA"		_("Hydra")
+.Hyah	"Hydra's head"	_("Hydra's head")
+Crt	"CUP"		_("Crater")
+Ant	"PUMP"		_("Antlia")
+# chart 11 
+.Hyat	"HYDRA's tail"	_("Hydra's tail")
+Vir	"VIRGIN"	_("Virgo")
+.Virh	"head"		_("head")
+.Virf	"feet"		_("feet")
+Lib	"SCALES"	_("Libra")
+Crv	"CROW"		_("Corvus")
+.Crvb	"bill"		_("bill")
+.Crvf	"foot"		_("foot")
+.Crvt	"tail"		_("tail")
+# chart 12
+SerCd	"SERPENT'S TAIL"	_("Serpens Cauda")
+SerCp	"SERPENT'S HEAD"	_("Serpens Caput")
+.SerHh	"head"	   		_("head")
+Oph	"SERPENT HOLDER"	_("Ophiuchus")
+.Ophb	"body"	 _("body")
+.Ophh	"head"	 _("head")
+.Opha1	"arm"	 _("arm")
+.Opha2	"arm"	 _("arm")
+.Ophf1	"foot"	 _("foot")
+.Ophf2	"foot"	 _("foot")
+Sco	"SCORPION"		_("Scorpius")
+.Scoc 	"claws"			_("claws")
+.Scot	"tail"			_("tail")
+.Scoe	"cat's eyes"		_("cat's eyes")
+# chart 13 
+Sge	"ARROW"		_("Sagitta")
+Del	"DOLPHIN"	_("Delphinus")
+Aql	"EAGLE"		_("Aquila")
+.Aqlh	"head"		_("head")
+.Aqlw1	"wing"		_("wing")
+.Aqlw2	"wing"		_("wing")
+.Aqlt	"tail"		_("tail")
+Sct	"SHIELD"	_("Scutum")
+Sgr	"ARCHER"	_("Sagittarius")
+.Sgrh	"head"		_("head")
+.Sgrb	"body"		_("body")
+.Sgrs	"skirt"		_("skirt")
+.Sgrt	"the bow"	_("the bow")
+CrA	"SOUTHERN CROWN" _("Corona Australis")
+# chart 14
+Equ	"LITTLE HORSE"	_("Equuleus")
+Aqr	"WATER CARRIER"	_("Aquarius")
+.Aqrh	"head" 		_("head")
+.Aqra	"arm"		_("arm")
+.Aqrv	"vessel"	_("vessel")
+Cap	"GOAT"	  	_("Capricornus")
+PsA	"SOUTHERN FISH"	_("Piscis Austrinus")
+Gru	"CRANE"		_("Grus")
+Phe	"PHOENIX"	_("Phoenix")
+# chart 15 
+Psc	"FISHES"	_("Pisces")
+.PscN	"N.FISH"	_("Northern Fish")
+.PscW	"Circlet or W. FISH" _("Circlet")
+Cet	"WHALE"		_("Cetus")
+.Cett	"tail"		_("tail")
+Scl	"SCULPTOR"	_("Sculptor")
+# chart 16
+Vel	"SHIP's SAIL"	_("Vela")
+Pyx	"SHIP'S COMPASS" _("Pyxis")
+.CruF	"False Cross"	 _("False Cross")
+Car	"SHIP'S KEEL"	_("Carina")
+.Carh	"figurehead"	 _("figurehead")
+Pup	"SHIP'S STERN"	_("Puppis")
+.Pupt	"transom"	 _("transom")
+Vol	"FLYING FISH"	_("Volans")
+.Volw1	"wing"		_("wing")
+.Volw2	"wing"		_("wing")
+Dor	"SWORDFISH"	_("Dorado")
+Col	"DOVE"		_("Columba")
+.Colh	"head"		_("head")
+.Colt	"tail"		_("tail")
+.Colw	"wing"		_("wing")
+Hyi	"HYDRUS"	_("Hydrus")
+Pic	"EASEL"		_("Pictor")
+Ret	"NET"		_("Reticulum")
+Hor	"CLOCK"		_("Horologium")
+For	"FURNACE"	_("Fornax")
+# chart 17
+Lup	"WOLF"		_("Lupus")
+.Lupt	"tail"		_("tail")
+.Lupe	"ears"		_("ears")
+Cen	"CENTAUR"	_("Centaurus")
+.Cenh	"head"		_("head")
+.Cena1	"arm"		_("arm")
+.Cena2	"arm"		_("arm")
+.Cenb	"body"		_("body")
+.Cenf	"front legs"	_("front legs")
+.Cenl	"hind legs"	_("hind legs")
+Cru	"SOUTHERN CROSS"	_("Crux")
+Nor	"SQUARE"	_("Norma")
+Cir	"DIVIDERS"	_("Circinus")
+TrA	"SOUTHERN TRIANGLE"	_("Triangulum Australe")
+Ara	"ALTAR"		_("Ara")
+Mus	"FLY"		_("Fly")
+Aps	"BIRD OF PARADISE" _("Apus")
+Cha	"CHAMELEON"	_("Chamaeleon")
+.Chae	"eyes"		_("eyes")
+Pav	"PEACOCK"	_("Pavo")
+Oct	"OCTANT"	_("Octans")
+Tuc	"TOUCAN"	_("Tucana")
+Ind	"INDIAN"	_("Indus")
+Tel	"TELESCOPE"	_("Telescopium")
+# uncharted
+Mic	"MICROSCOPE"	_("Microscopium")
+Cae	"CHISEL"	_("Caelum")
+Men	"TABLE M."	_("Mensa")
+Sex	"SEXTANT"	_("Sextans")

=== added file 'skycultures/western_rey/constellationship.fab'
--- skycultures/western_rey/constellationship.fab	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/constellationship.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,206 @@
+# Western-Rey from H.A.Rey: The Stars - A New Way To See Them (1952, 41th reprint ca 1998).
+# Original by Mike Richards, verified&extended by Rey's descriptions 2014 Georg Zotti
+#
+# TODO: Find a way to mark asterisms different from constellations?
+# If you want to hide the abbreviation from display in "abbreviated" mode, prepend a dot to the name.
+# there are 1-star "subfigures" labeled according to Rey, with hidden abbreviations and linked to dim stars. 
+#
+# chart 1
+# BIG DIPPER as separate constellation
+BgD  7 67301 65378 65378 62956 62956 59774 59774 54061 54061 53910 53910 58001 58001 59774
+.UMaP 1 53910 54061 
+UMi 7 11767 85822 85822 82080 82080 77055 77055 79822 79822 75097 75097 72607 72607 77055
+# Guardians
+.UMiG 1 72607 75097
+Dra 15 87585 87833 87833 85670 85670 85829 85829 87585 87585 94376 94376 97433 94376 89908 89937 89908 89908 83895 83895 80331 80331 78527 78527 75458 75458 68756 68756 61281 61281 56211
+# Dra feet
+.DraF 3 89937 89908 89908 94376 94376 97433
+# Dra head
+.DraH 4 87585 87833 87833 85670 85670 85829 85829 87585
+# Dra tail (only rear end)
+.DraT 1 68756 61281
+# Chart2: 
+# Cas: the W has an extra star!
+Cas 5 9598 8886 8886 6686 6686 4427 4427 3179 3179 746 
+Cep 12 110991 112724 112724 106032 106032 105199 105199 102422 102422 101093 105199 107259 107259 109857 109857 109492 109492 110991 109492 107418 112724 116727 116727 106032
+Cam 8 23040 23522 23522 17884 17884 16228 17884 17959 17959 22783 22783 23522 22783 33694 33694 29997
+# Chart3:
+Uma 19 67301 65378 65378 62956 62956 59774 59774 54061 54061 53910 53910 58001 58001 59774 54061 46733 46733 41704 41704 44127 44127 44471 44471 50801 50372 46853 46853 48319 48319 46733 50801 55203   55219 54539 54539 57399 57399 67301
+.UMah 1 64468 64468
+.UMap1 1 55203 55219
+.UMap2 1 50801 44471
+Leo 18 57632 54872 54872 54879 54879 55642 55642 55434 54879 51624 54879 49583 49583 49669 49583 47508 49583 50583 50583 53954 53954 54872 50583 50335 50335 48455 48455 46146 46146 46750 46750 47908 47908 48455 47908 49583
+.Leoh 1 48390 48390
+.Leot 1 56146 56146
+CVn 1 61317 63125
+LMi 5 53229 51233 51233 49593 49593 46952 49593 51056 51056 53229
+# chart 4
+Boo 18 67275 67459 67459 67927 67927 69673 69673 71795 71795 72105 72105 69673 72105 74666 74666 75411 75411 73555 73555 74666 73555 71075 71075 71053 71053 71284 71284 72105 71075 69732 69732 70497 70497 69483 69483 69732
+.Boob 1 71571 71571
+.Booh 1 73634 73634
+.Boop 1 69483 69483
+Com 5 64241 64394 64394 60742 64394 60697 64394 60746 64394 60904
+CrB 5 76127 75695 75695 76267 76267 76952 76952 77512 77512 78159
+# chart 5
+Cyg 16 94779 97165 97165 100453 100453 102098 102098 104060 102098 99785 99785 95853 95853 94779    100453 102488 102488 104732 104732 103413 103413 102098 103413 105102 105102 104887 100453 98110 98110 96683 96683 95947
+.Cygw1 1 98610 98610
+.Cygw2 1 101756 101756
+.Cygf 1 104463 104463
+.Cygn 1 97295 97295
+Lyr 10 91262 91926 91926 92862 92862 94481 94481 94713 94713 93194 93194 92420 92420 89826 89826 91262 93194 92791 92420 91971
+Vul 1 95771 98543
+Her 25 84345 84379 84379 85693 85693 86974 86974 88794 88794 88267 88267 88886 88886 90139 90139 92043 92043 92161 88794 87933 87933 84380 84380 85112 85112 87808 87808 86414 86414 81126 81126 79101 79101 79992 79992 86414 86974 83207 83207 81693 81693 81833 81833 84380 84380 83207 83207 80816 80816 80170
+.Herc 1 80963 80963
+.Herk 1 82959 82959
+# chart 6
+Lac 10 109937 109754 109754 111104 111104 111944 111944 111022 111022 110351 110351 111104 111022 110609 110609 110538 110538 111169 111169 111022
+Tri 3 10670 10064 10064 8796 8796 10670
+And 18 677 3092 3092 2912 2912 5447 5447 3092 3092 3031 3031 3693 3693 4463 5447 7513 7513 9640 5447 4436 4436 3881 3881 5434 5434 7607 2912 1411 1411 116631 116584 116805 116805 116631 116631 113726
+# Andromeda's chain. Has separate label, but is no asterism. 
+.Andc 1 115808 115808
+# GSq Great Square of Pegasus
+GSq 4 113963 113881 113881 677 677 1067 1067 113963
+Peg 18 113963 113881 113881 1067 1067 113963 113963 112440 112440 112748 112748 112158 112158 109410 114520 113963 113963 114144 113963 112447 112447 112029 112029 109427 112029 107315 112447 109176 109176 107348 112440 109176 109176 107354 107354 105502
+.Pegh 1 111191 111191
+.Pegt 1 113958 113958
+.Pegw 1 115288 115288
+# chart 7
+Per 25 17448 18246 18246 18614 18614 18532 18532 14576 14576 14354 14354 13254 18532 17529 17529 16335 16335 15863 15863 16826 16826 17358 17358 19343 19343 19812 19812 20070 20070 19167 14576 14668 14668 14632 14632 13531 13531 13268 13268 14328 14328 13531 14328 15863 15863 14632 14632 12777 12777 8068
+Ari 12 14838 13914 13914 10306 10306 8832 13914 13209 13209 13061 13061 12719 12719 13209 12719 9884 9884 9153 9153 8903 8903 9884 9884 10306
+.Arih 1 8718 8718
+.Arit 1 12808 12808
+Tau 20 25428 21881 21881 20711 20711 17702 21881 26451 26451 21421 21421 20894 20894 20205 20205 20455 20455 20648 20648 20889 20889 20711 20205 21589 21589 21402 20205 19860 20205 18724 18724 16083 16083 16369 16083 15900 15900 16852 15900 18907
+.Tauh 1 22947 22947
+.Tauc1 1 23395 23395
+.Tauc2 1 19009 19009
+.Taut 1 16095 16095
+# chart 8
+Aur 10 23015 28380 28380 28360 28360 28358 28358 24608 24608 28360 23015 23767 23767 24608 24608 23416 23416 23453 23453 23767
+Lyn 6 45860 45688 45688 44248 44248 41075 41075 36145 36145 33449 33449 30060
+Gem 17 31681 34088 34088 35550 35550 35350 35350 32362 35550 36962 36962 37740 36962 37826 36962 36046 36046 34693 34693 36366 36366 36850 34693 33018 34693 32246 32246 30883 32246 30343 30343 29655 29655 28734
+CMi 1 37279 36188
+Cnc 6 43103 42806 42806 40167 40167 40526 40526 42911 42911 42806 42911 44066
+# chart 9
+Mon 10 41307 39863 29651 30867 30867 34769 34769 32578 32578 30419 34769 39863 39863 37447 32578 31216 30419 31216 31216 31978
+Ori 23 26727 26311 26311 25930 28716 29426 29426 29038 29038 27913 27913 28716 29239 28614 28614 27989 27989 26727 26727 27366 24436 25281 25281 25930 25930 25336 25336 25813 25813 26207 25813 27989 25336 22449 22449 22549 22549 22797 22797 23123 22449 22509 22509 22845 22845 22957
+.Orib 1 26464 26464
+.Oric 1 28447 28447
+.Oris 1 22245 22245
+Lep 12 28910 28103 28103 27288 27288 25985 25985 24305 28910 27654 27654 27072 27072 25606 25606 23685 25985 25606 24305 24845 24305 24327 23685 24305 
+CMa 17 33160 34045 34045 33347 33347 32349 32349 33977 33977 34444 34444 35037 35037 35904 33579 33856 33856 34444 33579 33152 33152 31592 31592 31125 31592 30324 31592 32349 33579 32759 30122 33579 33347 33160
+Eri 27 7588 9007 9007 10602 10602 11407 11407 12486 12486 13847 13847 15510 15510 17874 17874 20042 20042 20535 20535 21393 21393 18673 18673 18216 18216 17717 17717 17651 17651 16611 16611 15474 15474 14146 14146 13701 13701 16537 16537 17378 17378 18543 18543 19849 19849 19587 19587 21444 21444 22109 22109 23875 23875 21594
+# chart 10
+Hya 17 42799 42402 42402 42313 42313 43109 43109 43813 43813 42799 43813 45336 45336 47431 47431 46390 46390 49841 49841 51069 51069 52943 52943 53740 53740 54682 54682 56343 56343 57936 57936 64962 64962 68895
+.Hyah 1 42142 42142
+Crt 9 53740 54682 54682 55705 55705 55282 55282 53740 55282 55687 55687 56633 56633 58188 58188 57283 57283 55705
+Ant 1 51172 51172
+# chart 11
+.Hyat 1 61720 61720
+Vir 17 57380 57757 57757 60129 60129 61941 61941 58948 58948 57380 61941 64238 64238 65474 65474 69427 69427 69701 69701 71957 65474 66249 66249 68520 68520 72220 66249 63090 63090 63608 63090 61941 69701 68520
+.Virh 1 58510 58510
+.Virf 1 70755 70755
+Lib 6 73714 72622 72622 74785 74785 76333 76333 72622 76333 76470 76470 76600
+Crv 7 61174 60965 60965 59803 59803 59316 59316 59199 59316 60189 60189 61359 60189 60965
+.Crvb 1 61145 61145
+.Crvf 1 61251 61251
+.Crvt 1 59087 59087
+# chart 12
+# We need a complete Ser entry to keep the IAU border valid.
+Ser 19 92946 88771 88771 88601 88601 89962 89962 88048 88048 86565 86565 86263 86263 84880 80628 79882 79882 79593 79593 77516 77516 77622 77622 77070 77070 77257 77257 76276 76276 77233 77233 78072 78072 77450 77450 76852 76852 77233
+SerCd 7 92946 88771 88771 88601 88601 89962 89962 88048 88048 86565 86565 86263 86263 84880 
+SerCp 12 80628 79882 79882 79593 79593 77516 77516 77622 77622 77070 77070 77257 77257 76276 76276 77233 77233 78072 78072 77450 77450 76852 76852 77233
+.SerHh 1 77995 77995
+Oph 21 85423 84405 84405 84970 84970 85340 85340 84893 84893 84012 84012 85365 85365 86742 86742 87108 87108 88601 86742 86032 86032 83000 83000 86742 83000 82673 82673 80883 80883 79593 83000 81377 81377 80894 80894 80569 80569 80343 80343 80975 81377 84012
+.Ophb 1 83262 83262 
+.Ophh 1 85664 85664
+.Opha1 1 87108 87108 
+.Opha2 1 81007 81007
+.Ophf1 1 85084 85084
+.Ophf2 1 80569 80569
+Sco 19 87261 85927 85927 85696 85696 86170 86170 86670 86670 87073 87073 86228 86228 84143 84143 82671 82671 82514 82514 82396 82396 81266 81266 80763 80763 80112 80112 79404 79404 78104 78104 78265 80112 79374 79374 78820 78820 78401
+.Scoc 1 79098 79098
+.Scot 1 85889 85889
+.Scoe 1 85543 85543
+# chart 13
+Sge 3 98337 97365 97365 96837 97365 96757
+Del 10 101421 101916 101421 101800 101916 101800 101800 101882 101882 102281 102281 102532 102532 101958 101958 101769 101769 101483 101483 101800
+Aql 10 98036 97649 97649 97278 97278 96229 96229 95501 95501 97804 99473 97804 95501 93747 93747 93244 95501 93805 93805 93429
+.Aqlh 1 97229 97229
+.Aqlw1 1 97980 97980
+.Aqlw2 1 94486 94486
+.Aqlt 1 93717 93717
+Sct 4 92175 91726 91726 90595 90595 91117 91117 92175
+Sgr 22 88635 89931 89931 90185 90185 89642 89642 88635 88635 89341 89341 90496 90496 89931 89931 92041 92041 92855 92855 94141 94141 95168 95168 95176 94141 93085 93085 92855 92855 93864 93864 93506 93506 92041 93864 98412 98412 98032 95241 95347 95347 98412 95347 93506
+.Sgrh 1 93537 93537
+.Sgrb 1 93277 93277
+.Sgrs 1 95774 95774
+.Sgrt 1 89678 89678
+CrA 6 92989 93174 93174 93825 93825 94114 94114 94160 94160 94005 94005 93542 93542 92953
+# chart 14
+Equ 2 104987 104858 104858 104521
+Aqr 23 102618 103045 103045 104459 104459 106278 106278 109139 106278 109074 109074 110395 110395 111497 111497 110672 110672 109074 109074 110003 110003 112961 112961 114855 114855 114724 114724 112961 112961 112716 112716 113136 113136 114855 114855 114341 114341 114375 114375 114119 114855 115438 115438 115669 115669 116247
+.Aqrh 1 110764 110764
+.Aqra 1 110378 110378
+.Aqrv 1 113658 113658
+Cap 14 100064 100345 100345 104139 104139 105515 105515 106985 106985 107556 105515 106039 106039 105881 105881 104139 104139 104019 104019 104234 104019 101027 100345 101027 101027 102485 102485 102978
+PsA 9 113368 111954 111954 109285 109285 107380 107380 107608 107608 109285 109285 111188 111188 112948 112948 113246 113246 113368
+Gru 9 114131 110997 110997 109268 109268 112122 112122 114421 114421 114131 112122 113638 112122 112623 109268 109111 109111 108085
+Phe 12 5348 5165 5165 3245 3245 2072 3245 5348 5165 7083 7083 8837 8837 5165 5165 6867 6867 3245 2072 2081 2081 765 765 2072
+#chart 15
+Psc 20 5586 5742 5586 6193 6193 5742 5742 6706 6706 7097 7097 8198 8198 9487 9487 7884 7884 7007 7007 5737 5737 4906 4906 3786 3786 118268 118268 116771 116771 116928 116928 115738 115738 114971 114971 115227 115227 115830 115830 116771
+.PscN 1 5339 5339
+.PscW 1 115476 115476
+Cet 14 12706 11484 11484 12828 12828 13954 13954 14135 14135 12706 12706 12387 12387 10826 10826 8645 8645 6537 6537 1562 1562 3419 3419 8102 3419 9347 9347 12387
+.Cett 1 12925 12925
+Scl 1 4577 4577
+# chart 16
+Vel 9 39953 42913 42913 45941 45941 48774 48774 52727 52727 51986 51986 50191 50191 46651 46651 44816 44816 39953
+Pyx 3 39429 42515 42515 42828 42828 43409
+.CruF 2 45941 41037 45556 42913
+Car 14 39953 38827 38827 41037 41037 45556 45556 50371 50371 51232 51232 51849 51849 53253 53253 54463 53253 52468 52468 51576 51576 52419 52419 50099 50099 45238 45238 30438 
+.Carh 1 52742 52742
+Pup 12 30438 31685 31685 35264 35264 36917 36917 37229 37229 37173 37173 38170 38170 38070 38070 37677 37677 36917 38170 39757 39757 39429 39429 39953
+.Pupt 1 37089 37089
+Vol 8 37504 34481 34481 39794 39794 37504 39794 35228 39794 41312 41312 44382 44382 39794 40817 39794
+.Volw1 1 41304 41304
+.Volw2 1 37032 37032
+Dor 7 27100 27890 27890 26069 26069 27100 26069 21281 21281 19893 26069 23693 23693 21281
+Col 8 28328 28199 28199 30277 30277 29807 29807 28199 28199 27628 27628 28328 27628 26634 26634 25859
+.Colh 1 26035 26035
+.Colt 1 28992 28992
+.Colw 1 27955 27955
+Hyi 5 2021 17678 17678 12394 12394 11001 11001 8928 8928 9236
+Pic 3 32607 27530 27530 27321 32607 27321
+Ret 4 19780 19921 19921 18597 18597 17440 17440 19780
+Hor 1 19747 19747
+For 1 14879 14879
+# chart 17
+Lup 24 78918 77634 77634 76705 76705 75177 75177 78384 75177 75304 75304 75501 75501 76297 76297 76552 76552 76829 75501 75141 75141 74117 74117 74911 74911 75264 74117 73807 73807 74376 74376 74395 73807 71536 71536 71121 71536 71860 71860 69996 71860 70576 71860 72683 72683 73273 73273 75177
+.Lupt 1 77523 77523
+.Lupe 1 70320 70320
+Cen 31 72010 71865 71865 73334 73334 71352 71352 68245 68245 68862 68862 70300 70300 70090 70090 68933 68933 67464 67464 68245 67153 67457 67153 67669 67153 67786 67153 65109 65109 65936 65936 67464 67464 67472 67472 68002 68002 68523 68523 68282 68282 68245 68002 66657 66657 71683 66657 68702 66657 61932 61932 68002 61932 60823 60823 59449 59449 56561 60823 59196 59196 55425
+.Cenh 1 69995 69995
+.Cena1 1 71353 71353
+.Cena2 1 66019 66019
+.Cenb 1 65810 65810
+.Cenf 1 69618 69618
+.Cenl 1 57512 57512
+Cru 2 61084 60718 62434 59747
+Nor 4 80000 80582 80582 78914 78914 78639 78639 80000
+Cir 2 71908 75323 71908 74824
+TrA 4 82273 74946 74946 76440 76440 77952 77952 82273
+Ara 6 88714 85792 85792 83153 83153 83081 83081 82363 82363 85727 85727 88714
+Mus 6 62322 61585 61585 63613 63613 61199 61199 61585 61585 59929 59929 57363
+Aps 4 80047 81065 81065 81852 81852 80047 80047 72370
+Cha 5 40702 51839 51839 52595 52595 60000 60000 58484 58484 51839
+.Chae 1 40888 40888
+Pav 13 100751 105858 105858 102395 102395 99240 99240 100751 99240 98495 98495 91792 91792 93015 93015 99240 93015 92609 92609 90098 90098 88866 88866 92609 88866 86929
+Oct 3 107089 112405 112405 70638 70638 107089
+Tuc 5 110130 114996 114996 118322 118322 1599 1599 2484 2484 114996
+Ind 5 101772 102333 102333 103227 103227 108870 108870 108431 108431 103227
+Tel [phone]
+# These are not described in Rey's detail maps. Only here to allow drawing the constellation borders. 
+Mic 1 102831 102831
+Cae 1 21770 21770
+Men 1 29271 29271
+Sex 1 49641 49641
\ No newline at end of file

=== added file 'skycultures/western_rey/description.de.utf8'
--- skycultures/western_rey/description.de.utf8	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/description.de.utf8	2014-11-26 23:45:42 +0000
@@ -0,0 +1,97 @@
+<h2>Westlich: H.A. Rey</h2>
+
+<h4>Einleitung</h4>
+
+<p>Im Laufe des 19. Jahrhunderts kam die Verwendung und weitere
+Ausgaben von mit mythologischen Figuren überladenen und aufwendig
+illustrierten Sternatlanten aus der Mode. Die Sterne in Atlanten aus
+dieser Zeit wurden mit Linienzügen verbunden, die jedoch oft nur
+andeuten, welche Sterne zu welchem Sternbild gehören, ohne jedoch der
+Figur zu folgen. Nach mehreren Jahrzehnten solcher Atlastradition
+waren die Linienzüge bis zur Mitte des 20. Jahrhunderts für angehende
+Sternfreunde völlig unverständlich geworden.</p>
+
+
+<p><img src="Rey_cover.png" width="150" align="right"/>
+H. A. Rey (Hans Augusto Reyersbach) (1898-1977), ein aus Hamburg
+gebürtiger Illustrator und Autor von Kinderbüchern, veröffentlichte
+1952 seine Neuinterpretation in dem Buch <em>The Stars - A New Way To
+See Them</em>.</p>
+
+
+<h4>Die Sternbilder</h4>
+
+<p>In diesem Buch, das sich insbesondere in den USA sehr großer
+Beliebtheit erfreut, verband Rey die Sterne jedes Sternbilds "in einer
+Weise, daß die sich ergebende Figur Sinn macht." Was ihn erstaunte
+war, "daß niemand das vorher gemacht hatte. Die Grundidee ist doch so
+einfach."</p>
+
+
+<p>Reys neue Linienzüge erleichtern das Erkennen der Figuren
+tatsächlich. Rey hat in seiner Arbeit keine zusätzlichen Bilder
+verwendet, die Figuren aus den Linienzügen sprechen für sich. Daher
+wäre eine Darstellung in Stellarium, die über die Linienzüge hinaus
+noch gemalte Figuren zeigte, nicht angebracht. Rey bestand auch auf
+die Bezeichnung in der Sprache des Volkes (USA: Englisch) statt der
+Verwendung lateinischer Bezeichnungen. Bei Einstellung der
+Namensdarstellung auf "Original" wird die Schreibweise von Rey
+dargestellt: Zu den Sternbildernamen in Blockschrift hat er auch noch
+Sternbilderteile erklärend beschriftet. Auch die benannten Sterne sind
+auf die im Buch genannten Namen beschränkt.</p>
+
+
+
+<h4>Reys Figuren im Vergleich mit den Klassischen Sternbildern</h4>
+
+<p>Rey hält sich in Anzahl und Benennung im Wesentlichen an die
+Tradition der Westlichen Sternsagen und beschreibt die 88 offiziell
+anerkannten Bilder, mit Ergänzungen um die beiden Wagen und ein
+"Großes Quadrat" (im Pegasus).  Allerdings weicht seine Sichtweise doch
+in einigen Fällen sehr markant von den Bildern ab, die Ptolemäus in
+seinem Almagest (Mitte des 2. Jh n.Chr.) durch Bezeichnung der
+Sternörter wie "der an der Schulter", "Kopf" etc. festgelegt
+hatte. Einige Beispiele: <ul>
+
+<li> Rey drehte die Figur der großen Bärin (<em>Ursa Major</em>) um,
+sie sieht jetzt aus wie ein Eisbär beim Wittern von Beute. Dadurch
+entgeht er der ewigen Frage nach dem langen Bärenschwanz, andererseits
+entfällt der Eindruck der den Pol mit dem täglichen Umschwung des
+Himmels umwandernden Bärin.</li>
+
+<li>Den Stier (<em>Taurus</em>), von dem seit der Antike nur der
+Vorderteil gezeigt wird, hat Rey um ein Hinterteil erweitert. Dafür
+präsentiert er ihn nicht mit nach oben, sondern seitwärts büffelartig
+weit ausladenden Hörnern. Der Hauptstern <em>Aldebaran</em>, sonst das
+rote Auge, liegt nun am Hals.</li>
+
+<li>Der Kopf des <em>Herkules</em>, Rasalgethi, liegt
+traditionellerweise gleich neben dem des Schlangenträgers
+<em>Ophiuchus</em>, und ein Sternenviereck bildet seinen Körper. Aus
+diesem bildet Rey nun den Kopf des Helden, und Rasalgethi (obwohl
+arabisch eindeutig Ras=Kopf) markiert einen Fuß.
+
+<li>Auch der Walfisch (<em>Cetus</em>) ist umgedreht, aus dem Maul
+wurde eine Schwanzflosse.</li>
+
+<li>Beim <em>Pegasus</em> vertauschte Rey Kopf und Füße. </li>
+
+<li><em>Bootes</em>, der Rinderhirt, wird sitzend und beim
+Pfeifenrauchen dargestellt. (Und das in einem Buch auch für Kinder!
+Keine Spur von "Political Correctness" in den 1950ern... :-) </li>
+</ul> </p>
+
+
+<h3>Weiterführende Links</h3>
+<ul>
+<li><a href="http://en.wikipedia.org/wiki/H._A._Rey">H.A.Rey (englischsprachige Wikipedia)</a></li>
+</ul>
+
+<h3>Autoren</h3>
+
+<p>Diese Sternbildkultur war in Form einer alternativen
+Linienzug-Datei von Mike Richards für den Austausch durch Anwender
+bereits lange Zeit verfügbar mittels eines Links in der "Westlichen"
+Sternbilderkultur. Die Prüfung anhand der 41. Auflage des Buches,
+Erweiterung zu einer separaten Sternbilderkultur inklusive 
+Beschreibung erfolgten durch Georg Zotti.</p>

=== added file 'skycultures/western_rey/description.en.utf8'
--- skycultures/western_rey/description.en.utf8	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/description.en.utf8	2014-11-26 23:45:42 +0000
@@ -0,0 +1,83 @@
+<h2>Western: H.A. Rey</h2>
+
+<h4> Introduction</h4>
+
+<p>During the 19th century the use and further editions of richly
+illustrated atlases with sumptuously engraved mythological figures
+fell out of fashion. The stars of the constellations in atlases of
+that time started to be shown connected with line patterns ("stick
+figures"), which however appear sometimes only to have been used to
+indicate which stars belong to which constellation.  Over several
+decades the figures had ceased to resemble the figures they were named
+after and appeared incomprehensible to beginning stargazers in the
+middle of the 20th century.</p>
+
+<p><img src="Rey_cover.png" width="150" align="right"/>
+H. A. Rey (Hans Augusto Reyersbach) (1898-1977), an artist and author
+of children's books of German descent but emigrated to the USA,
+published his answer to this problem in 1952 with the book <em>The
+Stars - A New Way To See Them</em>.</p>
+
+
+<h4>The Constellations</h4>
+
+<p>In this book, which has become very popular especially in the US,
+Rey connected the stars of every constellation "in such a way that the
+resulting shape makes sense." What surprised him was "that nobody has
+done it before. The basic idea is so simple." </p>
+
+<p>Rey's new stick figures make it indeed very simple to recognize the
+depicted constellation figures. Rey's work does not include figurative
+artwork, therefore this sky culture deliberately only comes with Rey's
+original stick figures.  The constellation names were also always
+given in English by Rey. If you switch to "Native" name display mode, you
+may see exactly the spelling used in his book. Also the stars named
+here are limited to those included in the book.</p>
+
+<h4>Rey's Figures and the Classic Constellations</h4>
+
+<p>Rey's constellations adhere to the tradition of the Western sky
+culture and describes the 88 officially acknowledged constellations,
+with addition of asterisms of the two Dippers and the "Great Square"
+(of Pegasus).  However, at several points Rey's figures deviate from
+the canonical figures described since Ptolemy's Almagest (2nd century
+AD), where also positions of the stars in their constellations had
+been described in their names. For example, <ul>
+
+<li> Rey inverted the figure of the Great Bear (<em>Ursa Major</em>)
+to look like a polar bear scenting prey.  This on one hand does not
+have the usual problem to explain its long tail. On the other hand,
+the bear is not shown to walk around the pole in this
+orientation.</li>
+
+<li>The Bull (<em>Taurus</em>), only the front of which is shown with
+long upright horns in usual depictions, is shown with a complete body
+including its tail, with horns stretched wide like those of a 
+buffalo. Its bright eye <em>Aldebaran</em> now lies in its neck.</li>
+
+<li>The head of <em>Hercules</em> is usually next to the head of
+<em>Ophiuchus</em>, the serpent holder, and the four stars known as
+"keystone" form his body. Rey makes his head out of the keystone, and
+the star that usually marks the hero's head is now one of his feet.</li>
+
+<li>The Whale (<em>Cetus</em>) has been turned around, its former
+mouth now forming a tail fin. </li>
+
+<li><em>Pegasus</em> exchanged feet and head.</li>
+
+<li><em>Bootes</em>, the herdsman, is shown sitting and smoking a pipe
+(no trace of political correctness in a children's book of the
+1950s... :-) </li> </ul> </p>
+
+
+<h3>External links</h3>
+<ul>
+<li><a href="http://en.wikipedia.org/wiki/H._A._Rey">H.A.Rey (Wikipedia)</a></li>
+</ul>
+
+<h3>Authors</h3>
+
+<p>This sky culture used to be for a long time an easy
+user-installable addon example contributed by Mike Richards.  It has
+been reworked following the 41st reprint and completed with this
+description by Georg Zotti.</p>

=== added file 'skycultures/western_rey/info.ini'
--- skycultures/western_rey/info.ini	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/info.ini	2014-11-26 23:45:42 +0000
@@ -0,0 +1,3 @@
+[info]
+name = Western (H.A.Rey)
+author = Mike Richards and Georg Zotti

=== added file 'skycultures/western_rey/star_names.fab'
--- skycultures/western_rey/star_names.fab	1970-01-01 00:00:00 +0000
+++ skycultures/western_rey/star_names.fab	2014-11-26 23:45:42 +0000
@@ -0,0 +1,58 @@
+# star_names.fab for H.A.Rey sky culture. 
+# Only stars mentioned in the book are included here. 
+# Authentic list - DO NOT ADD STARS WHICH ARE NOT IN THE BOOK!
+# chart 1
+ 11767|_("Pole Star")
+ 72607|_("Kochab")
+ 65378|_("Mizar")
+ 65477|_("Alcor")
+# chart 2
+ 68756|_("Thuban")
+# chart 3
+ 49669|_("Regulus")
+ 57632|_("Denebola")
+ 63125|_("Cor Caroli")
+# chart 4
+ 69673|_("Arcturus")
+ 76267|_("Gemma")
+# chart 5
+ 95947|_("Albireo")
+102098|_("Deneb")
+ 91262|_("Vega")
+# chart 6: none
+# chart 7
+ 14576|_("Algol")
+#17702|_("Alcyone")
+ 17702|_("Pleiades")
+ 21421|_("Aldebaran")
+# chart 8
+ 36850|_("Castor")
+ 37826|_("Pollux")
+ 24608|_("Capella")
+ 37279|_("Procyon")
+# chart 9
+ 27989|_("Betelgeuse")
+ 24436|_("Rigel")
+ 32349|_("Sirius")
+# chart 10
+ 46390|_("Alphard")
+# chart 11
+ 65474|_("Spica")
+# chart 12
+ 80763|_("Antares")
+# chart 13
+ 97649|_("Altair")
+# chart 14
+113368|_("Fomalhaut")
+# chart 15
+ 10826|_("Mira")
+  8102|_("Tau Ceti")
+  9487|_("Knot")
+# chart 16
+ 30438|_("Canopus")
+  7588|_("Achernar")
+# chart 17
+ 60718|_("Acrux")
+ 71683|_("Alpha Centauri")
+ 68702|_("Beta Centauri")
+

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-11-08 18:55:34 +0000
+++ src/CMakeLists.txt	2014-11-26 23:45:42 +0000
@@ -240,6 +240,7 @@
 	CLIProcessor.hpp
 	CLIProcessor.cpp
 	translations.h
+	translations_skycultures.h
 )
 
 # On windows, QZipReader is already included in the lib

=== modified file 'src/core/StelSkyCultureMgr.hpp'
--- src/core/StelSkyCultureMgr.hpp	2013-04-02 15:45:15 +0000
+++ src/core/StelSkyCultureMgr.hpp	2014-11-26 23:45:42 +0000
@@ -39,7 +39,8 @@
 //! Manage sky cultures for stellarium.
 //! Different human cultures have used different names for stars, and visualised
 //! different constellations in the sky (and in different parts of the sky).
-//! In the installation data directory and user data directory are the "skycultures" sub-directory containing one sub-directory per sky culture.
+//! In the installation data directory and user data directory are the "skycultures"
+//! sub-directories containing one sub-directory per sky culture.
 //! This sub-directory name is that we refer to as sky culture ID here.
 //! @author Fabien Chereau
 class StelSkyCultureMgr : public QObject
@@ -106,7 +107,7 @@
 	
 	//! Get the directory associated with a specified translated culture name.
 	//! @param cultureName The culture name in the current language.
-	//! @return The directory assocuated with cultureName.
+	//! @return The directory associated with cultureName.
 	QString skyCultureI18ToDirectory(const QString& cultureName) const;
 	
 	QMap<QString, StelSkyCulture> dirToNameEnglish;

=== modified file 'src/core/modules/Comet.cpp'
--- src/core/modules/Comet.cpp	2014-11-08 15:56:11 +0000
+++ src/core/modules/Comet.cpp	2014-11-26 23:45:42 +0000
@@ -129,6 +129,11 @@
 	slopeParameter = slope;
 }
 
+void Comet::translateName(const StelTranslator &translator)
+{
+	nameI18 = translator.qtranslate(englishName);
+}
+
 QString Comet::getInfoString(const StelCore *core, const InfoStringGroup &flags) const
 {
 	//Mostly copied from Planet::getInfoString():
@@ -138,7 +143,7 @@
 	if (flags&Name)
 	{
 		oss << "<h2>";
-		oss << q_(englishName);  // UI translation can differ from sky translation
+		oss << getNameI18n();  // UI translation can differ from sky translation
 		oss.setRealNumberNotation(QTextStream::FixedNotation);
 		oss.setRealNumberPrecision(1);
 		if (sphereScale != 1.f)

=== modified file 'src/core/modules/Comet.hpp'
--- src/core/modules/Comet.hpp	2014-11-08 13:56:47 +0000
+++ src/core/modules/Comet.hpp	2014-11-26 23:45:42 +0000
@@ -77,6 +77,11 @@
 	//virtual QString getType() const {return "Comet";}
 	//! \todo Find better sources for the g,k system
 	virtual float getVMagnitude(const StelCore* core) const;
+	//! sets the nameI18 property with the appropriate translation.
+	//! Function overriden to handle the problem with name conflicts.
+	virtual void translateName(const StelTranslator& trans);
+	virtual QString getEnglishName(void) const {return englishName;}
+	virtual QString getNameI18n(void) const {return nameI18;}
 
 	//! \brief sets absolute magnitude and slope parameter.
 	//! These are the parameters in the IAU's two-parameter magnitude system

=== modified file 'src/core/modules/Constellation.cpp'
--- src/core/modules/Constellation.cpp	2014-10-15 14:00:01 +0000
+++ src/core/modules/Constellation.cpp	2014-11-26 23:45:42 +0000
@@ -26,6 +26,8 @@
 #include "StelPainter.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
+#include "StelModuleMgr.hpp"
+#include "ConstellationMgr.hpp"
 
 #include <algorithm>
 #include <QString>
@@ -65,7 +67,9 @@
 	if (istr.status()!=QTextStream::Ok)
 		return false;
 
-	abbreviation = abb.toUpper();
+	// It's better to allow mixed-case abbreviations now that they can be displayed on screen. We then need toUpper() in comparisons.
+	//abbreviation = abb.toUpper();
+	abbreviation=abb;
 
 	asterism = new StelObjectP[numberOfSegments*2];
 	for (unsigned int i=0;i<numberOfSegments*2;++i)
@@ -121,15 +125,33 @@
 	}
 }
 
-void Constellation::drawName(StelPainter& sPainter) const
+void Constellation::drawName(StelPainter& sPainter, ConstellationMgr::ConstellationDisplayStyle style) const
 {
 	if (!nameFader.getInterstate())
 		return;
 
 	if (checkVisibility())
 	{
+		QString name;
+		switch (style)
+		{
+			case ConstellationMgr::constellationsTranslated:
+				name=nameI18;
+				break;
+			case ConstellationMgr::constellationsNative:
+				name=nativeName;
+				break;
+			case ConstellationMgr::constellationsEnglish:
+				name=englishName;
+				break;
+			case ConstellationMgr::constellationsAbbreviated:
+				name=(abbreviation.startsWith('.') ? "" : abbreviation);
+				break;
+			Q_ASSERT(0);
+		}
+
 		sPainter.setColor(labelColor[0], labelColor[1], labelColor[2], nameFader.getInterstate());
-		sPainter.drawText(XYname[0], XYname[1], nameI18, 0., -sPainter.getFontMetrics().width(nameI18)/2, 0, false);
+		sPainter.drawText(XYname[0], XYname[1], name, 0., -sPainter.getFontMetrics().width(name)/2, 0, false);
 	}
 }
 

=== modified file 'src/core/modules/Constellation.hpp'
--- src/core/modules/Constellation.hpp	2014-10-15 14:00:01 +0000
+++ src/core/modules/Constellation.hpp	2014-11-26 23:45:42 +0000
@@ -2,6 +2,7 @@
  * Stellarium
  * Copyright (C) 2002 Fabien Chereau
  * Copyright (C) 2012 Timothy Reaves
+ * Copyright (C) 2014 Georg Zotti
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,6 +27,7 @@
 #include "StelFader.hpp"
 #include "StelTextureTypes.hpp"
 #include "StelSphereGeometry.hpp"
+#include "ConstellationMgr.hpp"
 
 #include <vector>
 #include <QString>
@@ -37,8 +39,14 @@
 //! @class Constellation
 //! The Constellation class models a grouping of stars in a Sky Culture.
 //! Each Constellation consists of a list of stars identified by their
-//! Hipparcos catalogue numbers, a name and optionally an abbreviated name,
-//! boundary shape and an artistic pictorial representation.
+//! @var abbreviation and Hipparcos catalogue numbers (taken from @file: constellationship.fab),
+//! another entry in @file constellation_names.eng.fab with the defining abbreviated name,
+//! @var nativeName, and translatable @var englishName (translation goes into @var nameI18),
+//! boundary shape from @file constellations_boundaries.dat and an (optional) artistic pictorial representation.
+//! GZ NEW: The @var nativeName should be accessible in a GUI option, so that e.g. original names as written in a
+//! concrete book where a skyculture has been taken from can be assured even when translation is available.
+//! TODO: There should be a distinction between constellations and asterisms, which are "inofficial" figures within a sky culture.
+//! For example, Western sky culture has a "Big Dipper", "Coathanger", etc. These would be nice to see, but in different style.
 class Constellation : public StelObject
 {
 	friend class ConstellationMgr;
@@ -50,9 +58,9 @@
 	//! Get a string with data about the Constellation.
 	//! Constellations support the following InfoStringGroup flags:
 	//! - Name
-	//! @param core the Stelore object
+	//! @param core the StelCore object
 	//! @param flags a set of InfoStringGroup items to include in the return value.
-	//! @return a QString a description of the Planet.
+	//! @return a QString a description of the constellation.
 	virtual QString getInfoString(const StelCore*, const InfoStringGroup& flags) const
 	{
 		if (flags&Name) return getNameI18n() + "(" + getShortName() + ")";
@@ -70,15 +78,15 @@
 
 	//! @param record string containing the following whitespace
 	//! separated fields: abbreviation - a three character abbreviation
-	//! for the constellation, a number of lines, and a list of Hipparcos
-	//! catalogue numbers which, when connected form the lines of the
+	//! for the constellation, a number of lines (pairs), and a list of Hipparcos
+	//! catalogue numbers which, when connected pairwise, form the lines of the
 	//! constellation.
 	//! @param starMgr a pointer to the StarManager object.
 	//! @return false if can't parse record, else true.
 	bool read(const QString& record, StarMgr *starMgr);
 
 	//! Draw the constellation name
-	void drawName(StelPainter& sPainter) const;
+	void drawName(StelPainter& sPainter, ConstellationMgr::ConstellationDisplayStyle style) const;
 	//! Draw the constellation art
 	void drawArt(StelPainter& sPainter) const;
 	//! Draw the constellation boundary
@@ -104,10 +112,10 @@
 	//! Get the short name for the Constellation (returns the abbreviation).
 	QString getShortName() const {return abbreviation;}
 	//! Draw the lines for the Constellation.
-	//! This method uses the coords of the stars (optimized for use thru
+	//! This method uses the coords of the stars (optimized for use through
 	//! the class ConstellationMgr only).
 	void drawOptim(StelPainter& sPainter, const StelCore* core, const SphericalCap& viewportHalfspace) const;
-	//! Draw the art texture, optimized function to be called thru a constellation manager only.
+	//! Draw the art texture, optimized function to be called through a constellation manager only.
 	void drawArtOptim(StelPainter& sPainter, const SphericalRegion& region) const;
 	//! Update fade levels according to time since various events.
 	void update(int deltaTime);
@@ -142,11 +150,15 @@
 
 	//! International name (translated using gettext)
 	QString nameI18;
-	//! Name in english
+	//! Name in english (column 3 in constellation_names.eng.fab)
 	QString englishName;
-	//! Name in native language
+	//! Name in native language (column 2 in constellation_names.eng.fab).
+	//! According to practice as of V0.13.1, this may be an empty string.
+	//! If empty, will be filled with englishName.
 	QString nativeName;
 	//! Abbreviation (of the latin name for western constellations)
+	//! For non-western, a skyculture designer must invent it. (usually 2-5 letters)
+	//! This MUST be filled and be unique within a sky culture.
 	QString abbreviation;
 	//! Direction vector pointing on constellation name drawing position
 	Vec3d XYZname;

=== modified file 'src/core/modules/ConstellationMgr.cpp'
--- src/core/modules/ConstellationMgr.cpp	2014-11-08 22:04:20 +0000
+++ src/core/modules/ConstellationMgr.cpp	2014-11-26 23:45:42 +0000
@@ -49,6 +49,7 @@
 // constructor which loads all data from appropriate files
 ConstellationMgr::ConstellationMgr(StarMgr *_hip_stars)
 	: hipStarMgr(_hip_stars),
+	  constellationDisplayStyle(ConstellationMgr::constellationsTranslated),
 	  artFadeDuration(1.),
 	  artIntensity(0),
 	  artDisplayed(0),
@@ -94,6 +95,30 @@
 	setFlagIsolateSelected(conf->value("viewing/flag_constellation_isolate_selected",
 			       conf->value("viewing/flag_constellation_pick", false).toBool() ).toBool());
 
+	QString starloreDisplayStyle=conf->value("viewing/constellation_name_style", "translated").toString();
+	if (starloreDisplayStyle=="translated")
+	{
+		setConstellationDisplayStyle(constellationsTranslated);
+	}
+	else if (starloreDisplayStyle=="native")
+	{
+		setConstellationDisplayStyle(constellationsNative);
+	}
+	else if (starloreDisplayStyle=="abbreviated")
+	{
+		setConstellationDisplayStyle(constellationsAbbreviated);
+	}
+	else if (starloreDisplayStyle=="english")
+	{
+		setConstellationDisplayStyle(constellationsEnglish);
+	}
+	else
+	{
+		qDebug() << "Warning: viewing/constellation_name_style (" << starloreDisplayStyle << ") invalid. Using translated style.";
+		conf->setValue("viewing/constellation_name_style", "translated");
+		setConstellationDisplayStyle(constellationsTranslated);
+	}
+
 	StelObjectMgr *objectManager = GETSTELMODULE(StelObjectMgr);
 	objectManager->registerStelObjectMgr(this);
 	connect(objectManager, SIGNAL(selectedObjectChanged(StelModule::StelModuleSelectAction)), 
@@ -131,7 +156,7 @@
 	QString conArtFile = StelFileMgr::findFile("skycultures/"+skyCultureDir+"/constellationsart.fab");
 	if (conArtFile.isEmpty())
 	{
-		qDebug() << "No constellationsart.fab file found for sky culture " << QDir::toNativeSeparators(skyCultureDir);
+		qDebug() << "No constellationsart.fab file found for sky culture dir" << QDir::toNativeSeparators(skyCultureDir);
 	}
 
 	// first of all, remove constellations from the list of selected objects in StelObjectMgr, since we are going to delete them
@@ -157,12 +182,12 @@
 	updateI18n();
 
 	// load constellation boundaries
-	// First try load constellation boundaries from sky culture
+	// First try loading constellation boundaries from sky culture. You may inhibit borders with an empty file.
 	fic = StelFileMgr::findFile("skycultures/" + skyCultureDir + "/constellations_boundaries.dat");
 	bool existBoundaries = false;
 	if (fic.isEmpty())
 	{
-		qWarning() << "ERROR loading constellation boundaries file in sky culture: " << skyCultureDir;
+		qWarning() << "No separate constellation boundaries file in sky culture dir" << skyCultureDir << "- Using generic IAU boundaries.";
 		// OK, Second try load generic constellation boundaries
 		fic = StelFileMgr::findFile("data/constellations_boundaries.dat");
 		if (fic.isEmpty())
@@ -312,6 +337,23 @@
 	return asterFont.pixelSize();
 }
 
+void ConstellationMgr::setConstellationDisplayStyle(int style)
+{
+	constellationDisplayStyle=(ConstellationMgr::ConstellationDisplayStyle) style;
+
+	QSettings* conf = StelApp::getInstance().getSettings();
+	Q_ASSERT(conf);
+	conf->setValue("viewing/constellation_name_style",
+		       (constellationDisplayStyle == constellationsAbbreviated ? "abbreviated" : (constellationDisplayStyle == constellationsNative ? "native" : "translated")));
+	emit constellationsDisplayStyleChanged(constellationDisplayStyle);
+}
+
+ConstellationMgr::ConstellationDisplayStyle ConstellationMgr::getConstellationDisplayStyle()
+{
+	return constellationDisplayStyle;
+}
+
+
 void ConstellationMgr::loadLinesAndArt(const QString &fileName, const QString &artfileName, const QString& cultureName)
 {
 	QFile in(fileName);
@@ -340,7 +382,7 @@
 	asterisms.clear();
 	Constellation *cons = NULL;
 
-	// read the file, adding a record per non-comment line
+	// read the file of line patterns, adding a record per non-comment line
 	int currentLineNumber = 0;	// line in file
 	int readOk = 0;			// count of records processed OK
 	while (!in.atEnd())
@@ -363,7 +405,7 @@
 		}
 		else
 		{
-			qWarning() << "ERROR reading constellation rec at line " << currentLineNumber << "for culture" << cultureName;
+			qWarning() << "ERROR reading constellation lines record at line " << currentLineNumber << "for culture" << cultureName;
 			delete cons;
 		}
 	}
@@ -563,7 +605,7 @@
 	{
 		// Check if in the field of view
 		if (sPainter.getProjector()->projectCheck((*iter)->XYZname, (*iter)->XYname))
-			(*iter)->drawName(sPainter);
+			(*iter)->drawName(sPainter, constellationDisplayStyle);
 	}
 }
 
@@ -584,13 +626,19 @@
 Constellation* ConstellationMgr::findFromAbbreviation(const QString& abbreviation) const
 {
 	// search in uppercase only
-	QString tname = abbreviation.toUpper();
+	//QString tname = abbreviation.toUpper();
 
 	vector < Constellation * >::const_iterator iter;
 	for (iter = asterisms.begin(); iter != asterisms.end(); ++iter)
 	{
-		if ((*iter)->abbreviation == tname)
+		//if ((*iter)->abbreviation.toUpper() == tname)
+		if ((*iter)->abbreviation.compare(abbreviation, Qt::CaseInsensitive) == 0)
+		{
+			//if ((*iter)->abbreviation != abbreviation)
+			//	qDebug() << "ConstellationMgr::findFromAbbreviation: not a perfect match, but sufficient:" << (*iter)->abbreviation << "vs." << abbreviation;
 			return (*iter);
+		}
+		//else qDebug() << "Comparison mismatch: " << abbreviation << "vs." << (*iter)->abbreviation;
 	}
 	return NULL;
 }
@@ -627,7 +675,8 @@
 
 	// lines which look like records - we use the RE to extract the fields
 	// which will be available in recRx.capturedTexts()
-	QRegExp recRx("^\\s*(\\w+)\\s+\"(.*)\"\\s+_[(]\"(.*)\"[)]\\n");
+	// abbreviation is allowed to start with a dot to mark as "hidden".
+	QRegExp recRx("^\\s*(\\.?\\w+)\\s+\"(.*)\"\\s+_[(]\"(.*)\"[)]\\n");
 
 	// Some more variables to use in the parsing
 	Constellation *aster;
@@ -650,7 +699,7 @@
 
 		if (!recRx.exactMatch(record))
 		{
-			qWarning() << "ERROR - cannot parse record at line" << lineNumber << "in constellation names file" << QDir::toNativeSeparators(namesFile);
+			qWarning() << "ERROR - cannot parse record at line" << lineNumber << "in constellation names file" << QDir::toNativeSeparators(namesFile) << ":" << record;
 		}
 		else
 		{
@@ -662,6 +711,9 @@
 				aster->nativeName = recRx.capturedTexts().at(2);
 				aster->englishName = recRx.capturedTexts().at(3);
 				readOk++;
+				// Some skycultures already have empty nativeNames. Fill those.
+				if (aster->nativeName.isEmpty())
+					aster->nativeName=aster->englishName;
 			}
 			else
 			{
@@ -902,7 +954,7 @@
 	return artDisplayed;
 }
 
-void ConstellationMgr::setFlagLabels(bool displayed)
+void ConstellationMgr::setFlagLabels(const bool displayed)
 {
 	if (namesDisplayed != displayed)
 	{
@@ -1037,8 +1089,6 @@
 
 		// And remove all selections
 		selected.clear();
-
-
 	}
 }
 
@@ -1225,7 +1275,8 @@
 		find = false;
 		if (useStartOfWords)
 		{
-			if (objPrefix.toUpper()==cn.mid(0, objPrefix.size()).toUpper())
+			//if (objPrefix.toUpper()==cn.mid(0, objPrefix.size()).toUpper())  // WHY SO LONG?
+			if (cn.startsWith(objPrefix, Qt::CaseInsensitive))
 				find = true;
 		}
 		else
@@ -1257,7 +1308,8 @@
 		find = false;
 		if (useStartOfWords)
 		{
-			if (objPrefix.toUpper()==cn.mid(0, objPrefix.size()).toUpper())
+			//if (objPrefix.toUpper()==cn.mid(0, objPrefix.size()).toUpper())  // WHY SO LONG?
+			if (cn.startsWith(objPrefix, Qt::CaseInsensitive))
 				find = true;
 		}
 		else

=== modified file 'src/core/modules/ConstellationMgr.hpp'
--- src/core/modules/ConstellationMgr.hpp	2014-10-15 14:00:01 +0000
+++ src/core/modules/ConstellationMgr.hpp	2014-11-26 23:45:42 +0000
@@ -87,6 +87,11 @@
 			   READ getFlagLabels
 			   WRITE setFlagLabels
 			   NOTIFY namesDisplayedChanged)
+	Q_PROPERTY(ConstellationDisplayStyle constellationDisplayStyle
+			   READ getConstellationDisplayStyle
+			   WRITE setConstellationDisplayStyle
+			   NOTIFY constellationsDisplayStyleChanged)
+
 
 public:
 	//! Constructor
@@ -121,24 +126,34 @@
 	virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
 
 	//! Return the matching constellation if exists or NULL
-	//! @param name The case in-sensistive standard program name (three letter abbreviation)
+	//! @param name The case in-sensitive standard program name (three letter abbreviation)
 	virtual StelObjectP searchByName(const QString& name) const;
 
+	// GZ: I see dubious descriptions and non-fitting var names: objPrefix should just be "string" or "obj",
+	// and useStartOfWord likely should be described as "decide if start of word is searched"  (2x)
 	//! Find and return the list of at most maxNbItem objects auto-completing the passed object I18n name.
 	//! @param objPrefix the case insensitive first letters of the searched object
 	//! @param maxNbItem the maximum number of returned object names
 	//! @param useStartOfWords the autofill mode for returned objects names
-	//! @return a vector of matching object name by order of relevance, or an empty vector if nothing match
+	//! @return a vector of matching object name by order of relevance, or an empty vector if nothing matches
 	virtual QStringList listMatchingObjectsI18n(const QString& objPrefix, int maxNbItem=5, bool useStartOfWords=false) const;
 	//! Find and return the list of at most maxNbItem objects auto-completing the passed object English name.
 	//! @param objPrefix the case insensitive first letters of the searched object
 	//! @param maxNbItem the maximum number of returned object names
 	//! @param useStartOfWords the autofill mode for returned objects names
-	//! @return a vector of matching object name by order of relevance, or an empty vector if nothing match
+	//! @return a vector of matching object name by order of relevance, or an empty vector if nothing matches
 	virtual QStringList listMatchingObjects(const QString& objPrefix, int maxNbItem=5, bool useStartOfWords=false) const;
 	virtual QStringList listAllObjects(bool inEnglish) const;
 	virtual QStringList listAllObjectsByType(const QString& objType, bool inEnglish) const { Q_UNUSED(objType) Q_UNUSED(inEnglish) return QStringList(); }
 	virtual QString getName() const { return "Constellations"; }
+	//! Describes how to display constellation labels. The viewDialog GUI has a combobox which corresponds to these values.
+	enum ConstellationDisplayStyle
+	{
+		constellationsAbbreviated = 0,
+		constellationsNative      = 1,
+		constellationsTranslated  = 2,
+		constellationsEnglish     = 3 // Maybe this is not useful?
+	};
 
 	///////////////////////////////////////////////////////////////////////////
 	// Properties setters and getters
@@ -188,9 +203,9 @@
 	//! Get line color
 	Vec3f getLinesColor() const;
 
-	//! Set whether constellation path lines will be displayed
+	//! Set whether constellation lines will be displayed
 	void setFlagLines(const bool displayed);
-	//! Get whether constellation path lines are displayed
+	//! Get whether constellation lines are displayed
 	bool getFlagLines(void) const;
 
 	//! Set label color for names
@@ -204,7 +219,7 @@
 	Vec3f getLabelsColor() const;
 
 	//! Set whether constellation names will be displayed
-	void setFlagLabels(bool displayed);
+	void setFlagLabels(const bool displayed);
 	//! Set whether constellation names are displayed
 	bool getFlagLabels(void) const;
 
@@ -213,6 +228,13 @@
 	//! Get the font size used for constellation names display
 	float getFontSize() const;
 
+	//! set the way how contellation names are displayed: abbbreviated/as-given/translated
+	//! @param style acceptable values 0=abbreviated, 1=untranslated, 2=translated.
+	//! @note Will be cast to enum'ed value, but usually receives value from a QComboBox in the GUI.
+	void setConstellationDisplayStyle(int style);
+	//! get the way how contellation names are displayed: abbbreviated/as-given/translated
+	ConstellationDisplayStyle getConstellationDisplayStyle();
+
 signals:
 	void artDisplayedChanged(const bool displayed) const;
 	void artFadeDurationChanged(const float duration) const;
@@ -225,6 +247,7 @@
 	void linesDisplayedChanged(const bool displayed) const;
 	void namesColorChanged(const Vec3f & color) const;
 	void namesDisplayedChanged(const bool displayed) const;
+	void constellationsDisplayStyleChanged(const ConstellationDisplayStyle style) const;
 
 private slots:
 	//! Limit the number of constellations to draw based on selected stars.
@@ -248,13 +271,16 @@
 
 private:
 	//! Read constellation names from the given file.
-	//! @param namesFile Name of the file containing the constellation names in english
+	//! @param namesFile Name of the file containing the constellation names
+	//!        in a format consisting of abbreviation, native name and translatable english name.
+	//! @note The abbreviation must occur in the lines file loaded first in @name loadLinesAndArt()!
 	void loadNames(const QString& namesFile);
 
 	//! Load constellation line shapes, art textures and boundaries shapes from data files.
 	//! @param fileName The name of the constellation data file
 	//! @param artFileName The name of the constellation art data file
 	//! @param cultureName A string ID of the current skyculture
+	//! @note The abbreviation used in @param filename is required for cross-identifying translatable names in @name loadNames():
 	void loadLinesAndArt(const QString& fileName, const QString& artfileName, const QString& cultureName);
 
 	//! Load the constellation boundary file.
@@ -263,7 +289,7 @@
 	//! data file consists of whitespace separated values (space, tab or newline).
 	//! Each boundary may span multiple lines, and consists of the following ordered
 	//! data items:
-	//!  - The number of vertexes which make up in the boundary (integer).
+	//!  - The number of vertices which make up in the boundary (integer).
 	//!  - For each vertex, two floating point numbers describing the ra and dec
 	//!    of the vertex.
 	//!  - The number of constellations which this boundary separates (always 2).
@@ -276,7 +302,7 @@
 	//! @param rulesFile Name of the file containing the seasonal rules
 	void loadSeasonalRules(const QString& rulesFile);
 
-        //! Draw the constellation lines at the epoch given by the StelCore.
+	//! Draw the constellation lines at the epoch given by the StelCore.
 	void drawLines(StelPainter& sPainter, const StelCore* core) const;
 	//! Draw the constellation art.
 	void drawArt(StelPainter& sPainter) const;
@@ -316,6 +342,9 @@
 
 	QString lastLoadedSkyCulture;	// Store the last loaded sky culture directory name
 
+	//! this controls how constellations (and also star names) are printed: Abbreviated/as-given/translated
+	ConstellationDisplayStyle constellationDisplayStyle;
+
 	// These are THE master settings - individual constellation settings can vary based on selection status
 	float artFadeDuration;
 	float artIntensity;

=== modified file 'src/core/modules/MinorPlanet.cpp'
--- src/core/modules/MinorPlanet.cpp	2014-11-08 13:52:53 +0000
+++ src/core/modules/MinorPlanet.cpp	2014-11-26 23:45:42 +0000
@@ -190,7 +190,7 @@
 		if (nameIsProvisionalDesignation)
 			oss << provisionalDesignationHtml;
 		else
-			oss << q_(properName);  // UI translation can differ from sky translation
+			oss << getNameI18n();  // UI translation can differ from sky translation
 		oss.setRealNumberNotation(QTextStream::FixedNotation);
 		oss.setRealNumberPrecision(1);
 		if (sphereScale != 1.f)

=== modified file 'src/core/modules/MinorPlanet.hpp'
--- src/core/modules/MinorPlanet.hpp	2014-08-18 17:15:29 +0000
+++ src/core/modules/MinorPlanet.hpp	2014-11-26 23:45:42 +0000
@@ -76,6 +76,8 @@
 	//! sets the nameI18 property with the appropriate translation.
 	//! Function overriden to handle the problem with name conflicts.
 	virtual void translateName(const StelTranslator& trans);
+	virtual QString getEnglishName(void) const {return englishName;}
+	virtual QString getNameI18n(void) const {return nameI18;}
 
 	//! set the minor planet's number, if any.
 	//! The number should be specified as an additional parameter, as

=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2014-11-21 18:49:36 +0000
+++ src/core/modules/Planet.cpp	2014-11-26 23:45:42 +0000
@@ -113,6 +113,7 @@
 	normalMap = StelApp::getInstance().getTextureManager().createTextureThread(StelFileMgr::getInstallationDir()+"/textures/"+normalMapName, StelTexture::StelTextureParams(true, GL_LINEAR, GL_REPEAT));
 
 	nameI18 = englishName;
+	nativeName = "";
 	if (englishName!="Pluto")
 	{
 		deltaJD = 0.001*StelCore::JD_SECOND;
@@ -156,7 +157,20 @@
 
 void Planet::translateName(const StelTranslator& trans)
 {
-	nameI18 = trans.qtranslate(englishName);
+	if (nativeName.isEmpty())
+		nameI18 = trans.qtranslate(englishName);
+	else
+		nameI18 = trans.qtranslate(nativeName);
+}
+
+QString Planet::getEnglishName() const
+{
+	return englishName;
+}
+
+QString Planet::getNameI18n() const
+{
+	return nameI18;
 }
 
 // Return the information string "ready to print" :)
@@ -167,7 +181,7 @@
 
 	if (flags&Name)
 	{
-		oss << "<h2>" << q_(englishName);  // UI translation can differ from sky translation
+		oss << "<h2>" << getNameI18n();  // UI translation can differ from sky translation
 		oss.setRealNumberNotation(QTextStream::FixedNotation);
 		oss.setRealNumberPrecision(1);
 		if (sphereScale != 1.f)
@@ -280,7 +294,7 @@
 	QString str;
 	QTextStream oss(&str);
 	oss.setRealNumberPrecision(2);
-	oss << nameI18;
+	oss << getNameI18n();
 
 	if (sphereScale != 1.f)
 	{

=== modified file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	2014-11-08 18:40:32 +0000
+++ src/core/modules/Planet.hpp	2014-11-26 23:45:42 +0000
@@ -147,8 +147,8 @@
 	virtual Vec3f getInfoColor(void) const;
 	virtual QString getType(void) const {return "Planet";}
 	virtual Vec3d getJ2000EquatorialPos(const StelCore *core) const;
-	virtual QString getEnglishName(void) const {return englishName;}
-	virtual QString getNameI18n(void) const {return nameI18;}
+	virtual QString getEnglishName(void) const;
+	virtual QString getNameI18n(void) const;
 	virtual double getAngularSize(const StelCore* core) const;
 	virtual bool hasAtmosphere(void) {return atmosphere;}
 	virtual bool hasHalo(void) {return halo;}
@@ -179,6 +179,8 @@
 	const QString getPlanetTypeString() const {return pTypeMap.value(pType);}
 	PlanetType getPlanetType() const {return pType;}
 
+	void setNativeName(QString planet) { nativeName = planet; }
+
 	ApparentMagnitudeAlgorithm getApparentMagnitudeAlgorithm() const { return vMagAlgorithm; }
 	const QString getApparentMagnitudeAlgorithmString() const { return vMagAlgorithmMap.value(vMagAlgorithm); }
 	void setApparentMagnitudeAlgorithm(QString algorithm);
@@ -292,7 +294,8 @@
 
 	QString englishName;             // english planet name
 	QString nameI18;                 // International translated name
-	QString texMapName;              // Texture file path	
+	QString nativeName;              // Can be used in a skyculture
+	QString texMapName;              // Texture file path
 	QString normalMapName;              // Texture file path
 	int flagLighting;                // Set whether light computation has to be proceed
 	RotationElements re;             // Rotation param
@@ -333,7 +336,7 @@
 	ApparentMagnitudeAlgorithm vMagAlgorithm;
 
 	static Vec3f labelColor;
-	static StelTextureSP hintCircleTex;
+	static StelTextureSP hintCircleTex;	
 	static QMap<PlanetType, QString> pTypeMap; // Maps fast type to english name.
 	static QMap<ApparentMagnitudeAlgorithm, QString> vMagAlgorithmMap;
 	
@@ -379,7 +382,6 @@
 	
 	static void initShader();
 	static void deinitShader();
-
 };
 
 #endif // _PLANET_HPP_

=== modified file 'src/core/modules/SolarSystem.cpp'
--- src/core/modules/SolarSystem.cpp	2014-11-01 15:03:47 +0000
+++ src/core/modules/SolarSystem.cpp	2014-11-26 23:45:42 +0000
@@ -154,6 +154,7 @@
 	
 	StelApp *app = &StelApp::getInstance();
 	connect(app, SIGNAL(languageChanged()), this, SLOT(updateI18n()));
+	connect(app, SIGNAL(skyCultureChanged(QString)), this, SLOT(updateSkyCulture(QString)));
 	connect(app, SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&)));
 
 	QString displayGroup = N_("Display Options");
@@ -179,6 +180,81 @@
 	}
 }
 
+
+void SolarSystem::updateSkyCulture(const QString& skyCultureDir)
+{
+	planetNativeNamesMap.clear();
+
+	QString namesFile = StelFileMgr::findFile("skycultures/" + skyCultureDir + "/planet_names.fab");
+
+	if (namesFile.isEmpty())
+	{
+		foreach (const PlanetP& p, systemPlanets)
+		{
+			if (p->getPlanetType()==Planet::isPlanet || p->getPlanetType()==Planet::isMoon || p->getPlanetType()==Planet::isStar)
+				p->setNativeName("");
+		}
+		updateI18n();
+		return;
+	}
+
+	// Open file
+	QFile planetNamesFile(namesFile);
+	if (!planetNamesFile.open(QIODevice::ReadOnly | QIODevice::Text))
+	{
+		qDebug() << "Cannot open file" << QDir::toNativeSeparators(namesFile);
+		return;
+	}
+
+	// Now parse the file
+	// lines to ignore which start with a # or are empty
+	QRegExp commentRx("^(\\s*#.*|\\s*)$");
+
+	// lines which look like records - we use the RE to extract the fields
+	// which will be available in recRx.capturedTexts()
+	QRegExp recRx("^\\s*(\\w+)\\s+\"(.+)\"\\s+_[(]\"(.+)\"[)]\\n");
+
+	QString record, planetId, nativeName;
+
+	// keep track of how many records we processed.
+	int totalRecords=0;
+	int readOk=0;
+	int lineNumber=0;
+	while (!planetNamesFile.atEnd())
+	{
+		record = QString::fromUtf8(planetNamesFile.readLine());
+		lineNumber++;
+
+		// Skip comments
+		if (commentRx.exactMatch(record))
+			continue;
+
+		totalRecords++;
+
+		if (!recRx.exactMatch(record))
+		{
+			qWarning() << "ERROR - cannot parse record at line" << lineNumber << "in planet names file" << QDir::toNativeSeparators(namesFile);
+		}
+		else
+		{
+			planetId = recRx.capturedTexts().at(1).trimmed();
+			nativeName = recRx.capturedTexts().at(2).trimmed();
+			planetNativeNamesMap[planetId] = nativeName;
+			readOk++;
+		}
+	}
+	planetNamesFile.close();
+	qDebug() << "Loaded" << readOk << "/" << totalRecords << "native names of planets";
+
+	foreach (const PlanetP& p, systemPlanets)
+	{
+		if (p->getPlanetType()==Planet::isPlanet || p->getPlanetType()==Planet::isMoon || p->getPlanetType()==Planet::isStar)
+			p->setNativeName(planetNativeNamesMap[p->getEnglishName()]);
+	}
+
+	updateI18n();
+}
+
 void SolarSystem::drawPointer(const StelCore* core)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
@@ -1163,10 +1239,10 @@
 	return result;
 }
 
-// Update i18 names from english names according to current translator
+// Update i18 names from english names according to current sky culture translator
 void SolarSystem::updateI18n()
 {
-	const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getAppStelTranslator();
+	const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
 	foreach (PlanetP p, systemPlanets)
 		p->translateName(trans);
 }
@@ -1181,8 +1257,7 @@
 		{
 			oss << p->getParent()->getEnglishName() << " : ";
 		}
-		oss << p->getEnglishName() << endl;
-		oss << p->getEnglishName() << endl;
+		oss << p->getEnglishName() << endl;		
 	}
 	return str;
 }

=== modified file 'src/core/modules/SolarSystem.hpp'
--- src/core/modules/SolarSystem.hpp	2014-11-01 15:03:47 +0000
+++ src/core/modules/SolarSystem.hpp	2014-11-26 23:45:42 +0000
@@ -334,6 +334,10 @@
 	//! Load a color scheme
 	void setStelStyle(const QString& section);
 
+	//! Called when the sky culture is updated.
+	//! Loads native names of planets for a given sky culture.
+	//! @param skyCultureDir the name of the directory containing the sky culture to use.
+	void updateSkyCulture(const QString& skyCultureDir);
 
 private:
 	//! Search for SolarSystem objects which are close to the position given
@@ -361,7 +365,6 @@
 
 	void recreateTrails();
 
-
 	//! Used to count how many planets actually need shadow information
 	int shadowPlanetCount;
 	PlanetP sun;
@@ -405,6 +408,8 @@
 	Vec3f trailColor;
 	Vec3f pointerColor;
 
+	QHash<QString, QString> planetNativeNamesMap;
+
 	//////////////////////////////////////////////////////////////////////////////////
 	// DEPRECATED
 	//////////////////////////////////////////////////////////////////////////////////

=== modified file 'src/core/modules/StarMgr.cpp'
--- src/core/modules/StarMgr.cpp	2014-10-11 19:50:44 +0000
+++ src/core/modules/StarMgr.cpp	2014-11-26 23:45:42 +0000
@@ -44,6 +44,8 @@
 #include "ZoneArray.hpp"
 #include "StelSkyDrawer.hpp"
 #include "RefractionExtinction.hpp"
+#include "StelModuleMgr.hpp"
+#include "ConstellationMgr.hpp"
 
 #include <QTextStream>
 #include <QFile>
@@ -159,8 +161,13 @@
 		delete[] hipIndex;
 }
 
+// Allow untranslated name here if set in constellationMgr!
 QString StarMgr::getCommonName(int hip)
 {
+	ConstellationMgr* cmgr=GETSTELMODULE(ConstellationMgr);
+	if (cmgr->getConstellationDisplayStyle() == ConstellationMgr::constellationsNative)
+		return getCommonEnglishName(hip);
+
 	QHash<int,QString>::const_iterator it(commonNamesMapI18n.find(hip));
 	if (it!=commonNamesMapI18n.end())
 		return it.value();

=== modified file 'src/core/modules/StarMgr.hpp'
--- src/core/modules/StarMgr.hpp	2014-08-30 16:58:25 +0000
+++ src/core/modules/StarMgr.hpp	2014-11-26 23:45:42 +0000
@@ -219,7 +219,7 @@
 	//! Get the (English) common name for a star with a specified
 	//! Hipparcos catalogue number.
 	//! @param hip The Hipparcos number of star
-	//! @return translated common name of star
+	//! @return common name of star (from skyculture @file star_names.fab)
 	static QString getCommonEnglishName(int hip);
 
 	//! Get the type of variability for a variable star with a specified
@@ -352,10 +352,10 @@
 					  const Vec3f &c1,
 					  const Vec3f &c2);
 
-	HipIndexStruct *hipIndex; // array of hiparcos stars
+	HipIndexStruct *hipIndex; // array of Hipparcos stars
 
-	static QHash<int, QString> commonNamesMap;
-	static QHash<int, QString> commonNamesMapI18n;
+	static QHash<int, QString> commonNamesMap;     // the original names from skyculture (star_names.fab)
+	static QHash<int, QString> commonNamesMapI18n; // translated names
 	static QMap<QString, int> commonNamesIndexI18n;
 	static QMap<QString, int> commonNamesIndex;
 

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2014-11-17 14:56:04 +0000
+++ src/gui/ConfigurationDialog.cpp	2014-11-26 23:45:42 +0000
@@ -157,6 +157,16 @@
 	updateCurrentLanguage();
 	connect(cb->lineEdit(), SIGNAL(editingFinished()), this, SLOT(updateCurrentLanguage()));
 	connect(cb, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(selectLanguage(const QString&)));
+	// Do the same for sky language:
+	cb = ui->skycultureLanguageComboBox;
+	cb->clear();
+	cb->addItems(StelTranslator::globalTranslator->getAvailableLanguagesNamesNative(StelFileMgr::getLocaleDir()));
+	cb->model()->sort(0);
+	updateCurrentSkyLanguage();
+	connect(cb->lineEdit(), SIGNAL(editingFinished()), this, SLOT(updateCurrentSkyLanguage()));
+	connect(cb, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(selectSkyLanguage(const QString&)));
+
+
 
 	ui->groupBoxUpdates->setChecked(StelApp::getInstance().getSettings()->value("main/check_updates_enabled", true).toBool());
 	connect(ui->groupBoxUpdates, SIGNAL(toggled(bool)), this, SLOT(setUpdatesFlag(bool)));
@@ -331,12 +341,40 @@
 		cb->setCurrentIndex(lt);
 }
 
+void ConfigurationDialog::updateCurrentSkyLanguage()
+{
+	QComboBox* cb = ui->skycultureLanguageComboBox;
+	QString skyLang = StelApp::getInstance().getLocaleMgr().getSkyLanguage();
+	QString l2 = StelTranslator::iso639_1CodeToNativeName(skyLang);
+
+	if (cb->currentText() == l2)
+		return;
+
+	int lt = cb->findText(l2, Qt::MatchExactly);
+	if (lt == -1 && skyLang.contains('_'))
+	{
+		l2 = skyLang.left(skyLang.indexOf('_'));
+		l2=StelTranslator::iso639_1CodeToNativeName(l2);
+		lt = cb->findText(l2, Qt::MatchExactly);
+	}
+	if (lt!=-1)
+		cb->setCurrentIndex(lt);
+}
+
 void ConfigurationDialog::selectLanguage(const QString& langName)
 {
 	QString code = StelTranslator::nativeNameToIso639_1Code(langName);
 	StelApp::getInstance().getLocaleMgr().setAppLanguage(code);
+//	StelApp::getInstance().getLocaleMgr().setSkyLanguage(code);
+	StelMainView::getInstance().initTitleI18n();
+}
+
+void ConfigurationDialog::selectSkyLanguage(const QString& langName)
+{
+	QString code = StelTranslator::nativeNameToIso639_1Code(langName);
+//	StelApp::getInstance().getLocaleMgr().setAppLanguage(code);
 	StelApp::getInstance().getLocaleMgr().setSkyLanguage(code);
-	StelMainView::getInstance().initTitleI18n();
+//	StelMainView::getInstance().initTitleI18n();
 }
 
 void ConfigurationDialog::setStartupTimeMode()

=== modified file 'src/gui/ConfigurationDialog.hpp'
--- src/gui/ConfigurationDialog.hpp	2014-10-11 19:50:44 +0000
+++ src/gui/ConfigurationDialog.hpp	2014-11-26 23:45:42 +0000
@@ -84,7 +84,9 @@
 	void setSelectedInfoFromCheckBoxes();
 
 	void updateCurrentLanguage();
+	void updateCurrentSkyLanguage();
 	void selectLanguage(const QString& languageCode);
+	void selectSkyLanguage(const QString& languageCode);
 	void setStartupTimeMode();
 	//! Show/bring to foreground the shortcut editor window.
 	void showShortcutsWindow();

=== modified file 'src/gui/LocationDialog.cpp'
--- src/gui/LocationDialog.cpp	2014-10-26 13:26:29 +0000
+++ src/gui/LocationDialog.cpp	2014-11-26 23:45:42 +0000
@@ -284,6 +284,7 @@
 	QComboBox* planets = ui->planetNameComboBox;
 	SolarSystem* ssystem = GETSTELMODULE(SolarSystem);
 	QStringList planetNames(ssystem->getAllPlanetEnglishNames());
+	const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
 
 	//Save the current selection to be restored later
 	planets->blockSignals(true);
@@ -294,7 +295,7 @@
 	//data. Unfortunately, there's no other way to do this than with a cycle.
 	foreach(const QString& name, planetNames)
 	{
-		planets->addItem(q_(name), name);
+		planets->addItem(trans.qtranslate(name), name);
 	}
 	//Restore the selection
 	index = planets->findData(selectedPlanetId, Qt::UserRole, Qt::MatchCaseSensitive);

=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2014-11-23 16:43:10 +0000
+++ src/gui/ViewDialog.cpp	2014-11-26 23:45:42 +0000
@@ -254,17 +254,8 @@
 	ui->autoChangeLandscapesCheckBox->setChecked(lmgr->getFlagLandscapeAutoSelection());
 	connect(ui->autoChangeLandscapesCheckBox, SIGNAL(toggled(bool)), lmgr, SLOT(setFlagLandscapeAutoSelection(bool)));
 	
-	// GZ: changes for refraction
-	//ui->pressureDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getAtmospherePressure());
-	//connect(ui->pressureDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmospherePressure(double)));
-	//ui->temperatureDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getAtmosphereTemperature());
-	//connect(ui->temperatureDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAtmosphereTemperature(double)));
-	//ui->extinctionDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getExtinctionCoefficient());
-	//connect(ui->extinctionDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setExtinctionCoefficient(double)));
-	//// instead
+	// atmosphere details
 	connect(ui->pushButtonAtmosphereDetails, SIGNAL(clicked()), this, SLOT(showAtmosphereDialog()));
-	// GZ: Done
-
 
 	ui->useAsDefaultLandscapeCheckBox->setChecked(lmgr->getCurrentLandscapeID()==lmgr->getDefaultLandscapeID());
 	ui->useAsDefaultLandscapeCheckBox->setEnabled(lmgr->getCurrentLandscapeID()!=lmgr->getDefaultLandscapeID());
@@ -300,8 +291,10 @@
 	const bool b = StelApp::getInstance().getSkyCultureMgr().getCurrentSkyCultureID()==StelApp::getInstance().getSkyCultureMgr().getDefaultSkyCultureID();
 	ui->useAsDefaultSkyCultureCheckBox->setChecked(b);
 	ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b);
+	// GZ NEW allow to display short names and inhibit translation.
+	connect(ui->skyCultureNamesStyleComboBox, SIGNAL(currentIndexChanged(int)), cmgr, SLOT(setConstellationDisplayStyle(int)));
 
-	// Sky layers
+	// Sky layers. This not yet finished and not visible in releases.
 	populateSkyLayersList();
 	connect(this, SIGNAL(visibleChanged(bool)), this, SLOT(populateSkyLayersList()));
 	connect(ui->skyLayerListWidget, SIGNAL(currentTextChanged(const QString&)), this, SLOT(skyLayersSelectionChanged(const QString&)));
@@ -408,6 +401,23 @@
 	l->blockSignals(false);
 	updateSkyCultureText();
 
+	// populate language printing combo. (taken from DeltaT combo)
+	ConstellationMgr* cmgr=GETSTELMODULE(ConstellationMgr);
+	Q_ASSERT(cmgr);
+	Q_ASSERT(ui->skyCultureNamesStyleComboBox);
+	QComboBox* cultureNamesStyleComboBox = ui->skyCultureNamesStyleComboBox;
+	cultureNamesStyleComboBox->blockSignals(true);
+	cultureNamesStyleComboBox->clear();
+	cultureNamesStyleComboBox->addItem(q_("Abbreviated"),  ConstellationMgr::constellationsAbbreviated);
+	cultureNamesStyleComboBox->addItem(q_("Native"),       ConstellationMgr::constellationsNative);  // Please make this always a transcript into European letters!
+	cultureNamesStyleComboBox->addItem(q_("Translated"),   ConstellationMgr::constellationsTranslated);
+	//cultureNamesStyleComboBox->addItem(q_("English"),    ConstellationMgr::constellationsEnglish); // This is not useful.
+	//Restore the selection
+	int index = cultureNamesStyleComboBox->findData(cmgr->getConstellationDisplayStyle(), Qt::UserRole, Qt::MatchCaseSensitive);
+	if (index==-1) index=2; // Default: Translated
+	cultureNamesStyleComboBox->setCurrentIndex(index);
+	cultureNamesStyleComboBox->blockSignals(false);
+
 	const StelCore* core = StelApp::getInstance().getCore();	
 	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
 	Q_ASSERT(gui);
@@ -496,6 +506,7 @@
 	ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b);
 }
 
+// fill the description text window, not the names in the sky.
 void ViewDialog::updateSkyCultureText()
 {
 	StelApp& app = StelApp::getInstance();

=== modified file 'src/gui/ViewDialog.hpp'
--- src/gui/ViewDialog.hpp	2014-11-23 16:43:10 +0000
+++ src/gui/ViewDialog.hpp	2014-11-26 23:45:42 +0000
@@ -71,6 +71,7 @@
 	void populateLightPollution();
 	void populateLandscapeMinimalBrightness();
 
+	// WHAT IS THE SKY LAYER? hidden, under development?
 	void populateSkyLayersList();
 	void skyLayersSelectionChanged(const QString&);
 	void skyLayersEnabledChanged(int);

=== modified file 'src/gui/configurationDialog.ui'
--- src/gui/configurationDialog.ui	2014-09-26 14:33:13 +0000
+++ src/gui/configurationDialog.ui	2014-11-26 23:45:42 +0000
@@ -170,7 +170,7 @@
           <item>
            <widget class="QGroupBox" name="groupBox_2">
             <property name="title">
-             <string>Program language</string>
+             <string>Language settings</string>
             </property>
             <layout class="QHBoxLayout" name="horizontalLayout_2">
              <property name="leftMargin">
@@ -186,38 +186,84 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QComboBox" name="programLanguageComboBox">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>220</width>
-                 <height>24</height>
-                </size>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>220</width>
-                 <height>24</height>
-                </size>
-               </property>
-               <property name="editable">
-                <bool>true</bool>
-               </property>
-               <property name="insertPolicy">
-                <enum>QComboBox::NoInsert</enum>
-               </property>
-               <property name="sizeAdjustPolicy">
-                <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
-               </property>
-               <property name="frame">
-                <bool>true</bool>
-               </property>
-              </widget>
+              <layout class="QGridLayout" name="languageGridLayout">
+               <item row="0" column="0">
+                <widget class="QLabel" name="programLanguageLabel">
+                 <property name="text">
+                  <string>Program Language</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="1">
+                <widget class="QComboBox" name="programLanguageComboBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>220</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>220</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="editable">
+                  <bool>true</bool>
+                 </property>
+                 <property name="insertPolicy">
+                  <enum>QComboBox::NoInsert</enum>
+                 </property>
+                 <property name="sizeAdjustPolicy">
+                  <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+                 </property>
+                 <property name="frame">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="0">
+                <widget class="QLabel" name="skycultureLanguageLabel">
+                 <property name="text">
+                  <string>Sky Culture Language</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="1" column="1">
+                <widget class="QComboBox" name="skycultureLanguageComboBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>220</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>220</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="editable">
+                  <bool>true</bool>
+                 </property>
+                 <property name="insertPolicy">
+                  <enum>QComboBox::NoInsert</enum>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </item>
             </layout>
            </widget>
@@ -1644,7 +1690,6 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>programLanguageComboBox</tabstop>
   <tabstop>setViewingOptionAsDefaultPushButton</tabstop>
   <tabstop>restoreDefaultsButton</tabstop>
   <tabstop>checkBoxName</tabstop>

=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2014-11-23 16:09:46 +0000
+++ src/gui/viewDialog.ui	2014-11-26 23:45:42 +0000
@@ -1917,7 +1917,10 @@
             <property name="title">
              <string>Options</string>
             </property>
-            <layout class="QVBoxLayout" name="verticalLayout_8">
+            <layout class="QFormLayout" name="formLayout_2">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+             </property>
              <property name="leftMargin">
               <number>0</number>
              </property>
@@ -1930,13 +1933,30 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item>
+             <item row="0" column="0">
               <widget class="QCheckBox" name="useAsDefaultSkyCultureCheckBox">
                <property name="text">
                 <string>Use this sky culture as default</string>
                </property>
               </widget>
              </item>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Show names</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QComboBox" name="skyCultureNamesStyleComboBox">
+               <property name="toolTip">
+                <string>Select if you want names abbreviated, original or translated</string>
+               </property>
+               <property name="currentText">
+                <string/>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>

=== modified file 'src/translations.h'
--- src/translations.h	2014-11-14 19:05:02 +0000
+++ src/translations.h	2014-11-26 23:45:42 +0000
@@ -19,6 +19,7 @@
 
 // This file contains translations for all translatable strings stored within data files
 // It is not meant to be compiled but just parsed by gettext
+// names of celestial objects for screen display (Sky language) have been taken to translations_skycultures.h
 
 class Translations
 {
@@ -28,143 +29,7 @@
 	{
 		// Generate Gettext strings for traduction
 		Q_ASSERT(0);
-		
-		// Planets and satellites from ssystem.ini
-		N_("Sun");
-		N_("Mercury");
-		N_("Venus");
-		N_("Earth");
-		N_("Moon");
-		N_("Mars");
-		N_("Deimos");
-		N_("Phobos");
-		N_("Ceres");
-		N_("Pallas");
-		N_("Juno");
-		N_("Vesta");
-		N_("Jupiter");
-		N_("Io");
-		N_("Europa");
-		N_("Ganymede");
-		N_("Callisto");
-		N_("Amalthea");
-		N_("Himalia");
-		N_("Elara");
-		N_("Pasiphae");
-		N_("Sinope");
-		N_("Lysithea");
-		N_("Carme");
-		N_("Ananke");
-		N_("Leda");
-		N_("Thebe");
-		N_("Adrastea");
-		N_("Metis");
-		N_("Saturn");
-		N_("Mimas");
-		N_("Enceladus");
-		N_("Tethys");
-		N_("Dione");
-		N_("Rhea");
-		N_("Titan");
-		N_("Hyperion");
-		N_("Iapetus");
-		N_("Phoebe");
-		N_("Neptune");
-		N_("Uranus");
-		N_("Miranda");
-		N_("Ariel");
-		N_("Umbriel");
-		N_("Titania");
-		N_("Oberon");
-		N_("Pluto");
-		N_("Charon");
-		// TRANSLATORS: Moon of Pluto (II)
-		N_("Nix");
-		// TRANSLATORS: Moon of Pluto (III)
-		N_("Hydra (moon)");
-		N_("Eris");
-		N_("Triton");
-		N_("Nereid");
-		N_("Naiad");
-		N_("Thalassa");
-		N_("Despina");
-		N_("Galatea");
-		N_("Larissa");
-		N_("Proteus");
-		N_("Halimede");
-		N_("Psamathe");
-		N_("Sao");
-		N_("Laomedeia");
-		N_("Neso");
-		N_("Solar System Observer");
-		//TNO's that are in the default ssystem.ini
-		// TRANSLATORS: TNO/Asteroid (90377) Sedna
-		N_("Sedna");
-		// TRANSLATORS: TNO/Asteroid (50000) Quaoar
-		N_("Quaoar");
-		// TRANSLATORS: TNO/Asteroid (90482) Orcus
-		N_("Orcus");
-		// TRANSLATORS: TNO/Asteroid (136108) Haumea
-		N_("Haumea");
-		//Asteroids that are not in the default ssystem.ini
-		// TRANSLATORS: Asteroid (5) Astraea
-		N_("Astraea");
-		// TRANSLATORS: Asteroid (6) Hebe
-		N_("Hebe");
-		// TRANSLATORS: Asteroid (7) Iris
-		N_("Iris");
-		// TRANSLATORS: Asteroid (8) Flora
-		N_("Flora");
-		// TRANSLATORS: Asteroid (9) Metis
-		N_("Metis");
-		// TRANSLATORS: Asteroid (10) Hygiea
-		N_("Hygiea");
-		// TRANSLATORS: Asteroid (41) Daphne
-		N_("Daphne");
-		// TRANSLATORS: Asteroid (1221) Amor
-		N_("Amor");
-		// TRANSLATORS: Asteroid (99942) Apophis
-		N_("Apophis");
-		// TRANSLATORS: Asteroid (2060) Chiron
-		N_("Chiron");
-		// TRANSLATORS: Asteroid (433) Eros
-		N_("Eros");
-		// TRANSLATORS: Asteroid (624) Hektor
-		N_("Hektor");
-		// TRANSLATORS: Asteroid (20000) Varuna
-		N_("Varuna");
-		// TRANSLATORS: Asteroid (136472) Makemake
-		N_("Makemake");
-		// TRANSLATORS: Asteroid (3200) Phaethon
-		N_("Phaethon");
-		// TRANSLATORS: Asteroid (1866) Sisyphus
-		N_("Sisyphus");
-		// TRANSLATORS: Asteroid (1864) Daedalus
-		N_("Daedalus");
-		// TRANSLATORS: Asteroid (1566) Icarus
-		N_("Icarus");
-		// TRANSLATORS: Asteroid (1809) Prometheus
-		N_("Prometheus");
-		N_("Prometheus (moon)");
-		// TRANSLATORS: Asteroid (1810) Epimetheus
-		N_("Epimetheus");
-		N_("Epimetheus (moon)");
-		// TRANSLATORS: Asteroid (951) Gaspra
-		N_("Gaspra");
-		// TRANSLATORS: Asteroid (243) Ida
-		N_("Ida");
-		// TRANSLATORS: Asteroid (218) Bianca
-		N_("Bianca");
-		N_("Bianca (moon)");
-		
-		// TRANSLATORS: Proper name of comet C/1680 V1
-		N_("Great Comet of 1680 (C/1680 V1)");
-		
-		// TRANSLATORS: Name of supernova SN 1572A and script name
-		N_("Tycho's Supernova");
-		// TRANSLATORS: Name of supernova SN 1604A
-		N_("Kepler's Supernova");
-		
+
 		// Cardinals names
 		N_("N");	// North
 		N_("S");	// South
@@ -240,6 +105,7 @@
 		N_("Tupi-Guarani");
 		N_("Tongan");
 		N_("Western");
+		N_("Western (H.A.Rey)");
 
 		
 		// =====================================================================
@@ -263,6 +129,7 @@
 		// TRANSLATORS: Name of landscape
 		N_("Geneva");
 		// TRANSLATORS: Name of landscape
+		// TRANSLATORS: Name of landscape
 		N_("Grossmugl");
 		// TRANSLATORS: Name of landscape
 		N_("Zero Horizon");
@@ -320,6 +187,8 @@
 		N_("Earth and Venus Greatest Elongations and Brilliancies from Mars");
 		// TRANSLATORS: Name of script
 		N_("Earth and Mars Greatest Elongations and Transits from Callisto");
+		// TRANSLATORS: Name of script
+		N_("Tycho's Supernova");
 		
 		// =====================================================================
 		// Script descriptions

=== added file 'src/translations_skycultures.h'
--- src/translations_skycultures.h	1970-01-01 00:00:00 +0000
+++ src/translations_skycultures.h	2014-11-26 23:45:42 +0000
@@ -0,0 +1,171 @@
+/*
+ * Stellarium
+ * Copyright (C) 2005 Fabien Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+ */
+
+// This file contains translations for all translatable strings stored within data files
+// which relate to displayable celestial objects. These need a translation separate from the App translations.
+// Currently these are only names of solar system objects.
+// It is not meant to be compiled but just parsed by gettext
+
+class TranslationsSkycultures
+{
+	void TranslationsSkycultures(){;}
+
+	static translationList()
+	{
+		// Generate Gettext strings for traduction
+		Q_ASSERT(0);
+		
+		// Planets and satellites from ssystem.ini
+		N_("Sun");
+		N_("Mercury");
+		N_("Venus");
+		N_("Earth");
+		N_("Moon");
+		N_("Mars");
+		N_("Deimos");
+		N_("Phobos");
+		N_("Ceres");
+		N_("Pallas");
+		N_("Juno");
+		N_("Vesta");
+		N_("Jupiter");
+		N_("Io");
+		N_("Europa");
+		N_("Ganymede");
+		N_("Callisto");
+		N_("Amalthea");
+		N_("Himalia");
+		N_("Elara");
+		N_("Pasiphae");
+		N_("Sinope");
+		N_("Lysithea");
+		N_("Carme");
+		N_("Ananke");
+		N_("Leda");
+		N_("Thebe");
+		N_("Adrastea");
+		N_("Metis");
+		N_("Saturn");
+		N_("Mimas");
+		N_("Enceladus");
+		N_("Tethys");
+		N_("Dione");
+		N_("Rhea");
+		N_("Titan");
+		N_("Hyperion");
+		N_("Iapetus");
+		N_("Phoebe");
+		N_("Neptune");
+		N_("Uranus");
+		N_("Miranda");
+		N_("Ariel");
+		N_("Umbriel");
+		N_("Titania");
+		N_("Oberon");
+		N_("Pluto");
+		N_("Charon");
+		// TRANSLATORS: Moon of Pluto (II)
+		N_("Nix");
+		// TRANSLATORS: Moon of Pluto (III)
+		N_("Hydra (moon)");
+		N_("Eris");
+		N_("Triton");
+		N_("Nereid");
+		N_("Naiad");
+		N_("Thalassa");
+		N_("Despina");
+		N_("Galatea");
+		N_("Larissa");
+		N_("Proteus");
+		N_("Halimede");
+		N_("Psamathe");
+		N_("Sao");
+		N_("Laomedeia");
+		N_("Neso");
+		N_("Solar System Observer");
+		//TNO's that are in the default ssystem.ini
+		// TRANSLATORS: TNO/Asteroid (90377) Sedna
+		N_("Sedna");
+		// TRANSLATORS: TNO/Asteroid (50000) Quaoar
+		N_("Quaoar");
+		// TRANSLATORS: TNO/Asteroid (90482) Orcus
+		N_("Orcus");
+		// TRANSLATORS: TNO/Asteroid (136108) Haumea
+		N_("Haumea");
+		//Asteroids that are not in the default ssystem.ini
+		// TRANSLATORS: Asteroid (5) Astraea
+		N_("Astraea");
+		// TRANSLATORS: Asteroid (6) Hebe
+		N_("Hebe");
+		// TRANSLATORS: Asteroid (7) Iris
+		N_("Iris");
+		// TRANSLATORS: Asteroid (8) Flora
+		N_("Flora");
+		// TRANSLATORS: Asteroid (9) Metis
+		N_("Metis");
+		// TRANSLATORS: Asteroid (10) Hygiea
+		N_("Hygiea");
+		// TRANSLATORS: Asteroid (41) Daphne
+		N_("Daphne");
+		// TRANSLATORS: Asteroid (1221) Amor
+		N_("Amor");
+		// TRANSLATORS: Asteroid (99942) Apophis
+		N_("Apophis");
+		// TRANSLATORS: Asteroid (2060) Chiron
+		N_("Chiron");
+		// TRANSLATORS: Asteroid (433) Eros
+		N_("Eros");
+		// TRANSLATORS: Asteroid (624) Hektor
+		N_("Hektor");
+		// TRANSLATORS: Asteroid (20000) Varuna
+		N_("Varuna");
+		// TRANSLATORS: Asteroid (136472) Makemake
+		N_("Makemake");
+		// TRANSLATORS: Asteroid (3200) Phaethon
+		N_("Phaethon");
+		// TRANSLATORS: Asteroid (1866) Sisyphus
+		N_("Sisyphus");
+		// TRANSLATORS: Asteroid (1864) Daedalus
+		N_("Daedalus");
+		// TRANSLATORS: Asteroid (1566) Icarus
+		N_("Icarus");
+		// TRANSLATORS: Asteroid (1809) Prometheus
+		N_("Prometheus");
+		N_("Prometheus (moon)");
+		// TRANSLATORS: Asteroid (1810) Epimetheus
+		N_("Epimetheus");
+		N_("Epimetheus (moon)");
+		// TRANSLATORS: Asteroid (951) Gaspra
+		N_("Gaspra");
+		// TRANSLATORS: Asteroid (243) Ida
+		N_("Ida");
+		// TRANSLATORS: Asteroid (218) Bianca
+		N_("Bianca");
+		N_("Bianca (moon)");
+		
+		// TRANSLATORS: Proper name of comet C/1680 V1
+		N_("Great Comet of 1680 (C/1680 V1)");
+		
+		// TRANSLATORS: Name of supernova SN 1572A
+		N_("Tycho's Supernova");
+		// TRANSLATORS: Name of supernova SN 1604A
+		N_("Kepler's Supernova");
+		
+	}
+};