9 changed files with 176 additions and 400 deletions
--- a/admin1CodesASCII.txt
+++ b/admin1CodesASCII.txt
@ -1686,7 +1686,7 @@ KY.10375972	Sister Island	Sister Island	10375972
 KZ.07	Batys Qazaqstan	Batys Qazaqstan	607847
 KZ.09	Mangghystaū	Mangghystau	608879
 KZ.06	Atyrau Oblisi	Atyrau Oblisi	609862
-KZ.04	Aktyubinskaya Oblast’	Aktyubinskaya Oblast'	610688
+KZ.04	Aqtöbe	Aqtoebe	610688
 KZ.15	East Kazakhstan	East Kazakhstan	1517381
 KZ.03	Aqmola	Aqmola	1518003
 KZ.16	North Kazakhstan	North Kazakhstan	1519367
@ -2104,7 +2104,7 @@ MN.19	Uvs Province	Uvs Province	1514967
 MN.12	Hovd	Hovd	1515696
 MN.10	Govi-Altai Province	Govi-Altai Province	1515917
 MN.09	Dzabkhan	Dzabkhan	1516012
-MN.03	Bayan-Ölgii Province	Bayan-OElgii Province	1516278
+MN.03	Bayan-Ölgiy	Bayan-Olgiy	1516278
 MN.02	Bayanhongor	Bayanhongor	1516290
 MN.20	Ulaanbaatar	Ulaanbaatar	2028461
 MN.18	Central Aimak	Central Aimak	2028849
--- a/admin2Codes.txt
+++ b/admin2Codes.txt
@ -15,7 +15,7 @@ AE.06.306	Al Madam	Al Madam	12060399
 AE.06.301	Sharjah	Sharjah	12060400
 AE.06.303	Al Hamriyah	Al Hamriyah	12060401
 AE.02.402	Manama	Manama	12060402
-AE.02.403	Masfut	Masfut	12060403
+AE.02.403	Masfout	Masfout	12060403
 AE.06.308	Al Batayih	Al Batayih	12060404
 AE.03.600	Sector 6	Sector 6	13060544
 AE.03.200	Sector 2	Sector 2	13060545
@ -485,88 +485,16 @@ AL.51.10944425	Bashkia Konispol	Bashkia Konispol	10944425
 AL.51.10944426	Bashkia Sarandë	Bashkia Sarande	10944426
 AL.51.10944427	Bashkia Selenicë	Bashkia Selenice	10944427
 AL.51.10944428	Bashkia Vlorë	Bashkia Vlore	10944428
+AM.08.174761	Sisian	Sisian	174761
+AM.10.174959	Vayk'i Shrjan	Vayk'i Shrjan	174959
+AM.11.616200	Spandaryanskiy Rayon	Spandaryanskiy Rayon	616200
 AM.11.616205	Arabkir	Arabkir	616205
-AM.08.13133004	Kapan Municipality	Kapan Municipality	13133004
-AM.08.13133005	Goris Municipality	Goris Municipality	13133005
-AM.08.13133006	Meghri Municipality	Meghri Municipality	13133006
-AM.08.13133007	Sisian Municipality	Sisian Municipality	13133007
-AM.08.13133008	Kajaran Municipality	Kajaran Municipality	13133008
-AM.08.13133009	Tatev Municipality	Tatev Municipality	13133009
-AM.08.13133010	Tegh Municipality	Tegh Municipality	13133010
-AM.10.13133019	Yeghegnadzor Municipality	Yeghegnadzor Municipality	13133019
-AM.10.13133022	Jermuk Municipality	Jermuk Municipality	13133022
-AM.10.13133023	Vayk Municipality	Vayk Municipality	13133023
-AM.10.13133025	Areni Municipality	Areni Municipality	13133025
-AM.10.13133026	Yeghegis Municipality	Yeghegis Municipality	13133026
-AM.02.13133028	Artashat Municipality	Artashat Municipality	13133028
-AM.02.13133029	Ararat Municipality	Ararat Municipality	13133029
-AM.02.13133030	Masis Municipality	Masis Municipality	13133030
-AM.02.13133031	Vedi Municipality	Vedi Municipality	13133031
-AM.02.13133032	Verin Dvin Municipality	Verin Dvin Municipality	13133032
-AM.04.13156120	Gavar Municipality	Gavar Municipality	13156120
-AM.04.13156121	Chambarak Municipality	Chambarak Municipality	13156121
-AM.04.13156122	Martuni Municipality	Martuni Municipality	13156122
-AM.04.13156123	Sevan Municipality	Sevan Municipality	13156123
-AM.04.13156124	Vardenis Municipality	Vardenis Municipality	13156124
-AM.09.13156180	Dilijan Municipality	Dilijan Municipality	13156180
-AM.09.13156181	Ijevan Municipality	Ijevan Municipality	13156181
-AM.09.13156182	Berd Municipality	Berd Municipality	13156182
-AM.09.13156183	Noyemberyan Municipality	Noyemberyan Municipality	13156183
-AM.06.13156275	Alaverdi Municipality	Alaverdi Municipality	13156275
-AM.06.13156276	Tumanyan Municipality	Tumanyan Municipality	13156276
-AM.06.13156277	Pambak Municipality	Pambak Municipality	13156277
-AM.06.13156278	Lermontovo Municipality	Lermontovo Municipality	13156278
-AM.06.13156279	Fioletovo Municipality	Fioletovo Municipality	13156279
-AM.06.13156280	Vanadzor Municipality	Vanadzor Municipality	13156280
-AM.06.13156281	Spitak Municipality	Spitak Municipality	13156281
-AM.06.13156282	Stepanavan Municipality	Stepanavan Municipality	13156282
-AM.06.13156283	Tashir Municipality	Tashir Municipality	13156283
-AM.06.13156284	Gyulagarak Municipality	Gyulagarak Municipality	13156284
-AM.06.13156285	Lori Berd Municipality	Lori Berd Municipality	13156285
-AM.07.13156473	Amasia Municipality	Amasia Municipality	13156473
-AM.07.13156474	Ashotsk Municipality	Ashotsk Municipality	13156474
-AM.07.13156475	Gyumri Municipality	Gyumri Municipality	13156475
-AM.07.13156476	Akhuryan Municipality	Akhuryan Municipality	13156476
-AM.07.13156477	Artik Municipality	Artik Municipality	13156477
-AM.07.13156478	Ani Municipality	Ani Municipality	13156478
-AM.01.13156510	Tsaghkahovit Municipality	Tsaghkahovit Municipality	13156510
-AM.01.13156511	Alagyaz Municipality	Alagyaz Municipality	13156511
-AM.01.13156512	Aparan Municipality	Aparan Municipality	13156512
-AM.01.13156513	Ashtarak Municipality	Ashtarak Municipality	13156513
-AM.01.13156514	Talin Municipality	Talin Municipality	13156514
-AM.01.13156515	Arevut Municipality	Arevut Municipality	13156515
-AM.01.13156516	Metsadzor Municipality	Metsadzor Municipality	13156516
-AM.01.13156517	Shamiram Municipality	Shamiram Municipality	13156517
-AM.05.13156540	Nairi Municipality	Nairi Municipality	13156540
-AM.05.13156542	Nor Hachn Municipality	Nor Hachn Municipality	13156542
-AM.05.13156543	Arzni Municipality	Arzni Municipality	13156543
-AM.05.13156544	Abovyan Municipality	Abovyan Municipality	13156544
-AM.05.13156545	Jrvezh Municipality	Jrvezh Municipality	13156545
-AM.05.13156546	Garni Municipality	Garni Municipality	13156546
-AM.05.13156547	Byureghavan Municipality	Byureghavan Municipality	13156547
-AM.05.13156548	Akunk Municipality	Akunk Municipality	13156548
-AM.05.13156549	Charentsavan Municipality	Charentsavan Municipality	13156549
-AM.05.13156550	Hrazdan Municipality	Hrazdan Municipality	13156550
-AM.05.13156551	Tsaghkadzor Municipality	Tsaghkadzor Municipality	13156551
-AM.03.13156552	Ferik Municipality	Ferik Municipality	13156552
-AM.03.13156553	Vagharshapat Municipality	Vagharshapat Municipality	13156553
-AM.03.13156554	Parakar Municipality	Parakar Municipality	13156554
-AM.03.13156555	Khoy Municipality	Khoy Municipality	13156555
-AM.03.13156556	Araks Municipality	Araks Municipality	13156556
-AM.03.13156557	Metsamor Municipality	Metsamor Municipality	13156557
-AM.03.13156558	Armavir Municipality	Armavir Municipality	13156558
-AM.03.13156559	Baghramyan Municipality	Baghramyan Municipality	13156559
-AM.11.13156594	Ajapnyak	Ajapnyak	13156594
-AM.11.13156595	Avan	Avan	13156595
-AM.11.13156596	Davtashen	Davtashen	13156596
-AM.11.13156597	Erebuni	Erebuni	13156597
-AM.11.13156598	Kanaker-Zeytun	Kanaker-Zeytun	13156598
-AM.11.13156599	Kentron District	Kentron District	13156599
-AM.11.13156600	Malatia-Sebastia	Malatia-Sebastia	13156600
-AM.11.13156601	Nork-Marash	Nork-Marash	13156601
-AM.11.13156602	Nor Nork	Nor Nork	13156602
-AM.11.13156603	Nubarashen	Nubarashen	13156603
-AM.11.13156604	Shengavit	Shengavit	13156604
+AM.11.616233	Shaumyanskiy Rayon	Shaumyanskiy Rayon	616233
+AM.11.616323	Ordzhonikidzevskiy Rayon	Ordzhonikidzevskiy Rayon	616323
+AM.04.616436	Martuni	Martuni	616436
+AM.11.616485	Leninskiy Rayon	Leninskiy Rayon	616485
+AM.11.616624	Imeni Dvadtsati Shesti Komissarov Rayon	Imeni Dvadtsati Shesti Komissarov Rayon	616624
+AM.01.7874001	Achtarak	Achtarak	7874001
 AO.18.145530	Saurimo	Saurimo	145530
 AO.17.145723	Lucapa	Lucapa	145723
 AO.17.145775	Chitato	Chitato	145775
