Merge lp:~stellarium/stellarium/tz into lp:stellarium

[Alexander Wolf]

Added time zone support

[Alexander Wolf (alexwolf)]

I've removed Time Zone plugin but maybe I should restore him and use him for management really custom rules for time zone and DST?

review: Needs Information

[gzotti (georg-zotti)]

I very much welcome a thorough re-work on the timezone issues, the many bug and wishlist items speak for themselves.

I had no time for a thorough test so far. Do you want to merge now and run public testing for a few weeks on the new trunk betas (and of course fix a few rounds in trunk), or have some testers on this branch and merge only when all is done? Can you publish betas from this branch?

I think some extra TZ settings options can be built into the main program's location panel. (This can become a bit larger. Also the map is very small on FullHD and higher-resolution screens.) There is no use to have a plugin when you must have it activated anyway for really basic operations. The configuration panel is more easily reached in this way.

Some things that can hopefully solved with IANA's TZ database:
DST rules for "Continent/City" timezones. In various countries, DST was introduced at some point in the 20th century. (e.g. WW1, WW2, energy crisis in the 1970s). It would be great if all times can be produced here.
Timezones were introduced around 1886, but not everywhere. Some standardisations were available previously (e.g. Railway time). The current 1886 limit may need a second thought.

Some useful options:
Have a tick (default=active) "System Defaults". This uses time zone of configured location.
Use system settings, but disable DST.
Set timezone as UT offset (15 minute steps)
Use Local Mean Solar Time. This should be default until 1885 (or we find some other meaningful date?).
Use Local True Solar Time (i.e. also add Equation of Time!) This may be useful for historical research. LTST use should be marked somehow in the bottom bar.

In any case, UT+HH:MM should be visible in the bottom toolbar like it is now. Maybe print TZ name or "LMST" in addition?

[lp:~stellarium/stellarium/tz]

8775. By Alexander Wolf on 2016-10-24

Updates and improvements

[Alexander Wolf (alexwolf)]

I prefer merge it in trunk and allow to testing it by wide circle of users.

I've added LTST also and allows to enabling/disabling DST.

Adding of full list of all exists time zones is... difficult, because in this case we should implement own tool to manage all them.

Please check last changes.

[lp:~stellarium/stellarium/tz]

8776. By Alexander Wolf on 2016-10-24

Cosmetic fixes

8777. By Alexander Wolf on 2016-10-24

Cosmetic fix

8778. By Alexander Wolf on 2016-10-24

Another cosmetic fix - let's hide combobox for TZ when we use time zones from locations

[gzotti (georg-zotti)]

LTST is great! However, it should be marked in the bottom status line, else just UT+HH:MM looks like LMST. ALso, the last change, hiding the combobox, is more confusing than helpful. I suggest the timezone combo should be visible (so that you can see what has been found for the city), but unclickable when time from location is active.

When I switch from LMST back to zone time (or activate default) it seems the LMST longitude offset is not set back, or even all auto-zone lookup fails, it seems to keep LMST offset when I select a city.

Disabling DST seems OK for now.

review: Needs Fixing

[Alexander Wolf (alexwolf)]

Please use tooltip with info for LMST/LTST and current time zone name. Or you meant that I should remove UTC+XX:XX data and use LMST/LTST instead?

I'll check switching from LMST - it should be work correct.

[Alexander Wolf (alexwolf)]

I can introduce additional UTC+XX:XX time zones with 15-min. step also - should be the range UTC-12:00 -- UTC+12:00?

[gzotti (georg-zotti)]

Don't forget that tooltips sometimes don't work. Win7/NVidia OpenGL frequently just has no tooltips. (This was my default until recently!)

Optimal would be to see "UT+HH:MM", "UT+HH:MM (LMST)" or "UT+HH:MM (LTST)"

[gzotti (georg-zotti)]

> I can introduce additional UTC+XX:XX time zones with 15-min. step also -
> should be the range UTC-12:00 -- UTC+12:00?

According to https://en.wikipedia.org/wiki/Time_zone#Offsets_from_UTC
this should even go up to UT+14:00.
Not sure: Half-hour offsets seem frequent, but there are only very few 15-min offsets (Nepal, Australia). Make all, or only the particular actually existing zones? Can you filter the existing zone offsets from the IANA list?

[Alexander Wolf (alexwolf)]

OK for the tooltip problem.

For time zones in format UTC+HH:MM - we are have them in this format already. Please see bottom of the list.

[gzotti (georg-zotti)]

Ah yes. OK, Zone list seems complete.

When I am in "Custom zone" mode and select a zone, then disable custom zone, the combo is hidden and correct zone is used. When I then select a neighbour town, it goes back to some other zone. Not even the previously selected!

Example: I set Vienna, but custom zone America/Indianapolis, deselected custom zone (came back to Europe/Vienna), selected some location in Poland, and we were in zone America/Bogota. I see the zone offset in the status bar and zone name in the tooltip, OK. But custom timezone is disabled, so we should correctly be in Europe/Warsaw! I would prefer to see the combobox, just disabled, for reference, and of course correct zone lookup when custom time zone is disabled.

[lp:~stellarium/stellarium/tz]

8779. By Alexander Wolf on 2016-10-25

Cosmetic fixes

8780. By Alexander Wolf on 2016-10-25

Cosmetic fix

[Alexander Wolf (alexwolf)]

Please check it again.

[gzotti (georg-zotti)]

New observations: Immediately after start, tooltip timezone string is not set under some circumstances. Yes, when ini:localisation:time_zone is missing because it is set to default.

I call the location panel. custom timezone disabled, DST enabled. Displayed time zone: Local Mean Solar Time. This is wrong. It could be UTC+2:00?
Still my time is correctly displayed as UTC+2:00, not LMST.
When I click on my city in the list, all is OK.
This may have to do with an "unnamed" location (just long/Lat). My startup location is not in the site list. Maybe better always store time_zone?

The "Bogota" problem is however solved. ... No, now sometimes it's the other way! Custom tz disabled, I select a city, and TZ goes to previously selected Europe/Vienna. I have to enable custom zone and disable it again to switch to the correct one. I have not found a pattern yet to trigger this confusing behaviour.

When I click a location on the map, accurate country-based timezone is not found automatically, of course. But you could simply suggest a UT+XX zone from Longitude/15, this should fit a first guess.

I have auto-location from IP query disabled. Does this also deliver a timezone?

Maybe add the longitude time offset (LMST) and equation of time value (LTST) in the tooltip? My preference would be "UT+HH:MM", "UT+HH:MM (LMST)" or "UT+HH:MM (LTST)" in the time string directly (avoid problems with tooltips not working).

review: Needs Fixing

[Alexander Wolf (alexwolf)]

Sorry, but your location was defined by user and he don't have info about time zone - LMST is good solution for guessing here. It's correct behaviour.

>My startup location is not in the site list. Maybe better always store time_zone?

No, because this will cause the old behaviour but with new mistakes.

> I have auto-location from IP query disabled. Does this also deliver a timezone?

Yes.

> My preference would be "UT+HH:MM", "UT+HH:MM (LMST)" or "UT+HH:MM (LTST)"

Please give use case, when it may be useful.

[lp:~stellarium/stellarium/tz]

8781. By Alexander Wolf on 2016-10-25

Cosmetic fix

8782. By Alexander Wolf on 2016-10-25

fixed stupid bug

8783. By Alexander Wolf on 2016-10-25

added alias 'auto' for LMST

[Alexander Wolf (alexwolf)]

Please check it again.

[gzotti (georg-zotti)]

> Sorry, but your location was defined by user and he don't have info about time
> zone - LMST is good solution for guessing here. It's correct behaviour.
>
> >My startup location is not in the site list. Maybe better always store
> time_zone?
>
> No, because this will cause the old behaviour but with new mistakes.

I expect tons of misunderstanding. But this is what user testing is all about, let's see then how useful it feels after a few weeks.

> > My preference would be "UT+HH:MM", "UT+HH:MM (LMST)" or "UT+HH:MM (LTST)"
>
> Please give use case, when it may be useful.

Where is it not useful? This mode is mostly for users with advanced requirements (but not necessarily expert astronomers, but maybe historians of science) who understand the difference but e.g. want to be sure it is computed correctly, they don't make a mistake in their thoughts, or want to explain the difference to others.

[Alexander Wolf (alexwolf)]

Well, let's try public testing :)

[gzotti (georg-zotti)]

When I go back to my stored location, "Use custom timezone" is disabled, but the correct TZ shown.
After restarting Stellarium, you are using correct UT+2, but location panel indicates LMST.
This is confusing. I had stored a location with custom TZ Europe/Vienna plus active DST (resulting in UTC+2). However, after reverting to default location the previously stored TZ is not again stored in config.ini, so I assume the UTC+2 comes from system settings. Still, the location panel shows LMST.

Maybe you must remember custom time zone from startup to be able to reset properly to startup location/TZ.

LMST/LTST display is fine now!

OK, I expect some user questions/complaints about some inconsistent behaviour which I described until this is fixed, but else I agree this is (going to be) much better user experience than the previous plugin-based TZ handling which required program restart. So this is the way to proceed, and yes for public testing!

review: Approve

[Alexander Wolf (alexwolf)]

Please send me your user_locations.txt file for playing.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-14 14:15:29 +0000
+++ CMakeLists.txt	2016-10-25 16:10:21 +0000
@@ -254,7 +254,6 @@
 ADD_PLUGIN(Supernovae 1)
 ADD_PLUGIN(TextUserInterface 1)
 ADD_PLUGIN(TelescopeControl 1)
-ADD_PLUGIN(TimeZoneConfiguration 1)
 
 ########## Static plugins need to define includes and libraries
 ########## for the compilation of Stellarium itself
 
=== modified file 'cmake/default_config.ini.cmake'
--- cmake/default_config.ini.cmake	2016-10-10 13:50:34 +0000
+++ cmake/default_config.ini.cmake	2016-10-25 16:10:21 +0000
@@ -55,7 +55,6 @@
 sky_culture                         = western
 sky_locale                          = system
 app_locale                          = system
-time_zone                           = system_default
 time_display_format                 = system_default
 date_display_format                 = yyyymmdd
 
 
=== modified file 'data/gui/normalStyle.css'
--- data/gui/normalStyle.css	2015-09-03 21:24:13 +0000
+++ data/gui/normalStyle.css	2016-10-25 16:10:21 +0000
@@ -230,7 +230,7 @@
 	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgb(183, 184, 185), stop: 1 rgb(111, 113, 114));
 }
 
-QPushButton::Disabled {
+QPushButton::disabled {
         color: #f0f0f0;
 }
 
@@ -718,6 +718,11 @@
 	padding-left: 3px;
 }
 
+QComboBox:disabled, QSpinBox:disabled {
+        color: #f0f0f0;
+}
+
+
 QProgressBar {
 	border: 1px solid rgba(102, 102, 128, 50%);
 	border-radius: 2px;
 
=== removed file 'data/zone.tab'
--- data/zone.tab	2005-03-11 01:52:16 +0000
+++ data/zone.tab	1970-01-01 00:00:00 +0000
@@ -1,399 +0,0 @@
-# @(#)zone.tab	1.27
-#
-# TZ zone descriptions
-#
-# From Paul Eggert <[e-mail]> (1996-08-05):
-#
-# This file contains a table with the following columns:
-# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
-# 2.  Latitude and longitude of the zone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Zone name used in value of TZ environment variable.
-# 4.  Comments; present if and only if the country has multiple rows.
-#
-# Columns are separated by a single tab.
-# The table is sorted first by country, then an order within the country that
-# (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
-#
-# Lines beginning with `#' are comments.
-#
-#country-
-#code	coordinates	TZ			comments
-AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AG	[phone]	America/Antigua
-AI	[phone]	America/Anguilla
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AN	[phone]	America/Curacao
-AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
-AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
-AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
-AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
-AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
-AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
-AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Base, Terre Adelie
-AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
-AR	-3436-05827	America/Buenos_Aires	E Argentina (BA, DF, SC, TF)
-AR	-3124-06411	America/Cordoba	most locations (CB,CC,CH,CN,ER,FM,LP,LR,MN,NQ,RN,SA,SE,SF,SJ,SL,TM)
-AR	-2411-06518	America/Jujuy	Jujuy (JY)
-AR	-2828-06547	America/Catamarca	Catamarca (CT)
-AR	-3253-06849	America/Mendoza	Mendoza (MZ)
-AS	-1416-17042	Pacific/Pago_Pago
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-4253+14719	Australia/Hobart	Tasmania
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales - most locations
-AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
-AU	-2728+15302	Australia/Brisbane	Queensland - most locations
-AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia
-AW	[phone]	America/Aruba
-AZ	+4023+04951	Asia/Baku
-BA	+4352+01825	Europe/Sarajevo
-BB	[phone]	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BF	[phone]	Africa/Ouagadougou
-BG	+4241+02319	Europe/Sofia
-BH	+2623+05035	Asia/Bahrain
-BI	-0323+02922	Africa/Bujumbura
-BJ	+0629+00237	Africa/Porto-Novo
-BM	[phone]	Atlantic/Bermuda
-BN	+0456+11455	Asia/Brunei
-BO	-1630-06809	America/La_Paz
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Amapa, E Para
-BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PR)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (BA, GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-1535-05605	America/Cuiaba	Mato Grosso, Mato Grosso do Sul
-BR	-0846-06354	America/Porto_Velho	W Para, Rondonia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	E Amazonas
-BR	-0640-06952	America/Eirunepe	W Amazonas
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	[phone]	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BW	-2545+02555	Africa/Gaborone
-BY	+5354+02734	Europe/Minsk
-BZ	[phone]	America/Belize
-CA	[phone]	America/St_Johns	Newfoundland Island
-CA	[phone]	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
-CA	[phone]	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
-CA	[phone]	America/Goose_Bay	Atlantic Time - E Labrador
-CA	[phone]	America/Montreal	Eastern Time - Ontario & Quebec - most locations
-CA	[phone]	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
-CA	[phone]	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
-CA	[phone]	America/Pangnirtung	Eastern Standard Time - Pangnirtung, Nunavut
-CA	[phone]	America/Iqaluit	Eastern Standard Time - east Nunavut
-CA	[phone]	America/Rankin_Inlet	Eastern Standard Time - central Nunavut
-CA	[phone]	America/Winnipeg	Central Time - Manitoba & west Ontario
-CA	[phone]	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
-CA	[phone]	America/Cambridge_Bay	Central Time - west Nunavut
-CA	[phone]	America/Regina	Central Standard Time - Saskatchewan - most locations
-CA	[phone]	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
-CA	[phone]	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
-CA	[phone]	America/Yellowknife	Mountain Time - central Northwest Territories
-CA	[phone]	America/Inuvik	Mountain Time - west Northwest Territories
-CA	[phone]	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
-CA	[phone]	America/Vancouver	Pacific Time - west British Columbia
-CA	[phone]	America/Whitehorse	Pacific Time - south Yukon
-CA	[phone]	America/Dawson	Pacific Time - north Yukon
-CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
-CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
-CF	+0422+01835	Africa/Bangui
-CG	-0416+01517	Africa/Brazzaville
-CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most locations
-CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
-CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
-CN	+4545+12641	Asia/Harbin	Heilongjiang
-CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
-CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang Uyghur
-CN	+3929+07559	Asia/Kashgar	southwest Xinjiang Uyghur
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	[phone]	America/Havana
-CV	[phone]	Atlantic/Cape_Verde
-CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia
-CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin
-DJ	+1136+04309	Africa/Djibouti
-DK	+5540+01235	Europe/Copenhagen
-DM	[phone]	America/Dominica
-DO	[phone]	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	mainland
-EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	[phone]	Africa/El_Aaiun
-ER	+1520+03853	Africa/Asmera
-ES	[phone]	Europe/Madrid	mainland
-ES	[phone]	Africa/Ceuta	Ceuta & Melilla
-ES	[phone]	Atlantic/Canary	Canary Islands
-ET	+0902+03842	Africa/Addis_Ababa
-FI	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0931+13808	Pacific/Yap	Yap
-FM	+0725+15147	Pacific/Truk	Truk (Chuuk)
-FM	+0658+15813	Pacific/Ponape	Ponape (Pohnpei)
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	[phone]	Atlantic/Faeroe
-FR	+4852+00220	Europe/Paris
-GA	+0023+00927	Africa/Libreville
-GB	[phone]	Europe/London	Great Britain
-GB	[phone]	Europe/Belfast	Northern Ireland
-GD	[phone]	America/Grenada
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GH	+0533-00013	Africa/Accra
-GI	[phone]	Europe/Gibraltar
-GL	[phone]	America/Godthab	most locations
-GL	[phone]	America/Danmarkshavn	east coast, north of Scoresbysund
-GL	[phone]	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
-GL	[phone]	America/Thule	Thule / Pituffik
-GM	[phone]	Africa/Banjul
-GN	+0931-01343	Africa/Conakry
-GP	[phone]	America/Guadeloupe
-GQ	+0345+00847	Africa/Malabo
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	[phone]	America/Guatemala
-GU	+1328+14445	Pacific/Guam
-GW	[phone]	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	[phone]	America/Tegucigalpa
-HR	+4548+01558	Europe/Zagreb
-HT	[phone]	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java & Sumatra
-ID	-0002+10920	Asia/Pontianak	west & central Borneo
-ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
-ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
-IE	[phone]	Europe/Dublin
-IL	+3146+03514	Asia/Jerusalem
-IN	+2232+08822	Asia/Calcutta
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	[phone]	Atlantic/Reykjavik
-IT	+4154+01229	Europe/Rome
-JM	[phone]	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Asia/Phnom_Penh
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KM	-1141+04316	Indian/Comoro
-KN	[phone]	America/St_Kitts
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Asia/Kuwait
-KY	[phone]	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most locations
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
-KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Asia/Vientiane
-LB	+3353+03530	Asia/Beirut
-LC	[phone]	America/St_Lucia
-LI	+4709+00931	Europe/Vaduz
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LS	-2928+02730	Africa/Maseru
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	[phone]	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most locations
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MK	+4159+02126	Europe/Skopje
-ML	[phone]	Africa/Bamako	southwest Mali
-ML	[phone]	Africa/Timbuktu	northeast Mali
-MM	+1647+09610	Asia/Rangoon
-MN	+4755+10653	Asia/Ulaanbaatar	most locations
-MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
-MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
-MO	+2214+11335	Asia/Macau
-MP	+1512+14545	Pacific/Saipan
-MQ	[phone]	America/Martinique
-MR	[phone]	Africa/Nouakchott
-MS	[phone]	America/Montserrat
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MW	-1547+03500	Africa/Blantyre
-MX	[phone]	America/Mexico_City	Central Time - most locations
-MX	[phone]	America/Cancun	Central Time - Quintana Roo
-MX	[phone]	America/Merida	Central Time - Campeche, Yucatan
-MX	[phone]	America/Monterrey	Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas
-MX	[phone]	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
-MX	[phone]	America/Chihuahua	Mountain Time - Chihuahua
-MX	[phone]	America/Hermosillo	Mountain Standard Time - Sonora
-MX	[phone]	America/Tijuana	Pacific Time
-MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
-MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
-MZ	-2558+03235	Africa/Maputo
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16530	Pacific/Noumea
-NE	+1331+00207	Africa/Niamey
-NF	-2903+16758	Pacific/Norfolk
-NG	+0627+00324	Africa/Lagos
-NI	[phone]	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Katmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901+16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most locations
-NZ	-4355-17630	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Asia/Muscat
-PA	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	[phone]	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR	[phone]	America/Puerto_Rico
-PS	+3130+03428	Asia/Gaza
-PT	[phone]	Europe/Lisbon	mainland
-PT	[phone]	Atlantic/Madeira	Madeira Islands
-PT	[phone]	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Indian/Reunion
-RO	+4426+02606	Europe/Bucharest
-RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
-RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
-RU	+5312+05009	Europe/Samara	Moscow+01 - Caspian Sea
-RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
-RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
-RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
-RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
-RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
-RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
-RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
-RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
-RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
-RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
-RW	-0157+03004	Africa/Kigali
-SA	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Atlantic/St_Helena
-SI	+4603+01431	Europe/Ljubljana
-SJ	+7800+01600	Arctic/Longyearbyen	Svalbard
-SJ	[phone]	Atlantic/Jan_Mayen	Jan Mayen
-SK	+4809+01707	Europe/Bratislava
-SL	+0830-01315	Africa/Freetown
-SM	+4355+01228	Europe/San_Marino
-SN	[phone]	Africa/Dakar
-SO	+0204+04522	Africa/Mogadishu
-SR	+0550-05510	America/Paramaribo
-ST	+0020+00644	Africa/Sao_Tome
-SV	[phone]	America/El_Salvador
-SY	+3330+03618	Asia/Damascus
-SZ	-2618+03106	Africa/Mbabane
-TC	[phone]	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen
-TG	+0608+00113	Africa/Lome
-TH	+1345+10031	Asia/Bangkok
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-2110+17510	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT	[phone]	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kiev	most locations
-UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk
-UA	+4457+03406	Europe/Simferopol	central Crimea
-UG	+0019+03225	Africa/Kampala
-UM	[phone]	Pacific/Johnston	Johnston Atoll
-UM	[phone]	Pacific/Midway	Midway Islands
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	[phone]	America/New_York	Eastern Time
-US	[phone]	America/Detroit	Eastern Time - Michigan - most locations
-US	[phone]	America/Louisville	Eastern Time - Kentucky - Louisville area
-US	[phone]	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
-US	[phone]	America/Indianapolis	Eastern Standard Time - Indiana - most locations
-US	[phone]	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
-US	[phone]	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
-US	[phone]	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
-US	[phone]	America/Chicago	Central Time
-US	[phone]	America/Menominee	Central Time - Michigan - Wisconsin border
-US	[phone]	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
-US	[phone]	America/Denver	Mountain Time
-US	[phone]	America/Boise	Mountain Time - south Idaho & east Oregon
-US	[phone]	America/Shiprock	Mountain Time - Navajo
-US	[phone]	America/Phoenix	Mountain Standard Time - Arizona
-US	[phone]	America/Los_Angeles	Pacific Time
-US	[phone]	America/Anchorage	Alaska Time
-US	[phone]	America/Juneau	Alaska Time - Alaska panhandle
-US	[phone]	America/Yakutat	Alaska Time - Alaska panhandle neck
-US	[phone]	America/Nome	Alaska Time - west Alaska
-US	[phone]	America/Adak	Aleutian Islands
-US	[phone]	Pacific/Honolulu	Hawaii
-UY	-3453-05611	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
-VA	+4154+01227	Europe/Vatican
-VC	[phone]	America/St_Vincent
-VE	[phone]	America/Caracas
-VG	[phone]	America/Tortola
-VI	[phone]	America/St_Thomas
-VN	+1045+10640	Asia/Saigon
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Asia/Aden
-YT	-1247+04514	Indian/Mayotte
-YU	+4450+02030	Europe/Belgrade
-ZA	-2615+02800	Africa/Johannesburg
-ZM	-1525+02817	Africa/Lusaka
-ZW	-1750+03103	Africa/Harare
-XX      0+0		Etc/UTC
 \ No newline at end of file
 
=== modified file 'plugins/EquationOfTime/CMakeLists.txt'
--- plugins/EquationOfTime/CMakeLists.txt	2015-10-28 14:52:25 +0000
+++ plugins/EquationOfTime/CMakeLists.txt	2016-10-25 16:10:21 +0000
@@ -1,6 +1,6 @@
 SET(EQUATIONOFTIME_MAJOR "0")
 SET(EQUATIONOFTIME_MINOR "1")
-SET(EQUATIONOFTIME_PATCH "3")
+SET(EQUATIONOFTIME_PATCH "4")
 SET(EQUATIONOFTIME_VERSION "${EQUATIONOFTIME_MAJOR}.${EQUATIONOFTIME_MINOR}.${EQUATIONOFTIME_PATCH}")
 
 IF(APPLE)
 
=== modified file 'plugins/EquationOfTime/src/EquationOfTime.cpp'
--- plugins/EquationOfTime/src/EquationOfTime.cpp	2015-10-28 14:52:25 +0000
+++ plugins/EquationOfTime/src/EquationOfTime.cpp	2016-10-25 16:10:21 +0000
@@ -33,9 +33,6 @@
 #include "EquationOfTime.hpp"
 #include "EquationOfTimeWindow.hpp"
 
-//#include "sidereal_time.h"
-#include "precession.h"
-
 #include <QFontMetrics>
 #include <QSettings>
 #include <QPixmap>
@@ -123,7 +120,7 @@
 	sPainter.setFont(font);
 
 	QString timeText;
-	double eqTime = getSolutionEquationOfTime(core->getJDE());
+	double eqTime = core->getSolutionEquationOfTime(core->getJDE());
 
 	if (getFlagInvertedValue())
 		eqTime *= -1;
@@ -215,44 +212,6 @@
 	conf->endGroup();
 }
 
