diff --git a/data/base_locations.bin.gz b/data/base_locations.bin.gz
index d5bed09c5e01f..4d2f31d3600d8 100644
Binary files a/data/base_locations.bin.gz and b/data/base_locations.bin.gz differ
diff --git a/data/base_locations.txt b/data/base_locations.txt
index e8c14fb11a81c..6bf358d98351d 100644
--- a/data/base_locations.txt
+++ b/data/base_locations.txt
@@ -6227,6 +6227,7 @@ Orlova	Moravskoslezsky	17	N	34.282	49.84527N	18.43011E	226	5	Europe/Prague
 Opava	Moravskoslezsky	17	N	60.252	49.93866N	17.90257E	262	6	Europe/Prague
 Olomouc	Olomoucky	17	R	99.496	49.59552N	17.25175E	223	6	Europe/Prague
 Novy Jicin	Moravskoslezsky	17	N	26.547	49.59438N	18.01028E	287	5	Europe/Prague
+Nove Mesto	Prague	17	N	27.105	50.07829N	14.42089E	211	5	Europe/Prague
 Neratovice	Central Bohemia	17	N	16.427	50.25926N	14.51759E	170	5	Europe/Prague
 Nachod	Kralovehradecky kraj	17	N	21.263	50.4167N	16.16289E	350	5	Europe/Prague
 Most	Ustecky kraj	17	N	67.905	50.50301N	13.63617E	282	6	Europe/Prague
@@ -7951,12 +7952,14 @@ Kafr Shukr	Monufia	01	N	30.948	30.54972N	31.24444E	17	5	Africa/Cairo
 Kafr Saqr	Sharqia	01	N	44.529	30.79336N	31.62575E	11	5	Africa/Cairo
 Kafr Sa'd	Damietta	01	N	18.12	31.35573N	31.68484E	5	5	Africa/Cairo
 Kafr az Zayyat	Gharbia	01	N	83.348	30.8248N	30.81805E	18	6	Africa/Cairo
+As Salahat	Dakahlia	01	N	45.557	31.00205N	31.62626E	7	5	Africa/Cairo
 Kafr ash Shaykh	Kafr el-Sheikh	01	R	194.569	31.11174N	30.93991E	11	7	Africa/Cairo
 Kafr al Kurdi	Dakahlia	01	N	44.905	31.16844N	31.7655E	9	5	Africa/Cairo
 Kafr al Battikh	Damietta	01	N	47.198	31.40398N	31.73778E	5	5	Africa/Cairo
 Kafr ad Dawwar	Beheira	01	N	128.539	31.13379N	30.12969E	5	7	Africa/Cairo
 Juhaynah	Sohag	01	N	76.555	26.67418N	31.49686E	65	6	Africa/Cairo
 Girga	Sohag	01	N	151.256	26.33721N	31.89295E	78	7	Africa/Cairo