@ -8907,7 +8835,7 @@ CA.11.4706026	Sherwood No. 159	Sherwood No. 159	6146276
 CA.03.6147482	Sifton	Sifton	6147482
 CA.11.4705011	Silverwood No. 123	Silverwood No. 123	6147943
 CA.08.3543	Simcoe County	Simcoe County	6147963
-CA.02.5947	North Coast Regional District	North Coast Regional District	6148773
+CA.02.5947	Skeena-Queen Charlotte Regional District	Skeena-Queen Charlotte Regional District	6148773
 CA.11.4709033	Sliding Hills No. 273	Sliding Hills No. 273	6149496
 CA.01.4812022	Smoky Lake County	Smoky Lake County	6150297
 CA.11.4708074	Snipe Lake No. 259	Snipe Lake No. 259	6150632
@ -10573,7 +10501,7 @@ CH.BE.242	Biel/Bienne District	Biel/Bienne District	8260136
 CH.BE.243	Seeland District	Seeland District	8260137
 CH.BE.247	Thun District	Thun District	8260138
 CH.BE.250	Interlaken-Oberhasli District	Interlaken-Oberhasli District	8260139
-CH.BE.241	Bernese Jura	Bernese Jura	8260140
+CH.BE.241	Jura bernois	Jura bernois	8260140
 CH.BE.244	Oberaargau	Oberaargau	8260141
 CH.BE.246	Bern-Mittelland District	Bern-Mittelland District	8260142
 CH.TG.2012	Bezirk Frauenfeld	Bezirk Frauenfeld	8260143
@ -11048,7 +10976,7 @@ CN.05.2206	Baishan Shi	Baishan Shi	2036646
 CN.20.1507	Hulunbuir Region	Hulunbuir Region	2036660
 CN.20.1501	Hohhot Shi	Hohhot Shi	2036891
 CN.20.1522	Hinggan Meng	Hinggan Meng	2036898
-CN.08.2311	Heihe	Heihe	2036971
+CN.08.2311	Heihe Shi	Heihe Shi	2036971
 CN.08.2304	Hegang Shi	Hegang Shi	2036985
 CN.08.2301	Harbin Shi	Harbin Shi	2037012
 CN.19.2109	Fuxin Shi	Fuxin Shi	2037337
@ -13723,7 +13651,7 @@ DZ.35.12952554	Djendel	Djendel	12952554
 DZ.38.12952555	Tabelbala	Tabelbala	12952555
 DZ.35.12952556	El Abadia	El Abadia	12952556
 DZ.35.12952557	El Amra	El Amra	12952557
-DZ.36.12952558	Aïn Larbaâ	Ain Larbaa	12952558
+DZ.36.12952558	Ain Larbaa	Ain Larbaa	12952558
 DZ.36.12952559	Ain Temouchent	Ain Temouchent	12952559
 DZ.35.12952560	Rouina	Rouina	12952560
 DZ.01.12952561	Bir Mourad Rais	Bir Mourad Rais	12952561
@ -14052,136 +13980,136 @@ DZ.15.12952883	Nedroma	Nedroma	12952883
 DZ.15.12952884	Ouled Mimoun	Ouled Mimoun	12952884
 DZ.15.12952885	Remchi	Remchi	12952885
 DZ.15.12952886	Sabra	Sabra	12952886
-EC.08.0713	Zaruma	Zaruma	3649913
-EC.20.1901	Zamora	Zamora	3649958
-EC.20.1905	Yantzaza	Yantzaza	3650052
+EC.08.0713	Cantón Zaruma	Canton Zaruma	3649913
+EC.20.1901	Cantón Zamora	Canton Zamora	3649958
+EC.20.1905	Cantón Yantzaza	Canton Yantzaza	3650052
 EC.10.0920	Cantón Yaguachi	Canton Yaguachi	3650124
-EC.20.1904	Yacuambi	Yacuambi	3650141
-EC.13.1208	Vinces	Vinces	3650185
-EC.13.1207	Ventanas	Ventanas	3650264
+EC.20.1904	Cantón Yacuambi	Canton Yacuambi	3650141
+EC.13.1208	Cantón Vinces	Canton Vinces	3650185
+EC.13.1207	Cantón Ventanas	Canton Ventanas	3650264
 EC.14.1316	Cantón Veinticuatro de Mayo	Canton Veinticuatro de Mayo	3650277
 EC.24.2201	Francisco de Orellana Canton	Francisco de Orellana Canton	3650339
-EC.13.1206	Urdaneta	Urdaneta	3650340
+EC.13.1206	Cantón Urdaneta	Canton Urdaneta	3650340
 EC.10.0919	Cantón Salitre	Canton Salitre	3650347
 EC.05.0401	Cantón Tulcán	Canton Tulcan	3650471
-EC.23.1501	Tena	Tena	3650720
+EC.23.1501	Cantón Tena	Canton Tena	3650720
 EC.22.2105	Cantón Sucumbíos	Canton Sucumbios	3650954
 EC.15.1406	Cantón Sucúa	Canton Sucua	3650955
 EC.14.1314	Cantón Sucre	Canton Sucre	3650958
-EC.12.1112	Sozoranga	Sozoranga	3650979
-EC.02.0109	Sígsig	Sigsig	3651065
-EC.12.1111	Saraguro	Saraguro	3651244
-EC.26.2301	Santo Domingo	Santo Domingo	3651296
+EC.12.1112	Cantón Sozoranga	Canton Sozoranga	3650979
+EC.02.0109	Cantón Sigsig	Canton Sigsig	3651065
+EC.12.1111	Cantón Saraguro	Canton Saraguro	3651244
+EC.26.2301	Cantón Santo Domingo de los Colorados	Canton Santo Domingo de los Colorados	3651296
 EC.15.1405	Santiago de Méndez	Santiago de Mendez	3651317
 EC.08.0712	Cantón Santa Rosa	Canton Santa Rosa	3651355
-EC.02.0108	Santa Isabel	Santa Isabel	3651417
-EC.25.2401	Santa Elena	Santa Elena	3651436
-EC.01.2003	Santa Cruz	Santa Cruz	3651446
-EC.14.1313	Santa Ana	Santa Ana	3651484
-EC.03.0205	San Miguel	San Miguel	3651621
-EC.09.0805	San Lorenzo	San Lorenzo	3651686
+EC.02.0108	Cantón Santa Isabel	Canton Santa Isabel	3651417
+EC.25.2401	Cantón Santa Elena	Canton Santa Elena	3651436
+EC.01.2003	Cantón Santa Cruz	Canton Santa Cruz	3651446
+EC.14.1313	Cantón Santa Ana	Canton Santa Ana	3651484
+EC.03.0205	Cantón San Miguel	Canton San Miguel	3651621
+EC.09.0805	Cantón San Lorenzo	Canton San Lorenzo	3651686
 EC.01.2001	Cantón San Cristóbal	Canton San Cristobal	3651947
 EC.10.0916	Cantón Samborondón	Canton Samborondon	3652064
-EC.25.2403	Salinas	Salinas	3652097
-EC.07.0505	Salcedo	Salcedo	3652108
+EC.25.2403	Cantón Salinas	Canton Salinas	3652097
+EC.07.0505	Cantón Salcedo	Canton Salcedo	3652108
 EC.18.1705	Cantón Rumiñahui	Canton Ruminahui	3652228
-EC.14.1312	Rocafuerte	Rocafuerte	3652312
-EC.06.0601	Riobamba	Riobamba	3652349
-EC.18.1701	Quito	Quito	3652461
+EC.14.1312	Cantón Rocafuerte	Canton Rocafuerte	3652312
+EC.06.0601	Cantón Riobamba	Canton Riobamba	3652349
+EC.18.1701	Cantón Quito	Canton Quito	3652461
 EC.09.0804	Cantón Quinindé	Canton Quininde	3652499
-EC.23.1507	Quijos	Quijos	3652561
-EC.13.1205	Quevedo	Quevedo	3652566
-EC.19.1806	Quero	Quero	3652572
-EC.12.1110	Puyango	Puyango	3652587
-EC.22.2103	Putumayo	Putumayo	3652592
+EC.23.1507	Cantón Quijos	Canton Quijos	3652561
+EC.13.1205	Cantón Quevedo	Canton Quevedo	3652566
+EC.19.1806	Cantón Quero	Canton Quero	3652572
+EC.12.1110	Cantón Puyango	Canton Puyango	3652587
+EC.22.2103	Cantón Putumayo	Canton Putumayo	3652592
 EC.07.0504	Cantón Pujilí	Canton Pujili	3652683
-EC.13.1204	Puebloviejo	Puebloviejo	3652785
-EC.14.1301	Portoviejo	Portoviejo	3652940
-EC.08.0711	Portovelo	Portovelo	3652942
+EC.13.1204	Cantón Puebloviejo	Canton Puebloviejo	3652785
+EC.14.1301	Cantón Portoviejo	Canton Portoviejo	3652940
+EC.08.0711	Cantón Portovelo	Canton Portovelo	3652942
 EC.08.0710	Cantón Piñas	Canton Pinas	3653129