-double EquationOfTime::getSolutionEquationOfTime(const double JDE) const
-{
-	StelCore* core = StelApp::getInstance().getCore();
-
-	double tau = (JDE - 2451545.0)/365250.0;
-	double sunMeanLongitude = 280.4664567 + tau*(360007.6892779 + tau*(0.03032028 + tau*(1./49931. - tau*(1./15300. - tau/2000000.))));
-
-	// reduce the angle
-	sunMeanLongitude = std::fmod(sunMeanLongitude, 360.);
-	// force it to be the positive remainder, so that 0 <= angle < 360
-	sunMeanLongitude = std::fmod(sunMeanLongitude + 360., 360.);
-
-	Vec3d pos = GETSTELMODULE(StelObjectMgr)->searchByName("Sun")->getEquinoxEquatorialPos(core);
-	double ra, dec;
-	StelUtils::rectToSphe(&ra, &dec, pos);
-
-	// covert radians to degrees and reduce the angle
-	double alpha = std::fmod(ra*180./M_PI, 360.);
-	// force it to be the positive remainder, so that 0 <= angle < 360
-	alpha = std::fmod(alpha + 360., 360.);
-
-	double deltaPsi, deltaEps;
-	getNutationAngles(JDE, &deltaPsi, &deltaEps); // these are radians!
-	//double equation = 4*(sunMeanLongitude - 0.0057183 - alpha + get_nutation_longitude(JDE)*cos(get_mean_ecliptical_obliquity(JDE)));
-	double equation = 4*(sunMeanLongitude - 0.0057183 - alpha + deltaPsi*180./M_PI*cos(getPrecessionAngleVondrakEpsilon(JDE)));
-	// The equation of time is always smaller 20 minutes in absolute value
-	if (qAbs(equation)>20)
-	{
-		// If absolute value of the equation of time appears to be too large, add 24 hours (1440 minutes) to or subtract it from our result
-		if (equation>0.)
-			equation -= 1440.;
-		else
-			equation += 1440.;
-	}
-
-	return equation;
-}
-
 void EquationOfTime::updateMessageText()
 {
 	messageEquation = q_("Equation of Time");
 
=== modified file 'plugins/EquationOfTime/src/EquationOfTime.hpp'
--- plugins/EquationOfTime/src/EquationOfTime.hpp	2015-10-28 14:52:25 +0000
+++ plugins/EquationOfTime/src/EquationOfTime.hpp	2016-10-25 16:10:21 +0000
@@ -86,12 +86,6 @@
 	//! Save the settings to the main configuration file.
 	void saveSettingsToConfig(void);
 
-	//! Get solution of equation of time
-	//! Source: J. Meeus "Astronomical Algorithms" (2nd ed., with corrections as of August 10, 2009) p.183-187.
-	//! @param JDE JD in Dynamical Time (previously called Ephemeris Time)
-	//! @return time in minutes
-	double getSolutionEquationOfTime(const double JDE) const;
-
 	//! Is plugin enabled?
 	bool isEnabled() const
 	{
 
=== modified file 'plugins/Observability/src/Observability.cpp'
--- plugins/Observability/src/Observability.cpp	2016-07-21 22:45:43 +0000
+++ plugins/Observability/src/Observability.cpp	2016-10-25 16:10:21 +0000
@@ -287,8 +287,7 @@
 	double currheight = (6371.+(core->getCurrentLocation().altitude)/1000.)/UA;
 	double currJD = core->getJD();
 	double currJDint;
-//	GMTShift = StelUtils::getGMTShiftFromQT(currJD)/24.0;
-	GMTShift = StelApp::getInstance().getLocaleMgr().getGMTShift(currJD)/24.0;
+	GMTShift = core->getUTCOffset(currJD)/24.0;
 
 
 	double currLocalT = 24.*modf(currJD + GMTShift,&currJDint);
 
=== modified file 'plugins/RemoteControl/src/MainService.cpp'
--- plugins/RemoteControl/src/MainService.cpp	2016-06-03 17:40:43 +0000
+++ plugins/RemoteControl/src/MainService.cpp	2016-10-25 16:10:21 +0000
@@ -163,7 +163,7 @@
 			double jday = core->getJD();
 			double deltaT = core->getDeltaT() * StelCore::JD_SECOND;
 
-			double gmtShift = localeMgr->getGMTShift(jday) / 24.0;
+			double gmtShift = core->getUTCOffset(jday) / 24.0;
 
 			QString utcIso = StelUtils::julianDayToISO8601String(jday,true).append('Z');
 			QString localIso = StelUtils::julianDayToISO8601String(jday+gmtShift,true);
 
=== modified file 'plugins/Satellites/src/Satellites.cpp'
--- plugins/Satellites/src/Satellites.cpp	2016-09-17 09:48:40 +0000
+++ plugins/Satellites/src/Satellites.cpp	2016-10-25 16:10:21 +0000
@@ -1689,7 +1689,7 @@
 					if (angle>angle0 && (v<1) && lat>5*M_PI/180)
 					{
 						IridiumFlaresPrediction flare;
-						flare.datetime = StelUtils::julianDayToISO8601String(currentJD+dt+StelUtils::getGMTShiftFromQT(currentJD+dt)/24.f);
+						flare.datetime = StelUtils::julianDayToISO8601String(currentJD+dt+StelApp::getInstance().getCore()->getUTCOffset(currentJD+dt)/24.f);
 						flare.satellite = sat.data()->getEnglishName();
 						flare.azimuth   = lon;
 						flare.altitude  = lat;
 
=== modified file 'plugins/Satellites/src/gui/SatellitesDialog.cpp'
--- plugins/Satellites/src/gui/SatellitesDialog.cpp	2016-05-22 13:40:10 +0000
+++ plugins/Satellites/src/gui/SatellitesDialog.cpp	2016-10-25 16:10:21 +0000
@@ -997,7 +997,7 @@
 	QString date = modelIndex.sibling(modelIndex.row(), IridiumFlaresDate).data().toString();
 	bool ok;
 	double JD  = StelUtils::getJulianDayFromISO8601String(date.left(10) + "T" + date.right(8), &ok);
-	JD -= StelUtils::getGMTShiftFromQT(JD)/24.;
+	JD -= StelApp::getInstance().getCore()->getUTCOffset(JD)/24.;
 
 	StelObjectMgr* objectMgr = GETSTELMODULE(StelObjectMgr);
 	if (objectMgr->findAndSelectI18n(name) || objectMgr->findAndSelect(name))
 
=== removed directory 'plugins/TimeZoneConfiguration'
=== removed file 'plugins/TimeZoneConfiguration/CMakeLists.txt'
--- plugins/TimeZoneConfiguration/CMakeLists.txt	2015-10-20 17:16:34 +0000
+++ plugins/TimeZoneConfiguration/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-
-SET(TIME_ZONE_CONFIGURATION_MAJOR "0")
-SET(TIME_ZONE_CONFIGURATION_MINOR "0")
-SET(TIME_ZONE_CONFIGURATION_PATCH "4")
-SET(TIME_ZONE_CONFIGURATION_VERSION "${TIME_ZONE_CONFIGURATION_MAJOR}.${TIME_ZONE_CONFIGURATION_MINOR}.${TIME_ZONE_CONFIGURATION_PATCH}")
-
-IF(APPLE)
-     SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
-ElSE(APPLE)
-     SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
-ENDIF(APPLE)
-
-ADD_DEFINITIONS(-DTIME_ZONE_CONFIGURATION_VERSION="${TIME_ZONE_CONFIGURATION_VERSION}")
-
-ADD_SUBDIRECTORY( src )
-
-INSTALL(FILES DESTINATION "modules/TimeZoneConfiguration")
-
-
 
=== removed directory 'plugins/TimeZoneConfiguration/src'
=== removed file 'plugins/TimeZoneConfiguration/src/CMakeLists.txt'
--- plugins/TimeZoneConfiguration/src/CMakeLists.txt	2015-10-20 17:16:34 +0000
+++ plugins/TimeZoneConfiguration/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-
-INCLUDE_DIRECTORIES(
-     .
-     gui
-     ${CMAKE_BINARY_DIR}
-     ${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src
-     ${CMAKE_BINARY_DIR}/plugins/TimeZoneConfiguration/src/gui
-)
-
-LINK_DIRECTORIES(/src)
-
-SET(TimeZoneConfiguration_SRCS
-     TimeZoneConfiguration.hpp
-     TimeZoneConfiguration.cpp
-     gui/TimeZoneConfigurationWindow.hpp
-     gui/TimeZoneConfigurationWindow.cpp
-     gui/DefineTimeZoneWindow.hpp
-     gui/DefineTimeZoneWindow.cpp
-)
-
-SET(TimeZoneConfiguration_UIS
-     gui/timeZoneConfigurationWindow.ui
-     gui/defineTimeZone.ui
-)
-
-QT5_WRAP_UI(TimeZoneConfiguration_UIS_H ${TimeZoneConfiguration_UIS})
-
-SET(extLinkerOption ${OPENGL_LIBRARIES})
-
-ADD_LIBRARY(TimeZoneConfiguration-static STATIC ${TimeZoneConfiguration_SRCS} ${TimeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H})
-QT5_USE_MODULES(TimeZoneConfiguration-static Core Network Gui Widgets)
-SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES OUTPUT_NAME "TimeZoneConfiguration")
-TARGET_LINK_LIBRARIES(TimeZoneConfiguration-static ${extLinkerOption})
-SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
-ADD_DEPENDENCIES(AllStaticPlugins TimeZoneConfiguration-static)
 
=== removed file 'plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp'
--- plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp	2014-04-15 19:00:10 +0000
+++ plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "TimeZoneConfiguration.hpp"
-#include "TimeZoneConfigurationWindow.hpp"
-
-#include "StelApp.hpp"
-#include "StelLocaleMgr.hpp"
-#include "StelModule.hpp"
-
-#include <QSettings>
-
-StelModule* TimeZoneConfigurationStelPluginInterface::getStelModule() const
-{
-	return new TimeZoneConfiguration();
-}
-
-StelPluginInfo TimeZoneConfigurationStelPluginInterface::getPluginInfo() const
-{
-	// Allow to load the resources when used as a static plugin
-	//Q_INIT_RESOURCE(TimeZoneConfiguration);
-
-	StelPluginInfo info;
-	info.id = "TimeZoneConfiguration";
-	info.displayedName = N_("Time Zone");
-	info.authors = "Bogdan Marinov";
-	info.contact = "http://stellarium.org";
-	info.description = N_("A convenient interface for some of the more obscure options in Stellarium's configuration file. Allows setting the time zone and changing the way the time and the date are displayed in the bottom bar.");
-	info.version = TIME_ZONE_CONFIGURATION_VERSION;
-	return info;
-}
-
-TimeZoneConfiguration::TimeZoneConfiguration()
-{
-	setObjectName("TimeZoneConfiguration");
-	mainWindow = new TimeZoneConfigurationWindow();
-	//
-}
-
-TimeZoneConfiguration::~TimeZoneConfiguration()
-{
-	//
-}
-
-void TimeZoneConfiguration::init()
-{
-	//
-}
-
-void TimeZoneConfiguration::deinit()
-{
-	delete mainWindow;
-}
-
-double TimeZoneConfiguration::getCallOrder(StelModuleActionName) const
-{
-	return 0.;
-}
-
-void TimeZoneConfiguration::update(double)
-{
-	//
-}
-
-bool TimeZoneConfiguration::configureGui(bool show)
-{
-	if (show)
-		mainWindow->setVisible(true);
-
-	return true;
-}
-
-void TimeZoneConfiguration::setTimeZone(QString timeZoneString)
-{
-	if (timeZoneString.isEmpty())
-	{
-		return;
-	}
-	//TODO: Validation?
-	qDebug() << "Setting \"localization/time_zone\" to" << timeZoneString;
-
-	QSettings * settings = StelApp::getInstance().getSettings();
-	Q_ASSERT(settings);
-
-	settings->setValue("localization/time_zone", timeZoneString);
-	settings->sync();
-}
-
-QString TimeZoneConfiguration::readTimeZone()
-{
-	QSettings * settings = StelApp::getInstance().getSettings();
-	Q_ASSERT(settings);
-
-	return settings->value("localization/time_zone").toString();
-}
-
-void TimeZoneConfiguration::saveDisplayFormats()
-{
-	QSettings * settings = StelApp::getInstance().getSettings();
-	Q_ASSERT(settings);
-
-	StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr();
-
-	QString timeDisplayFormat = localeManager.getTimeFormatStr();
-	settings->setValue("localization/time_display_format", timeDisplayFormat);
-
-	QString dateDisplayFormat = localeManager.getDateFormatStr();
-	settings->setValue("localization/date_display_format", dateDisplayFormat);
-
-	settings->sync();
-}
 
=== removed file 'plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.hpp'
--- plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.hpp	2015-02-18 22:21:55 +0000
+++ plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.hpp	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
- 
- #ifndef _TIME_ZONE_CONFIGURATION_HPP_
- #define _TIME_ZONE_CONFIGURATION_HPP_
-
-#include "StelGui.hpp"
-#include "StelModule.hpp"
-
-#include <QString>
-
-class TimeZoneConfigurationWindow;
-
-class TimeZoneConfiguration : public StelModule
-{
-	Q_OBJECT
-
-public:
-	TimeZoneConfiguration();
-	~TimeZoneConfiguration();
-
-	virtual void init();
-	virtual void deinit();
-	virtual void update(double deltaTime);
-	//virtual void draw(StelCore *core);
-	virtual double getCallOrder(StelModuleActionName actionName) const;
-	virtual bool configureGui(bool show);
-
-	//! Sets the time zone field in Stellarium's configuration file.
-	//! To work, timeZoneString should be a valid value of the TZ environmental
-	//! variable according to the POSIX format.
-	//! (See http://www.gnu.org/s/libc/manual/html_node/TZ-Variable.html)
-	//! Note that Microsoft Windows may use a truncated version of the TZ
-	//! format.
-	//! For now, Stellarium needs to be restarted for the new settings to take
-	//! effect.
-	void setTimeZone(QString timeZoneString);
-
-	//! Reads the time zone field in Stellarium's configuration file.
-	//! \returns the contents of the "localization/time_zone" field in
-	//! Stellarium's configuration file.
-	QString readTimeZone();
-
-	//! Saves the formats used to display date and time in the bottom bar.
-	void saveDisplayFormats();
-
-private:
-	TimeZoneConfigurationWindow * mainWindow;
-};
-
-
-#include <QObject>
-#include "StelPluginInterface.hpp"
-
-//! This class is used by Qt to manage a plug-in interface
-class TimeZoneConfigurationStelPluginInterface : public QObject, public StelPluginInterface
-{
-	Q_OBJECT
-	Q_PLUGIN_METADATA(IID StelPluginInterface_iid)
-	Q_INTERFACES(StelPluginInterface)
-public:
-	virtual StelModule* getStelModule() const;
-	virtual StelPluginInfo getPluginInfo() const;
-};
- 
- #endif //_TIME_ZONE_CONFIGURATION_HPP_
 
=== removed directory 'plugins/TimeZoneConfiguration/src/gui'
=== removed file 'plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.cpp'
--- plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.cpp	2016-01-22 11:05:08 +0000
+++ plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.cpp	1970-01-01 00:00:00 +0000
@@ -1,541 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "TimeZoneConfigurationWindow.hpp"
-#include "DefineTimeZoneWindow.hpp"
-#include "ui_defineTimeZone.h"
-#include "StelApp.hpp"
-#include "StelTranslator.hpp"
-
-#include <cmath>
-#include <QRegExpValidator>
-
-DefineTimeZoneWindow::DefineTimeZoneWindow()
-{
-	ui = new Ui_defineTimeZoneForm();
-	dialogName = "TimeZoneConfigurationDefineTimeZone";
-	timeZoneNameValidator = new QRegExpValidator(QRegExp("[^:\\d,+-/]{3,}"), this);
-}
-
-DefineTimeZoneWindow::~DefineTimeZoneWindow()
-{
-	delete ui;
-	delete timeZoneNameValidator;
-}
-
-void DefineTimeZoneWindow::retranslate()
-{
-	if (dialog)
-	{
-		ui->retranslateUi(dialog);
-		int startDateMonthIndex = ui->comboBoxDstStartDateMonth->currentIndex();
-		int startDayIndex = ui->comboBoxDstStartDay->currentIndex();
-		int startMonthIndex = ui->comboBoxDstStartMonth->currentIndex();
-		int startWeekIndex = ui->comboBoxDstStartWeek->currentIndex();
-		int endDateMonthIndex = ui->comboBoxDstEndDateMonth->currentIndex();
-		int endDayIndex = ui->comboBoxDstEndDay->currentIndex();
-		int endMonthIndex = ui->comboBoxDstEndMonth->currentIndex();
-		int endWeekIndex = ui->comboBoxDstEndWeek->currentIndex();
-		populateDateLists();
-		ui->comboBoxDstStartDateMonth->setCurrentIndex(startDateMonthIndex);
-		ui->comboBoxDstStartDay->setCurrentIndex(startDayIndex);
-		ui->comboBoxDstStartMonth->setCurrentIndex(startMonthIndex);
-		ui->comboBoxDstStartWeek->setCurrentIndex(startWeekIndex);
-		ui->comboBoxDstEndDateMonth->setCurrentIndex(endDateMonthIndex);
-		ui->comboBoxDstEndDay->setCurrentIndex(endDayIndex);
-		ui->comboBoxDstEndMonth->setCurrentIndex(endMonthIndex);
-		ui->comboBoxDstEndWeek->setCurrentIndex(endWeekIndex);
-	}
-}
-
-void DefineTimeZoneWindow::createDialogContent()
-{
-	ui->setupUi(dialog);
-	connect(&StelApp::getInstance(), SIGNAL(languageChanged()),
-	        this, SLOT(retranslate()));
-
-	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
-	connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint)));
-	connect(ui->pushButtonUseDefinition, SIGNAL(clicked()),
-	        this, SLOT(useDefinition()));
-
-	connect(ui->doubleSpinBoxOffset, SIGNAL(valueChanged(double)),
-	        this, SLOT(updateDstOffset(double)));
-
-	connect(ui->comboBoxDstStartDateMonth, SIGNAL(currentIndexChanged(int)),
-	        this, SLOT(updateDayNumberMaximumDstStart(int)));
-	connect(ui->comboBoxDstEndDateMonth, SIGNAL(currentIndexChanged(int)),
-	        this, SLOT(updateDayNumberMaximumDstEnd(int)));
-
-	ui->lineEditName->setValidator(timeZoneNameValidator);
-	ui->lineEditNameDst->setValidator(timeZoneNameValidator);
-
-	resetWindowState();
-}
-
-void DefineTimeZoneWindow::useDefinition()
-{
-	QString definition;
-	QString timeZoneName = ui->lineEditName->text();
-	if (timeZoneName.length() < 3)
-	{
-		return;
-	}
-	definition.append(timeZoneName);
-	definition.append(TimeZoneConfigurationWindow::getTzOffsetStringFrom(ui->doubleSpinBoxOffset));
-
-	//Daylight saving time
-	if (ui->checkBoxDst->isChecked())
-	{
-		QString dstTimeZoneName = ui->lineEditNameDst->text();
-		if (dstTimeZoneName.length() < 3 || dstTimeZoneName == timeZoneName)
-		{
-			return;
-		}
-		//The name is the minimum required for DST
-		definition.append(dstTimeZoneName);
-
-		//The offset is not necessary
-		if (ui->checkBoxOffsetDst->isChecked())
-		{
-			definition.append(TimeZoneConfigurationWindow::getTzOffsetStringFrom(ui->doubleSpinBoxOffsetDst));
-		}
-
-		if (ui->groupBoxDstStart->isChecked() && ui->groupBoxDstEnd->isChecked())
-		{
-			if (ui->radioButtonDstStartDate->isChecked())
-			{
-				const int month = ui->comboBoxDstStartDateMonth->currentIndex() + 1;
-				const int day = ui->spinBoxDstStartDateDay->value();
-				QDate startDate;
-				if (month == 2 && day == 29)
-				{
-					//Leap year: day is indexed between 0 and 365
-					startDate.setDate(2000, month, day);
-					definition.append(QString(",%1").arg(startDate.dayOfYear() - 1));
-				}
-				else
-				{
-					startDate.setDate(2010, month, day);
-					definition.append(QString(",J%1").arg(startDate.dayOfYear()));
-				}
-			}
-			else //Day of week
-			{
-				//Day of the week: 0-6, 0 is Sunday
-				int day  = ui->comboBoxDstStartDay->currentIndex();
-				//Week ordinal number: 1-5, 5 is "last"
-				int week = ui->comboBoxDstStartWeek->currentIndex() + 1;
-				//Month: 1-12
-				int month = ui->comboBoxDstStartMonth->currentIndex() + 1;
-
-				definition.append(QString(",M%1.%2.%3").arg(month).arg(week).arg(day));
-			}
-
-			if (ui->checkBoxDstStartTime->isChecked())
-			{
-				definition.append(ui->timeEditDstStart->time().toString("'/'hh:mm:ss"));
-			}
-
-			if (ui->radioButtonDstEndDate->isChecked())
-			{
-				const int month = ui->comboBoxDstEndDateMonth->currentIndex() + 1;
-				const int day = ui->spinBoxDstEndDateDay->value();
-				QDate endDate;
-				if (month == 2 && day == 29)
-				{
-					//Leap year: day is indexed between 0 and 365
-					endDate.setDate(2000, month, day);
-					definition.append(QString(",%1").arg(endDate.dayOfYear() - 1));
-				}
-				else
-				{
-					endDate.setDate(2010, month, day);
-					definition.append(QString(",J%1").arg(endDate.dayOfYear()));
-				}
-			}
-			else //Day of week
-			{
-				//Day of the week: 0-6, 0 is Sunday
-				int day  = ui->comboBoxDstEndDay->currentIndex();
-				//Week ordinal number: 1-5, 5 is "last"
-				int week = ui->comboBoxDstEndWeek->currentIndex() + 1;
-				//Month: 1-12
-				int month = ui->comboBoxDstEndMonth->currentIndex() + 1;
-
-				definition.append(QString(",M%1.%2.%3").arg(month).arg(week).arg(day));
-			}
-
-			if (ui->checkBoxDstEndTime->isChecked())
-			{
-				definition.append(ui->timeEditDstEnd->time().toString("'/'hh:mm:ss"));
-			}
-		}
-	}
-
-	emit timeZoneDefined(definition);
-	close();
-}
-
-void DefineTimeZoneWindow::updateDstOffset(double normalOffset)
-{
-	if (ui->checkBoxOffsetDst->isChecked())
-		return;
-
-	//By default, the DST offset is +1 hour the normal offset
-	ui->doubleSpinBoxOffsetDst->setValue(normalOffset + 1.0);
-}
-
-void DefineTimeZoneWindow::resetWindowState()
-{
-	populateDateLists();
-
-	//Default section
-	ui->lineEditName->clear();
-	ui->lineEditNameDst->clear();
-
-	ui->doubleSpinBoxOffset->setValue(0.0);
-	//(indirectly sets doubleSpinBoxOffsetDst)
-
-	ui->checkBoxDst->setChecked(false);
-	ui->frameDst->setVisible(false);
-
-	ui->checkBoxOffsetDst->setChecked(false);
-	ui->doubleSpinBoxOffsetDst->setEnabled(false);
-
-	ui->groupBoxDstStart->setChecked(false);
-	//(indirectly sets the other one)
-
-	ui->radioButtonDstStartDay->setChecked(true);
-	ui->radioButtonDstEndDay->setChecked(true);
-
-	ui->spinBoxDstStartDateDay->setValue(1);
-	ui->spinBoxDstEndDateDay->setValue(1);
-	ui->comboBoxDstStartDateMonth->setCurrentIndex(0);
-	ui->comboBoxDstEndDateMonth->setCurrentIndex(0);
-
-	ui->checkBoxDstStartTime->setChecked(false);
-	ui->timeEditDstStart->setEnabled(false);
-	ui->timeEditDstStart->setTime(QTime(2, 0, 0, 0));
-	ui->checkBoxDstEndTime->setChecked(false);
-	ui->timeEditDstEnd->setEnabled(false);
-	ui->timeEditDstEnd->setTime(QTime(2, 0, 0, 0));
-}
-
-void DefineTimeZoneWindow::populateDateLists()
-{
-	QStringList monthList;
-	monthList.append(q_("January"));
-	monthList.append(q_("February"));
-	monthList.append(q_("March"));
-	monthList.append(q_("April"));
-	monthList.append(q_("May"));
-	monthList.append(q_("June"));
-	monthList.append(q_("July"));
-	monthList.append(q_("August"));
-	monthList.append(q_("September"));
-	monthList.append(q_("October"));
-	monthList.append(q_("November"));
-	monthList.append(q_("December"));
-
-	ui->comboBoxDstStartMonth->clear();
-	ui->comboBoxDstStartMonth->addItems(monthList);
-	ui->comboBoxDstEndMonth->clear();
-	ui->comboBoxDstEndMonth->addItems(monthList);
-	ui->comboBoxDstStartDateMonth->clear();
-	ui->comboBoxDstStartDateMonth->addItems(monthList);
-	ui->comboBoxDstEndDateMonth->clear();
-	ui->comboBoxDstEndDateMonth->addItems(monthList);
-
-	QStringList weekList;
-	weekList.append(q_("First week"));
-	weekList.append(q_("Second week"));
-	weekList.append(q_("Third week"));
-	weekList.append(q_("Fourth week"));
-	weekList.append(q_("Last week"));
-
-	ui->comboBoxDstStartWeek->clear();
-	ui->comboBoxDstStartWeek->addItems(weekList);
-	ui->comboBoxDstEndWeek->clear();
-	ui->comboBoxDstEndWeek->addItems(weekList);
-
-	//Starts from Sunday deliberately
-	QStringList dayList;
-	dayList.append(q_("Sunday"));
-	dayList.append(q_("Monday"));
-	dayList.append(q_("Tuesday"));
-	dayList.append(q_("Wednesday"));
-	dayList.append(q_("Thursday"));
-	dayList.append(q_("Friday"));
-	dayList.append(q_("Saturday"));
-
-	ui->comboBoxDstStartDay->clear();
-	ui->comboBoxDstStartDay->addItems(dayList);
-	ui->comboBoxDstEndDay->clear();
-	ui->comboBoxDstEndDay->addItems(dayList);
-}
-void DefineTimeZoneWindow::updateDayNumberMaximum(int monthIndex, QSpinBox *spinBoxDay)
-{
-	int maximum = 31;
-	switch (monthIndex)
-	{
-		case 0: //January
-		case 2: //March
-		case 4: //May
-		case 6: //July
-		case 7: //August
-		case 9: //October
-		case 11: //December
-			maximum = 31;
-			break;
-		case 3: //April
-		case 5: //June
-		case 8: //September
-		case 10: //November
-			maximum = 30;
-			break;
-		case 1: //February
-			maximum = 29;
-			break;
-		default:
-			;//
-	}
-
-	if (spinBoxDay->value() > maximum)
-		spinBoxDay->setValue(maximum);
-	spinBoxDay->setRange(1, maximum);
-}
-
-void DefineTimeZoneWindow::updateDayNumberMaximumDstStart(int monthIndex)
-{
-	updateDayNumberMaximum(monthIndex, ui->spinBoxDstStartDateDay);
-}
-
-void DefineTimeZoneWindow::updateDayNumberMaximumDstEnd(int monthIndex)
-{
-	updateDayNumberMaximum(monthIndex, ui->spinBoxDstEndDateDay);
-}
-
-bool DefineTimeZoneWindow::readDstEndpoint(const QString& string,
-                                           DstEndpoint endpoint)
-{
-	QGroupBox* groupBox = 0;
-	QRadioButton* radioButtonDay = 0;
-	QRadioButton* radioButtonDate = 0;
-	QCheckBox* checkBoxTime = 0;
-	QComboBox* comboBoxWeek = 0;
-	QComboBox* comboBoxMonth = 0;
-	QComboBox* comboBoxDay = 0;
-	QTimeEdit* timeEdit = 0;
-
-	if (endpoint == DstStart)
-	{
-		groupBox = ui->groupBoxDstStart;
-		radioButtonDay = ui->radioButtonDstStartDay;
-		radioButtonDate = ui->radioButtonDstStartDate;
-		checkBoxTime = ui->checkBoxDstStartTime;
-		comboBoxWeek = ui->comboBoxDstStartWeek;
-		comboBoxMonth = ui->comboBoxDstStartMonth;
-		comboBoxDay = ui->comboBoxDstStartDay;
-		timeEdit = ui->timeEditDstStart;
-	}
-	else
-	{
-		groupBox = ui->groupBoxDstEnd;
-		radioButtonDay = ui->radioButtonDstEndDay;
-		radioButtonDate = ui->radioButtonDstEndDate;
-		checkBoxTime = ui->checkBoxDstEndTime;
-		comboBoxWeek = ui->comboBoxDstEndWeek;
-		comboBoxMonth = ui->comboBoxDstEndMonth;
-		comboBoxDay = ui->comboBoxDstEndDay;
-		timeEdit = ui->timeEditDstEnd;
-	}
-
-	QRegExp endPointFormat("(J\\d{1,3}|\\d{1,3}|M\\d{1,2}\\.\\d\\.\\d)(?:\\/(\\d{1,2}(?:\\:(?:\\d{1,2})(?:\\:(?:\\d{1,2}))?)?))?");
-	if (!endPointFormat.exactMatch(string))
-		return false;
-
-	if (endPointFormat.captureCount() == 2)
-	{
-		QString timeString = endPointFormat.cap(2).trimmed();
-		if (!timeString.isEmpty())
-		{
-			int hours, minutes, seconds;
-			TimeZoneConfigurationWindow::readTzTimeString(timeString,
-			                                              hours,
-			                                              minutes,
-			                                              seconds);
-			QTime time(hours, minutes, seconds);
-			if (time.isValid())
-			{
-				checkBoxTime->setChecked(true);
-				timeEdit->setTime(time);
-			}
-			else
-				return false;
-		}
-	}
-
-	QString date = endPointFormat.cap(1);
-	if (date.startsWith('J'))
-	{
-		int julianDay = date.mid(1).toInt();
-		if (julianDay < 1 || julianDay > 365)
-			return false;
-
-		radioButtonDate->setChecked(true);
-		setEndPointDate(julianDay, false, endpoint);
-	}
-	else if (date.startsWith('M'))
-	{
-		QStringList list = date.mid(1).split('.');
-		if (list.count() != 3)
-			return false;
-
-		int month = list[0].toInt();
-		if (month < 1 || month > 12)
-			return false;
-		int week = list[1].toInt();
-		if (week < 1 || week > 5)
-			return false;
-		int day = list[2].toInt();
-		if (day < 0 || day > 6)
-			return false;
-
-		radioButtonDay->setChecked(true);
-		comboBoxMonth->setCurrentIndex(month - 1);
-		comboBoxWeek->setCurrentIndex(week - 1);
-		comboBoxDay->setCurrentIndex(day);
-	}
-	else
-	{
-		int julianDay = date.toInt();
-		if (julianDay < 0 || julianDay > 365)
-			return false;
-
-		radioButtonDate->setChecked(true);
-		setEndPointDate(julianDay+1, true, endpoint);
-	}
-
-	groupBox->setChecked(true);
-	return true;
-}
-
-void DefineTimeZoneWindow::setEndPointDate(int ordinalDate,
-                                           bool leapYear,
-                                           DstEndpoint endpoint)
-{
-	QSpinBox* spinBoxDateDay = 0;
-	QComboBox* comboBoxDateMonth = 0;
-	if (endpoint == DstStart)
-	{
-		spinBoxDateDay = ui->spinBoxDstStartDateDay;
-		comboBoxDateMonth = ui->comboBoxDstStartDateMonth;
-	}
-	else
-	{
-		spinBoxDateDay = ui->spinBoxDstEndDateDay;
-		comboBoxDateMonth = ui->comboBoxDstEndDateMonth;
-	}
-
-	int monthLength[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-	if (leapYear)
-		monthLength[1] = 29;
-	for (int i = 0; i < 12; i++)
-	{
-		if (ordinalDate <= monthLength[i])
-		{
-			spinBoxDateDay->setValue(ordinalDate);
-			comboBoxDateMonth->setCurrentIndex(i);
-			break;
-		}
-		else
-		{
-			ordinalDate -= monthLength[i];
-		}
-	}
-}
-
-void DefineTimeZoneWindow::setTimeZone(QString tzString)
-{
-	if (dialog == NULL) //As initialized in StelDialog
-		return;
-
-	if (tzString.isEmpty())
-		return;
-
-	//TZ variable format:
-	// - name
-	// - signed offset
-	// The following is optional:
-	// - DST name
-	// - DST signed offset
-	// - DST beginning
-	// - DST end
-	QRegExp tzFormat("^([^:\\d,+-/]{3,})([+-]?[\\d:]+)(?:([^:\\d,+-/]{3,})((?:[+-]?[\\d:]+)?),([JM\\d\\./:]+),([JM\\d\\./:]+))?$");
-	if (!tzFormat.exactMatch(tzString))
-		return;
-
-	double offset = TimeZoneConfigurationWindow::readTzOffsetString(tzFormat.cap(2));
-	if (fabs(offset) >= 24)
-		return;
-
-	QString name = tzFormat.cap(1).trimmed();
-	if (name.isEmpty())
-		return;
-
-	ui->lineEditName->setText(name);
-	ui->doubleSpinBoxOffset->setValue(offset);
-
-	//TODO: Clean this up. The offset and the end point are not obligatory?
-	int count = tzFormat.captureCount();
-	if (count > 2)
-	{
-		QString dstName = tzFormat.cap(3).trimmed();
-		if (dstName.isEmpty())
-			return;
-		QString dstOffsetString = tzFormat.cap(4).trimmed();
-		if (!dstOffsetString.isEmpty())
-		{
-			double dstOffset = TimeZoneConfigurationWindow::readTzOffsetString(dstOffsetString);
-			if (fabs(dstOffset) >= 24)
-				return;
-
-			ui->checkBoxOffsetDst->setChecked(true);
-			ui->doubleSpinBoxOffsetDst->setValue(dstOffset);
-		}
-		else
-		{
-			ui->checkBoxOffsetDst->setChecked(false);
-			ui->doubleSpinBoxOffsetDst->setValue(offset + 1);
-		}
-
-		QString dstStartString = tzFormat.cap(5).trimmed();
-		if (!readDstEndpoint(dstStartString, DstStart))
-			return;
-		QString dstEndString = tzFormat.cap(6).trimmed();
-		if (!readDstEndpoint(dstEndString, DstEnd))
-			return;
-
-		ui->checkBoxDst->setChecked(true);
-		ui->lineEditNameDst->setText(dstName);
-	}
-
-
-}
 
=== removed file 'plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.hpp'
--- plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.hpp	2012-02-13 18:59:16 +0000
+++ plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.hpp	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _DEFINE_TIME_ZONE_HPP_
-#define _DEFINE_TIME_ZONE_HPP_
-
-#include "StelDialog.hpp"
-
-class Ui_defineTimeZoneForm;
-class QRegExpValidator;
-class QSpinBox;
-
-class DefineTimeZoneWindow : public StelDialog
-{
-	Q_OBJECT
-
-public:
-	DefineTimeZoneWindow();
-	~DefineTimeZoneWindow();
-
-	//! Fills the fields of the form with the time zone described in the string.
-	//! Call after createDialogContent() or setVisible() to avoid a crash.
-	void setTimeZone(QString timeZoneString);
-
-public slots:
-	void retranslate();
-
-signals:
-	void timeZoneDefined(QString timeZoneString);
-
-protected:
-	void createDialogContent();
-
-private:
-	Ui_defineTimeZoneForm * ui;
-
-	QRegExpValidator * timeZoneNameValidator;
-
-	void resetWindowState();
-	void populateDateLists();
-
-	void updateDayNumberMaximum(int monthIndex, QSpinBox * spinBoxDay);
-
-	enum DstEndpoint {DstStart, DstEnd};
-	//! \returns false if #string is not a valid TZ DST end point description.
-	bool readDstEndpoint(const QString& string, DstEndpoint endpoint);
-	void setEndPointDate(int ordinalDate, bool leapYear, DstEndpoint endpoint);
-
-private slots:
-	void useDefinition();
-	void updateDstOffset(double normalOffset);
-	void updateDayNumberMaximumDstStart(int monthIndex);
-	void updateDayNumberMaximumDstEnd(int monthIndex);
-};
-
-
-#endif //_DEFINE_TIME_ZONE_HPP_
 
=== removed file 'plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.cpp'
--- plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.cpp	2016-01-22 11:05:08 +0000
+++ plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.cpp	1970-01-01 00:00:00 +0000
@@ -1,285 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include "TimeZoneConfiguration.hpp"
-#include "TimeZoneConfigurationWindow.hpp"
-#include "DefineTimeZoneWindow.hpp"
-#include "ui_timeZoneConfigurationWindow.h"
-
-#include "StelApp.hpp"
-#include "StelLocaleMgr.hpp"
-#include "StelModuleMgr.hpp"
-
-TimeZoneConfigurationWindow::TimeZoneConfigurationWindow()
-{
-	ui = new Ui_timeZoneConfigurationWindowForm();
-	dialogName = "TimeZoneConfiguration";
-	timeZoneConfiguration = GETSTELMODULE(TimeZoneConfiguration);
-	defineTimeZoneWindow = NULL;
-}
-
-TimeZoneConfigurationWindow::~TimeZoneConfigurationWindow()
-{
-	delete ui;
-	if (defineTimeZoneWindow)
-		delete defineTimeZoneWindow;
-}
-
-void TimeZoneConfigurationWindow::retranslate()
-{
-	if (dialog)
-	{
-		ui->retranslateUi(dialog);
-		updateAboutText();
-	}
-}
-
-void TimeZoneConfigurationWindow::createDialogContent()
-{
-	ui->setupUi(dialog);
-
-	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
-	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
-	connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint)));
-	connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(saveTimeZoneSettings()));
-	connect(ui->pushButtonEditTimeZone, SIGNAL(clicked()), this, SLOT(openDefineTimeZoneWindow()));
-
-	connect(ui->radioButtonTimeDefault, SIGNAL(toggled(bool)), this, SLOT(setTimeFormat(bool)));
-	connect(ui->radioButtonTime12Hour, SIGNAL(toggled(bool)), this, SLOT(setTimeFormat(bool)));
-	connect(ui->radioButtonTime24Hour, SIGNAL(toggled(bool)), this, SLOT(setTimeFormat(bool)));
-
-	connect(ui->radioButtonDateDefault, SIGNAL(toggled(bool)), this, SLOT(setDateFormat(bool)));
-	connect(ui->radioButtonDateDMY, SIGNAL(toggled(bool)), this, SLOT(setDateFormat(bool)));
-	connect(ui->radioButtonDateMDY, SIGNAL(toggled(bool)), this, SLOT(setDateFormat(bool)));
-	connect(ui->radioButtonDateYMD, SIGNAL(toggled(bool)), this, SLOT(setDateFormat(bool)));
-
-	updateDisplayFormatSwitches();
-
-	QString currentTimeZoneString = timeZoneConfiguration->readTimeZone();
-	//ui->lineEditCurrent->setText(currentTimeZoneString);
-	ui->lineEditUserDefined->setText(currentTimeZoneString);
-	ui->frameUserDefined->setEnabled(false);
-
-	if (currentTimeZoneString.startsWith("SCT"))
-	{
-		if (currentTimeZoneString == "SCT+0")
-		{
-			ui->radioButtonUtc->setChecked(true);
-		}
-		else
-		{
-			ui->radioButtonOffset->setChecked(true);
-			double offset = readTzOffsetString(currentTimeZoneString.mid(3));
-			ui->doubleSpinBoxOffset->setValue(offset);
-		}
-	}
-	else if (currentTimeZoneString == "system_default")
-	{
-		ui->radioButtonLocalSettings->setChecked(true);
-	}
-	else
-	{
-		ui->radioButtonUserDefined->setChecked(true);
-	}
-
-	updateAboutText();
-}
-
-void TimeZoneConfigurationWindow::updateAboutText()
-{
-	ui->labelTitle->setText(q_("Time Zone plug-in"));
-	QString version = QString(q_("Version %1")).arg(TIME_ZONE_CONFIGURATION_VERSION);
-	ui->labelVersion->setText(version);
-}
-
-void TimeZoneConfigurationWindow::saveTimeZoneSettings()
-{
-	QString timeZoneString;
-	if (ui->radioButtonUtc->isChecked())
-	{
-		timeZoneString = "SCT+0";//"Stellarium Custom Time" :)
-	}
-	else if (ui->radioButtonOffset->isChecked())
-	{
-		timeZoneString = QString("SCT").append(getTzOffsetStringFrom(ui->doubleSpinBoxOffset));
-	}
-	else if (ui->radioButtonUserDefined->isChecked())
-	{
-		timeZoneString = ui->lineEditUserDefined->text();
-	}
-	else
-	{
-		timeZoneString = "system_default";
-	}
-
-	timeZoneConfiguration->setTimeZone(timeZoneString);
-}
-
-void TimeZoneConfigurationWindow::openDefineTimeZoneWindow()
-{
-	dialog->setEnabled(false);
-
-	if (defineTimeZoneWindow == NULL)
-	{
-		defineTimeZoneWindow = new DefineTimeZoneWindow();
-		connect(defineTimeZoneWindow, SIGNAL(timeZoneDefined(QString)), this, SLOT(timeZoneDefined(QString)));
-		connect(defineTimeZoneWindow, SIGNAL(visibleChanged(bool)), this, SLOT(closeDefineTimeZoneWindow(bool)));
-	}
-
-	defineTimeZoneWindow->setVisible(true);
-	defineTimeZoneWindow->setTimeZone(ui->lineEditUserDefined->text());
-}
-
-void TimeZoneConfigurationWindow::closeDefineTimeZoneWindow(bool show)
-{
-	if (show)
-		return;
-
-	disconnect(defineTimeZoneWindow, SIGNAL(timeZoneDefined(QString)), this, SLOT(timeZoneDefined(QString)));
-	disconnect(defineTimeZoneWindow, SIGNAL(visibleChanged(bool)), this, SLOT(closeDefineTimeZoneWindow(bool)));
-	delete defineTimeZoneWindow;
-	defineTimeZoneWindow = NULL;
-
-	dialog->setEnabled(true);
-}
-
-void TimeZoneConfigurationWindow::timeZoneDefined(QString timeZoneDefinition)
-{
-	ui->lineEditUserDefined->setText(timeZoneDefinition);
-}
-
-double TimeZoneConfigurationWindow::readTzOffsetString(const QString& string)
-{
-	const QChar signChar = string.at(0);
-	//Offset is POSIX style: UTF - local time = offset,
-	//so invert the sign:
-	const int sign = (signChar == '-') ? 1 : -1;
-	int hours, minutes, seconds;
-	readTzTimeString((signChar.isDigit()) ? string : string.mid(1),
-	                 hours, minutes, seconds);
-	const double offset = sign * (hours + floor(((minutes * 60 + seconds)/3600.0) * 100) / 100.0);//Round to the second digit
-	return offset;
-}
-
-void TimeZoneConfigurationWindow::readTzTimeString(const QString& string,
-                                                   int& hours,
-                                                   int& minutes,
-                                                   int& seconds)
-{
-	hours = 0;
-	minutes = 0;
-	seconds = 0;
-
-	QRegExp tzTimeFormat("(\\d{1,2})(?:\\:(\\d{1,2})(?:\\:(\\d{1,2}))?)?");
-	if (!tzTimeFormat.exactMatch(string))
-		return;
-
-	int count = tzTimeFormat.captureCount();
-	switch (count)
-	{
-		case 3:
-			seconds = tzTimeFormat.cap(3).toInt();
-			//Fallthrough!
-		case 2:
-			minutes = tzTimeFormat.cap(2).toInt();
-			//Fallthrough!
-		case 1:
-		default:
-			hours = tzTimeFormat.cap(1).toInt();
-	}
-}
-
-QString TimeZoneConfigurationWindow::getTzOffsetStringFrom(QDoubleSpinBox * spinBox)
-{
-	Q_ASSERT(spinBox);
-
-	int offset = spinBox->value() * 3600;
-	//Offset is POSIX style: UTC - local time = offset,
-	//so invert the sign:
-	QChar offsetSign = (offset > 0) ? '-' : '+';
-	offset = abs(offset);
-	int offsetSeconds = offset % 60; offset /= 60.;
-	int offsetMinutes = offset % 60; offset /= 60.;
-	int offsetHours = offset;
-
-	return QString("%1%2:%3:%4").arg(offsetSign).arg(offsetHours, 2, 10, QChar('0')).arg(offsetMinutes, 2, 10, QChar('0')).arg(offsetSeconds, 2, 10, QChar('0'));
-}
-
-void TimeZoneConfigurationWindow::updateDisplayFormatSwitches()
-{
-	StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr();
-
-	QString timeFormat = localeManager.getTimeFormatStr();
-	if (timeFormat == "12h")
-		ui->radioButtonTime12Hour->setChecked(true);
-	else if (timeFormat == "24h")
-		ui->radioButtonTime24Hour->setChecked(true);
-	else
-		ui->radioButtonTimeDefault->setChecked(true);
-
-	QString dateFormat = localeManager.getDateFormatStr();
-	if (dateFormat == "yyyymmdd")
-		ui->radioButtonDateYMD->setChecked(true);
-	else if (dateFormat == "ddmmyyyy")
-		ui->radioButtonDateDMY->setChecked(true);
-	else if (dateFormat == "mmddyyyy")
-		ui->radioButtonDateMDY->setChecked(true);
-	else
-		ui->radioButtonDateDefault->setChecked(true);
-}
-
-void TimeZoneConfigurationWindow::setTimeFormat(bool)
-{
-	//TODO: This will break if the settings' format is changed.
-	//It's a pity StelLocaleMgr::sTimeFormatToString() is private...
-	QString selectedFormat;
-	if (ui->radioButtonTime12Hour->isChecked())
-		selectedFormat = "12h";
-	else if (ui->radioButtonTime24Hour->isChecked())
-		selectedFormat = "24h";
-	else
-		selectedFormat = "system_default";
-
-	StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr();
-	if (selectedFormat == localeManager.getTimeFormatStr())
-		return;
-	localeManager.setTimeFormatStr(selectedFormat);
-	timeZoneConfiguration->saveDisplayFormats();
-}
-
-void TimeZoneConfigurationWindow::setDateFormat(bool)
-{
-	//TODO: This will break if the settings' format is changed.
-	//It's a pity StelLocaleMgr::sDateFormatToString() is private...
-	QString selectedFormat;
-	if (ui->radioButtonDateYMD->isChecked())
-		selectedFormat = "yyyymmdd";
-	else if (ui->radioButtonDateDMY->isChecked())
-		selectedFormat = "ddmmyyyy";
-	else if (ui->radioButtonDateMDY->isChecked())
-		selectedFormat = "mmddyyyy";
-	else
-		selectedFormat = "system_default";
-
-	StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr();
-	if (selectedFormat == localeManager.getDateFormatStr())
-		return;
-	localeManager.setDateFormatStr(selectedFormat);
-	timeZoneConfiguration->saveDisplayFormats();
-}
 