+Jarajus	Qena	01	N	20.427	25.87198N	32.75585E	80	5	Africa/Cairo
 `Izbat al Burj	Dakahlia	01	N	37.953	31.5084N	31.84106E	8	5	Africa/Cairo
 Itay al Barud	Beheira	01	N	77.606	30.88697N	30.66724E	8	6	Africa/Cairo
 Itsa	Faiyum	01	N	74.357	29.2376N	30.78944E	20	6	Africa/Cairo
@@ -8148,6 +8151,7 @@ Talavera de la Reina	Castille-La Mancha	19	N	88.856	39.96348N	4.83076W	380	6	Eur
 Tacoronte	Canary Islands	19	N	23.562	28.47688N	16.41016W	569	5	Atlantic/Canary
 Tavernes de la Valldigna	Valencia	19	N	18.195	39.07195N	0.26623W	20	5	Europe/Madrid
 Sueca	Valencia	19	N	28.908	39.2026N	0.31114W	14	5	Europe/Madrid
+Son Rapinya	Balearic Islands	19	N	17.993	39.58932N	2.61899E	81	5	Europe/Madrid
 Silla	Valencia	19	N	18.979	39.36257N	0.41169W	12	5	Europe/Madrid
 Sevilla	Andalusia	19	R	684.234	37.38283N	5.97317W	16	8	Europe/Madrid
 San Vicent del Raspeig	Valencia	19	N	56.715	38.3964N	0.5255W	113	6	Europe/Madrid
@@ -8704,7 +8708,9 @@ Sant Marti de Provencals	Catalonia	19	N	26.196	41.4202N	2.19632E	11	5	Europe/Mad
 Los Realejos	Canary Islands	19	N	36.405	28.38487N	16.58275W	297	5	Atlantic/Canary
 Pasaia	Basque Country	19	N	15.99	43.3253N	1.92707W	10	5	Europe/Madrid
 Basauri	Basque Country	19	N	42.657	43.2397N	2.8858W	57	5	Europe/Madrid
+Sant Agusti	Balearic Islands	19	N	15.136	39.55065N	2.59741E	15	5	Europe/Madrid
 Llefia	Catalonia	19	N	43.827	41.43806N	2.2195E	23	5	Europe/Madrid
+Stadtzentrum	Canary Islands	19	N	88.546	28.1272N	15.4314W	18	6	Atlantic/Canary
 Corvera de Asturias	Asturias	19	N	15.955	43.53554N	5.88893W	57	5	Europe/Madrid
 Tres Cantos	Madrid	19	N	41.896	40.60092N	3.70806W	731	5	Europe/Madrid
 Iturrama	Navarre	19	N	24.846	42.80847N	1.65825W	449	5	Europe/Madrid
@@ -10106,6 +10112,7 @@ Hythe	England	18	N	20.201	50.86004N	1.40162W	29	5	Europe/London
 Hyde	England	18	N	31.926	53.45131N	2.07943W	112	5	Europe/London
 Huyton	England	18	N	54.738	53.4115N	2.83935W	40	6	Europe/London
 Huntingdon	England	18	N	23.937	52.33049N	0.18651W	18	5	Europe/London
+Humberstone	England	18	N	18.854	52.64738N	1.08647W	72	5	Europe/London
 Huddersfield	England	18	N	149.017	53.64904N	1.78416W	90	7	Europe/London
 Hucknall	England	18	N	29.728	53.03333N	1.2W	80	5	Europe/London
 Hoyland Nether	England	18	N	15.842	53.5N	1.45W	162	5	Europe/London
@@ -10184,6 +10191,7 @@ Godalming	England	18	N	22.689	51.1858N	0.61489W	46	5	Europe/London
 Gloucester	England	18	N	132.416	51.86568N	2.2431W	24	7	Europe/London
 Glossop	England	18	N	33.243	53.44325N	1.949W	156	5	Europe/London
 Glenrothes	Scotland	18	N	38.36	56.19514N	3.17316W	92	5	Europe/London
+Glen Parva	England	18	N	17	52.58527N	1.17062W	83	5	Europe/London
 Glasgow	Scotland	18	N	626.41	55.86515N	4.25763W	40	8	Europe/London
 Gillingham	England	18	N	101.187	51.38914N	0.54863E	31	7	Europe/London
 Gelligaer	Wales	18	N	17.376	51.66444N	3.25611W	233	5	Europe/London
@@ -10366,6 +10374,7 @@ Bridgend	Wales	18	N	49.597	51.50583N	3.57722W	23	5	Europe/London
 Brentwood	England	18	N	52.586	51.62127N	0.30556E	108	6	Europe/London
 Brent	England	18	N	329.1	51.55306N	0.3023W	44	7	Europe/London
 Bredbury	England	18	N	15.126	53.41667N	2.11667W	91	5	Europe/London
+Braunstone	England	18	N	16.85	52.61835N	1.17904W	83	5	Europe/London
 Bramhall	England	18	N	25.506	53.35801N	2.16539W	83	5	Europe/London
 Braintree	England	18	N	53.477	51.87819N	0.55292E	68	6	Europe/London
 Bradford	England	18	N	366.187	53.79391N	1.75206W	110	7	Europe/London
@@ -10474,6 +10483,7 @@ Telford	England	18	N	155.57	52.67659N	2.44926W	163	7	Europe/London
 Craigavon	Northern Ireland	18	N	59.236	54.44709N	6.387W	34	6	Europe/London
 Soho	England	18	N	19.634	51.5144N	0.13535W	34	5	Europe/London
 Bayswater	England	18	N	17.5	51.51116N	0.18426W	35	5	Europe/London
+North Watford	England	18	N	18.3	51.68072N	0.39446W	79	5	Europe/London
 Yateley	England	18	N	20.214	51.34305N	0.82985W	61	5	Europe/London
 Bowthorpe	England	18	N	20	52.63884N	1.21885E	26	5	Europe/London
 Hedge End	England	18	N	17.978	50.91234N	1.30076W	28	5	Europe/London
@@ -10539,6 +10549,9 @@ Stamford Hill	England	18	N	68.05	51.56872N	0.07334W	34	6	Europe/London
 Burngreave	England	18	N	27.481	53.39302N	1.45789W	65	5	Europe/London
 Archway	England	18	N	215.667	51.56733N	0.13415W	67	7	Europe/London
 Sinfin	England	18	N	15.128	52.88157N	1.48681W	46	5	Europe/London
+South Ruislip	England	18	N	16.8	51.55518N	0.40867W	35	5	Europe/London
+Wealdstone	England	18	N	18.5	51.59983N	0.33711W	62	5	Europe/London
+East Barnet	England	18	N	18.1	51.64674N	0.16103W	56	5	Europe/London
 Perry Vale	England	18	N	15.618	51.43639N	0.04442W	43	5	Europe/London
 Furzedown	England	18	N	15.504	51.42456N	0.14656W	39	5	Europe/London
 Seven Sisters	England	18	N	15.968	51.57769N	0.07895W	18	5	Europe/London
@@ -11336,7 +11349,7 @@ Meulaboh	Aceh	14	N	64.646	4.14402N	96.12664E	7	6	Asia/Jakarta
 Medan	North Sumatra	14	R	2435.252	3.58333N	98.66667E	26	9	Asia/Jakarta
 Lhokseumawe	Aceh	14	N	188.713	5.1801N	97.1507E	6	7	Asia/Jakarta
 Langsa	Aceh	14	N	185.971	4.4683N	97.9683E	10	7	Asia/Jakarta
-Labuhan Deli	North Sumatra	14	N	49.668	3.7278N	98.6738E	4	5	Asia/Jakarta
+Labuhan Deli	North Sumatra	14	N	49.668	3.879N	98.633E	2	5	Asia/Jakarta
 Kisaran	North Sumatra	14	N	141.915	2.9845N	99.6158E	20	7	Asia/Jakarta
 Kabanjahe	North Sumatra	14	N	73.581	3.1001N	98.4908E	1196	6	Asia/Jakarta
 Gunungsitoli	North Sumatra	14	N	136.707	1.2888N	97.6143E	14	7	Asia/Jakarta
@@ -11476,7 +11489,7 @@ Pecangaan	Central Java	14	N	61.046	6.6978S	110.7107E	18	6	Asia/Jakarta
 Payakumbuh	West Sumatra	14	N	139.576	0.2159S	100.6334E	517	7	Asia/Jakarta
 Pati	Central Java	14	N	107.028	6.7559S	111.038E	13	7	Asia/Jakarta
 Pasuruan	East Java	14	N	208.006	7.6453S	112.9075E	9	7	Asia/Jakarta
-Paseh	West Java	14	N	126.181	7.1026S	107.7641E	918	7	Asia/Jakarta
+Paseh	West Java	14	N	126.181	7.068S	107.794E	924	7	Asia/Jakarta
 Pasarkemis	West Java	14	N	273.659	6.17028S	106.53028E	20	7	Asia/Jakarta
 Parung	West Java	14	N	123.078	6.42139S	106.73306E	101	7	Asia/Jakarta
 Pariaman	West Sumatra	14	N	92.183	0.61898S	100.11997E	4	6	Asia/Jakarta
@@ -11606,7 +11619,7 @@ Godean	Yogyakarta	14	N	63.164	7.76972S	110.29389E	121	6	Asia/Jakarta
 Genteng	East Java	14	N	79.652	8.36667S	114.15E	172	6	Asia/Jakarta
 Gedangan	East Java	14	N	79.23	7.39083S	112.72667E	5	6	Asia/Jakarta
 Gebog	Central Java	14	N	43.756	6.735S	110.8444E	127	5	Asia/Jakarta
-Gampengrejo	East Java	14	N	49.118	7.76667S	112.01667E	59	5	Asia/Jakarta
+Gampengrejo	East Java	14	N	49.118	7.764S	112.035E	84	5	Asia/Jakarta
 Gambiran Satu	East Java	14	N	22.525	8.3939S	114.1464E	143	5	Asia/Jakarta
 Galesong	South Sulawesi	14	N	83.05	5.3166S	119.3661E	12	6	Asia/Makassar
 Fakfak	Papua	14	N	18.9	2.92481S	132.29813E	71	5	Asia/Jayapura
@@ -18418,6 +18431,7 @@ Itu	Akwa Ibom State	05	N	36.358	5.20131N	7.98373E	32	5	Africa/Lagos
 Isieke	Ebonyi State	05	N	89.99	6.38186N	8.03736E	68	6	Africa/Lagos
 Ise-Ekiti	Ekiti State	05	N	190.063	7.46478N	5.42333E	379	7	Africa/Lagos
 Isanlu-Itedoijowa	Kogi State	05	N	15.087	8.27338N	5.83526E	309	5	Africa/Lagos
+Irewe	Lagos	05	N	139.494	6.41692N	3.14058E	7	7	Africa/Lagos
 Ipoti	Ekiti State	05	N	82.113	7.87377N	5.07691E	593	6	Africa/Lagos
 Iperu	Ogun State	05	N	15.935	6.91002N	3.66557E	97	5	Africa/Lagos
 Inisa	Osun State	05	N	164.161	7.84855N	4.32981E	370	7	Africa/Lagos
@@ -18545,6 +18559,8 @@ Abuja	FCT	05	C	2690	9.05785N	7.49508E	476	9	Africa/Lagos
 Abeokuta	Ogun State	05	R	735	7.15571N	3.34509E	64	8	Africa/Lagos
 Abakaliki	Ebonyi State	05	R	134.102	6.32485N	8.11368E	65	7	Africa/Lagos
 Aba	Abia State	05	N	1160	5.10658N	7.36667E	64	9	Africa/Lagos
+Obalende	Lagos	05	N	342	6.44694N	3.41528E	6	7	Africa/Lagos
+Akowonjo	Lagos	05	N	308.9	6.61012N	3.30968E	44	7	Africa/Lagos
 Degema Hulk	Rivers State	05	N	19.223	4.76145N	6.74957E	6	5	Africa/Lagos
 Chakwama	Jigawa State	05	N	200	11.55965N	9.66407E	415	7	Africa/Lagos
 Tipitapa	Managua Department	07	N	50	12.19732N	86.09706W	54	6	America/Managua
@@ -20206,6 +20222,7 @@ Jarocin	Greater Poland	17	N	25.665	51.97266N	17.50256E	119	5	Europe/Warsaw
 Inowroclaw	Kujawsko-Pomorskie	17	N	77.597	52.79886N	18.26387E	98	6	Europe/Warsaw
 Ilawa	Warmia-Masuria	17	N	32.557	53.59601N	19.56849E	105	5	Europe/Warsaw
 Gubin	Lubusz	17	N	16.629	51.94956N	14.72837E	45	5	Europe/Warsaw
+Grzegorzki	Lesser Poland	17	N	28.96	50.06423N	19.96761E	217	5	Europe/Warsaw
 Gryfino	West Pomerania	17	N	21.27	53.25243N	14.48831E	7	5	Europe/Warsaw
 Gryfice	West Pomerania	17	N	16.72	53.9165N	15.20027E	17	5	Europe/Warsaw
 Grudziadz	Kujawsko-Pomorskie	17	N	95.045	53.48411N	18.75366E	22	6	Europe/Warsaw
@@ -20341,6 +20358,7 @@ Setubal	Setubal	19	R	117.11	38.5244N	8.8882W	16	7	Europe/Lisbon
 Sao Martinho	Madeira	19	N	26.482	32.6448N	16.93843W	198	5	Atlantic/Madeira
 Sao Joao da Talha	Lisbon	19	N	18.925	38.82378N	9.09719W	66	5	Europe/Lisbon
 Sao Domingos de Rana	Lisbon	19	N	46.718	38.70194N	9.34083W	72	5	Europe/Lisbon
+Santo Antonio	Madeira	19	N	25.94	32.66138N	16.93482W	234	5	Atlantic/Madeira
 Santarem	Santarem	19	R	29.385	39.23333N	8.68333W	107	5	Europe/Lisbon
 Santa Iria da Azoia	Lisbon	19	N	18.573	38.8411N	9.09908W	108	5	Europe/Lisbon
 Sacavem	Lisbon	19	N	17.718	38.79202N	9.10801W	39	5	Europe/Lisbon
@@ -20370,6 +20388,7 @@ Monsanto	Santarem	19	N	50	39.46203N	8.7118W	143	6	Europe/Lisbon
 Moita	Setubal	19	N	17.795	38.65078N	8.99038W	10	5	Europe/Lisbon
 Massama	Lisbon	19	N	28.112	38.75279N	9.2811W	142	5	Europe/Lisbon
 Marinha Grande	Leiria	19	N	28.916	39.74769N	8.93228W	91	5	Europe/Lisbon
+Lumiar	Lisbon	19	N	46.334	38.77478N	9.15601W	94	5	Europe/Lisbon
 Loures	Lisbon	19	N	66.231	38.83091N	9.16845W	23	6	Europe/Lisbon
 Loule	Faro	19	N	23.109	37.13772N	8.01968W	186	5	Europe/Lisbon
 Lisbon	Lisbon	19	C	517.802	38.71667N	9.13333W	45	8	Europe/Lisbon
@@ -20392,15 +20411,20 @@ Carnaxide	Lisbon	19	N	23.698	38.72706N	9.24671W	82	5	Europe/Lisbon
 Carcavelos	Lisbon	19	N	20.366	38.69105N	9.32215W	30	5	Europe/Lisbon
 Caparica	Setubal	19	N	21.167	38.66179N	9.20032W	98	5	Europe/Lisbon
 Canico	Madeira	19	N	23.368	32.65078N	16.83749W	216	5	Atlantic/Madeira
+Campo Grande	Lisbon	19	N	15.514	38.75471N	9.16651W	90	5	Europe/Lisbon
 Camarate	Lisbon	19	N	20.177	38.80358N	9.12809W	108	5	Europe/Lisbon
 Camara de Lobos	Madeira	19	N	32.209	32.65043N	16.97718W	83	5	Atlantic/Madeira
 Caldas da Rainha	Leiria	19	N	27.378	39.40326N	9.13839W	60	5	Europe/Lisbon
 Cacem	Lisbon	19	N	93.982	38.76698N	9.29793W	123	6	Europe/Lisbon
+Buraca	Lisbon	19	N	16.081	38.73333N	9.2W	166	5	Europe/Lisbon
 Benfica	Lisbon	19	N	36.985	38.75087N	9.20282W	82	5	Europe/Lisbon
+Belem	Lisbon	19	N	16.546	38.69875N	9.19289W	13	5	Europe/Lisbon
 Belas	Lisbon	19	N	21.019	38.7767N	9.26353W	147	5	Europe/Lisbon
 Beja	Beja	19	R	34.76	38.01506N	7.86323W	286	5	Europe/Lisbon
 Barreiro	Setubal	19	N	51.28	38.66314N	9.0724W	7	6	Europe/Lisbon
+Azambuja	Lisbon	19	N	21.422	39.07029N	8.86822W	25	5	Europe/Lisbon
 Arrentela	Setubal	19	N	30.156	38.625N	9.10151W	30	5	Europe/Lisbon
+Areeiro	Lisbon	19	N	21.16	38.73333N	9.13333W	64	5	Europe/Lisbon
 Amora	Setubal	19	N	52.577	38.62961N	9.11557W	12	6	Europe/Lisbon
 Amadora	Lisbon	19	N	178.858	38.75382N	9.23083W	138	7	Europe/Lisbon
 Almada	Setubal	19	N	34.008	38.67902N	9.1569W	58	5	Europe/Lisbon
@@ -20415,13 +20439,17 @@ Vilar de Andorinho	Porto	19	N	18.944	41.10574N	8.58622W	196	5	Europe/Lisbon
 Vila Nova de Gaia	Porto	19	N	70.811	41.12401N	8.61241W	122	6	Europe/Lisbon
 Vila do Conde	Porto	19	N	27.642	41.35326N	8.74516W	12	5	Europe/Lisbon
 Viana do Castelo	Viana do Castelo	19	R	36.148	41.69323N	8.83287W	12	5	Europe/Lisbon
+Vermoim	Porto	19	N	15.764	41.24315N	8.60651W	77	5	Europe/Lisbon
 Valongo	Porto	19	N	21.328	41.18883N	8.49857W	140	5	Europe/Lisbon
+Valadares	Porto	19	N	22.322	41.09294N	8.63219W	53	5	Europe/Lisbon
 Trofa	Porto	19	N	20.692	41.33729N	8.5596W	44	5	Europe/Lisbon
 Sequeira	Guarda	19	N	28.502	40.55364N	7.22594W	853	5	Europe/Lisbon
 Senhora da Hora	Porto	19	N	28.93	41.18641N	8.65172W	85	5	Europe/Lisbon
+Sao Tiago de Custoias	Porto	19	N	19	41.2N	8.63333W	84	5	Europe/Lisbon
 Sao Pedro da Cova	Porto	19	N	17.011	41.14331N	8.50033W	81	5	Europe/Lisbon
 Sao Mamede de Infesta	Porto	19	N	25.94	41.19183N	8.61105W	103	5	Europe/Lisbon
 Sao Joao da Madeira	Aveiro	19	N	22.079	40.9007N	8.4902W	228	5	Europe/Lisbon
+Santo Ovidio	Porto	19	N	38.544	41.11379N	8.60235W	189	5	Europe/Lisbon
 Santo Antonio dos Olivais	Coimbra	19	N	38.936	40.21805N	8.40523W	154	5	Europe/Lisbon
 Rio Tinto	Porto	19	N	49.966	41.17872N	8.55953W	80	5	Europe/Lisbon
 Povoa de Varzim	Porto	19	N	29.044	41.38344N	8.76364W	16	5	Europe/Lisbon
@@ -20429,11 +20457,13 @@ Porto	Porto	19	R	249.633	41.14961N	8.61099W	97	7	Europe/Lisbon
 Ponte de Lima	Viana do Castelo	19	N	44.667	41.76719N	8.58393W	13	5	Europe/Lisbon
 Pedroso	Porto	19	N	18.963	41.41103N	8.74897W	35	5	Europe/Lisbon
 Paredes	Porto	19	N	19.834	41.20485N	8.33147W	179	5	Europe/Lisbon
+Paranhos	Porto	19	N	45.883	41.17289N	8.59931W	125	5	Europe/Lisbon
 Ovar	Aveiro	19	N	18.452	40.85862N	8.62513W	16	5	Europe/Lisbon
 Oliveira do Douro	Porto	19	N	24.407	41.12466N	8.58463W	87	5	Europe/Lisbon
 Moncao	Viana do Castelo	19	N	19.738	42.07892N	8.48076W	34	5	Europe/Lisbon
 Matosinhos	Porto	19	N	28.07	41.18207N	8.68908W	17	5	Europe/Lisbon
 Maia	Porto	19	N	36.426	41.23574N	8.6199W	93	5	Europe/Lisbon
+Lordelo do Ouro	Porto	19	N	22.27	41.15059N	8.64845W	33	5	Europe/Lisbon
 Leca do Bailio	Porto	19	N	16.103	41.21201N	8.63422W	90	5	Europe/Lisbon
 Leca da Palmeira	Porto	19	N	17.996	41.191N	8.70027W	18	5	Europe/Lisbon
 Ilhavo	Aveiro	19	N	17.236	40.60188N	8.67021W	13	5	Europe/Lisbon
@@ -20458,18 +20488,23 @@ Cabeceiras de Basto	Braga	19	N	16.71	41.51431N	7.98942W	295	5	Europe/Lisbon
 Braganca	Braganca	19	R	34.375	41.80582N	6.75719W	673	5	Europe/Lisbon
 Braga	Braga	19	R	121.394	41.55032N	8.42005W	188	7	Europe/Lisbon
 Bougado	Porto	19	N	21.68	41.33979N	8.5518W	35	5	Europe/Lisbon
+Bomfim	Porto	19	N	22.978	41.15417N	8.58688W	85	5	Europe/Lisbon
 Barcelos	Braga	19	N	19.085	41.53174N	8.61843W	36	5	Europe/Lisbon
 Baiao	Porto	19	N	20.522	41.16273N	8.0347W	577	5	Europe/Lisbon
 Baguim do Monte	Porto	19	N	15.85	41.19203N	8.54118W	143	5	Europe/Lisbon
 Aveiro	Aveiro	19	R	54.162	40.64427N	8.64554W	19	6	Europe/Lisbon
 Arcos de Valdevez	Viana do Castelo	19	N	22.847	41.84668N	8.41905W	42	5	Europe/Lisbon
 Alfena	Porto	19	N	15.211	41.23671N	8.52454W	117	5	Europe/Lisbon
+Aldoar	Porto	19	N	29.085	41.1671N	8.6691W	43	5	Europe/Lisbon
 Aguas Santas	Porto	19	N	27.686	41.21017N	8.57599W	112	5	Europe/Lisbon
+Afurada de Baixo	Porto	19	N	34.332	41.14389N	8.64639W	2	5	Europe/Lisbon
 Quinta Do Conde	Setubal	19	N	25.606	38.56528N	9.04316W	38	5	Europe/Lisbon
 Alfragide	Lisbon	19	N	17.044	38.73203N	9.2192W	127	5	Europe/Lisbon
 Alvalade	Lisbon	19	N	31.813	38.75328N	9.14397W	91	5	Europe/Lisbon
 Ponta Delgada	Azores	19	R	20.056	37.73952N	25.66874W	12	5	Atlantic/Azores
+Sao Jorge de Arroios	Lisbon	19	N	22.99	38.7289N	9.13806W	71	5	Europe/Lisbon
 Azeitao	Setubal	19	N	18.877	38.51919N	9.0139W	105	5	Europe/Lisbon
+Parque das Nacoes	Lisbon	19	N	22.382	38.76908N	9.09632W	9	5	Europe/Lisbon
 Ngerulmud	Melekeok	23	C	0	7.50077N	134.6238E	72		Pacific/Palau
 Villarrica	Guaira	08	R	41.157	25.74946S	56.43518W	143	5	America/Asuncion
 Villa Hayes	Presidente Hayes	08	R	57.217	25.09306S	57.52361W	75	6	America/Asuncion
@@ -20497,7 +20532,7 @@ Caaguazu	Caaguazu	08	N	54.808	25.47104S	56.01603W	336	6	America/Asuncion
 Caacupe	Cordillera Department	08	R	56.864	25.38575S	57.14217W	180	6	America/Asuncion
 Asuncion	Asuncion	08	C	1482.2	25.28646S	57.647W	113	9	America/Asuncion
 Filadelfia	Boqueron	08	R	19.927	22.33936S	60.03157W	140	5	America/Asuncion
-Umm Salal Muhammad	Umm Salal Municipality	16	N	29.391	25.41524N	51.40647E	25	5	Asia/Qatar
+Umm Salal Muhammad	Umm Salal	16	N	29.391	25.41524N	51.40647E	25	5	Asia/Qatar
 Ar Rayyan	Baladiyat ar Rayyan	16	R	272.465	25.29194N	51.42444E	23	7	Asia/Qatar
 Al Wakrah	Al Wakrah	16	R	26.436	25.17151N	51.60337E	9	5	Asia/Qatar
 Al Khawr	Al Khor	16	R	18.923	25.68389N	51.50583E	10	5	Asia/Qatar
@@ -22040,14 +22075,18 @@ Alingsas	Vaestra Goetaland	18	N	26.329	57.93033N	12.53345E	66	5	Europe/Stockholm
 Akersberga	Stockholm	18	N	32.659	59.47944N	18.29967E	9	5	Europe/Stockholm
 Majorna	Vaestra Goetaland	18	N	29.254	57.69195N	11.91605E	8	5	Europe/Stockholm
 Tensta	Stockholm	18	N	17.083	59.3939N	17.90111E	32	5	Europe/Stockholm
+Yew Tee		14	N	40.39	1.39444N	103.75389E	13	5	Asia/Singapore
 Singapore		14	C	5638.7	1.28967N	103.85007E	23	9	Asia/Singapore
 Punggol		14	N	174.45	1.41444N	103.90694E	30	7	Asia/Singapore
+Marsiling		14	N	22	1.44111N	103.77083E	29	5	Asia/Singapore
 Kampong Pasir Ris		14	N	147.11	1.37833N	103.93194E	5	7	Asia/Singapore
 Geylang		14	N	110.2	1.31953N	103.88689E	8	7	Asia/Singapore
 Jurong Town		14	N	262.73	1.33417N	103.72278E	20	7	Asia/Singapore
 Woodlands		14	N	254.73	1.43801N	103.78877E	27	7	Asia/Singapore
 Marine Parade		14	N	46.39	1.30306N	103.90778E	16	5	Asia/Singapore
+Bukit Panjang New Town		14	N	138.27	1.37972N	103.76472E	36	7	Asia/Singapore
 Queenstown Estate		14	N	95.93	1.29417N	103.8025E	22	6	Asia/Singapore
+Choa Chu Kang New Town		14	N	190.89	1.3825N	103.74972E	28	7	Asia/Singapore
 Jamestown	Saint Helena	05	C	0.637	15.92488S	5.71816W	256		Atlantic/St_Helena
 Trbovlje	Trbovlje	19	R	15.163	46.155N	15.05333E	285	5	Europe/Ljubljana
 Velenje	Velenje	19	R	24.327	46.35917N	15.11028E	391	5	Europe/Ljubljana
@@ -22828,6 +22867,7 @@ Sarkisla	Sivas	16	N	23.8	39.35186N	36.40976E	1250	5	Europe/Istanbul
 Sarkikaraagac	Isparta	16	N	32.771	38.07944N	31.36639E	1170	5	Europe/Istanbul
 Saraykoy	Denizli	16	N	18.937	37.92448N	28.92516E	163	5	Europe/Istanbul
 Sandikli	Afyonkarahisar Province	16	N	42.981	38.46472N	30.26946E	1086	5	Europe/Istanbul
+Samandag	Hatay	16	N	123.447	36.08012N	35.97603E	20	7	Europe/Istanbul
 Salihli	Manisa	16	N	88.906	38.48258N	28.14774E	109	6	Europe/Istanbul
 Reyhanli	Hatay	16	N	56.995	36.26791N	36.56747E	153	6	Europe/Istanbul
 Polatli	Ankara	16	N	93.262	39.57715N	32.14132E	855	6	Europe/Istanbul
diff --git a/data/nomenclature.dat b/data/nomenclature.dat
index 282b0a065cc3d..20dd8685a5b77 100644
Binary files a/data/nomenclature.dat and b/data/nomenclature.dat differ
diff --git a/data/nomenclature.fab b/data/nomenclature.fab
index 0d490f75dc6f2..84c3b8a873eb7 100644
--- a/data/nomenclature.fab
+++ b/data/nomenclature.fab
@@ -4840,6 +4840,12 @@ Mars	16253	_("Picardi","crater")	AA	-8.060000	200.500000	79	_("Giovanni; Italian
 Mars	16120	_("Marsabit","crater")	AA	12.030000	338.970000	40	_("Town in Kenya.","origin")
 # TRANSLATORS: (Mars); Town in United Arab Emirates.
 Mars	16255	_("Ruwais","crater")	AA	22.860000	175.890000	28	_("Town in United Arab Emirates.","origin")
+# TRANSLATORS: (Mars); Town in Canada.
+Mars	16276	_("Kahnawake","crater")	AA	-27.600000	203.100000	30	_("Town in Canada.","origin")
+# TRANSLATORS: (Mars); Village in Saint Helena Island.
+Mars	16277	_("Longwood","crater")	AA	-25.880000	199.460000	43	_("Village in Saint Helena Island.","origin")
+# TRANSLATORS: (Mars); Village in Hao atoll, Tuamotu Archipelago, French Polynesia.
+Mars	16278	_("Otepa","crater")	AA	-26.320000	198.570000	42	_("Village in Hao atoll, Tuamotu Archipelago, French Polynesia.","origin")
 # TRANSLATORS: (Mars); Nancy Grace; American astronomer (1925-2018).
 Mars	16165	_("Roman","crater")	AA	-4.380000	80.420000	60	_("Nancy Grace; American astronomer (1925-2018).","origin")
 # TRANSLATORS: (Mars); Village in Spain.
@@ -26748,6 +26754,8 @@ Rhea	6588	_("Wuraka","crater")	AA	25.100000	356.000000	0	_("Kakadu (Australia) a
 Rhea	4060	_("Mubai","crater")	AA	55.800000	339.800000	0	_("Tibetan heavenly god.","origin")
 # TRANSLATORS: (Rhea); Mythological ancestor of the Buriat tribe.
 Rhea	914	_("Bulagat","crater")	AA	-38.200000	344.800000	0	_("Mythological ancestor of the Buriat tribe.","origin")
+# TRANSLATORS: (Rhea); Ainu (Japan) god of the heavens, who gave the Ainus civilization and taught them hunting and fishing.
+Rhea	16275	_("Okikurumi","crater")	AA	-17.520000	109.170000	12	_("Ainu (Japan) god of the heavens, who gave the Ainus civilization and taught them hunting and fishing.","origin")
 # TRANSLATORS: (Rhea); Nganasan (Taymyr Peninsula Samoyed, Russia) mythical mountain range, the first land to appear from the primordial waters after creation. The first man and woman were placed on it.
 Rhea	14752	_("Koykamou Catena","catena")	CA	-70.000000	116.000000	110	_("Nganasan (Taymyr Peninsula Samoyed, Russia) mythical mountain range, the first land to appear from the primordial waters after creation. The first man and woman were placed on it.","origin")
 # TRANSLATORS: (Rhea); Holy land created by Persian god Ahura Mazda (Ormazd); modern Mary/Merv Oasis, Turkmenistan.
@@ -27012,6 +27020,8 @@ Titan	14903	_("Momoy","crater")	AA	11.600000	315.400000	40	_("Chumash (Californi
 Titan	14902	_("Hano","crater")	AA	40.300000	14.900000	100	_("Bella Coola (northwestern USA and western Canada) goddess of education, knowledge, and magic. She manifested as a shaman so she could teach the people.","origin")
 # TRANSLATORS: (Titan); Melanesian (New Ireland Island, Papua New Guinea) god of wisdom.
 Titan	14925	_("Soi","crater")	AA	24.300000	219.100000	75	_("Melanesian (New Ireland Island, Papua New Guinea) god of wisdom.","origin")
+# TRANSLATORS: (Titan); Tahitian goddess of wisdom, worshipped by the learned.
+Titan	16274	_("Ihi","crater")	AA	-7.820000	194.880000	42	_("Tahitian goddess of wisdom, worshipped by the learned.","origin")
 # TRANSLATORS: (Titan); Norse god, the wisest and most eloquent of the Aesir.
 Titan	15311	_("Forseti","crater")	AA	25.532200	349.595900	145	_("Norse god, the wisest and most eloquent of the Aesir.","origin")
 # TRANSLATORS: (Titan); Celtic/Irish goddess of water, education, and knowledge. Anyone who drinks the water from her well will become wise.
diff --git a/po/stellarium/stellarium.pot b/po/stellarium/stellarium.pot
index 077a5a09e248a..affe398ab84bd 100644
--- a/po/stellarium/stellarium.pot
+++ b/po/stellarium/stellarium.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: stellarium@googlegroups.com\n"
-"POT-Creation-Date: 2024-03-15 12:19+0700\n"
+"POT-Creation-Date: 2024-03-30 15:07+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr ""
 msgid "custom object"
 msgstr ""
 
-#: src/core/modules/CustomObjectMgr.cpp:68
+#: src/core/modules/CustomObjectMgr.cpp:71
 msgid "Marker"
 msgstr ""
 
@@ -5982,31 +5982,31 @@ msgctxt "search tool"
 msgid "searches"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:628
+#: src/gui/SearchDialog.cpp:631
 msgid "Clear search history: delete all search objects data"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:628
+#: src/gui/SearchDialog.cpp:631
 msgid "Clear search history: no data to delete"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:1175
+#: src/gui/SearchDialog.cpp:1178
 msgid "Simbad Lookup Error"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:1182
+#: src/gui/SearchDialog.cpp:1185
 msgid "Simbad Lookup"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:1476
+#: src/gui/SearchDialog.cpp:1479
 msgid "University of Strasbourg (France)"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:1477
+#: src/gui/SearchDialog.cpp:1480
 msgid "Harvard University (USA)"
 msgstr ""
 
-#: src/gui/SearchDialog.cpp:1559
+#: src/gui/SearchDialog.cpp:1562
 msgid "Paste and Search"
 msgstr ""
 
@@ -18409,7 +18409,8 @@ msgstr ""
 #: plugins/Satellites/src/ui_satellitesDialog.h:1363
 msgid ""
 "Satellites in the marked source lists will be automatically added on the "
-"next update if they are not already in the collection."
+"next update if they are not already in the collection. Unmarked entries will "
+"also be fetched to update only previously included satellites."
 msgstr ""
 
 #: plugins/Satellites/src/ui_satellitesDialog.h:1368