-EC.11.1005	Pimampiro	Pimampiro	3653145
-EC.19.1808	Santiago de Píllaro	Santiago de Pillaro	3653158
-EC.19.1807	San Pedro de Pelileo	San Pedro de Pelileo	3653286
-EC.18.1704	Pedro Moncayo	Pedro Moncayo	3653294
-EC.02.0105	Paute	Paute	3653330
-EC.19.1805	Patate	Patate	3653370
-EC.17.1601	Pastaza	Pastaza	3653394
-EC.08.0709	Pasaje	Pasaje	3653402
+EC.11.1005	Cantón Pimampiro	Canton Pimampiro	3653145
+EC.19.1808	Cantón Píllaro	Canton Pillaro	3653158
+EC.19.1807	Cantón Pelileo	Canton Pelileo	3653286
+EC.18.1704	Cantón Pedro Moncayo	Canton Pedro Moncayo	3653294
+EC.02.0105	Cantón Paute	Canton Paute	3653330
+EC.19.1805	Cantón Patate	Canton Patate	3653370
+EC.17.1601	Cantón Pastaza	Canton Pastaza	3653394
+EC.08.0709	Cantón Pasaje	Canton Pasaje	3653402
 EC.07.0503	Cantón Pangua	Canton Pangua	3653474
-EC.12.1109	Paltas	Paltas	3653515
-EC.15.1404	Palora	Palora	3653522
+EC.12.1109	Cantón Paltas	Canton Paltas	3653515
+EC.15.1404	Cantón Palora	Canton Palora	3653522
 EC.14.1310	Cantón Paján	Canton Pajan	3653608
-EC.11.1004	Otavalo	Otavalo	3653692
-EC.10.0912	Naranjito	Naranjito	3653872
-EC.10.0911	Naranjal	Naranjal	3653880
+EC.11.1004	Cantón Otavalo	Canton Otavalo	3653692
+EC.10.0912	Cantón Naranjito	Canton Naranjito	3653872
+EC.10.0911	Cantón Naranjal	Canton Naranjal	3653880
 EC.09.0803	Cantón Muisne	Canton Muisne	3653966
-EC.15.1401	Morona	Morona	3654006
+EC.15.1401	Cantón Morona	Canton Morona	3654006
 EC.05.0405	Cantón Montúfar	Canton Montufar	3654038
-EC.14.1309	Montecristi	Montecristi	3654054
-EC.05.0404	Mira	Mira	3654172
-EC.10.0910	Milagro	Milagro	3654213
+EC.14.1309	Cantón Montecristi	Canton Montecristi	3654054
+EC.05.0404	Cantón Mira	Canton Mira	3654172
+EC.10.0910	Cantón Milagro	Canton Milagro	3654213
 EC.17.1602	Cantón Mera	Canton Mera	3654246
 EC.18.1703	Cantón Mejía	Canton Mejia	3654259
-EC.14.1308	Manta	Manta	3654408
-EC.08.0701	Machala	Machala	3654532
+EC.14.1308	Cantón Manta	Canton Manta	3654408
+EC.08.0701	Cantón Machala	Canton Machala	3654532
 EC.12.1108	Cantón Macará	Canton Macara	3654544
-EC.12.1101	Loja	Loja	3654666
+EC.12.1101	Cantón Loja	Canton Loja	3654666
 EC.15.1403	Cantón Limón Indanza	Canton Limon Indanza	3654737
-EC.07.0501	Latacunga	Latacunga	3654869
-EC.22.2101	Lago Agrio	Lago Agrio	3655184
+EC.07.0501	Cantón Latacunga	Canton Latacunga	3654869
+EC.22.2101	Cantón Lago Agrio	Canton Lago Agrio	3655184
 EC.14.1307	Cantón Junín	Canton Junin	3655383
-EC.14.1306	Jipijapa	Jipijapa	3655445
-EC.01.2002	Isabela	Isabela	3655572
+EC.14.1306	Cantón Jipijapa	Canton Jipijapa	3655445
+EC.01.2002	Cantón Isabela	Canton Isabela	3655572
 EC.11.1001	Ibarra	Ibarra	3655672
-EC.08.0707	Huaquillas	Huaquillas	3655719
-EC.10.0901	Guayaquil	Guayaquil	3657508
-EC.03.0201	Guaranda	Guaranda	3657570
-EC.06.0607	Guano	Guano	3657593
-EC.06.0606	Guamote	Guamote	3657620
-EC.15.1402	Gualaquiza	Gualaquiza	3657660
-EC.02.0103	Gualaceo	Gualaceo	3657669
-EC.08.0706	El Guabo	El Guabo	3657721
+EC.08.0707	Cantón Huaquillas	Canton Huaquillas	3655719
+EC.10.0901	Cantón Guayaquil	Canton Guayaquil	3657508
+EC.03.0201	Cantón Guaranda	Canton Guaranda	3657570
+EC.06.0607	Cantón Guano	Canton Guano	3657593
+EC.06.0606	Cantón Guamote	Canton Guamote	3657620
+EC.15.1402	Cantón Gualaquiza	Canton Gualaquiza	3657660
+EC.02.0103	Cantón Gualaceo	Canton Gualaceo	3657669
+EC.08.0706	Cantón Guabo	Canton Guabo	3657721
 EC.12.1107	Cantón Gonzanamá	Canton Gonzanama	3657777
 EC.02.0102	Cantón Girón	Canton Giron	3657793
-EC.12.1106	Espíndola	Espindola	3657967
-EC.05.0403	Espejo	Espejo	3657981
-EC.09.0801	Esmeraldas	Esmeraldas	3657987
-EC.09.0802	Eloy Alfaro	Eloy Alfaro	3658191
-EC.10.0908	El Empalme	El Empalme	3658266
-EC.14.1304	El Carmen	El Carmen	3658324
-EC.10.0906	Daule	Daule	3658498
-EC.02.0101	Cuenca	Cuenca	3658665
-EC.11.1003	Cotacachi	Cotacachi	3658780
-EC.06.0603	Colta	Colta	3658919
-EC.06.0605	Chunchi	Chunchi	3659071
-EC.14.1303	Chone	Chone	3659138
-EC.20.1902	Chinchipe	Chinchipe	3659209
+EC.12.1106	Cantón Espindola	Canton Espindola	3657967
+EC.05.0403	Cantón Espejo	Canton Espejo	3657981
+EC.09.0801	Cantón Esmeraldas	Canton Esmeraldas	3657987
+EC.09.0802	Cantón Eloy Alfaro	Canton Eloy Alfaro	3658191
+EC.10.0908	Cantón El Empalme	Canton El Empalme	3658266
+EC.14.1304	Cantón El Carmen	Canton El Carmen	3658324
+EC.10.0906	Cantón Daule	Canton Daule	3658498
+EC.02.0101	Cantón Cuenca	Canton Cuenca	3658665
+EC.11.1003	Cantón Cotacachi	Canton Cotacachi	3658780
+EC.06.0603	Cantón Colta	Canton Colta	3658919
+EC.06.0605	Cantón Chunchi	Canton Chunchi	3659071
+EC.14.1303	Cantón Chone	Canton Chone	3659138
+EC.20.1902	Cantón Chinchipe	Canton Chinchipe	3659209
 EC.03.0203	Cantón Chimbo	Canton Chimbo	3659242
-EC.03.0202	Chillanes	Chillanes	3659255
+EC.03.0202	Cantón Chillanes	Canton Chillanes	3659255
 EC.12.1104	Cantón Celica	Canton Celica	3659543
-EC.18.1702	Cayambe	Cayambe	3659576
-EC.12.1103	Catamayo	Catamayo	3659598
+EC.18.1702	Cantón Cayambe	Canton Cayambe	3659576
+EC.12.1103	Cantón Catamayo	Canton Catamayo	3659598
 EC.04.0303	Cantón Cañar	Canton Canar	3659851
-EC.12.1102	Calvas	Calvas	3659882
+EC.12.1102	Cantón Calvas	Canton Calvas	3659882
 EC.14.1302	Cantón Bolívar	Canton Bolivar	3660131
 EC.04.0302	Cantón Biblián	Canton Biblian	3660210
-EC.19.1802	Baños de Agua Santa	Banos de Agua Santa	3660343
-EC.10.0904	Balzar	Balzar	3660360
-EC.13.1201	Babahoyo	Babahoyo	3660417
+EC.19.1802	Cantón Baños	Canton Banos	3660343
+EC.10.0904	Cantón Balzar	Canton Balzar	3660360
+EC.13.1201	Cantón Babahoyo	Canton Babahoyo	3660417
 EC.13.1202	Cantón Baba	Canton Baba	3660421
-EC.04.0301	Azogues	Azogues	3660433
-EC.08.0702	Arenillas	Arenillas	3660558
-EC.23.1503	Archidona	Archidona	3660572
+EC.04.0301	Cantón Azogues	Canton Azogues	3660433
+EC.08.0702	Cantón Arenillas	Canton Arenillas	3660558
+EC.23.1503	Cantón Archidona	Canton Archidona	3660572
 EC.11.1002	Cantón Antonio Ante	Canton Antonio Ante	3660592
-EC.19.1801	Ambato	Ambato	3660688
+EC.19.1801	Cantón Ambato	Canton Ambato	3660688
 EC.06.0602	Cantón Alausí	Canton Alausi	3660797
 EC.24.2202	Cantón Aguarico	Canton Aguarico	3660839
 EC.02.0107	Cantón San Fernando	Canton San Fernando	7626219
 EC.02.0104	Cantón Nabón	Canton Nabon	7648116