=== removed file 'plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.hpp'
--- plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.hpp	2012-02-13 18:59:16 +0000
+++ plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.hpp	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Time zone configuration plug-in for Stellarium
- *
- * Copyright (C) 2010 Bogdan Marinov
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TIME_ZONE_CONFIGURATION_WINDOW_HPP_
-#define _TIME_ZONE_CONFIGURATION_WINDOW_HPP_
-
-#include "StelDialog.hpp"
-
-#include <QString>
-#include <QDoubleSpinBox>
-
-class Ui_timeZoneConfigurationWindowForm;
-class TimeZoneConfiguration;
-class DefineTimeZoneWindow;
-
-//! Main window of the Time Zone configuration plug-in.
-class TimeZoneConfigurationWindow : public StelDialog
-{
-	Q_OBJECT
-
-public:
-	TimeZoneConfigurationWindow();
-	~TimeZoneConfigurationWindow();
-
-	//! Parses an offset string in the format [+|-]hh[:mm[:ss]].
-	//! \returns a fraction of hours. The sign is inverted,
-	//! as in the TZ format offset = (UTC - local time),
-	//! and the traditional offset = (local time - UTC).
-	static double readTzOffsetString(const QString& string);
-
-	//! Parses a time string in the format hh[:mm[:ss]] to separate values.
-	//! Used both by readTzOffsetString() and in DefineTimeZoneWindow.
-	static void readTzTimeString(const QString& string, int& hour, int& minutes, int& seconds);
-
-	//! Converts a decimal fraction of hours to a string containing a signed
-	//! offset in the format used in the TZ variable.
-	//! The sign is inverted, as in the TZ format offset = (UTC - local time),
-	//! not the traditional offset = (local time - UTC).
-	static QString getTzOffsetStringFrom(QDoubleSpinBox * spinBox);
-
-public slots:
-	void retranslate();
-
-protected:
-	void createDialogContent();
-
-private:
-	Ui_timeZoneConfigurationWindowForm * ui;
-	DefineTimeZoneWindow * defineTimeZoneWindow;
-	TimeZoneConfiguration * timeZoneConfiguration;
-	
-	void updateAboutText();
-
-private slots:
-	void saveTimeZoneSettings();
-	void openDefineTimeZoneWindow();
-	void closeDefineTimeZoneWindow(bool);
-	void timeZoneDefined(QString timeZoneDefinition);
-
-	void setTimeFormat(bool);
-	void setDateFormat(bool);
-	void updateDisplayFormatSwitches();
-};
-
-
-#endif //_TIME_ZONE_CONFIGURATION_WINDOW_HPP_
 
=== removed file 'plugins/TimeZoneConfiguration/src/gui/defineTimeZone.ui'
--- plugins/TimeZoneConfiguration/src/gui/defineTimeZone.ui	2011-11-17 16:55:28 +0000
+++ plugins/TimeZoneConfiguration/src/gui/defineTimeZone.ui	1970-01-01 00:00:00 +0000
@@ -1,621 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>defineTimeZoneForm</class>
- <widget class="QWidget" name="defineTimeZoneForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>450</width>
-    <height>474</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="BarFrame" name="TitleBar">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>4</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="leftSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="stelWindowTitle">
-        <property name="text">
-         <string>Define a time zone</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="rightSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="closeStelWindow">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBoxTimeZone">
-     <property name="title">
-      <string>Time zone</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayoutTimeZone">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayoutName">
-        <item>
-         <widget class="QLabel" name="labelName">
-          <property name="text">
-           <string>Timezone name:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacerName">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="lineEditName"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayoutOffset">
-        <item>
-         <widget class="QLabel" name="labelOffset">
-          <property name="text">
-           <string>Offset from UTC (hours):</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QDoubleSpinBox" name="doubleSpinBoxOffset">
-          <property name="wrapping">
-           <bool>true</bool>
-          </property>
-          <property name="minimum">
-           <double>-24.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>24.000000000000000</double>
-          </property>
-          <property name="singleStep">
-           <double>0.250000000000000</double>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="checkBoxDst">
-        <property name="text">
-         <string>Daylight saving time (summer time)</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frameDst">
-        <layout class="QVBoxLayout" name="verticalLayoutDst">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QFrame" name="frame">
-           <layout class="QVBoxLayout" name="verticalLayoutDstMain">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayoutNameDst">
-              <item>
-               <widget class="QLabel" name="labelNameDst">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="text">
-                 <string>DST timezone name:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacerNameDst">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>40</width>
-                  <height>20</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="lineEditNameDst"/>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayoutOffsetDst">
-              <item>
-               <widget class="QCheckBox" name="checkBoxOffsetDst">
-                <property name="text">
-                 <string>DST offset from UTC (hours):</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <spacer name="horizontalSpacerOffsetDst">
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" stdset="0">
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <widget class="QDoubleSpinBox" name="doubleSpinBoxOffsetDst">
-                <property name="wrapping">
-                 <bool>true</bool>
-                </property>
-                <property name="minimum">
-                 <double>-24.000000000000000</double>
-                </property>
-                <property name="maximum">
-                 <double>24.000000000000000</double>
-                </property>
-                <property name="singleStep">
-                 <double>0.250000000000000</double>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="groupBoxDstStart">
-           <property name="title">
-            <string>Daylight saving time start</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-           <layout class="QGridLayout" name="gridLayoutDstStart">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item row="1" column="0" colspan="2">
-             <widget class="QRadioButton" name="radioButtonDstStartDay">
-              <property name="text">
-               <string>Day:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="5">
-             <widget class="QComboBox" name="comboBoxDstStartMonth"/>
-            </item>
-            <item row="4" column="0" colspan="2">
-             <widget class="QCheckBox" name="checkBoxDstStartTime">
-              <property name="text">
-               <string>Time of change:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="2" colspan="4">
-             <widget class="QTimeEdit" name="timeEditDstStart">
-              <property name="wrapping">
-               <bool>true</bool>
-              </property>
-              <property name="time">
-               <time>
-                <hour>2</hour>
-                <minute>0</minute>
-                <second>0</second>
-               </time>
-              </property>
-              <property name="displayFormat">
-               <string notr="true">HH:mm:ss</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0" colspan="2">
-             <widget class="QRadioButton" name="radioButtonDstStartDate">
-              <property name="text">
-               <string>Date:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="2" colspan="4">
-             <widget class="QFrame" name="frameDstStartDate">
-              <layout class="QHBoxLayout" name="horizontalLayout">
-               <property name="margin">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QSpinBox" name="spinBoxDstStartDateDay"/>
-               </item>
-               <item>
-                <widget class="QComboBox" name="comboBoxDstStartDateMonth"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item row="1" column="3" colspan="2">
-             <widget class="QComboBox" name="comboBoxDstStartWeek"/>
-            </item>
-            <item row="1" column="2">
-             <widget class="QComboBox" name="comboBoxDstStartDay"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="groupBoxDstEnd">
-           <property name="title">
-            <string>Daylight saving time end</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_4">
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item row="1" column="0" colspan="2">
-             <widget class="QRadioButton" name="radioButtonDstEndDay">
-              <property name="text">
-               <string>Day:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="5">
-             <widget class="QComboBox" name="comboBoxDstEndMonth"/>
-            </item>
-            <item row="4" column="0" colspan="2">
-             <widget class="QCheckBox" name="checkBoxDstEndTime">
-              <property name="text">
-               <string>Time of change:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="2" colspan="4">
-             <widget class="QTimeEdit" name="timeEditDstEnd">
-              <property name="wrapping">
-               <bool>true</bool>
-              </property>
-              <property name="time">
-               <time>
-                <hour>2</hour>
-                <minute>0</minute>
-                <second>0</second>
-               </time>
-              </property>
-              <property name="displayFormat">
-               <string notr="true">HH:mm:ss</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0" colspan="2">
-             <widget class="QRadioButton" name="radioButtonDstEndDate">
-              <property name="text">
-               <string>Date:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="2" colspan="4">
-             <widget class="QFrame" name="frameDstEndDate">
-              <layout class="QHBoxLayout" name="horizontalLayoutDstEndDate">
-               <property name="margin">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QSpinBox" name="spinBoxDstEndDateDay"/>
-               </item>
-               <item>
-                <widget class="QComboBox" name="comboBoxDstEndDateMonth"/>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item row="1" column="3" colspan="2">
-             <widget class="QComboBox" name="comboBoxDstEndWeek"/>
-            </item>
-            <item row="1" column="2">
-             <widget class="QComboBox" name="comboBoxDstEndDay"/>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButtonUseDefinition">
-        <property name="text">
-         <string>Use this definition</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BarFrame</class>
-   <extends>QFrame</extends>
-   <header>Dialog.hpp</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>lineEditName</tabstop>
-  <tabstop>doubleSpinBoxOffset</tabstop>
-  <tabstop>checkBoxDst</tabstop>
-  <tabstop>lineEditNameDst</tabstop>
-  <tabstop>checkBoxOffsetDst</tabstop>
-  <tabstop>doubleSpinBoxOffsetDst</tabstop>
-  <tabstop>radioButtonDstStartDay</tabstop>
-  <tabstop>groupBoxDstStart</tabstop>
-  <tabstop>comboBoxDstStartDay</tabstop>
-  <tabstop>comboBoxDstStartWeek</tabstop>
-  <tabstop>comboBoxDstStartMonth</tabstop>
-  <tabstop>radioButtonDstStartDate</tabstop>
-  <tabstop>spinBoxDstStartDateDay</tabstop>
-  <tabstop>comboBoxDstStartDateMonth</tabstop>
-  <tabstop>checkBoxDstStartTime</tabstop>
-  <tabstop>timeEditDstStart</tabstop>
-  <tabstop>groupBoxDstEnd</tabstop>
-  <tabstop>radioButtonDstEndDay</tabstop>
-  <tabstop>comboBoxDstEndDay</tabstop>
-  <tabstop>comboBoxDstEndWeek</tabstop>
-  <tabstop>comboBoxDstEndMonth</tabstop>
-  <tabstop>radioButtonDstEndDate</tabstop>
-  <tabstop>spinBoxDstEndDateDay</tabstop>
-  <tabstop>comboBoxDstEndDateMonth</tabstop>
-  <tabstop>checkBoxDstEndTime</tabstop>
-  <tabstop>timeEditDstEnd</tabstop>
-  <tabstop>pushButtonUseDefinition</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>checkBoxDst</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>frameDst</receiver>
-   <slot>setVisible(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>230</x>
-     <y>125</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>228</x>
-     <y>316</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxOffsetDst</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>doubleSpinBoxOffsetDst</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>172</x>
-     <y>186</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>348</x>
-     <y>188</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxDstEndTime</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>timeEditDstEnd</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>95</x>
-     <y>427</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>362</x>
-     <y>430</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>checkBoxDstStartTime</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>timeEditDstStart</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>115</x>
-     <y>298</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>187</x>
-     <y>294</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>groupBoxDstStart</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBoxDstEnd</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>117</x>
-     <y>243</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>123</x>
-     <y>362</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>groupBoxDstEnd</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBoxDstStart</receiver>
-   <slot>setChecked(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>301</x>
-     <y>354</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>295</x>
-     <y>286</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
 
=== removed file 'plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui'
--- plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui	2013-12-23 00:22:34 +0000
+++ plugins/TimeZoneConfiguration/src/gui/timeZoneConfigurationWindow.ui	1970-01-01 00:00:00 +0000
@@ -1,585 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>timeZoneConfigurationWindowForm</class>
- <widget class="QWidget" name="timeZoneConfigurationWindowForm">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>448</width>
-    <height>480</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="BarFrame" name="TitleBar">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>25</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="autoFillBackground">
-      <bool>false</bool>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <layout class="QHBoxLayout">
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>4</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <spacer name="leftSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QLabel" name="stelWindowTitle">
-        <property name="text">
-         <string>Time zone</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="rightSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="closeStelWindow">
-        <property name="minimumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <widget class="QWidget" name="tabTimeZone">
-      <attribute name="title">
-       <string>Time zone</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayoutTimeZone">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupBoxTimeZone">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>400</height>
-          </size>
-         </property>
-         <property name="title">
-          <string>Time zone</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayoutCurrent">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <property name="verticalSpacing">
-           <number>8</number>
-          </property>
-          <item row="0" column="0" colspan="2">
-           <widget class="QLabel" name="labelTimeZoneInfo">
-            <property name="text">
-             <string>By default, the time displayed in Stellarium is interpreted as the local time in the system's time zone, not in the displayed location's time zone. This behaviour can be changed by changing Stellarium's global time zone settings.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" colspan="2">
-           <widget class="QRadioButton" name="radioButtonLocalSettings">
-            <property name="text">
-             <string>Use system settings (default)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QRadioButton" name="radioButtonUtc">
-            <property name="text">
-             <string>Universal Coordinated Time (UTC)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QRadioButton" name="radioButtonOffset">
-            <property name="text">
-             <string>Offset from UTC (hours):</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QDoubleSpinBox" name="doubleSpinBoxOffset">
-            <property name="wrapping">
-             <bool>true</bool>
-            </property>
-            <property name="decimals">
-             <number>2</number>
-            </property>
-            <property name="minimum">
-             <double>-24.000000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>24.000000000000000</double>
-            </property>
-            <property name="singleStep">
-             <double>0.250000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0" colspan="2">
-           <widget class="QLabel" name="labelOffset">
-            <property name="text">
-             <string>(offset = local time - UTC time)</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
-           <widget class="QRadioButton" name="radioButtonUserDefined">
-            <property name="text">
-             <string>User-defined:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QFrame" name="frameUserDefined">
-            <layout class="QHBoxLayout" name="horizontalLayout">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QLineEdit" name="lineEditUserDefined"/>
-             </item>
-             <item>
-              <widget class="QPushButton" name="pushButtonEditTimeZone">
-               <property name="text">
-                <string notr="true">...</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="7" column="0" colspan="2">
-           <widget class="QPushButton" name="pushButtonSave">
-            <property name="text">
-             <string>Save settings</string>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="0" colspan="2">
-           <widget class="QLabel" name="labelRestart">
-            <property name="text">
-             <string>Any changes will take effect the next time Stellarium is started.</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="9" column="0" colspan="2">
-           <spacer name="verticalSpacerTimeZone">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabDisplayFormats">
-      <attribute name="title">
-       <string>Display formats</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayoutTabTimeFormat">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QGroupBox" name="groupBoxDisplayFormats">
-         <property name="title">
-          <string>Display formats</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_4">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="labelDisplayFormats">
-            <property name="text">
-             <string>These settings control the way time and date are displayed in the bottom bar.</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="groupBoxTimeFormat">
-            <property name="title">
-             <string>Time display format</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayoutTimeFormat">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QRadioButton" name="radioButtonTimeDefault">
-               <property name="text">
-                <string>System default</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButtonTime12Hour">
-               <property name="text">
-                <string>12-hour format</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButtonTime24Hour">
-               <property name="text">
-                <string>24-hour format</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item>
-           <widget class="QGroupBox" name="groupBoxDateFormat">
-            <property name="title">
-             <string>Date display format</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayoutDateFormat">
-             <property name="leftMargin">
-              <number>0</number>
-             </property>
-             <property name="topMargin">
-              <number>0</number>
-             </property>
-             <property name="rightMargin">
-              <number>0</number>
-             </property>
-             <property name="bottomMargin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QRadioButton" name="radioButtonDateDefault">
-               <property name="text">
-                <string>System default</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButtonDateYMD">
-               <property name="text">
-                <string>yyyy-mm-dd (ISO 8601)</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButtonDateDMY">
-               <property name="text">
-                <string>dd-mm-yyyy</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButtonDateMDY">
-               <property name="text">
-                <string>mm-dd-yyyy</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacerDisplayFormats">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabAbout">
-      <attribute name="title">
-       <string comment="tab in plugin windows">About</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QLabel" name="labelTitle">
-         <property name="styleSheet">
-          <string notr="true">QLabel {
-	font: bold 18pt ;
-}</string>
-         </property>
-         <property name="text">
-          <string notr="true">Time Zone plug-in</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelVersion">
-         <property name="text">
-          <string notr="true">Version %1</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelCopyright">
-         <property name="text">
-          <string notr="true">Copyright &amp;copy; 2010 Bogdan Marinov</string>
-         </property>
-         <property name="textFormat">
-          <enum>Qt::RichText</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLabel" name="labelLicense">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string notr="true">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, see http://www.gnu.org/licenses/.</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
-         <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BarFrame</class>
-   <extends>QFrame</extends>
-   <header>Dialog.hpp</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>radioButtonLocalSettings</tabstop>
-  <tabstop>radioButtonUtc</tabstop>
-  <tabstop>radioButtonOffset</tabstop>
-  <tabstop>doubleSpinBoxOffset</tabstop>
-  <tabstop>radioButtonUserDefined</tabstop>
-  <tabstop>lineEditUserDefined</tabstop>
-  <tabstop>pushButtonEditTimeZone</tabstop>
-  <tabstop>pushButtonSave</tabstop>
-  <tabstop>radioButtonTimeDefault</tabstop>
-  <tabstop>radioButtonTime12Hour</tabstop>
-  <tabstop>radioButtonTime24Hour</tabstop>
-  <tabstop>radioButtonDateDefault</tabstop>
-  <tabstop>radioButtonDateYMD</tabstop>
-  <tabstop>radioButtonDateDMY</tabstop>
-  <tabstop>radioButtonDateMDY</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>radioButtonUserDefined</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>frameUserDefined</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>79</x>
-     <y>404</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>296</x>
-     <y>404</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
 
=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2016-10-22 13:40:38 +0000
+++ po/stellarium/POTFILES.in	2016-10-25 16:10:21 +0000
@@ -85,11 +85,6 @@
 plugins/TelescopeControl/src/ui_telescopeConfigurationDialog.h
 plugins/TelescopeControl/src/ui_telescopeDialog.h
 plugins/TelescopeControl/src/ui_storedPointsDialog.h
-plugins/TimeZoneConfiguration/src/TimeZoneConfiguration.cpp
-plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.cpp
-plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.cpp
-plugins/TimeZoneConfiguration/src/ui_defineTimeZone.h
-plugins/TimeZoneConfiguration/src/ui_timeZoneConfigurationWindow.h
 plugins/TextUserInterface/src/TextUserInterface.cpp
 plugins/TextUserInterface/src/TuiNodeBool.cpp
 plugins/TextUserInterface/src/TuiNodeColor.cpp
 
=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2016-10-03 16:08:03 +0000
+++ src/core/StelApp.cpp	2016-10-25 16:10:21 +0000
@@ -124,10 +124,6 @@
 Q_IMPORT_PLUGIN(SolarSystemEditorStelPluginInterface)
 #endif
 
-#ifdef USE_STATIC_PLUGIN_TIMEZONECONFIGURATION
-Q_IMPORT_PLUGIN(TimeZoneConfigurationStelPluginInterface)
-#endif
-
 #ifdef USE_STATIC_PLUGIN_METEORSHOWERS
 Q_IMPORT_PLUGIN(MeteorShowersStelPluginInterface)
 #endif
 
=== modified file 'src/core/StelCore.cpp'
--- src/core/StelCore.cpp	2016-10-09 05:03:17 +0000
+++ src/core/StelCore.cpp	2016-10-25 16:10:21 +0000
@@ -45,6 +45,7 @@
 #include <QSettings>
 #include <QDebug>
 #include <QMetaEnum>
+#include <QTimeZone>
 
 #include <iostream>
 #include <fstream>
@@ -78,7 +79,8 @@
 	, JD(0.,0.)
 	, presetSkyTime(0.)
 	, milliSecondsOfLastJDUpdate(0.)
-	, jdOfLastJDUpdate(0.)
+	, jdOfLastJDUpdate(0.)	
+	, flagUseDST(true)
 	, deltaTCustomNDot(-26.0)
 	, deltaTCustomYear(1820.0)
 	, de430Available(false)
@@ -118,7 +120,8 @@
 	currentProjectorParams.devicePixelsPerPixel = StelApp::getInstance().getDevicePixelsPerPixel();
 
 	flagUseNutation=conf->value("astro/flag_nutation", true).toBool();
-	flagUseTopocentricCoordinates=conf->value("astro/flag_topocentric_coordinates", true).toBool();	
+	flagUseTopocentricCoordinates=conf->value("astro/flag_topocentric_coordinates", true).toBool();
+	flagUseDST=conf->value("localization/flag_dst", true).toBool();
 }
 
 
@@ -164,6 +167,8 @@
 	}
 	position = new StelObserver(location);
 