-EC.13.1211	Valencia	Valencia	8471961
-EC.13.1210	Buena Fe	Buena Fe	8471975
-EC.23.1504	El Chaco	El Chaco	8472358
-EC.07.0507	Sigchos	Sigchos	8522615
+EC.13.1211	Cantón Valencia	Canton Valencia	8471961
+EC.13.1210	Cantón Buena Fe	Canton Buena Fe	8471975
+EC.23.1504	Cantón Chaco	Canton Chaco	8472358
+EC.07.0507	Cantón Sigchos	Canton Sigchos	8522615
 EC.06.0610	Cumanda	Cumanda	9155063
 EC.05.0402	Canton Bolivar	Canton Bolivar	9155065
 EC.10.0905	Canton Colimes	Canton Colimes	9155068
@ -14901,7 +14829,7 @@ FR.44.88	Vosges	Vosges	2967681
 FR.11.75	Paris	Paris	2968815
 FR.75.86	Vienne	Vienne	2969280
 FR.52.85	Vendée	Vendee	2970140
-FR.93.84	Département du Vaucluse	Departement du Vaucluse	2970554
+FR.93.84	Vaucluse	Vaucluse	2970554
 FR.93.83	Var	Var	2970749
 FR.11.95	Val d'Oise	Val d'Oise	2971071
 FR.11.94	Val-de-Marne	Val-de-Marne	2971090
@ -15328,7 +15256,6 @@ GE.04.9093934	Kobuletis Munitsip’alit’et’i	Kobuletis Munitsip'alit'et'i	90
 GE.04.9165838	Batumi	Batumi	9165838
 GE.02.9883703	Tkvarcheli district	Tkvarcheli district	9883703
 GE.73.10285963	Tskhinvali District	Tskhinvali District	10285963
-GE.51.13132123	Samgori District	Samgori District	13132123
 GF.GF.973	Guyane	Guyane	6690606
 GH.08.402	Keta	Keta	2299646
 GH.11.1005	Nadowli	Nadowli	7647177
@ -16124,13 +16051,13 @@ HN.15.1521	Silca	Silca	3601303
 HN.04.0318	Siguatepeque	Siguatepeque	3601312
 HN.14.1415	Sensenti	Sensenti	3601368
 HN.03.0205	Municipio de Sabá	Municipio de Saba	3601404
-HN.16.1625	San Vicente Centenario	San Vicente Centenario	3601437
+HN.16.1624	San Vicente Centenario	San Vicente Centenario	3601437
 HN.12.1218	Santiago Puringla	Santiago Puringla	3601463
 HN.05.0401	Santa Rosa de Copán	Santa Rosa de Copan	3601495
 HN.03.0207	Santa Rosa de Aguán	Santa Rosa de Aguan	3601497
 HN.18.1808	Santa Rita	Santa Rita	3601530
 HN.05.0421	Santa Rita	Santa Rita	3601531
-HN.16.1624	Santa Rita	Santa Rita	3601532
+HN.16.1625	Santa Rita	Santa Rita	3601532
 HN.15.1520	Santa María del Real	Santa Maria del Real	3601544
 HN.12.1217	Santa María	Santa Maria	3601557
 HN.08.0823	Santa Lucía	Santa Lucia	3601571
@ -17982,7 +17909,7 @@ IN.28.341	Hāora	Haora	1270397
 IN.11.028	Hamīrpur	Hamirpur	1270456
 IN.36.168	Hamīrpur	Hamirpur	1270457
 IN.35.421	Gwalior	Gwalior	1270585
-IN.10.086	Gurugram district	Gurugram district	1270644
+IN.10.086	Gurgaon	Gurgaon	1270644
 IN.23.035	Gurdaspur	Gurdaspur	1270648
 IN.02.548	Guntūr	Guntur	1270669
 IN.35.458	Guna	Guna	1270712
@ -29823,7 +29750,7 @@ PA.13.1301	Distrito de Arraiján	Distrito de Arraijan	3714635
 PA.03.0202	Distrito de Antón	Distrito de Anton	3714708
 PA.02.0401	Distrito de Alanje	Distrito de Alanje	3714937
 PA.03.0201	Distrito de Aguadulce	Distrito de Aguadulce	3715037
-PA.10.0912	Distrito de Mariato	Distrito de Mariato	9857610
+PA.10.0912	Mariato District	Mariato District	9857610
 PA.11.1102	Sambú	Sambu	9857626
 PA.12.1204	Nole Düima	Nole Dueima	9857644
 PA.12.1203	Müna	Muena	9857648
@ -35671,7 +35598,7 @@ RU.51.482229	Tonkinskiy Rayon	Tonkinskiy Rayon	482229
 RU.72.482496	Tokarëvskiy Rayon	Tokarevskiy Rayon	482496
 RU.17.482588	Tlyaratinskiy Rayon	Tlyaratinskiy Rayon	482588
 RU.41.482808	Timskiy Rayon	Timskiy Rayon	482808
-RU.38.482964	Timashëvskiy Rayon	Timashevskiy Rayon	482964
+RU.38.482964	Timashevskiy Rayon	Timashevskiy Rayon	482964
 RU.42.483008	Tikhvinskiy Rayon	Tikhvinskiy Rayon	483008
 RU.38.483027	Tikhoretskiy Rayon	Tikhoretskiy Rayon	483027
 RU.21.483136	Teykovskiy Rayon	Teykovskiy Rayon	483136
@ -35713,7 +35640,7 @@ RU.81.486044	Sursky District	Sursky District	486044
 RU.84.486070	Surovikinskiy Rayon	Surovikinskiy Rayon	486070
 RU.10.486147	Surazhskiy Rayon	Surazhskiy Rayon	486147
 RU.28.486183	Suoyarvskiy Rayon	Suoyarvskiy Rayon	486183
-RU.19.486197	Sunzhensky Rayon	Sunzhensky Rayon	486197
+RU.19.486197	Sernovodskiy Rayon	Sernovodskiy Rayon	486197
 RU.33.486207	Sunskiy Rayon	Sunskiy Rayon	486207
 RU.17.486360	Suleyman-Stal’skiy Rayon	Suleyman-Stal'skiy Rayon	486360
 RU.90.486411	Suksunsky District	Suksunsky District	486411
@ -36355,7 +36282,7 @@ RU.77.554182	Kalininskiy Rayon	Kalininskiy Rayon	554182
 RU.38.554184	Kalininskiy Rayon	Kalininskiy Rayon	554184
 RU.28.554317	Kaleval’skiy Rayon	Kaleval'skiy Rayon	554317
 RU.86.554402	Kalacheyevskiy Rayon	Kalacheyevskiy Rayon	554402
-RU.84.554403	Kalachëvskiy Rayon	Kalachevskiy Rayon	554403
+RU.84.554403	Kalachevskiy Rayon	Kalachevskiy Rayon	554403
 RU.61.554481	Kagalnitsky District	Kagalnitsky District	554481
 RU.37.554500	Kadyyskiy Rayon	Kadyyskiy Rayon	554500
 RU.85.554533	Kaduyskiy Rayon	Kaduyskiy Rayon	554533
@ -36640,7 +36567,7 @@ RU.38.584439	Abinskiy Rayon	Abinskiy Rayon	584439
 RU.55.584465	Abdulinsky District	Abdulinsky District	584465
 RU.01.824962	Takhtamukayskiy Rayon	Takhtamukayskiy Rayon	824962
 RU.07.824964	Gorodskoy Okrug Astrakhan'	Gorodskoy Okrug Astrakhan'	824964
-RU.09.824989	Gorodskoy Okrug Alekseyevka	Gorodskoy Okrug Alekseyevka	824989
+RU.09.824989	Gorod Alekseyevka	Gorod Alekseyevka	824989
 RU.09.824990	Grayvoronskiy Rayon	Grayvoronskiy Rayon	824990
 RU.09.824991	Krasnenskiy Rayon	Krasnenskiy Rayon	824991
 RU.09.824992	Krasnoyaruzhskiy Rayon	Krasnoyaruzhskiy Rayon	824992
@ -36748,7 +36675,7 @@ RU.04.1488635	Uglovskiy Rayon	Uglovskiy Rayon	1488635
 RU.53.1488709	Ubinskiy Rayon	Ubinskiy Rayon	1488709
 RU.04.1488739	Tyumentsevskiy Rayon	Tyumentsevskiy Rayon	1488739
 RU.78.1488743	Tyumensky District	Tyumensky District	1488743
-RU.91.1488770	Tyukhtetskiy Okrug	Tyukhtetskiy Okrug	1488770
+RU.91.1488770	Tyukhtetskiy Rayon	Tyukhtetskiy Rayon	1488770
 RU.54.1488778	Tyukalinskiy Rayon	Tyukalinskiy Rayon	1488778
 RU.29.1488837	Tyazhinskiy Rayon	Tyazhinskiy Rayon	1488837
 RU.91.1488901	Turukhanskiy Rayon	Turukhanskiy Rayon	1488901
@ -36807,7 +36734,7 @@ RU.75.1492290	Shegarsky District	Shegarsky District	1492290
 RU.03.1492297	Shebalinskiy Rayon	Shebalinskiy Rayon	1492297
 RU.40.1492326	Shchuchanskiy Rayon	Shchuchanskiy Rayon	1492326
 RU.40.1492387	Shatrovskiy Rayon	Shatrovskiy Rayon	1492387
-RU.91.1492400	Sharypovskiy Okrug	Sharypovskiy Okrug	1492400
+RU.91.1492400	Sharypovskiy Rayon	Sharypovskiy Rayon	1492400
 RU.40.1492514	Shadrinskiy Rayon	Shadrinskiy Rayon	1492514
 RU.91.1492565	Severo-Yeniseyskiy Rayon	Severo-Yeniseyskiy Rayon	1492565
 RU.53.1492577	Severnyy Rayon	Severnyy Rayon	1492577
@ -36830,7 +36757,7 @@ RU.40.1494157	Pritobol’nyy Rayon	Pritobol'nyy Rayon	1494157
 RU.04.1494329	Pospelikhinskiy Rayon	Pospelikhinskiy Rayon	1494329
 RU.54.1494494	Poltavsky District	Poltavsky District	1494494
 RU.40.1494512	Polovinskiy Rayon	Polovinskiy Rayon	1494512
-RU.91.1494942	Pirovskiy Okrug	Pirovskiy Okrug	1494942
+RU.91.1494942	Pirovskiy Rayon	Pirovskiy Rayon	1494942
 RU.40.1495014	Petukhovskiy Rayon	Petukhovskiy Rayon	1495014
 RU.04.1495102	Petropavlovskiy Rayon	Petropavlovskiy Rayon	1495102
 RU.04.1495265	Pervomayskiy Rayon	Pervomayskiy Rayon	1495265
@ -37081,14 +37008,14 @@ RU.20.2018795	Nukutskiy Rayon	Nukutskiy Rayon	2018795
 RU.20.2019196	Nizhneilimskiy Rayon	Nizhneilimskiy Rayon	2019196
 RU.93.2019322	Nerchinsko-Zavodskiy Rayon	Nerchinsko-Zavodskiy Rayon	2019322
 RU.93.2019324	Nerchinskiy Rayon	Nerchinskiy Rayon	2019324
-RU.63.2019491	Namskiy Ulus	Namskiy Ulus	2019491
+RU.63.2019491	Namskiy Rayon	Namskiy Rayon	2019491
 RU.59.2019548	Nadezhdinskiy Rayon	Nadezhdinskiy Rayon	2019548
 RU.11.2019707	Mukhorshibirskiy Rayon	Mukhorshibirskiy Rayon	2019707
 RU.93.2019909	Mogochinskiy Rayon	Mogochinskiy Rayon	2019909
-RU.63.2019952	Mirninskiy Ulus	Mirninskiy Ulus	2019952
+RU.63.2019952	Mirninskiy Rayon	Mirninskiy Rayon	2019952
 RU.05.2019985	Mikhaylovskiy Rayon	Mikhaylovskiy Rayon	2019985
 RU.59.2019986	Mikhaylovskiy Rayon	Mikhaylovskiy Rayon	2019986
-RU.63.2020094	Megino-Kangalasskiy Ulus	Megino-Kangalasskiy Ulus	2020094
+RU.63.2020094	Megino-Kangalasskiy Rayon	Megino-Kangalasskiy Rayon	2020094
 RU.05.2020117	Mazanovskiy Rayon	Mazanovskiy Rayon	2020117
 RU.20.2020302	Mamsko-Chuyskiy Rayon	Mamsko-Chuyskiy Rayon	2020302
 RU.05.2020589	Magdagachinskiy Rayon	Magdagachinskiy Rayon	2020589
@ -37101,7 +37028,7 @@ RU.20.2021089	Kuytunskiy Rayon	Kuytunskiy Rayon	2021089
 RU.11.2021185	Kurumkanskiy Rayon	Kurumkanskiy Rayon	2021185
 RU.93.2021617	Krasnokamenskiy Rayon	Krasnokamenskiy Rayon	2021617
 RU.05.2021792	Konstantinovskiy Rayon	Konstantinovskiy Rayon	2021792
-RU.63.2021938	Kobyayskiy Ulus	Kobyayskiy Ulus	2021938
+RU.63.2021938	Kobyayskiy Rayon	Kobyayskiy Rayon	2021938
 RU.11.2022001	Kizhinginskiy Rayon	Kizhinginskiy Rayon	2022001
 RU.59.2022059	Kirovskiy Rayon	Kirovskiy Rayon	2022059
 RU.20.2022082	Kirenskiy Rayon	Kirenskiy Rayon	2022082
@ -37121,17 +37048,17 @@ RU.20.2023332	Kachugskiy Rayon	Kachugskiy Rayon	2023332
 RU.11.2023349	Kabanskiy Rayon	Kabanskiy Rayon	2023349
 RU.05.2023386	Ivanovskiy Rayon	Ivanovskiy Rayon	2023386
 RU.20.2023464	Irkutskiy Rayon	Irkutskiy Rayon	2023464
-RU.63.2023916	Gornyy Ulus	Gornyy Ulus	2023916
+RU.63.2023916	Gornyy Rayon	Gornyy Rayon	2023916
 RU.93.2024124	Gazimuro-Zavodskiy Rayon	Gazimuro-Zavodskiy Rayon	2024124
 RU.20.2024464	Ekhirit-Bulagatskiy Rayon	Ekhirit-Bulagatskiy Rayon	2024464
 RU.11.2024574	Dzhidinskiy Rayon	Dzhidinskiy Rayon	2024574
-RU.63.2025240	Churapchinskiy Ulus	Churapchinskiy Ulus	2025240
+RU.63.2025240	Churapchinskiy Rayon	Churapchinskiy Rayon	2025240
 RU.93.2025332	Chitinskiy Rayon	Chitinskiy Rayon	2025332
 RU.93.2025455	Chernyshevskiy Rayon	Chernyshevskiy Rayon	2025455
 RU.59.2025486	Chernigovskiy Rayon	Chernigovskiy Rayon	2025486
 RU.20.2025526	Cheremkhovskiy Rayon	Cheremkhovskiy Rayon	2025526
 RU.05.2025915	Bureyskiy Rayon	Bureyskiy Rayon	2025915
-RU.63.2025971	Bulunskiy Ulus	Bulunskiy Ulus	2025971
+RU.63.2025971	Bulunskiy Rayon	Bulunskiy Rayon	2025971
 RU.20.2026092	Bratskiy Rayon	Bratskiy Rayon	2026092
 RU.93.2026128	Borzinskiy Rayon	Borzinskiy Rayon	2026128
 RU.20.2026543	Bokhanskiy Rayon	Bokhanskiy Rayon	2026543
@ -37147,7 +37074,7 @@ RU.11.2027104	Barguzinskiy Rayon	Barguzinskiy Rayon	2027104
 RU.93.2027182	Baleyskiy Rayon	Baleyskiy Rayon	2027182
 RU.05.2027485	Arkharinskiy Rayon	Arkharinskiy Rayon	2027485
 RU.59.2027594	Anuchinskiy Rayon	Anuchinskiy Rayon	2027594
-RU.63.2027729	Anabarskiy Natsional'nyy Ulus	Anabarskiy Natsional'nyy Ulus	2027729
+RU.63.2027729	Anabarskiy Rayon	Anabarskiy Rayon	2027729
 RU.30.2027744	Amurskiy Rayon	Amurskiy Rayon	2027744
 RU.93.2027942	Aleksandrovo-Zavodskiy Rayon	Aleksandrovo-Zavodskiy Rayon	2027942
 RU.63.2027964	Aldansky District	Aldansky District	2027964
@ -37198,7 +37125,7 @@ RU.92.2126347	Bystrinskiy Rayon	Bystrinskiy Rayon	2126347
 RU.15.2126681	Bilibinskiy Rayon	Bilibinskiy Rayon	2126681
 RU.64.2127149	Anivskiy Rayon	Anivskiy Rayon	2127149
 RU.15.2127198	Anadyrskiy Rayon	Anadyrskiy Rayon	2127198
-RU.63.2127257	Allaikhovskiy Ulus	Allaikhovskiy Ulus	2127257
+RU.63.2127257	Allaikhovskiy Rayon	Allaikhovskiy Rayon	2127257
 RU.92.2127270	Aleutskiy Rayon	Aleutskiy Rayon	2127270
 RU.64.2127281	Aleksandrovsk-Sakhalinskiy Rayon	Aleksandrovsk-Sakhalinskiy Rayon	2127281
 RU.63.2127365	Abyysky District	Abyysky District	2127365
@ -37480,6 +37407,7 @@ RU.13.12625361	Snezhinsk	Snezhinsk	12625361
 RU.13.12625362	Verkhny Ufaley	Verkhny Ufaley	12625362
 RU.17.12625363	Dagestanskiye Ogni District	Dagestanskiye Ogni District	12625363
 RU.17.12625365	Derbent Urban Okrug	Derbent Urban Okrug	12625365
+RU.19.12625367	Sunzhensky District	Sunzhensky District	12625367
 RU.20.12625368	Zalari Municipal Region	Zalari Municipal Region	12625368
 RU.21.12625370	Kokhma	Kokhma	12625370
 RU.21.12625371	Teykovo District	Teykovo District	12625371
@ -37966,76 +37894,6 @@ RU.78.13043421	Gorodskoy Okrug Gorod Tobol'sk	Gorodskoy Okrug Gorod Tobol'sk	130
 RU.78.13043423	Golyshmanovskiy Gorodskoy Okrug	Golyshmanovskiy Gorodskoy Okrug	13043423
 RU.78.13043424	Zavodoukovskiy Gorodskoy Okrug	Zavodoukovskiy Gorodskoy Okrug	13043424
 RU.32.13043425	Gorodskoy Okrug Nizhnevartovsk	Gorodskoy Okrug Nizhnevartovsk	13043425