+	setCurrentTimeZone(conf->value("localization/time_zone", getCurrentLocation().timeZone).toString());
+
 	// Delta-T stuff
 	// Define default algorithm for time correction (Delta T)
 	QString tmpDT = conf->value("navigation/time_correction_algorithm", "EspenakMeeus").toString();
@@ -194,7 +199,7 @@
 	setInitTodayTime(QTime::fromString(conf->value("navigation/today_time", "22:00").toString()));
 	startupTimeMode = conf->value("navigation/startup_time_mode", "actual").toString().toLower();
 	if (startupTimeMode=="preset")	
-		setJD(presetSkyTime - StelUtils::getGMTShiftFromQT(presetSkyTime) * JD_HOUR);
+		setJD(presetSkyTime - getUTCOffset(presetSkyTime) * JD_HOUR);
 	else if (startupTimeMode=="today")
 		setTodayTime(getInitTodayTime());
 
@@ -1136,6 +1141,115 @@
 	}
 }
 
+float StelCore::getUTCOffset(const double JD) const
+{
+	int year, month, day, hour, minute, second;
+	StelUtils::getDateFromJulianDay(JD, &year, &month, &day);
+	StelUtils::getTimeFromJulianDay(JD, &hour, &minute, &second);
+	// as analogous to second statement in getJDFromDate, nkerr
+	if ( year <= 0 )
+	{
+		year = year - 1;
+	}
+	//getTime/DateFromJulianDay returns UTC time, not local time
+	QDateTime universal(QDate(year, month, day), QTime(hour, minute, second), Qt::UTC);
+	if (!universal.isValid())
+	{
+		//qWarning() << "JD " << QString("%1").arg(JD) << " out of bounds of QT help with GMT shift, using current datetime";
+		// Assumes the GMT shift was always the same before year -4710
+		universal = QDateTime(QDate(-4710, month, day), QTime(hour, minute, second), Qt::UTC);
+	}
+
+	StelLocation loc = getCurrentLocation();
+	QString tzName = getCurrentTimeZone();
+
+	int shiftInSeconds = 0;
+	if (tzName=="system_default")
+	{
+		QDateTime local = universal.toLocalTime();
+		//Both timezones should be interpreted as UTC because secsTo() converts both
+		//times to UTC if their zones have different daylight saving time rules.
+		local.setTimeSpec(Qt::UTC);
+		shiftInSeconds = universal.secsTo(local);
+	}
+	else
+	{
+		QTimeZone* tz = new QTimeZone(tzName.toUtf8());
+		if (tz->isValid() && loc.planetName=="Earth" && year>=1886)
+		{
+			if (getUseDST())
+				shiftInSeconds = tz->offsetFromUtc(universal);
+			else
+				shiftInSeconds = tz->standardTimeOffset(universal);
+		}
+		else
+			shiftInSeconds = (loc.longitude/15.f)*3600.f; // Local Mean Solar Time
+
+		if (tzName=="LTST")
+			shiftInSeconds += getSolutionEquationOfTime(JD)*60;
+
+	}
+
+	float shiftInHours = shiftInSeconds / 3600.0f;
+	return shiftInHours;
+}
+
+QString StelCore::getCurrentTimeZone() const
+{
+	return currentTimeZone;
+}
+
+void StelCore::setCurrentTimeZone(const QString& tz)
+{
+	currentTimeZone = tz;
+}
+
+bool StelCore::getUseDST() const
+{
+	return flagUseDST;
+}
+
+void StelCore::setUseDST(const bool b)
+{
+	flagUseDST = b;
+	StelApp::getInstance().getSettings()->setValue("localization/flag_dst", b);
+}
+
+double StelCore::getSolutionEquationOfTime(const double JDE) const
+{
+	double tau = (JDE - 2451545.0)/365250.0;
+	double sunMeanLongitude = 280.4664567 + tau*(360007.6892779 + tau*(0.03032028 + tau*(1./49931. - tau*(1./15300. - tau/2000000.))));
+
+	// reduce the angle
+	sunMeanLongitude = std::fmod(sunMeanLongitude, 360.);
+	// force it to be the positive remainder, so that 0 <= angle < 360
+	sunMeanLongitude = std::fmod(sunMeanLongitude + 360., 360.);
+
+	Vec3d pos = GETSTELMODULE(StelObjectMgr)->searchByName("Sun")->getEquinoxEquatorialPos(this);
+	double ra, dec;
+	StelUtils::rectToSphe(&ra, &dec, pos);
+
+	// covert radians to degrees and reduce the angle
+	double alpha = std::fmod(ra*180./M_PI, 360.);
+	// force it to be the positive remainder, so that 0 <= angle < 360
+	alpha = std::fmod(alpha + 360., 360.);
+
+	double deltaPsi, deltaEps;
+	getNutationAngles(JDE, &deltaPsi, &deltaEps); // these are radians!
+	//double equation = 4*(sunMeanLongitude - 0.0057183 - alpha + get_nutation_longitude(JDE)*cos(get_mean_ecliptical_obliquity(JDE)));
+	double equation = 4*(sunMeanLongitude - 0.0057183 - alpha + deltaPsi*180./M_PI*cos(getPrecessionAngleVondrakEpsilon(JDE)));
+	// The equation of time is always smaller 20 minutes in absolute value
+	if (qAbs(equation)>20)
+	{
+		// If absolute value of the equation of time appears to be too large, add 24 hours (1440 minutes) to or subtract it from our result
+		if (equation>0.)
+			equation -= 1440.;
+		else
+			equation += 1440.;
+	}
+
+	return equation;
+}
 
 //! Set stellarium time to current real world time
 void StelCore::setTimeNow()