-RU.84.13071159	Gorodskoy Okrug Volzhskiy	Gorodskoy Okrug Volzhskiy	13071159
-RU.84.13071160	Gorodskoy Okrug Volgograd	Gorodskoy Okrug Volgograd	13071160
-RU.38.13077910	Belorechenskoye Gorodskoye Poseleniye	Belorechenskoye Gorodskoye Poseleniye	13077910
-RU.38.13077911	Gorodskoy Okrug Sochi	Gorodskoy Okrug Sochi	13077911
-RU.38.13077912	Labinskoye Gorodskoye Poseleniye	Labinskoye Gorodskoye Poseleniye	13077912
-RU.38.13077913	Yeyskoye Gorodskoye Poseleniye	Yeyskoye Gorodskoye Poseleniye	13077913
-RU.38.13077914	Tuapinskoye Gorodskoye Poseleniye	Tuapinskoye Gorodskoye Poseleniye	13077914
-RU.38.13077915	Gorodskoy Okrug Goryachiy Klyuch	Gorodskoy Okrug Goryachiy Klyuch	13077915
-RU.38.13077917	Krymskoye Gorodskoye Poseleniye	Krymskoye Gorodskoye Poseleniye	13077917
-RU.38.13077918	Gorodskoy Okrug Sirius	Gorodskoy Okrug Sirius	13077918
-RU.38.13077919	Gorodskoy Okrug Novorossiysk	Gorodskoy Okrug Novorossiysk	13077919
-RU.38.13077920	Tikhoretskoye Gorodskoye Poseleniye	Tikhoretskoye Gorodskoye Poseleniye	13077920
-RU.38.13077921	Slavyanskoye Gorodskoye Poseleniye	Slavyanskoye Gorodskoye Poseleniye	13077921
-RU.38.13077922	Gorodskoy Okrug Krasnodar	Gorodskoy Okrug Krasnodar	13077922
-RU.38.13077923	Kropotkinskoye Gorodskoye Poseleniye	Kropotkinskoye Gorodskoye Poseleniye	13077923
-RU.75.13081875	Gorodskoy Okrug Strezhevoy	Gorodskoy Okrug Strezhevoy	13081875
-RU.75.13081876	Gorodskoy Okrug Tomsk	Gorodskoy Okrug Tomsk	13081876
-RU.75.13081877	Gorodskoy Okrug Kedrovyy	Gorodskoy Okrug Kedrovyy	13081877
-RU.61.13083726	Sovetskiy Rayon	Sovetskiy Rayon	13083726
-RU.61.13083727	Gorodskoy Okrug Kamensk-Shakhtinskiy	Gorodskoy Okrug Kamensk-Shakhtinskiy	13083727
-RU.61.13083728	Volgodonskoy Rayon	Volgodonskoy Rayon	13083728
-RU.61.13083729	Gorodskoy Okrug Zverevo	Gorodskoy Okrug Zverevo	13083729
-RU.61.13083730	Gorodskoy Okrug Shakhty	Gorodskoy Okrug Shakhty	13083730
-RU.91.13097872	Gorodskoy Okrug Lesosibirsk	Gorodskoy Okrug Lesosibirsk	13097872
-RU.91.13097873	ZATO Zheleznogorsk	ZATO Zheleznogorsk	13097873
-RU.91.13097874	Taymyrskiy Dolgano-Nenetskiy Rayon	Taymyrskiy Dolgano-Nenetskiy Rayon	13097874
-RU.91.13097875	Gorodskoy Okrug Krasnoyarsk	Gorodskoy Okrug Krasnoyarsk	13097875
-RU.91.13097876	Gorodskoy Okrug Sosnovoborsk	Gorodskoy Okrug Sosnovoborsk	13097876
-RU.91.13097878	ZATO Solnechnyy	ZATO Solnechnyy	13097878
-RU.91.13097879	Evenkiyskiy Rayon	Evenkiyskiy Rayon	13097879
-RU.91.13097880	Gorodskoy Okrug Divnogorsk	Gorodskoy Okrug Divnogorsk	13097880
-RU.91.13097881	Gorodskoy Okrug Yeniseysk	Gorodskoy Okrug Yeniseysk	13097881
-RU.91.13097882	Gorodskoy Okrug Kedrovyy	Gorodskoy Okrug Kedrovyy	13097882
-RU.91.13097884	Gorodskoy Okrug Minusinsk	Gorodskoy Okrug Minusinsk	13097884
-RU.91.13097885	Gorodskoy Okrug Sharypovo	Gorodskoy Okrug Sharypovo	13097885
-RU.09.13109581	Gorodskoy Okrug Gubkin	Gorodskoy Okrug Gubkin	13109581
-RU.09.13109582	Gorodskoy Okrug Staryy Oskol	Gorodskoy Okrug Staryy Oskol	13109582
-RU.09.13109583	Gorodskoy Okrug Valuyki	Gorodskoy Okrug Valuyki	13109583
-RU.55.13130796	Sorochinskiy Gorodskoy Okrug	Sorochinskiy Gorodskoy Okrug	13130796
-RU.55.13130797	ZATO Komarovskiy	ZATO Komarovskiy	13130797
-RU.55.13130798	Yasnenskiy Gorodskoy Okrug	Yasnenskiy Gorodskoy Okrug	13130798
-RU.55.13130799	Gorodskoy Okrug Orenburg	Gorodskoy Okrug Orenburg	13130799
-RU.55.13130800	Gayskiy Gorodskoy Okrug	Gayskiy Gorodskoy Okrug	13130800
-RU.61.13130801	Gorodskoy Okrug Buzuluk	Gorodskoy Okrug Buzuluk	13130801
-RU.55.13130802	Kuvandykskiy Gorodskoy Okrug	Kuvandykskiy Gorodskoy Okrug	13130802
-RU.55.13130803	Sol'-Iletskiy Gorodskoky Okrug	Sol'-Iletskiy Gorodskoky Okrug	13130803
-RU.55.13130804	Gorodskoy Okrug Orsk	Gorodskoy Okrug Orsk	13130804
-RU.55.13130805	Abdulinskiy Gorodskoy Okrug	Abdulinskiy Gorodskoy Okrug	13130805
-RU.63.13131637	Gorodskoy Okrug Zhatay	Gorodskoy Okrug Zhatay	13131637
-RU.63.13131638	Neryungrinskiy Ulus	Neryungrinskiy Ulus	13131638
-RU.63.13131639	Eveno-Bytantayskiy Natsional'nyy Ulus	Eveno-Bytantayskiy Natsional'nyy Ulus	13131639
-RU.15.13131974	Gorodskoy Okrug Pevek	Gorodskoy Okrug Pevek	13131974
-RU.15.13131975	Providenskiy Gorodskoy Okrug	Providenskiy Gorodskoy Okrug	13131975
-RU.08.13138558	Gorodskoye Poseleniye Meleuz	Gorodskoye Poseleniye Meleuz	13138558
-RU.08.13138559	Gorodskoye Poseleniye Uchaly	Gorodskoye Poseleniye Uchaly	13138559
-RU.08.13138560	Gorodskoye Poseleniye Davlekanovo	Gorodskoye Poseleniye Davlekanovo	13138560
-RU.08.13138561	Gorodskoy Okrug Sterlitamak	Gorodskoy Okrug Sterlitamak	13138561
-RU.08.13138562	Gorodskoye Poseleniye Belebey	Gorodskoye Poseleniye Belebey	13138562
-RU.08.13138563	Gorodskoye Poseleniye Birsk	Gorodskoye Poseleniye Birsk	13138563
-RU.08.13138564	Gorodskoye Poseleniye Ishimbay	Gorodskoye Poseleniye Ishimbay	13138564
-RU.08.13138565	Gorodskoye Poseleniye Yanaul	Gorodskoye Poseleniye Yanaul	13138565
-RU.08.13138566	Gorodskoy Okrug Oktyabr'skiy	Gorodskoy Okrug Oktyabr'skiy	13138566
-RU.08.13138567	Gorodskoye Poseleniye Tuymazy	Gorodskoye Poseleniye Tuymazy	13138567
-RU.08.13138568	Gorodskoye Poseleniye Dyurtyuli	Gorodskoye Poseleniye Dyurtyuli	13138568
-RU.08.13138569	Gorodskoye Poseleniye Beloretsk	Gorodskoye Poseleniye Beloretsk	13138569
-RU.08.13138570	Gorodskoye Poseleniye Blagoveshchensk	Gorodskoye Poseleniye Blagoveshchensk	13138570
-RU.08.13138571	Gorodskoye Poseleniye Baymak	Gorodskoye Poseleniye Baymak	13138571
-RU.92.13139227	Gorodskoy Okrug Petropavlovsk-Kamchatskiy	Gorodskoy Okrug Petropavlovsk-Kamchatskiy	13139227
-RU.92.13139228	Yelizovskoye Gorodskoye Poseleniye	Yelizovskoye Gorodskoye Poseleniye	13139228
-RU.92.13139229	Vilyuchinskiy Gorodskoy Okrug	Vilyuchinskiy Gorodskoy Okrug	13139229
 RW.11.52	Nyagatare District	Nyagatare District	7688799
 RW.11.53	Gatsibo District	Gatsibo District	7688800
 RW.11.54	Kayonza District	Kayonza District	7688801
@ -39012,15 +38870,6 @@ SR.19.12088742	De Nieuwe Grond	De Nieuwe Grond	12088742
 SR.19.12088743	Koewarasan	Koewarasan	12088743
 SR.19.12088744	Saramacca Polder	Saramacca Polder	12088744
 SR.17.12088745	Kwatta	Kwatta	12088745
-SR.14.13108205	Ressort Oostelijke Polders	Ressort Oostelijke Polders	13108205
-SR.14.13108206	Ressort Westelijke Polders	Ressort Westelijke Polders	13108206
-SR.12.13108207	Ressort Welgelegen	Ressort Welgelegen	13108207
-SR.12.13108208	Ressort Totness	Ressort Totness	13108208
-SR.11.13108209	Meerzorg	Meerzorg	13108209
-SR.10.13108210	Ressort Marchallkreek	Ressort Marchallkreek	13108210
-SR.18.13108211	Paramacca	Paramacca	13108211
-SR.18.13108212	Ressort Boven-Coppename	Ressort Boven-Coppename	13108212
-SR.18.13108213	Ressort Coeroeni	Ressort Coeroeni	13108213
 SS.10.363414	Province of West Equatoria	Province of West Equatoria	363414
 SS.03.373249	Junqal	Junqal	373249
 SS.05.377888	Mudīrīyat Baḩr al Ghazāl ash Sharqīyah	Mudiriyat Bahr al Ghazal ash Sharqiyah	377888
@ -42224,7 +42073,7 @@ US.AL.105	Perry County	Perry County	4082741
 US.AL.107	Pickens County	Pickens County	4082974
 US.AL.109	Pike County	Pike County	4083063
 US.AL.111	Randolph County	Randolph County	4085418
-US.AL.115	St. Clair County	St. Clair County	4087481
+US.AL.115	Saint Clair County	Saint Clair County	4087481
 US.AL.117	Shelby County	Shelby County	4089551
 US.AL.119	Sumter County	Sumter County	4092386
 US.AL.121	Talladega County	Talladega County	4092795
@ -42295,7 +42144,7 @@ US.AR.115	Pope County	Pope County	4127100
 US.AR.117	Prairie County	Prairie County	4127330
 US.AR.119	Pulaski County	Pulaski County	4127619
 US.AR.121	Randolph County	Randolph County	4127846
-US.AR.123	St. Francis County	St. Francis County	4129533
+US.AR.123	Saint Francis County	Saint Francis County	4129533
 US.AR.125	Saline County	Saline County	4130035
 US.AR.127	Scott County	Scott County	4130373
 US.AR.129	Searcy County	Searcy County	4130432
@ -42309,6 +42158,7 @@ US.AR.143	Washington County	Washington County	4135394
 US.AR.145	White County	White County	4136143
 US.AR.147	Woodruff County	Woodruff County	4137047
 US.AR.149	Yell County	Yell County	4137268
+US.DC.001	Washington County	Washington County	4140987
 US.DE.001	Kent County	Kent County	4143221
 US.DE.003	New Castle County	New Castle County	4143835
 US.DE.005	Sussex County	Sussex County	4144895
@ -42868,7 +42718,7 @@ US.LA.047	Iberville Parish	Iberville Parish	4328261
 US.LA.049	Jackson Parish	Jackson Parish	4328854
 US.LA.053	Jefferson Davis Parish	Jefferson Davis Parish	4328965
 US.LA.051	Jefferson Parish	Jefferson Parish	4328978
-US.LA.059	LaSalle Parish	LaSalle Parish	4330078
+US.LA.059	La Salle Parish	La Salle Parish	4330078
 US.LA.055	Lafayette Parish	Lafayette Parish	4330160
 US.LA.057	Lafourche Parish	Lafourche Parish	4330185
 US.LA.061	Lincoln Parish	Lincoln Parish	4330983
@ -42891,7 +42741,7 @@ US.LA.093	Saint James Parish	Saint James Parish	4339793
 US.LA.095	Saint John the Baptist Parish	Saint John the Baptist Parish	4339881
 US.LA.097	Saint Landry Parish	Saint Landry Parish	4340045
 US.LA.099	Saint Martin Parish	Saint Martin Parish	4340186
-US.LA.101	St. Mary Parish	St. Mary Parish	4340232
+US.LA.101	Saint Mary Parish	Saint Mary Parish	4340232
 US.LA.103	Saint Tammany Parish	Saint Tammany Parish	4340579
 US.LA.105	Tangipahoa Parish	Tangipahoa Parish	4343122
 US.LA.107	Tensas Parish	Tensas Parish	4343280
@ -43009,7 +42859,7 @@ US.MO.177	Ray County	Ray County	4405143
 US.MO.179	Reynolds County	Reynolds County	4405470
 US.MO.181	Ripley County	Ripley County	4405720
 US.MO.183	Saint Charles County	Saint Charles County	4406835
-US.MO.185	St. Clair County	St. Clair County	4406842
+US.MO.185	Saint Clair County	Saint Clair County	4406842
 US.MO.187	Saint Francois County	Saint Francois County	4406884
 US.MO.189	Saint Louis County	Saint Louis County	4407074
 US.MO.510	City of Saint Louis	City of Saint Louis	4407084
@ -43044,7 +42894,7 @@ US.MS.025	Clay County	Clay County	4421964
 US.MS.027	Coahoma County	Coahoma County	4422178
 US.MS.029	Copiah County	Copiah County	4422700
 US.MS.031	Covington County	Covington County	4422907
-US.MS.033	DeSoto County	DeSoto County	4423655
+US.MS.033	De Soto County	De Soto County	4423655
 US.MS.035	Forrest County	Forrest County	4426954
 US.MS.037	Franklin County	Franklin County	4427119
 US.MS.039	George County	George County	4427592
@ -43288,7 +43138,7 @@ US.OK.071	Kay County	Kay County	4540074
 US.OK.073	Kingfisher County	Kingfisher County	4540316
 US.OK.075	Kiowa County	Kiowa County	4540342
 US.OK.077	Latimer County	Latimer County	4540696
-US.OK.079	LeFlore County	LeFlore County	4540759
+US.OK.079	Le Flore County	Le Flore County	4540759
 US.OK.081	Lincoln County	Lincoln County	4541067
 US.OK.083	Logan County	Logan County	4541599
 US.OK.085	Love County	Love County	4541812
@ -43929,7 +43779,7 @@ US.IL.011	Bureau County	Bureau County	4885994
 US.IL.015	Carroll County	Carroll County	4886694
 US.IL.019	Champaign County	Champaign County	4887163
 US.IL.031	Cook County	Cook County	4888671
-US.IL.039	DeWitt County	DeWitt County	4889548
+US.IL.039	De Witt County	De Witt County	4889548
 US.IL.037	DeKalb County	DeKalb County	4889554
 US.IL.043	DuPage County	DuPage County	4890213
 US.IL.053	Ford County	Ford County	4892729
@ -45300,15 +45150,15 @@ US.AK.198	Prince of Wales-Hyder Census Area	Prince of Wales-Hyder Census Area	11
 US.AK.158	Kusilvak Census Area	Kusilvak Census Area	11550056
 US.AK.066	Copper River Census Area	Copper River Census Area	12261501
 US.AK.063	Chugach Census Area	Chugach Census Area	12261502
-US.CT.120	Greater Bridgeport Planning Region	Greater Bridgeport Planning Region	12809018
-US.CT.140	Naugatuck Valley Planning Region	Naugatuck Valley Planning Region	12809019
-US.CT.190	Western Connecticut Planning Region	Western Connecticut Planning Region	12809020
-US.CT.110	Capitol Planning Region	Capitol Planning Region	12809021
-US.CT.130	Lower Connecticut River Valley Planning Region	Lower Connecticut River Valley Planning Region	12809022
-US.CT.170	South Central Connecticut Planning Region	South Central Connecticut Planning Region	12809023
-US.CT.180	Southeastern Connecticut Planning Region	Southeastern Connecticut Planning Region	12809024
-US.CT.150	Northeastern Connecticut Planning Region	Northeastern Connecticut Planning Region	12809025
-US.CT.160	Northwest Hills Planning Region	Northwest Hills Planning Region	12809026
+US.CT.120	Connecticut Metropolitan	Connecticut Metropolitan	12809018
+US.CT.140	Naugatuck Valley	Naugatuck Valley	12809019
+US.CT.190	Western Connecticut	Western Connecticut	12809020
+US.CT.110	Capitol Region	Capitol Region	12809021
+US.CT.130	Lower Connecticut River Valley	Lower Connecticut River Valley	12809022
+US.CT.170	South Central Regional	South Central Regional	12809023
+US.CT.180	Southeastern Connecticut	Southeastern Connecticut	12809024
+US.CT.150	Northeastern Connecticut	Northeastern Connecticut	12809025
+US.CT.160	Northwest Hills	Northwest Hills	12809026
 UY.02.12	Las Piedras	Las Piedras	11820767
 UY.02.06	Canelones	Canelones	11820768
 UY.02.24	San Ramon	San Ramon	11820769
@ -45421,18 +45271,6 @@ UY.04.01	Carmelo	Carmelo	11820875
 UY.04.06	Juan Lacaze	Juan Lacaze	11820876
 UY.17.04	Palmitas	Palmitas	11820877
 UY.01.01	Baltasar Brum	Baltasar Brum	11820878
-UY.03.13107354	Municipio de Las Cañas	Municipio de Las Canas	13107354
-UY.03.13107355	Municipio de Cerro de las Cuentas	Municipio de Cerro de las Cuentas	13107355
-UY.19.13107356	Villa Sara	Villa Sara	13107356
-UY.19.13107357	Municipio de General Enrique Martínez	Municipio de General Enrique Martinez	13107357
-UY.03.13107358	Bañado de Medina	Banado de Medina	13107358
-UY.19.13107359	Municipio de Cerro Chato	Municipio de Cerro Chato	13107359
-UY.19.13107360	Municipio de Rincón	Municipio de Rincon	13107360
-UY.08.13107362	Mariscala	Mariscala	13107362
-UY.03.13107363	Municipio de Quebracho	Municipio de Quebracho	13107363
-UY.03.13107364	Centurión	Centurion	13107364
-UY.04.13107365	Municipio de Miguelete	Municipio de Miguelete	13107365
-UY.03.13107367	Municipio de Tres Islas	Municipio de Tres Islas	13107367
 UZ.09.601276	Shumanay Tumani	Shumanay Tumani	601276
 UZ.09.601292	Nukus Tumani	Nukus Tumani	601292
 UZ.09.601301	Mo’ynoq Tumani	Mo'ynoq Tumani	601301