@@ -1150,7 +1264,7 @@
 	{
 		dt.setTime(target);
 		// don't forget to adjust for timezone / daylight savings.
-		double JD = StelUtils::qDateTimeToJd(dt)-(StelUtils::getGMTShiftFromQT(StelUtils::getJDFromSystem()) * JD_HOUR);
+		double JD = StelUtils::qDateTimeToJd(dt)-(getUTCOffset(StelUtils::getJDFromSystem()) * JD_HOUR);
 		setJD(JD);
 	}
 	else
 
=== modified file 'src/core/StelCore.hpp'
--- src/core/StelCore.hpp	2016-10-09 05:03:17 +0000
+++ src/core/StelCore.hpp	2016-10-25 16:10:21 +0000
@@ -274,6 +274,11 @@
 	//! Get the informations on the current location
 	const StelLocation& getCurrentLocation() const;
 
+	float getUTCOffset(const double JD) const;
+
+	QString getCurrentTimeZone() const;
+	void setCurrentTimeZone(const QString& tz);
+
 	const QSharedPointer<class Planet> getCurrentPlanet() const;
 
 	//! Unfortunately we also need this.
@@ -430,6 +435,14 @@
 	//! It is still frequently used in the literature.
 	double getJDE() const;
 
+	//! Get solution of equation of time
+	//! Source: J. Meeus "Astronomical Algorithms" (2nd ed., with corrections as of August 10, 2009) p.183-187.
+	//! @param JDE JD in Dynamical Time (previously called Ephemeris Time)
+	//! @return time in minutes
+	double getSolutionEquationOfTime(const double JDE) const;
+
+	bool getUseDST() const;
+	void setUseDST(const bool b);
 
 	//! Set the current date in Modified Julian Day (UT).
 	//! MJD is simply JD-2400000.5, getting rid of large numbers and starting days at midnight.
@@ -727,13 +740,16 @@
 	double timeSpeed;           // Positive : forward, Negative : Backward, 1 = 1sec/sec
 	//double JDay;              // Current time in Julian day. IN V0.12 TO V0.14, this was JD in TT, and all places where UT was required had to subtract getDeltaT() explicitly.
 	QPair<double,double> JD;    // From 0.14 on: JD.first=JD_UT, JD.second=DeltaT=TT-UT. To gain JD_TT, compute JDE=JD.first+JD.second or better just call getJDE()
-				// Use is best with calls getJD()/setJD() and getJDE()/setJDE() to explicitly state which flavour of JD you need.
+				    // Use is best with calls getJD()/setJD() and getJDE()/setJDE() to explicitly state which flavour of JD you need.
 	double presetSkyTime;
 	QTime initTodayTime;
 	QString startupTimeMode;
 	double milliSecondsOfLastJDUpdate;    // Time in seconds when the time rate or time last changed
 	double jdOfLastJDUpdate;         // JD when the time rate or time last changed
 
+	QString currentTimeZone;
+	bool flagUseDST;
+
 	// Variables for custom equation of Delta-T
 	Vec3f deltaTCustomEquationCoeff;
 	float deltaTCustomNDot;
 
=== modified file 'src/core/StelLocaleMgr.cpp'
--- src/core/StelLocaleMgr.cpp	2016-10-22 13:40:38 +0000
+++ src/core/StelLocaleMgr.cpp	2016-10-25 16:10:21 +0000
@@ -27,7 +27,6 @@
 #include <QSettings>
 #include <QString>
 #include <QTextStream>
-
 #include <QFile>
 
 #include <ctime>
@@ -37,9 +36,7 @@
 StelLocaleMgr::StelLocaleMgr()
 	: skyTranslator(NULL)
 	, timeFormat()
-	, dateFormat()
-	, timeZoneMode()
-	, GMTShift(0)
+	, dateFormat()	
 {
 	// Load from file
 	QString path = StelFileMgr::findFile("data/countryCodes.dat");
@@ -57,6 +54,8 @@
 		in >> countryCodeToStringMap;
 		file.close();
 	}
+
+	core = StelApp::getInstance().getCore();
 }
 
 
@@ -119,33 +118,6 @@
 
 	timeFormat = stringToSTimeFormat(conf->value("localization/time_display_format", "system_default").toString());
 	dateFormat = stringToSDateFormat(conf->value("localization/date_display_format", "system_default").toString());
-	// time_zone used to be in init_location section of config,
-	// so use that as fallback when reading config - Rob
-	QString tzstr = conf->value("localization/time_zone", conf->value("init_location/time_zone", "system_default").toString()).toString();
-	if (tzstr == "system_default")
-	{
-		timeZoneMode = STzSystemDefault;
-		// Set the program global intern timezones variables from the system locale
-		#ifdef _MSC_BUILD
-		_tzset();
-		#else
-		tzset();
-		#endif
-	}
-	else
-	{
-		if (tzstr == "gmt+x") // TODO : handle GMT+X timezones form
-		{
-			timeZoneMode = STzGMTShift;
-			// GMTShift = x;
-		}
-		else
-		{
-			// We have a custom time zone name
-			timeZoneMode = STzCustom;
-			setCustomTzName(tzstr);
-		}
-	}	
 }
 
 /*************************************************************************
@@ -214,16 +186,7 @@
 // Return the time in ISO 8601 format that is : %Y-%m-%d %H:%M:%S
 QString StelLocaleMgr::getISO8601TimeLocal(double JD) const
 {
-	double shift = 0.0;
-	if (timeZoneMode == STzGMTShift)
-	{
-		shift = GMTShift;
-	}
-	else
-	{
-		shift = StelUtils::getGMTShiftFromQT(JD)*0.041666666666;
-	}
-	return StelUtils::julianDayToISO8601String(JD + shift);
+	return StelUtils::julianDayToISO8601String(JD + core->getUTCOffset(JD)*0.041666666666);
 }
 
 //! get the six ints from an ISO8601 date time, understood to be local time, make a jdate out
@@ -237,11 +200,7 @@
 		return 0.0;
 	}
 	
-	// modified by shift
-	if (timeZoneMode == STzGMTShift)
-		jd -= GMTShift;
-	else
-		jd -= StelUtils::getGMTShiftFromQT(jd)*0.041666666666;
+	jd -= core->getUTCOffset(jd)*0.041666666666;
 	return jd;
 }
 
@@ -250,15 +209,7 @@
 QString StelLocaleMgr::getPrintableDateLocal(double JD) const
 {
 	int year, month, day, dayOfWeek;
-	double shift = 0.0;
-	if (timeZoneMode == STzGMTShift)
-	{
-		shift = GMTShift;
-	}
-	else
-	{
-		shift = StelUtils::getGMTShiftFromQT(JD)*0.041666666666;
-	}
+	double shift = core->getUTCOffset(JD)*0.041666666666;
 	StelUtils::getDateFromJulianDay(JD+shift, &year, &month, &day);
 	dayOfWeek = (int)floor(fmod(JD, 7));
 	QString str;
@@ -288,15 +239,8 @@
 QString StelLocaleMgr::getPrintableTimeLocal(double JD) const
 {
 	int hour, minute, second;
-	double shift = 0.0;
-	if (timeZoneMode == STzGMTShift)
-	{
-		shift = GMTShift;
-	}
-	else
-	{
-		shift = StelUtils::getGMTShiftFromQT(JD)*0.041666666666;
-	}
+	double shift = core->getUTCOffset(JD)*0.041666666666;
+
 	StelUtils::getTimeFromJulianDay(JD+shift, &hour, &minute, &second);
 
 	QTime t(hour, minute, second);
@@ -317,12 +261,32 @@
 
 QString StelLocaleMgr::getPrintableTimeZoneLocal(double JD) const
 {
-	double shift = StelUtils::getGMTShiftFromQT(JD);
-	QTime tz = QTime(0, 0, 0).addSecs(3600*qAbs(shift));
-	if(shift<0.0f)
-		return "UTC-" + tz.toString("hh:mm");
+	if (core->getCurrentLocation().planetName=="Earth")
+	{
+		QString timeZone = "UTC";
+		QString currTZ = core->getCurrentTimeZone();
+		QString timeZoneST = "";
+
+		if (JD<=2409907.5 || currTZ.contains("auto"))
+			timeZoneST = "LMST";
+
+		if (currTZ.contains("LMST") || currTZ.contains("LTST"))
+			timeZoneST = currTZ;
+
+		float shift = core->getUTCOffset(JD);
+		QTime tz = QTime(0, 0, 0).addSecs(3600*qAbs(shift));
+		if(shift<0.0f)
+			timeZone.append("-" + tz.toString("hh:mm"));
+		else
+			timeZone.append("+" + tz.toString("hh:mm"));
+
+		if (!timeZoneST.isEmpty())
+			timeZone.append(" (" + timeZoneST + ")");
+
+		return timeZone;
+	}
 	else
-		return "UTC+" + tz.toString("hh:mm");
+		return QString();
 }
 
 // Convert the time format enum to its associated string and reverse
@@ -385,30 +349,6 @@
 	return dfmt;
 }
 
-void StelLocaleMgr::setCustomTzName(const QString& tzname)
-{
-	customTzName = tzname;
-	timeZoneMode = STzCustom;
-
-	if( customTzName != "")
-	{
-		// set the TZ environement variable and update c locale stuff
-		#ifdef _MSC_BUILD
-		_putenv(_strdup(qPrintable("TZ=" + customTzName)));
-		_tzset();
-		#else
-		putenv(strdup(qPrintable("TZ=" + customTzName)));
-		tzset();
-		#endif
-    }
-}
-
-float StelLocaleMgr::getGMTShift(double JD) const
-{
-	if (timeZoneMode == STzGMTShift) return GMTShift;
-	else return StelUtils::getGMTShiftFromQT(JD);
-}
-
 // Convert a 2 letter country code to string
 QString StelLocaleMgr::countryCodeToString(const QString& countryCode)
 {
@@ -425,3 +365,4 @@
 	res.sort();
 	return res;
 }
+
 
=== modified file 'src/core/StelLocaleMgr.hpp'
--- src/core/StelLocaleMgr.hpp	2016-10-22 07:48:38 +0000
+++ src/core/StelLocaleMgr.hpp	2016-10-25 16:10:21 +0000
@@ -21,6 +21,7 @@
 #define _STELLOCALEMGR_HPP_
 
 #include "StelTranslator.hpp"
+#include "StelCore.hpp"
 
 //! @class StelLocaleMgr
 //! Manage i18n operations such as message translation and date/time localization.
@@ -101,11 +102,6 @@
 	//! Get the format string which describes the current date format (Qt style).
 	QString getQtDateFormatStr(void) const;
 	
-	//! Set the time zone.
-	//! @param tZ the time zone string as parsed from the TZ environment 
-	//! varibale by the tzset function from libc.
-	void setCustomTimezone(QString tZ) { setCustomTzName(tZ); }
-
 	//! @enum STimeFormat
 	//! The time display format.
 	enum STimeFormat {
@@ -131,35 +127,7 @@
 
 	//! Get a localized, formatted string representation of the time zone of a Julian date.
 	QString getPrintableTimeZoneLocal(double JD) const;
-	
-	//! @enum STzFormat
-	enum STzFormat
-	{
-		STzCustom,		//!< User-specified timezone.
-		STzGMTShift,		//!< GMT + offset.
-		STzSystemDefault	//!< System default.
-	};
-	
-	//! Get the current time shift at observator time zone with respect to GMT time.
-	void setGMTShift(int t)
-	{
-		GMTShift=t;
-	}
-	//! Get the current time shift in hours at observator time zone with respect to GMT time.
-	float getGMTShift(double JD = 0) const;
-	//! Set the timezone by a TZ-style string (see tzset in the libc manual).
-	void setCustomTzName(const QString& tzname);
-	//! Get the timezone name (a TZ-style string - see tzset in the libc manual).
-	QString getCustomTzName(void) const
-	{
-		return customTzName;
-	}
-	//! Get the current timezone format mode.
-	STzFormat getTzFormat(void) const
-	{
-		return timeZoneMode;
-	}
-	
+
 	//! Return the time in ISO 8601 format that is : %Y-%m-%dT%H:%M:%S
 	//! @param JD the time and date expressed as a Julian date value.
 	QString getISO8601TimeLocal(double JD) const;
@@ -180,15 +148,12 @@
 private:
 	// The translator used for astronomical object naming
 	StelTranslator* skyTranslator;
+	StelCore* core;
 	
 	// Date and time variables
 	STimeFormat timeFormat;
 	SDateFormat dateFormat;
-	STzFormat timeZoneMode;		// Can be the system default or a user defined value
-	
-	QString customTzName;			// Something like "Europe/Paris"
-	float GMTShift;				// Time shift between GMT time and local time in hour. (positive for Est of GMT)
-	
+
 	// Convert the time format enum to its associated string and reverse
 	STimeFormat stringToSTimeFormat(const QString&) const;
 	QString sTimeFormatToString(STimeFormat) const;
 
=== modified file 'src/core/StelLocationMgr.cpp'
--- src/core/StelLocationMgr.cpp	2016-10-22 15:05:57 +0000
+++ src/core/StelLocationMgr.cpp	2016-10-25 16:10:21 +0000
@@ -391,6 +391,7 @@
 				.arg(longitude<0 ? QString("%1W").arg(-longitude, 0, 'f', 6) : QString("%1E").arg(longitude, 0, 'f', 6))
 				.arg(ipTimeZone.isEmpty() ? "" : ipTimeZone);
 		location=StelLocation::createFromLine(locLine); // in lack of a regular constructor ;-)
+		core->setCurrentTimeZone(ipTimeZone.isEmpty() ? "LMST" : ipTimeZone);
 		core->moveObserverTo(location, 0.0f, 0.0f);
 		QSettings* conf = StelApp::getInstance().getSettings();
 		conf->setValue("init_location/last_location", QString("%1,%2").arg(latitude).arg(longitude));
@@ -436,3 +437,4 @@
 	}
 	return results;
 }
+
 
=== modified file 'src/gui/AstroCalcDialog.cpp'
--- src/gui/AstroCalcDialog.cpp	2016-10-15 17:21:05 +0000
+++ src/gui/AstroCalcDialog.cpp	2016-10-25 16:10:21 +0000
@@ -113,7 +113,7 @@
 	populateMajorPlanetList();
 	populateGroupCelestialBodyList();
 
-	double JD = core->getJD() + StelUtils::getGMTShiftFromQT(core->getJD())/24;
+	double JD = core->getJD() + core->getUTCOffset(core->getJD())/24;
 	ui->dateFromDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD));
 	ui->dateToDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD + 30.f));
 	ui->phenomenFromDateEdit->setDateTime(StelUtils::jdToQDateTime(JD));
@@ -181,8 +181,9 @@
 
 	initListPlanetaryPositions();
 
-	double JD = StelApp::getInstance().getCore()->getJD();
-	ui->positionsTimeLabel->setText(q_("Positions on %1").arg(StelUtils::jdToQDateTime(JD + StelUtils::getGMTShiftFromQT(JD)/24).toString("yyyy-MM-dd hh:mm")));
+	StelCore* core = StelApp::getInstance().getCore();
+	double JD = core->getJD();
+	ui->positionsTimeLabel->setText(q_("Positions on %1").arg(StelUtils::jdToQDateTime(JD + core->getUTCOffset(JD)/24).toString("yyyy-MM-dd hh:mm")));
 
 	foreach (const PlanetP& planet, allPlanets)
 	{
@@ -338,7 +339,7 @@
 	{
 		double currentJD = core->getJD(); // save current JD
 		double firstJD = StelUtils::qDateTimeToJd(ui->dateFromDateTimeEdit->dateTime());
-		firstJD = firstJD - StelUtils::getGMTShiftFromQT(firstJD)/24;
+		firstJD = firstJD - core->getUTCOffset(firstJD)/24;
 		int elements = (int)((StelUtils::qDateTimeToJd(ui->dateToDateTimeEdit->dateTime()) - firstJD)/currentStep);
 		EphemerisListJ2000.clear();
 		EphemerisListJ2000.reserve(elements);
@@ -351,11 +352,11 @@
 			core->update(0); // force update to get new coordinates			
 			Vec3d pos = obj->getJ2000EquatorialPos(core);
 			EphemerisListJ2000.append(pos);
-			EphemerisListDates.append(StelUtils::jdToQDateTime(JD + StelUtils::getGMTShiftFromQT(JD)/24).toString("yyyy-MM-dd"));
+			EphemerisListDates.append(StelUtils::jdToQDateTime(JD + core->getUTCOffset(JD)/24).toString("yyyy-MM-dd"));
 			StelUtils::rectToSphe(&ra,&dec,pos);
 			ACTreeWidgetItem *treeItem = new ACTreeWidgetItem(ui->ephemerisTreeWidget);
 			// local date and time
-			treeItem->setText(EphemerisDate, StelUtils::jdToQDateTime(JD + StelUtils::getGMTShiftFromQT(JD)/24).toString("yyyy-MM-dd hh:mm:ss"));
+			treeItem->setText(EphemerisDate, StelUtils::jdToQDateTime(JD + core->getUTCOffset(JD)/24).toString("yyyy-MM-dd hh:mm:ss"));
 			treeItem->setText(EphemerisJD, QString::number(JD, 'f', 5));
 			treeItem->setText(EphemerisRA, StelUtils::radToHmsStr(ra));
 			treeItem->setTextAlignment(EphemerisRA, Qt::AlignRight);
@@ -573,7 +574,7 @@
 	QString date = modelIndex.sibling(modelIndex.row(), PhenomenaDate).data().toString();
 	bool ok;
 	double JD  = StelUtils::getJulianDayFromISO8601String(date.left(10) + "T" + date.right(8), &ok);
-	JD -= StelUtils::getGMTShiftFromQT(JD)/24.;
+	JD -= core->getUTCOffset(JD)/24.;
 
 	if (objectMgr->findAndSelectI18n(name) || objectMgr->findAndSelect(name))
 	{
@@ -712,8 +713,8 @@
 		double currentJD = core->getJD(); // save current JD
 		double startJD = StelUtils::qDateTimeToJd(ui->phenomenFromDateEdit->dateTime());
 		double stopJD = StelUtils::qDateTimeToJd(ui->phenomenToDateEdit->dateTime());
-		startJD = startJD - StelUtils::getGMTShiftFromQT(startJD)/24;
-		stopJD = stopJD - StelUtils::getGMTShiftFromQT(stopJD)/24;
+		startJD = startJD - core->getUTCOffset(startJD)/24;
+		stopJD = stopJD - core->getUTCOffset(stopJD)/24;
 
 		if (obj2Type<9)
 		{
@@ -805,7 +806,7 @@
 		ACTreeWidgetItem *treeItem = new ACTreeWidgetItem(ui->phenomenaTreeWidget);
 		treeItem->setText(PhenomenaType, phenomenType);
 		// local date and time
-		treeItem->setText(PhenomenaDate, StelUtils::jdToQDateTime(it.key() + StelUtils::getGMTShiftFromQT(it.key())/24).toString("yyyy-MM-dd hh:mm:ss"));
+		treeItem->setText(PhenomenaDate, StelUtils::jdToQDateTime(it.key() + core->getUTCOffset(it.key())/24).toString("yyyy-MM-dd hh:mm:ss"));
 		treeItem->setText(PhenomenaObject1, object1->getNameI18n());
 		treeItem->setText(PhenomenaObject2, object2->getNameI18n());
 		treeItem->setText(PhenomenaSeparation, StelUtils::radToDmsStr(separation));
@@ -954,7 +955,7 @@
 		ACTreeWidgetItem *treeItem = new ACTreeWidgetItem(ui->phenomenaTreeWidget);
 		treeItem->setText(PhenomenaType, phenomenType);
 		// local date and time
-		treeItem->setText(PhenomenaDate, StelUtils::jdToQDateTime(it.key() + StelUtils::getGMTShiftFromQT(it.key())/24).toString("yyyy-MM-dd hh:mm:ss"));
+		treeItem->setText(PhenomenaDate, StelUtils::jdToQDateTime(it.key() + core->getUTCOffset(it.key())/24).toString("yyyy-MM-dd hh:mm:ss"));
 		treeItem->setText(PhenomenaObject1, object1->getNameI18n());
 		if (!object2->getNameI18n().isEmpty())
 			treeItem->setText(PhenomenaObject2, object2->getNameI18n());
 
=== modified file 'src/gui/BookmarksDialog.cpp'
--- src/gui/BookmarksDialog.cpp	2016-08-24 13:32:23 +0000
+++ src/gui/BookmarksDialog.cpp	2016-10-25 16:10:21 +0000
@@ -156,7 +156,7 @@
 			if (dateTimeFlag)
 			{
 				JD = core->getJD();
-				JDs = StelUtils::julianDayToISO8601String(JD + StelUtils::getGMTShiftFromQT(JD)/24.).replace("T", " ");
+				JDs = StelUtils::julianDayToISO8601String(JD + core->getUTCOffset(JD)/24.).replace("T", " ");
 			}
 
 			QString Location = "";
@@ -277,7 +277,7 @@
 		if (!JD.isEmpty())
 		{
 			bm.jd = JD;
-			JDs = StelUtils::julianDayToISO8601String(JD.toDouble() + StelUtils::getGMTShiftFromQT(JD.toDouble())/24.).replace("T", " ");
+			JDs = StelUtils::julianDayToISO8601String(JD.toDouble() + core->getUTCOffset(JD.toDouble())/24.).replace("T", " ");
 		}
 		QString Location = bookmarkData.value("location").toString();
 		if (!Location.isEmpty())
 
=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2016-10-10 04:45:16 +0000
+++ src/gui/ConfigurationDialog.cpp	2016-10-25 16:10:21 +0000
@@ -988,7 +988,7 @@
 {
 	StelCore* core = StelApp::getInstance().getCore();
 	double JD = core->getJD();
-	ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD+StelUtils::getGMTShiftFromQT(JD)/24));
+	ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD+core->getUTCOffset(JD)/24));
 	ui->fixedTimeRadio->setChecked(true);
 	setStartupTimeMode();
 }
 
=== modified file 'src/gui/DateTimeDialog.cpp'
--- src/gui/DateTimeDialog.cpp	2016-05-16 12:35:53 +0000
+++ src/gui/DateTimeDialog.cpp	2016-10-25 16:10:21 +0000
@@ -54,9 +54,10 @@
 void DateTimeDialog::createDialogContent()
 {
 	ui->setupUi(dialog);
-	double jd = StelApp::getInstance().getCore()->getJD();
+	StelCore *core = StelApp::getInstance().getCore();
+	double jd = core->getJD();
 	// UTC -> local tz
-	setDateTime(jd + (StelApp::getInstance().getLocaleMgr().getGMTShift(jd)/24.0));
+	setDateTime(jd + (core->getUTCOffset(jd)/24.0));
 
 	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
 	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
@@ -202,7 +203,7 @@
 {
 	double cjd;
 	StelUtils::getJDFromDate(&cjd, year, month, day, hour, minute, second);
-	cjd -= (StelApp::getInstance().getLocaleMgr().getGMTShift(cjd)/24.0); // local tz -> UTC
+	cjd -= (StelApp::getInstance().getCore()->getUTCOffset(cjd)/24.0); // local tz -> UTC
 
 	return cjd;
 }
@@ -232,7 +233,7 @@
 {
 	if (this->visible()) {
 		// JD and MJD should be at the UTC scale on the window!
-		double newJdC = newJd + StelApp::getInstance().getLocaleMgr().getGMTShift(newJd)/24.0; // UTC -> local tz
+		double newJdC = newJd + StelApp::getInstance().getCore()->getUTCOffset(newJd)/24.0; // UTC -> local tz
 		StelUtils::getDateFromJulianDay(newJdC, &year, &month, &day);
 		StelUtils::getTimeFromJulianDay(newJdC, &hour, &minute, &second);
 		jd = newJd;
 
=== modified file 'src/gui/LocationDialog.cpp'
--- src/gui/LocationDialog.cpp	2016-06-13 16:32:42 +0000
+++ src/gui/LocationDialog.cpp	2016-10-25 16:10:21 +0000
@@ -40,6 +40,7 @@
 #include <QSortFilterProxyModel>
 #include <QTimer>
 #include <QStringListModel>
+#include <QTimeZone>
 
 LocationDialog::LocationDialog(QObject* parent)
 	: StelDialog(parent)
@@ -64,6 +65,7 @@
 		ui->retranslateUi(dialog);
 		populatePlanetList();
 		populateCountryList();
+		populateTimeZonesList();
 	}
 }
 
@@ -113,6 +115,7 @@
 
 	populatePlanetList();
 	populateCountryList();
+	populateTimeZonesList();
 
 	connect(ui->citySearchLineEdit, SIGNAL(textChanged(const QString&)), proxyModel, SLOT(setFilterWildcard(const QString&)));
 	connect(ui->citiesListView, SIGNAL(clicked(const QModelIndex&)),
@@ -137,13 +140,24 @@
 		ui->useIpQueryCheckBox->setChecked(true);
 		b = false;
 	}
+	updateDefaultLocationControls(b);
+
+	customTimeZone = conf->value("localization/time_zone", "").toString();
+	if (!customTimeZone.isEmpty())
+		b = true;
+	else
+		b = false;
+	updateTimeZoneControls(b);
 
 	setFieldsFromLocation(currentLocation);
-	updateDefaultLocationControls(b);
 
 	connect(ui->useIpQueryCheckBox, SIGNAL(clicked(bool)), this, SLOT(ipQueryLocation(bool)));
 	connect(ui->useAsDefaultLocationCheckBox, SIGNAL(clicked(bool)), this, SLOT(setDefaultLocation(bool)));
 	connect(ui->pushButtonReturnToDefault, SIGNAL(clicked()), core, SLOT(returnToDefaultLocation()));
+	connect(ui->useCustomTimeZoneCheckBox, SIGNAL(clicked(bool)), this, SLOT(updateTimeZoneControls(bool)));
+
+	ui->dstCheckBox->setChecked(core->getUseDST());
+	connect(ui->dstCheckBox, SIGNAL(clicked(bool)), core, SLOT(setUseDST(bool)));
 
 	connectEditSignals();
 
@@ -178,7 +192,7 @@
 	}
 
 	const QString& key1 = currentLocation.getID();
-	const QString& key2 = locationFromFields().getID();
+	const QString& key2 = locationFromFields().getID();	
 	if (key1!=key2)
 	{
 		setFieldsFromLocation(currentLocation);
@@ -192,6 +206,7 @@
 	disconnect(ui->altitudeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setPositionFromCoords(int)));
 	disconnect(ui->planetNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(moveToAnotherPlanet(const QString&)));
 	disconnect(ui->countryNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(reportEdit()));
+	disconnect(ui->timeZoneNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(saveTimeZone()));
 	disconnect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(reportEdit()));
 }
 
@@ -202,6 +217,7 @@
 	connect(ui->altitudeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(setPositionFromCoords(int)));
 	connect(ui->planetNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(moveToAnotherPlanet(const QString&)));
 	connect(ui->countryNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(reportEdit()));
+	connect(ui->timeZoneNameComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(saveTimeZone()));
 	connect(ui->cityNameLineEdit, SIGNAL(textEdited(const QString&)), this, SLOT(reportEdit()));
 }
 
@@ -230,6 +246,19 @@
 		idx = ui->planetNameComboBox->findData(QVariant("Earth"), Qt::UserRole, Qt::MatchCaseSensitive);
 	}
 	ui->planetNameComboBox->setCurrentIndex(idx);
+
+	QString tz = loc.timeZone;
+	if (!customTimeZone.isEmpty())
+		tz = customTimeZone;
+	idx = ui->timeZoneNameComboBox->findData(tz, Qt::UserRole, Qt::MatchCaseSensitive);
+	if (idx==-1)
+	{
+		// Use LMST as default
+		idx = ui->timeZoneNameComboBox->findData(QVariant("LMST"), Qt::UserRole, Qt::MatchCaseSensitive);
+	}
+	ui->timeZoneNameComboBox->setCurrentIndex(idx);
+	StelApp::getInstance().getCore()->setCurrentTimeZone(tz);
+
 	setMapForLocation(loc);
 
 	// Set pointer position
@@ -335,6 +364,7 @@
 	{
 		countries->addItem(q_(name), name);
 	}
+	countries->addItem(QChar(0x2014), "");
 	//Restore the selection
 	index = countries->findData(selectedCountryId, Qt::UserRole, Qt::MatchCaseSensitive);
 	countries->setCurrentIndex(index);
@@ -343,6 +373,41 @@
 
 }
 
+void LocationDialog::populateTimeZonesList()
+{
+	Q_ASSERT(ui->timeZoneNameComboBox);
+
+	QComboBox* timeZones = ui->timeZoneNameComboBox;
+	// Return a list of all the known time zone names (from Qt)
+	QStringList tzNames;
+	QList<QByteArray> tzList = QTimeZone::availableTimeZoneIds();
+	QList<QByteArray>::iterator i;
+	for (i = tzList.begin(); i!= tzList.end(); ++i)
+		tzNames.append(*i);
+
+	tzNames.sort();
+
+	//Save the current selection to be restored later
+	timeZones->blockSignals(true);
+	int index = timeZones->currentIndex();
+	QVariant selectedTzId = timeZones->itemData(index);
+	timeZones->clear();
+	//For each time zone, display the localized name and store the original as user
+	//data. Unfortunately, there's no other way to do this than with a cycle.
+	foreach(const QString& name, tzNames)
+	{
+		timeZones->addItem(q_(name), name);
+	}
+	timeZones->addItem(q_("Local Mean Solar Time"), "LMST");
+	timeZones->addItem(q_("Local True Solar Time"), "LTST");
+	timeZones->addItem(q_("System default"), "system_default");
+	//Restore the selection
+	index = timeZones->findData(selectedTzId, Qt::UserRole, Qt::MatchCaseSensitive);
+	timeZones->setCurrentIndex(index);
+	timeZones->blockSignals(false);
+
+}
+
 // Create a StelLocation instance from the fields
 StelLocation LocationDialog::locationFromFields() const
 {
@@ -362,6 +427,12 @@
 	else
 		loc.country = ui->countryNameComboBox->itemData(index).toString();
 
+	index = ui->timeZoneNameComboBox->currentIndex();
+	if (index < 0)
+		loc.timeZone = QString(); //As returned by QComboBox::currentText()
+	else
+		loc.timeZone = ui->timeZoneNameComboBox->itemData(index).toString();
+
 	return loc;
 }
 
@@ -383,12 +454,14 @@
 	loc.longitude = longitude;
 	setFieldsFromLocation(loc);
 	StelApp::getInstance().getCore()->moveObserverTo(loc, 0.);
+	if (customTimeZone.isEmpty())
+		ui->timeZoneNameComboBox->setCurrentIndex(ui->timeZoneNameComboBox->findData("LMST", Qt::UserRole, Qt::MatchCaseSensitive));
 	// GZ: Filter location list for nearby sites. I assume Earth locations are better known. With only few locations on other planets in the list, 30 degrees seem OK.
 	LocationMap results = StelApp::getInstance().getLocationMgr().pickLocationsNearby(loc.planetName, longitude, latitude, loc.planetName=="Earth" ? 3.0f: 30.0f);
 	pickedModel->setStringList(results.keys());
 	proxyModel->setSourceModel(pickedModel);
 	proxyModel->sort(0, Qt::AscendingOrder);
-	ui->citySearchLineEdit->clear();
+	ui->citySearchLineEdit->clear();	
 }
 
 // Called when the planet name is changed by hand
@@ -422,6 +495,10 @@
 			LocationMap results = locMgr.pickLocationsNearby(loc.planetName, 0.0f, 0.0f, 180.0f);
 			pickedModel->setStringList(results.keys());
 			proxyModel->setSourceModel(pickedModel);
+			ui->countryNameComboBox->setCurrentIndex(ui->countryNameComboBox->findData("", Qt::UserRole, Qt::MatchCaseSensitive));
+			if (customTimeZone.isEmpty())
+				ui->timeZoneNameComboBox->setCurrentIndex(ui->timeZoneNameComboBox->findData("LMST", Qt::UserRole, Qt::MatchCaseSensitive));
+
 		}
 		proxyModel->sort(0, Qt::AscendingOrder);
 		ui->citySearchLineEdit->clear();
@@ -443,6 +520,14 @@
 	ui->mapLabel->setCursorPos(loc.longitude, loc.latitude);
 }
 
+void LocationDialog::saveTimeZone()
+{
+	QString tz = ui->timeZoneNameComboBox->itemData(ui->timeZoneNameComboBox->currentIndex()).toString();
+	StelApp::getInstance().getCore()->setCurrentTimeZone(tz);
+	if (ui->useCustomTimeZoneCheckBox->isChecked())
+		StelApp::getInstance().getSettings()->setValue("localization/time_zone", tz);
+}
+
 void LocationDialog::reportEdit()
 {
 	if (isEditingNew==false)
@@ -473,6 +558,7 @@
 	}
 	ui->addLocationToListPushButton->setEnabled(isEditingNew && canSave);
 	ui->deleteLocationFromListPushButton->setEnabled(locationMgr.canDeleteUserLocation(loc.getID()));
+	ui->timeZoneNameComboBox->setEnabled(isEditingNew && canSave);
 }
 
 // Called when the user clicks on the save button
@@ -535,6 +621,29 @@
 	ui->useAsDefaultLocationCheckBox->setEnabled(!currentIsDefault);
 }
 
+void LocationDialog::updateTimeZoneControls(bool useCustomTimeZone)
+{
+	if (useCustomTimeZone)
+	{
+		ui->useCustomTimeZoneCheckBox->setChecked(true);
+		saveTimeZone();
+	}
+	else
+	{
+		StelLocation loc = StelApp::getInstance().getCore()->getCurrentLocation();
+		int idx = ui->timeZoneNameComboBox->findData(loc.timeZone, Qt::UserRole, Qt::MatchCaseSensitive);
+		if (idx==-1)
+		{
+			// Use LMST as default
+			idx = ui->timeZoneNameComboBox->findData(QVariant("LMST"), Qt::UserRole, Qt::MatchCaseSensitive);
+		}
+		ui->timeZoneNameComboBox->setCurrentIndex(idx);
+		StelApp::getInstance().getSettings()->remove("localization/time_zone");
+	}
+
+	ui->timeZoneNameComboBox->setEnabled(useCustomTimeZone);	
+}
+
 // called when the user clicks on the IP Query button
 void LocationDialog::ipQueryLocation(bool state)
 {
@@ -548,6 +657,8 @@
 		locMgr.locationFromIP(); // This just triggers asynchronous lookup.
 		ui->useAsDefaultLocationCheckBox->setChecked(!state);
 		ui->pushButtonReturnToDefault->setEnabled(!state);
+		ui->useCustomTimeZoneCheckBox->setChecked(!state);
+		updateTimeZoneControls(!state);
 		connectEditSignals();
 		ui->citySearchLineEdit->setFocus();
 	}
 
=== modified file 'src/gui/LocationDialog.hpp'
--- src/gui/LocationDialog.hpp	2015-08-31 20:19:42 +0000
+++ src/gui/LocationDialog.hpp	2016-10-25 16:10:21 +0000
@@ -74,6 +74,12 @@
 	//! The original names are kept in the user data field of each QComboBox
 	//! item.
 	void populateCountryList();
+
+	//! Populates the drop-down list of time zones.
+	//! The displayed names are localized in the current interface language.
+	//! The original names are kept in the user data field of each QComboBox
+	//! item.
+	void populateTimeZonesList();
 	
 private slots:
 	//! Called whenever the StelLocationMgr is updated
@@ -81,6 +87,8 @@
 
 	//! To be called when user edits any field
 	void reportEdit();
+
+	void saveTimeZone();
 	
 	//! Update the widget to make sure it is synchrone if the location is changed programmatically
 	//! This function should be called repeatidly with e.g. a timer
@@ -115,15 +123,20 @@
 	
 	//! Called when the user wants to use the current location as default
 	void setDefaultLocation(bool state);
-	
+
+	//! Updates the check state and the enabled/disabled status.
+	void updateTimeZoneControls(bool useCustomTimeZone);
+
 private:
 	QString lastPlanet;
+	QString customTimeZone;
 	QStringListModel* allModel;
 	QStringListModel* pickedModel;
 	QSortFilterProxyModel *proxyModel;
 
 	//! Updates the check state and the enabled/disabled status.
 	void updateDefaultLocationControls(bool currentIsDefault);
+
 };
 
 #endif // _LOCATIONDIALOG_HPP_
 
=== modified file 'src/gui/StelGuiItems.cpp'
--- src/gui/StelGuiItems.cpp	2016-09-16 14:19:52 +0000
+++ src/gui/StelGuiItems.cpp	2016-10-25 16:10:21 +0000
@@ -626,6 +626,17 @@
 		newDateInfo = QString("JD %1").arg(jd, 0, 'f', 6);
 	}
 
+	QString currTZ = QString("%1: %2").arg(q_("Time zone")).arg(core->getCurrentTimeZone());
+	if (currTZ.contains("system_default"))
+		currTZ = QString("%1: %2").arg(q_("Time zone")).arg(q_("System default"));
+
+	QString planetName = core->getCurrentLocation().planetName;
+	if (currTZ.contains("LMST") || currTZ.contains("auto") || (planetName=="Earth" && jd<=2409907.5) || planetName!="Earth")
+		currTZ = q_("Local Mean Solar Time");
+
+	if (currTZ.contains("LTST"))
+		currTZ = q_("Local True Solar Time");
+
 	if (datetime->text()!=newDateInfo)
 	{
 		updatePos = true;		
@@ -641,10 +652,11 @@
 			else
 				deltaTInfo = QString("%1s%2").arg(deltaT, 3, 'f', 3).arg(validRangeMarker);
 
-			datetime->setToolTip(QString("<p style='white-space:pre'>%1T = %2 [n-dot @ -23.8946\"/cy%3%4]<br>%5</p>").arg(QChar(0x0394)).arg(deltaTInfo).arg(QChar(0x00B2)).arg(sigmaInfo).arg(newDateAppx));
+			datetime->setToolTip(QString("<p style='white-space:pre'>%1T = %2 [n-dot @ -23.8946\"/cy%3%4]<br>%5<br>%6</p>").arg(QChar(0x0394)).arg(deltaTInfo).arg(QChar(0x00B2)).arg(sigmaInfo).arg(newDateAppx).arg(currTZ));
 		}
 		else
-			datetime->setToolTip(QString("%1").arg(newDateAppx));
+			datetime->setToolTip(QString("<p style='white-space:pre'>%1<br>%2</p>").arg(newDateAppx).arg(currTZ));
+
 		if (qApp->property("text_texture")==true) // CLI option -t given?
 		{
 			datetime->setVisible(false); // hide normal thingy.
 
=== modified file 'src/gui/configurationDialog.ui'
--- src/gui/configurationDialog.ui	2016-08-24 13:32:23 +0000
+++ src/gui/configurationDialog.ui	2016-10-25 16:10:21 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>512</width>
-    <height>548</height>
+    <height>563</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -148,7 +148,7 @@
       <item row="1" column="0">
        <widget class="QStackedWidget" name="configurationStackedWidget">
         <property name="currentIndex">
-         <number>0</number>
+         <number>2</number>
         </property>
         <widget class="QWidget" name="page">
          <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -495,6 +495,18 @@
              <string>Selected object information</string>
             </property>
             <layout class="QGridLayout" name="gridLayout_2">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
              <item row="0" column="0">
               <widget class="QRadioButton" name="allSelectedInfoRadio">
                <property name="toolTip">
@@ -766,16 +778,6 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="enableKeysNavigationCheckBox">
-               <property name="toolTip">
-                <string>Allow keyboard to pan and zoom</string>
-               </property>
-               <property name="text">
-                <string>Enable keyboard navigation</string>
-               </property>
-              </widget>
-             </item>
              <item row="1" column="0">
               <widget class="QCheckBox" name="enableMouseNavigationCheckBox">
                <property name="toolTip">
@@ -793,6 +795,16 @@
                </property>
               </widget>
              </item>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="enableKeysNavigationCheckBox">
+               <property name="toolTip">
+                <string>Allow keyboard to pan and zoom</string>
+               </property>
+               <property name="text">
+                <string>Enable keyboard navigation</string>
+               </property>
+              </widget>
+             </item>
              <item row="1" column="1">
               <layout class="QHBoxLayout" name="_8">
                <item>
@@ -866,63 +878,6 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="2" column="0">
-              <layout class="QHBoxLayout" name="_4">
-               <item>
-                <widget class="QRadioButton" name="fixedTimeRadio">
-                 <property name="toolTip">
-                  <string>Use a specific date and time when Stellarium starts up</string>
-                 </property>
-                 <property name="text">
-                  <string>Other:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QDateTimeEdit" name="fixedDateTimeEdit">
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>24</height>
-                  </size>
-                 </property>
-                 <property name="maximumSize">
-                  <size>
-                   <width>16777215</width>
-                   <height>24</height>
-                  </size>
-                 </property>
-                 <property name="date">
-                  <date>
-                   <year>1952</year>
-                   <month>5</month>
-                   <day>11</day>
-                  </date>
-                 </property>
-                 <property name="time">
-                  <time>
-                   <hour>0</hour>
-                   <minute>42</minute>
-                   <second>0</second>
-                  </time>
-                 </property>
-                 <property name="calendarPopup">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="2" column="1">
-              <widget class="QPushButton" name="fixedDateTimeCurrentButton">
-               <property name="toolTip">
-                <string>Use current local date and time</string>
-               </property>
-               <property name="text">
-                <string>use current</string>
-               </property>
-              </widget>
-             </item>
              <item row="0" column="0">
               <widget class="QRadioButton" name="systemTimeRadio">
                <property name="toolTip">
@@ -991,6 +946,63 @@
                </item>
               </layout>
              </item>
+             <item row="2" column="0">
+              <layout class="QHBoxLayout" name="_4">
+               <item>
+                <widget class="QRadioButton" name="fixedTimeRadio">
+                 <property name="toolTip">
+                  <string>Use a specific date and time when Stellarium starts up</string>
+                 </property>
+                 <property name="text">
+                  <string>Other:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QDateTimeEdit" name="fixedDateTimeEdit">
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>16777215</width>
+                   <height>24</height>
+                  </size>
+                 </property>
+                 <property name="date">
+                  <date>
+                   <year>1952</year>
+                   <month>5</month>
+                   <day>11</day>
+                  </date>
+                 </property>
+                 <property name="time">
+                  <time>
+                   <hour>0</hour>
+                   <minute>42</minute>
+                   <second>0</second>
+                  </time>
+                 </property>
+                 <property name="calendarPopup">
+                  <bool>true</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="2" column="1">
+              <widget class="QPushButton" name="fixedDateTimeCurrentButton">
+               <property name="toolTip">
+                <string>Use current local date and time</string>
+               </property>
+               <property name="text">
+                <string>use current</string>
+               </property>
+              </widget>
+             </item>
             </layout>
            </widget>
           </item>
@@ -1139,6 +1151,18 @@
              <string>Planetarium options</string>
             </property>
             <layout class="QGridLayout" name="gridLayoutOptions">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
              <item row="3" column="0">
               <widget class="QCheckBox" name="autoEnableAtmosphereCheckBox">
                <property name="toolTip">
@@ -1774,7 +1798,7 @@
   <customwidget>
    <class>BarFrame</class>
    <extends>QFrame</extends>
-   <header location="global">Dialog.hpp</header>
+   <header>Dialog.hpp</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
 
=== modified file 'src/gui/locationDialogGui.ui'
--- src/gui/locationDialogGui.ui	2014-08-16 16:27:46 +0000
+++ src/gui/locationDialogGui.ui	2016-10-25 16:10:21 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>460</height>
+    <height>506</height>
    </rect>
   </property>
   <property name="styleSheet">
@@ -393,18 +393,99 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
-         <item row="1" column="2" colspan="2">
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
+         <item row="2" column="1" colspan="3">
+          <widget class="QFrame" name="frame_3">
+           <property name="minimumSize">
             <size>
-             <width>20</width>
-             <height>40</height>
+             <width>0</width>
+             <height>0</height>
             </size>
            </property>
-          </spacer>
+           <property name="frameShape">
+            <enum>QFrame::StyledPanel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Raised</enum>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QPushButton" name="addLocationToListPushButton">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>100</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="text">
+               <string>Add to list</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="deleteLocationFromListPushButton">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>60</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="text">
+               <string>Delete from list</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pushButtonReturnToDefault">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="focusPolicy">
+               <enum>Qt::NoFocus</enum>
+              </property>
+              <property name="text">
+               <string>Return to default location</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
          </item>
          <item row="0" column="1">
           <widget class="QFrame" name="frame_4">
@@ -436,6 +517,20 @@
             <property name="horizontalSpacing">
              <number>6</number>
             </property>
+            <item row="5" column="0" colspan="2">
+             <widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
+              <property name="text">
+               <string>Use current location as default</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Longitude:</string>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="0">
              <widget class="QLabel" name="label_5">
               <property name="text">
@@ -443,26 +538,10 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
-             <widget class="AngleSpinBox" name="latitudeSpinBox">
-              <property name="minimumSize">
-               <size>
-                <width>180</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>You can enter values in decimal degrees, or using dms format, for example: +1d 12m 8s</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label">
+            <item row="4" column="0" colspan="2">
+             <widget class="QCheckBox" name="useIpQueryCheckBox">
               <property name="text">
-               <string>Longitude:</string>
+               <string>Get location from Network</string>
               </property>
              </widget>
             </item>
@@ -482,13 +561,6 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_7">
-              <property name="text">
-               <string>Altitude:</string>
-              </property>
-             </widget>
-            </item>
             <item row="2" column="1">
              <widget class="QSpinBox" name="altitudeSpinBox">
               <property name="minimumSize">
@@ -517,100 +589,42 @@
               </property>
              </widget>
             </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="2" column="1" colspan="3">
-          <widget class="QFrame" name="frame_3">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QPushButton" name="pushButtonReturnToDefault">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="focusPolicy">
-               <enum>Qt::NoFocus</enum>
-              </property>
+            <item row="0" column="1">
+             <widget class="AngleSpinBox" name="latitudeSpinBox">
+              <property name="minimumSize">
+               <size>
+                <width>180</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="toolTip">
+               <string>You can enter values in decimal degrees, or using dms format, for example: +1d 12m 8s</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_7">
               <property name="text">
-               <string>Return to default location</string>
+               <string>Altitude:</string>
               </property>
              </widget>
             </item>
-            <item>
-             <spacer name="horizontalSpacer">
+            <item row="3" column="0">
+             <spacer name="verticalSpacer">
               <property name="orientation">
-               <enum>Qt::Horizontal</enum>
+               <enum>Qt::Vertical</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
-                <width>40</width>
-                <height>20</height>
+                <width>20</width>
+                <height>40</height>
                </size>
               </property>
              </spacer>
             </item>
-            <item>
-             <widget class="QPushButton" name="deleteLocationFromListPushButton">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>60</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="focusPolicy">
-               <enum>Qt::NoFocus</enum>
-              </property>
-              <property name="text">
-               <string>Delete</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="addLocationToListPushButton">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="focusPolicy">
-               <enum>Qt::NoFocus</enum>
-              </property>
-              <property name="text">
-               <string>Add to list</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </widget>
          </item>
@@ -654,10 +668,31 @@
             <property name="bottomMargin">
              <number>0</number>
             </property>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_3">
-              <property name="text">
-               <string>Name/City:</string>
+            <item row="1" column="1">
+             <widget class="QComboBox" name="countryNameComboBox">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+              <property name="insertPolicy">
+               <enum>QComboBox::NoInsert</enum>
               </property>
              </widget>
             </item>
@@ -668,41 +703,6 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>Country:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QComboBox" name="countryNameComboBox">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>24</height>
-               </size>
-              </property>
-              <property name="editable">
-               <bool>true</bool>
-              </property>
-              <property name="insertPolicy">
-               <enum>QComboBox::NoInsert</enum>
-              </property>
-             </widget>
-            </item>
             <item row="2" column="0">
              <widget class="QLabel" name="label_6">
               <property name="text">
@@ -710,6 +710,58 @@
               </property>
              </widget>
             </item>
+            <item row="4" column="0" colspan="2">
+             <widget class="QCheckBox" name="useCustomTimeZoneCheckBox">
+              <property name="text">
+               <string>Use custom time zone</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="timeZoneLabel">
+              <property name="text">
+               <string>Time zone:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>Name/City:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QComboBox" name="timeZoneNameComboBox">
+              <property name="enabled">
+               <bool>true</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>0</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>24</height>
+               </size>
+              </property>
+              <property name="editable">
+               <bool>true</bool>
+              </property>
+              <property name="insertPolicy">
+               <enum>QComboBox::NoInsert</enum>
+              </property>
+             </widget>
+            </item>
             <item row="2" column="1">
              <widget class="QComboBox" name="planetNameComboBox">
               <property name="sizePolicy">
@@ -738,23 +790,26 @@
               </property>
              </widget>
             </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Country:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0" colspan="2">
+             <widget class="QCheckBox" name="dstCheckBox">
+              <property name="toolTip">
+               <string/>
+              </property>
+              <property name="text">
+               <string>Enable daylight saving time</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QCheckBox" name="useAsDefaultLocationCheckBox">
-           <property name="text">
-            <string>Use current location as default</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="3">
-          <widget class="QCheckBox" name="useIpQueryCheckBox">
-           <property name="text">
-            <string>Get location from Network</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
 
=== modified file 'src/scripting/StelMainScriptAPI.cpp'
--- src/scripting/StelMainScriptAPI.cpp	2016-10-10 04:45:16 +0000
+++ src/scripting/StelMainScriptAPI.cpp	2016-10-25 16:10:21 +0000
@@ -175,7 +175,7 @@
 	if (spec=="utc")
 		return StelUtils::julianDayToISO8601String(getJDay());
 	else
-		return StelUtils::julianDayToISO8601String(getJDay()+StelUtils::getGMTShiftFromQT(getJDay())/24);
+		return StelUtils::julianDayToISO8601String(getJDay()+StelApp::getInstance().getCore()->getUTCOffset(getJDay())/24);
 }
 
 QString StelMainScriptAPI::getDeltaT() const