@ -46646,7 +46484,7 @@ VN.49.638	Huyện Phú Thiện	Huyen Phu Thien	8701098
 VN.49.635	Huyện Ia Pa	Huyen Ia Pa	8701099
 VN.49.626	Huyện Đak Đoa	Huyen GJak GJoa	8701100
 VN.49.634	Huyện Đak Pơ	Huyen GJak Po	8701101
-VN.20.767	Tân Phú District	Tan Phu District	8714530
+VN.20.767	Tân Phú	Tan Phu	8714530
 VN.32.127	Huyen Sop Cop	Huyen Sop Cop	8714967
 VN.61.564	Thị Xã Đông Hòa	Thi Xa Dong Hoa	8719342
 VN.88.657	Huyện Cư Kuin	Huyen Cu Kuin	8724351
--- a/cities1000.zip
+++ b/cities1000.zip
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb2ed22d609beaa2a93f684699f219da604cc14c9f64c54691af9f874586bbbf
-size 9488151
+oid sha256:2883985f4f0f1cdc2452992405fb44fd050ff99daed38bd018f433a57568ef53
+size 9273504
--- a/koko-24.08.1.tar.xz
+++ b/koko-24.08.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c638e5c7d3d85fa6c1f18094fd2c124374e044c31c7eb650767c91ac106551c
+size 8536196
--- a/koko-24.08.1.tar.xz.sig
+++ b/koko-24.08.1.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmbf/REACgkQu0YzUNbv
+Me/WHQ//Twzdk7cLNvtBug5GvA7BezQ3m0Jfr8GeszRDOKWDOn27J+Qy1KsKnWuZ
+4WxR3kKaPxf+eTLrY/L7Kvy3eyDk038whsDzi8znDRLO2LYK8S2c4lJEGqtb0f+9
+6jmmvi+HvuH+JfYvcleLpPlzdBZ/qWyurGZYWmmXRRZO4q8rO+mc8jZDpYXsrHnd
+2vkBNrRB04ELev827lmbzJspRsrDbwwnY/J01LctgZVCM7wxpPeSVKegH7JNUei1
+PPJEEU/hCodi2oJIDImoePDZgoTjTdXyBlAQmWeeElMCEbQVP7x9gkYJj5HW9UGk
+BIU46O/zaowwzShJqCD+NclKb35A0lC5AM9Z8AS5rmSFdfXTJEKCTavsTgXYsaz5
+L+sPIoEHeZ8E7hdeXsa0nHelWuBhNEoLBWD951czBQMo1jghn0D2WBQnnDgeJDPR
+34+9n+QDvAyigXfWP826gXXY6O5i1HyWRrUUi9+u4rXUVBiCDRcXAPiyKJSAvJ/t
+BWZFSJwPOz4UAnfwxY3yzjjRwBB5BSLRkxTRqqqyZ32qjNZgL+KW+iig8AyOvZMO
+Fhes7ZqOrb3uxsenF+YxLl2VhR59MAuqSJwYPSHGUxDOL1GNFuvDufMGy2Cv3T7s
+f4szsms00wmda789wC1tUdzNKYxzzPQlumeUBiDOxz53L4WSkSc=
+=p+Hy
+-----END PGP SIGNATURE-----
--- a/koko-24.12.1.tar.xz
+++ b/koko-24.12.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0548b79852eeea2342aad275eb3e246547bd34325fb2b68e91131f401a48fc8e
-size 8537176
--- a/koko-24.12.1.tar.xz.sig
+++ b/koko-24.12.1.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmd80yYACgkQu0YzUNbv
-Me8Cjg//cdG2uGDHjFTJ9phCFi0qWiBY48IYEIyeDXkeenURpG2PAmwXQZgPQFqy
-2XoEIO/+4jEObbCerLSCCarr2KikyT1bKLSIAYTFfiAyhi51mCnnZLH+naOTYJtk
-KmuZwUsisbb5+Log0tcS9RwOfw28HFQ6iQ7+fktflv44yqPbAIkBVleAkjystXTu
-FYl2FnVagHTqz2IOmmelwSvTgHSZ6nUQwPveDMfzB0S5DQOzKng7kZRQPRmCLAxO
-xHIcrYZThQvcydOxTtEjrrsBHpg33AWJjSouE9GHN/KoP4bK9loaijJfptYrjJ3k
-kaPxG+yLGiMgOAqUsmM3UFR75peHBn/LPZueWmJLtX9jB1mIMHmL1E0kMnhUyjLd
-LWvoj3KiSETM/KPoaZqWa02o5coHjU1xLDhool93e4FtdXjBLSK9VPbUAeUtoayN
-5LB59ha3ruOFDpWFWyhgHdZ+9nfEg9eECbIF1QV0e3qvzan4fos8mxRAyxkKmzjb
-GNlkEXm/j7NIiTH3eycD5DzajX4QBNgmeBDCEFep9VSSWiPn5zrhQYVoV5GGBbKX
-cWiEsl5X21ri/3dqbauQ4Mow9hepWdIo1G3RqCl31kcGi3Ta4Uoww0l+it98rxFP
-HHjFBWJ/7+HtNXl6YoO0R9M5J6ovQ9WpcG+AgdU2yfDA9kA6SzQ=
-=fOfW
-----END PGP SIGNATURE-----
--- a/koko.changes
+++ b/koko.changes
@ -1,68 +1,3 @@
-------------------------------------------------------------------
-Tue Jan  7 18:53:19 UTC 2025 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.12.1
-  * New bugfix release
-  * For more details please see:
-  * https://kde.org/announcements/gear/24.12.1/
- No code change since 24.12.0
-
-------------------------------------------------------------------
-Sun Dec  8 09:27:54 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.12.0
-  * New feature release
-  * For more details please see:
-  * https://kde.org/announcements/gear/24.12.0/
- No code change since 24.11.90
-
-------------------------------------------------------------------
-Mon Dec  2 08:43:23 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.11.90
-  * New feature release
- Changes since 24.11.80:
-  * Remove binding loop
-  * Remove debug output
-
-------------------------------------------------------------------
-Sat Nov 16 17:30:02 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.11.80
-  * New feature release
- Changes since 24.08.3:
-  * Use more function typing
-  * Fix missing Exiv2Extractor QML bindings
-  * Port manual geometry logic to KConfig.WindowStateSaver
-  * Remove unused kokoAboutData context property
-  * Update about page
-  * Remove version numbers from qml imports
-  * Port to declarative QML
-  * Port sidebar to FormCard
-  * Add kirigami-addons as CI dependency
-  * Default to org.kde.desktop QQC2 style
-  * Find Kirigami Addons, it is required at runtime
-  * Fix org.kde.kquickimageeditor dependency
-  * Fix image editor
-
-------------------------------------------------------------------
-Tue Nov  5 10:43:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.08.3
-  * New bugfix release
-  * For more details please see:
-  * https://kde.org/announcements/gear/24.08.3/
- No code change since 24.08.2
-
-------------------------------------------------------------------
-Tue Oct  8 12:01:50 UTC 2024 - Christophe Marin <christophe@krop.fr>
-
- Update to 24.08.2
-  * New bugfix release
-  * For more details please see:
-  * https://kde.org/announcements/gear/24.08.2/
- No code change since 24.08.1
-
 -------------------------------------------------------------------
 Tue Sep 10 14:11:02 UTC 2024 - Christophe Marin <christophe@krop.fr>

--- a/koko.spec
+++ b/koko.spec
@ -16,12 +16,12 @@
 #


-%define kf6_version 6.6.0
+%define kf6_version 6.3.0
 %define qt6_version 6.6.0

 %bcond_without released
 Name:           koko
-Version:        24.12.1
+Version:        24.08.1
 Release:        0
 Summary:        Kirigami based gallery application
 License:        LGPL-2.1-or-later
@ -53,7 +53,6 @@ BuildRequires:  cmake(KF6GuiAddons) >= %{kf6_version}
 BuildRequires:  cmake(KF6I18n) >= %{kf6_version}
 BuildRequires:  cmake(KF6KIO) >= %{kf6_version}
 BuildRequires:  cmake(KF6Kirigami) >= %{kf6_version}
-BuildRequires:  cmake(KF6KirigamiAddons)
 BuildRequires:  cmake(KF6Notifications) >= %{kf6_version}
 BuildRequires:  cmake(Qt6Positioning) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Qml) >= %{qt6_version}
@ -67,7 +66,6 @@ BuildRequires:  cmake(exiv2) >= 0.21
 BuildRequires:  pkgconfig(xcb)
 BuildRequires:  pkgconfig(xcb-atom)
 Requires:       kf6-kirigami-imports >= %{kf6_version}
-Requires:       kirigami-addons6
 Requires:       kquickimageeditor6-imports
 Requires:       qt6-sql-sqlite >= %{qt6_version}

@ -90,6 +88,9 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} src/
 %install
 %kf6_install

+# Not needed
+rm %{buildroot}%{_kf6_libdir}/libkokocommon.so
+
 %find_lang %{name} --all-name

 %ldconfig_scriptlets
@ -101,7 +102,9 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE5} src/
 %{_kf6_appstreamdir}/org.kde.koko.appdata.xml
 %{_kf6_bindir}/koko
 %{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.koko.svg
+%{_kf6_libdir}/libkokocommon.so.*
 %{_kf6_notificationsdir}/koko.notifyrc
+%{_kf6_qmldir}/org/kde/koko/
 %{_kf6_sharedir}/koko/

 %files lang -f %{name}.lang