Merge branch 'main' of https://gitlab.com/new-era-team/N3OW

N3OW/common/dynasties/NEOW_dynasties.txt

@@ -684,6 +684,36 @@ lapeyre_dynasty = {
 	culture = spanish
 }
 
+figueroa_dynasty = {
+	name = dynn_figueroa
+	culture = valencian
+}
+
+ribera_dynasty = {
+	name = dynn_ribera
+	culture = balearic
+}
+
+adgaz_dynasty  {
+	name = dynn_adgaz
+	culture = castilian
+}
+
+alonso_dynasty = {
+	name = dynn_alonso
+	culture = castilian
+}
+
+melendez_dynasty = {
+	name = dynn_melendez
+	culture = asturleonese
+}
+
+estevez_dynasty = {
+	name = dynn_estevez
+	culture = asturleonese
+}
+
 #e_italia
 
 salgari_dynasty = {

N3OW/common/game_concepts/neow_religion_game_concepts.txt

@@ -52,6 +52,9 @@ neow_singularity = {
 neow_new_rome = {
 	texture = "gfx/interface/icons/faith/romanofuturist.dds"
 }
+neow_quinternity = {
+	texture = "gfx/interface/icons/faith/humanist.dds"
+}
 neow_tsar = {
 	texture = "gfx/interface/icons/faith/tsarist.dds"
 }

N3OW/common/landed_titles/iberia.txt

@@ -277,12 +277,12 @@ e_iberia = {
 					color = { 27 130 60 }
 				}
 				b_caravacadelacruz = {
-					province = 1971
+					province = 1970
 
 					color = { 27 130 60 }
 				}
 				b_cieza = {
-					province = 1970
+					province = 1971
 
 					color = { 27 130 60 }
 				}
@@ -303,13 +303,13 @@ e_iberia = {
 					name_list_yemeni = cn_al_karas
 				}
 
-				b_huescar = { #Cotillas
+				b_segura = { 
-					province = 1973
+					province = 1968
 
 					color = { 5 115 60 }
 				}
-				b_segura = { #Albacete
+				b_huescar = { #Cotillas
-					province = 1968
+					province = 1973
 
 					color = { 5 115 60 }
 				}
@@ -465,6 +465,11 @@ e_iberia = {
 				color = { 150 218 21 }
 				can_be_named_after_dynasty = no
 
+				b_triana = { 
+					province = 1993
+
+					color = { 150 218 21 }
+				}
 				b_almonte = {
 					province = 1841
 
@@ -475,11 +480,6 @@ e_iberia = {
 
 					color = { 150 218 21 }
 				}
-				b_triana = { #aznalcollar
-					province = 1993
-
-					color = { 150 218 21 }
-				}
 				b_cantillana = {
 					province = 1994
 
@@ -567,6 +567,11 @@ e_iberia = {
 					name_list_yemeni = cn_labla
 				}
 
+				b_ayamonte = {
+					province = 1839
+
+					color = { 180 200 0 }
+				}
 				b_niebla = {
 					province = 1991
 
@@ -577,11 +582,6 @@ e_iberia = {
 
 					color = { 180 200 0 }
 				}
-				b_ayamonte = {
-					province = 1839
-
-					color = { 180 200 0 }
-				}
 				b_zafra = { #aracena
 					province = 1992
 
@@ -699,6 +699,11 @@ e_iberia = {
 				color = { 245 205 60 }
 				can_be_named_after_dynasty = no
 
+				b_palencia = {
+					province = 1905
+
+					color = { 242 196 12 }
+				}
 				b_amaya = {
 					province = 1814
 
@@ -714,11 +719,6 @@ e_iberia = {
 
 					color = { 245 205 60 }
 				}
-				b_palencia = {
-					province = 1905
-
-					color = { 242 196 12 }
-				}
 				b_lerma = {
 					province = 1908
 
@@ -772,12 +772,12 @@ e_iberia = {
 				can_be_named_after_dynasty = no
 
 				b_soria = {
-					province = 1901
+					province = 1900
 
 					color = { 255 215 5 }
 				}
 				b_osma = {
-					province = 1900
+					province = 1901
 
 					color = { 255 215 5 }
 				}
@@ -834,13 +834,13 @@ e_iberia = {
 				color = { 255 225 65 }
 				can_be_named_after_dynasty = no
 
-				b_olmedo = {
+				b_coracera = {
-					province = 1915
+					province = 1922
 
 					color = { 255 225 65 }
 				}
-				b_coracera = {
+				b_olmedo = {
-					province = 1922
+					province = 1915
 
 					color = { 255 225 65 }
 				}
@@ -907,16 +907,16 @@ e_iberia = {
 				color = { 235 230 120 }
 				can_be_named_after_dynasty = no
 				
-				b_villablino = {
-					province = 1824
-
-					color = { 223 128 31 }
-				}
 				b_carballido = {
 					province = 1793
 
 					color = { 215 85 0 }
 				}
+				b_villablino = {
+					province = 1824
+
+					color = { 223 128 31 }
+				}
 				b_sarria = {
 					province = 1822
 
@@ -981,21 +981,21 @@ e_iberia = {
 					name_list_yemeni = cn_salamanqa
 				}
 
-				b_bejar = {
-					province = 1913
-
-					color = { 195 105 25 }
-				}
 				b_salamanca = {
 					province = 1828
 
 					color = { 195 105 25 }
 				}
-				b_ciduadrodrigo = { #Ciudad Rodrigo
+				b_bejar = {
 					province = 1829
 
 					color = { 195 105 25 }
 				}
+				b_ciduadrodrigo = { #Ciudad Rodrigo
+					province = 1913
+
+					color = { 195 105 25 }
+				}
 				b_medinadelcampo = {
 					province = 1914
 
@@ -1070,13 +1070,13 @@ e_iberia = {
 				color = { 195 165 10 }
 				can_be_named_after_dynasty = no
 
-				b_cabaneros = {
+				b_lapueblademontalban = {
-					province = 1961
+					province = 1962
 
 					color = { 195 165 10 }
 				}
-				b_lapueblademontalban = {
+				b_cabaneros = {
-					province = 1962
+					province = 1961
 
 					color = { 195 165 10 }
 				}
@@ -1134,23 +1134,23 @@ e_iberia = {
 					name_list_yemeni = cn_mulina
 				}
 
+				b_gudalajara = {
+					province = 1929
+
+					color = { 230 185 15 }
+				}
 				b_molina = {
 					province = 1935
 
 					color = { 195 125 10 }
 				}
-				b_gudalajara = {
-					province = 1927
-
-					color = { 230 185 15 }
-				}
 				b_ablanque = { #Atienza
 					province = 1933
 
 					color = { 195 125 10 }
 				}
 				b_villarejodesalvanes = {
-					province = 1929
+					province = 1927
 
 					color = { 230 185 15 }
 				}
@@ -1269,13 +1269,13 @@ e_iberia = {
 					name_list_yemeni = cn_al_urqub
 				}
 
-				b_alarcon = {
+				b_valeria = {
-					province = 1949
+					province = 1948
 
 					color = { 0 100 35 }
 				}
-				b_valeria = {
+				b_alarcon = {
-					province = 1948
+					province = 1949
 
 					color = { 0 100 35 }
 				}
@@ -1306,6 +1306,11 @@ e_iberia = {
 					name_list_yemeni = cn_uqlish
 				}
 
+				b_ucles = {
+					province = 1952
+
+					color = { 190 130 20 }
+				}
 				b_mora = {
 					province = 1953
 
@@ -1326,11 +1331,6 @@ e_iberia = {
 
 					color = { 0 100 35 }
 				}
-				b_ucles = {
-					province = 1952
-
-					color = { 190 130 20 }
-				}
 			}
         }
 		d_badajoz = {
@@ -1498,13 +1498,13 @@ e_iberia = {
 				color = { 150 205 65 }
 				can_be_named_after_dynasty = no
 
-				b_medellin = {
+				b_donllorente = { #La Serena
-					province = 1996
+					province = 1998
 
 					color = { 150 205 65 }
 				}
-				b_donllorente = { #La Serena
+				b_medellin = {
-					province = 1998
+					province = 1996
 
 					color = { 150 205 65 }
 				}

N3OW/common/religion/religions/NEOW_europeanist.txt

@@ -281,6 +281,98 @@
 			holy_order_names = { #placeholder
 			}
 			
+			localization = {
+
+				#HealthGod
+				HealthGodName = trenchsinger_health_god_name
+				HealthGodNamePossessive = trenchsinger_health_god_name_possessive
+				HealthGodSheHe = CHARACTER_SHEHE_HE
+				HealthGodHerHis = CHARACTER_HERHIS_HIS
+				HealthGodHerHim = CHARACTER_HERHIM_HIM
+				
+				#FertilityGod
+				FertilityGodName = trenchsinger_fertility_god_name
+				FertilityGodNamePossessive = trenchsinger_fertility_god_name_possessive
+				FertilityGodSheHe = CHARACTER_SHEHE_HE
+				FertilityGodHerHis = CHARACTER_HERHIS_HIS
+				FertilityGodHerHim = CHARACTER_HERHIM_HIM
+
+				#WealthGod
+				WealthGodName = trenchsinger_wealth_god_name
+				WealthGodNamePossessive = trenchsinger_wealth_god_name_possessive
+				WealthGodSheHe = CHARACTER_SHEHE_HE
+				WealthGodHerHis = CHARACTER_HERHIS_HIS
+				WealthGodHerHim = CHARACTER_HERHIM_HIM
+
+				#HouseholdGod
+				HouseholdGodName = trenchsinger_household_god_name
+				HouseholdGodNamePossessive = trenchsinger_household_god_name_possessive
+				HouseholdGodSheHe = CHARACTER_SHEHE_SHE
+				HouseholdGodHerHis = CHARACTER_HERHIS_HER
+				HouseholdGodHerHim = CHARACTER_HERHIM_HER
+
+				#FateGod
+				FateGodName = trenchsinger_fate_god_name
+				FateGodNamePossessive = trenchsinger_fate_god_name_possessive
+				FateGodSheHe = CHARACTER_SHEHE_HE
+				FateGodHerHis = CHARACTER_HERHIS_HIS
+				FateGodHerHim = CHARACTER_HERHIM_HIM
+
+				#KnowledgeGod
+				KnowledgeGodName = trenchsinger_knowledge_god_name
+				KnowledgeGodNamePossessive = trenchsinger_knowledge_god_name_possessive
+				KnowledgeGodSheHe = CHARACTER_SHEHE_HE
+				KnowledgeGodHerHis = CHARACTER_HERHIS_HIS
+				KnowledgeGodHerHim = CHARACTER_HERHIM_HIM
+
+				#WarGod
+				WarGodName = trenchsinger_war_god_name
+				WarGodNamePossessive = trenchsinger_war_god_name_possessive
+				WarGodSheHe = CHARACTER_SHEHE_HE
+				WarGodHerHis = CHARACTER_HERHIS_HIS
+				WarGodHerHim = CHARACTER_HERHIM_HIM
+
+				#TricksterGod
+				TricksterGodName = trenchsinger_trickster_god_name
+				TricksterGodNamePossessive = trenchsinger_trickster_god_name_possessive
+				TricksterGodSheHe = CHARACTER_SHEHE_HE
+				TricksterGodHerHis = CHARACTER_HERHIS_HIS
+				TricksterGodHerHim = CHARACTER_HERHIM_HIM
+
+				#NightGod
+				NightGodName = trenchsinger_night_god_name
+				NightGodNamePossessive = trenchsinger_night_god_name_possessive
+				NightGodSheHe = CHARACTER_SHEHE_HE
+				NightGodHerHis = CHARACTER_HERHIS_HIS
+				NightGodHerHim = CHARACTER_HERHIM_HIM
+
+				#WaterGod
+				WaterGodName = numenorian_water_god_name
+				WaterGodNamePossessive = numenorian_water_god_name_possessive
+				WaterGodSheHe = CHARACTER_SHEHE_HE
+				WaterGodHerHis = CHARACTER_HERHIS_HIS
+				WaterGodHerHim = CHARACTER_HERHIM_HIN
+				
+				ReligiousSymbol = trenchsinger_religious_symbol
+				
+				GoodGodNames = {
+					europeanist_high_god_name
+					europeanist_high_god_name_alternate
+					trenchsinger_water_god_name
+					trenchsinger_trickster_god_name
+					europeanist_witch_god_name
+					trenchsinger_fate_god_name
+					trenchsinger_health_god_name
+					trenchsinger_wealth_god_name
+					trenchsinger_fertility_god_name
+					trenchsinger_household_god_name
+				}
+				EvilGodNames = {
+					trenchsinger_devil_name
+					trenchsinger_war_god_name
+					trenchsinger_death_god_name
+				}
+			}
 		}
 		heimwehler = {
 			color = { 18 18 124 }

N3OW/history/characters/NEOW_e_hispania.txt

@@ -36,6 +36,24 @@ hispania0002 = {
     	death = yes
 	}
 }
+castille_fernando_bourbon = { # Heir to Castille-Leon, Duke of Leon
+	name = "Fernando" 
+	dynasty = borbon_dynasty
+	religion = "sevillian"
+	culture = castilian
+	father = hispania0002
+	trait = shy
+	trait = patient
+	trait = education_learning_4
+	trait = scholar
+	trait = hunchbacked
+	2528.1.17 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
 
 hispania0003 = {
 	name = "Hernán"
@@ -476,3 +494,103 @@ hispania0024 = { #James Boatswain, lord of Gibraltar and tributary of the UK
     	death = yes
 	}
 }
+
+aragon_bermond_figueroa = {
+	name = "Bermond"
+	dynasty = figueroa_dynasty
+	religion = sevillian
+	culture = valencian
+	trait = cynical
+	trait = wrathful
+	trait = callous
+	trait = education_diplomacy_1
+	2534.1.19 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+aragon_berenguer_ribera = {
+	name = "Berenguer"
+	dynasty = ribera_dynasty
+	religion = sevillian
+	culture = balearic
+	trait = chaste
+	trait = content
+	trait = vengeful
+	trait = education_learning_3
+	2520.5.10 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_pedro_adgaz = {
+	name = "Pedro"
+	dynasty = adgaz_dynasty
+	religion = sevillian
+	culture = castilian
+	trait = trusting
+	trait = calm
+	trait = gregarious
+	trait = education_stewardship_3
+	2526.10.21 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_suero_alonso = {
+	name = "Suero"
+	dynasty = alonso_dynasty
+	religion = sevillian
+	culture = castilian
+	trait = stubborn
+	trait = lazy
+	trait = zealous
+	trait = education_martial_3
+	trait = lifestyle_hunter
+	trait = open_terrain_expert
+	2519.7.13 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+s_galicia_sanchu_melendez = {
+	name = "Sanchu"
+	dynasty = melendez_dynasty
+	religion = sevillian
+	culture = asturleonese
+	trait = fickle
+	trait = ambitious
+	trait = brave
+	trait = education_martial_3
+	trait = military_engineer
+	2521.6.17 = {
+		birth = yes
+	} 
+	2600.1.1 = {
+		death = yes
+	}
+}
+s_galicia_savaricu_estevez = {
+	name = "Savaricu"
+	dynasty = estevez_dynasty
+	religion = corsair
+	culture = asturleonese
+	trait = wrathful
+	trait = paranoid
+	trait = lustful
+	trait = education_intrigue_1
+	2527.3.2 = {
+		birth = yes
+	} 
+	2600.1.1 = {
+		death = yes
+	}
+}

N3OW/history/provinces/e_alps.txt

@@ -34,6 +34,21 @@
 9763 = {
 	holding = none
 }
+9783 = {
+	holding = none
+}
+###c_aargau
+2048 = {
+	culture = swiss
+	religion = helvetic
+	holding = castle_holding
+}
+3107 = {
+	holding = none
+}
+9784 = {
+	holding = none
+}
 ##d_transjurania
 ###c_bern
 2046 = {
@@ -69,6 +84,9 @@
 2038 = {
 	holding = city_holding
 }
+9782 = {
+	holding = none
+}
 ###c_ticino
 2478 = {
 	culture = romansch
@@ -89,15 +107,6 @@
 	religion = helvetic
 	holding = castle_holding
 }
-###c_aargau
-2048 = {
-	culture = swiss
-	religion = helvetic
-	holding = castle_holding
-}
-3107 = {
-	holding = none
-}
 
 #k_lichtenstein
 ##d_lictenstein
@@ -116,6 +125,9 @@
 9704 = {
 	holding = none
 }
+9786 = {
+	holding = none
+}
 
 #k_tirol
 ##d_vorarlberg
@@ -125,6 +137,9 @@
 	religion = einblicker
 	holding = castle_holding
 }
+2790 = {
+	holding = none
+}
 ##d_tyrol
 ###c_innsbruck
 2950 = {
@@ -136,9 +151,6 @@
 2953 = {
 	holding = church_holding
 }
-2985 = {
-	holding = none
-}
 2976 = {
 	holding = city_holding
 }
@@ -160,9 +172,6 @@
 2781 = {
 	holding = city_holding
 }
-2790 = {
-	holding = none
-}
 9705 = {
 	holding = none
 }
@@ -181,7 +190,7 @@
 9709 = {
 	holding = none
 }
-##d_tyrol
+##d_south_tyrol
 ###c_trent
 2499 = {
 	culture = venetian

N3OW/history/provinces/e_germany.txt

@@ -598,15 +598,10 @@
 	holding = church_holding
 	}
 }
-###c_hallstatt
+2985 = {
-3135 = {
+	holding = none
-	holding = castle_holding
-}
-3133 = {
-	culture = bavarian
-	religion = teutonic
-	holding = castle_holding
 }
+##d_upper_austria
 ###c_linz
 3131 = {
 	culture = bavarian
@@ -627,6 +622,7 @@
 3132 = {
 	holding = castle_holding
 }
+###c_muhlviertel
 3072 = {
 	culture = bavarian
 	religion = teutonic
@@ -637,13 +633,7 @@
 	religion = teutonic
 	holding = castle_holding
 }
-###c_schaumberg
+###c_innviertel
-2971 = {
-	holding = castle_holding
-}
-2979 = {
-	holding = none
-}
 2973 = {
 	culture = bavarian
 	religion = teutonic
@@ -658,6 +648,18 @@
 2970 = {
 	holding = church_holding
 }
+###c_hausruckviertel
+3133 = {
+	culture = bavarian
+	religion = teutonic
+	holding = castle_holding
+}
+2971 = {
+	holding = castle_holding
+}
+2979 = {
+	holding = none
+}
 ##d_steyermark
 ###c_graz
 3117 = {
@@ -689,20 +691,6 @@
 3116 = {
 	holding = none
 }
-###c_liebnitz
-3109 = {
-	culture = NEOW_carantanian
-	religion = roman_catholic
-	holding = castle_holding
-}
-3103 = {
-	culture = NEOW_carantanian
-	religion = roman_catholic
-	holding = castle_holding
-}
-3106 = {
-	holding = none
-}
 ###c_murzzuschlag
 3121 = {
 	culture = NEOW_carantanian
@@ -727,12 +715,6 @@
 3114 = {
 	holding = none
 }
-3129 = {
-	holding = none
-	1140.1.1 = {
-	holding = city_holding
-	}
-}
 ###c_knittelfeld
 3125 = {
 	culture = NEOW_carantanian
@@ -748,21 +730,31 @@
 	holding = city_holding
 	}
 }
+###c_liezen
+3130 = {
+	culture = bavarian
+	religion = teutonic
+	holding = castle_holding
+}
 3126 = {
 	holding = none
 	1066.1.1 = {
 	holding = church_holding
 	}
 }
-3130 = {
+3135 = {
-	culture = bavarian
-	religion = teutonic
 	holding = castle_holding
 }
-
+3129 = {
-9778 = {
+	holding = none
-	culture = bavarian
+	1140.1.1 = {
-	religion = teutonic
+	holding = city_holding
+	}
+}
+###c_liebnitz
+3109 = {
+	culture = NEOW_carantanian
+	religion = roman_catholic
 	holding = castle_holding
 }
 ##d_osterreich
@@ -883,6 +875,18 @@
 	holding = city_holding
 	}
 }
+###c_burgenland
+9778 = {
+	culture = bavarian
+	religion = teutonic
+	holding = castle_holding
+}
+9779 = {
+	holding = none
+}
+9780 = {
+	holding = none
+}
 ##d_carinthia
 ###c_karnten
 3105 = {
@@ -917,6 +921,19 @@
 3083 = {
 	holding = none
 }
+9798 = {
+	holding = none
+}
+##d_stajerska
+###c_maribor
+3103 = {
+	culture = NEOW_carantanian
+	religion = roman_catholic
+	holding = castle_holding
+}
+3106 = {
+	holding = none
+}
 
 #k_rhineland
 ##d_alsace
@@ -1243,7 +1260,6 @@
 	holding = castle_holding
 	culture = saxon
 	religion = heimwehler
-	}
 }
 3034 = {
 	holding = none

N3OW/history/provinces/e_iberia.txt

@@ -122,17 +122,19 @@
 1850 = {
 	holding = none
 }
-1971 = {
-	holding = church_holding
-}
 1970 = {
 	holding = none
 }
-###c_alcaraz
+1971 = {
-1973 = {
+	holding = church_holding
-	holding = none
 }
+###c_alcaraz
 1968 = {
+	culture = castilian
+	religion = sevillian
+	holding = castle_holding
+}
+1973 = {
 	holding = church_holding
 }
 ##d_granada
@@ -216,19 +218,16 @@
 }
 ##d_sevilla
 ###c_almonte
-1841 = {
+1993 = {
-	holding = city_holding
+	holding = castle_holding
 	culture = NEOW_andalusian
 	religion = sevillian
 }
-1980 = {
+1841 = {
-	holding = none
+	holding = city_holding
-	1066.1.1 = {
-	holding = castle_holding
-	}
 }
-1993 = {
+1980 = {
-	holding = church_holding
+	holding = castle_holding
 }
 1994 = {
 	holding = city_holding
@@ -264,23 +263,17 @@
 	holding = city_holding
 }
 ###c_niebla
-1991 = {
+1839 = {
-	culture = visigothic
-	religion = sevillian
-	holding = castle_holding
-	800.1.1 = { culture = andalusian }
-	812.1.1 = { religion = sevillian }
-	1245.3.19 = {
 	culture = NEOW_andalusian
 	religion = sevillian
-	}
+	holding = castle_holding
+}
+1991 = {
+	holding = church_holding
 }
 1840 = {
 	holding = city_holding
 }
-1839 = {
-	holding = church_holding
-}
 1992 = {
 	holding = none
 }
@@ -313,11 +306,13 @@
 	holding = none
 }
 ###c_amaya
-1814 = {
+1905 = {
-	culture = visigothic
 	religion = sevillian
 	holding = castle_holding
-	800.1.1 = { culture = castilian }
+	culture = castilian
+}
+1814 = {
+	holding = city_holding
 }
 1813 = {
 	holding = city_holding
@@ -325,9 +320,6 @@
 1904 = {
 	holding = church_holding
 }
-1905 = {
-	holding = city_holding
-}
 1908 = {
 	holding = church_holding
 }
@@ -359,26 +351,22 @@
 	955.1.1 = { culture = castilian }
 }
 ###c_soria
-1901 = {
-	culture = visigothic
-	religion = sevillian
-	holding = castle_holding
-	800.1.1 = { culture = castilian }
-	950.1.1 = { faith = sevillian }
-}
 1900 = {
+	holding = castle_holding
+	culture = castilian
+	religion = sevillian
+}
+1901 = {
 	holding = city_holding
 }
 1931 = {
-	holding = church_holding
+	holding = none
 }
 1902 = {
-	culture = basque
+	holding = none
-	faith = penitente
-	holding = castle_holding
 }
 1930 = {
-	holding = city_holding
+	holding = none
 }
 ###c_cuellar
 1924 = {
@@ -397,16 +385,13 @@
 	holding = city_holding
 }
 ###c_olmedo
-1915 = {
+1922 = {
 	culture = castilian
 	religion = sevillian
 	holding = castle_holding
 }
-1922 = {
+1915 = {
-	holding = none
-	1066.1.1 = {
 	holding = city_holding
-	}
 }
 1921 = {
 	holding = none
@@ -434,12 +419,12 @@
 	}
 }
 ###c_ponferrada
-1824 = {
+1793 = {
 	holding = castle_holding
 	culture = asturleonese
 	religion = sevillian
 }
-1793 = {
+1824 = {
 	holding = none
 }
 1822 = {
@@ -470,19 +455,17 @@
 	religion = sevillian
 }
 ###c_salamanca
-1913 = {
+1828 = {
-	culture = visigothic
 	religion = sevillian
 	holding = castle_holding
-	800.1.1 = { culture = andalusian }
+	culture = castilian
-	955.1.1 = { culture = castilian }
-}
-1828 = {
-	holding = church_holding
 }
 1829 = {
 	holding = city_holding
 }
+1913 = {
+	holding = church_holding
+}
 1914 = {
 	holding = city_holding
 }
@@ -517,12 +500,12 @@
 	holding = city_holding
 }
 ###c_malagon
-1961 = {
+1962 = {
 	culture = castilian
 	religion = sevillian
 	holding = castle_holding
 }
-1962 = {
+1961 = {
 	holding = church_holding
 }
 1958 = {
@@ -543,21 +526,19 @@
 	holding = church_holding
 }
 ###c_molina
-1935 = {
+1929 = {
-	culture = visigothic
-	religion = sevillian
 	holding = castle_holding
-	800.1.1 = { culture = andalusian }
+	religion = sevillian
-	950.1.1 = { culture = castilian }
+	culture = castilian
 }
-1927 = {
+1935 = {
-	holding = city_holding
+	holding = castle_holding
 }
 1933 = {
 	holding = none
 }
-1929 = {
+1927 = {
-	holding = none
+	holding = city_holding
 }
 1951 = {
 	holding = none
@@ -614,18 +595,12 @@
 	}
 }
 ###c_alarcon
-1949 = {
+1948 = {
-	culture = visigothic
-	religion = sevillian
 	holding = castle_holding
-	800.1.1 = { culture = andalusian }
-	812.1.1 = { religion = sevillian }
-	1235.1.1 = {
 	culture = castilian
 	religion = sevillian
-	}
 }
-1948 = {
+1949 = {
 	holding = church_holding
 }
 1967 = {
@@ -637,6 +612,17 @@
 	holding = castle_holding
 }
 ###c_mora
+1952 = {
+	culture = visigothic
+	religion = sevillian
+	holding = castle_holding
+	800.1.1 = { culture = andalusian }
+	939.1.1 = { religion = sevillian }
+	1235.1.1 = {
+	culture = castilian
+	religion = sevillian
+	}
+}
 1953 = {
 	culture = castilian
 	religion = sevillian
@@ -651,17 +637,6 @@
 1964 = {
 	holding = none
 }
-1952 = {
-	culture = visigothic
-	religion = sevillian
-	holding = castle_holding
-	800.1.1 = { culture = andalusian }
-	939.1.1 = { religion = sevillian }
-	1235.1.1 = {
-	culture = castilian
-	religion = sevillian
-	}
-}
 ##d_badajoz
 ###c_badajoz
 1835 = {
@@ -742,24 +717,19 @@
 	holding = none
 }
 ###c_medellin
-1996 = {
+1998 = {
-	culture = visigothic
-	religion = sevillian
-	800.1.1 = { culture = andalusian }
-	812.1.1 = { religion = sevillian }
-	1245.3.19 = {
 	culture = extremeno
 	religion = sevillian
-	}
+	holding = castle_holding
 }
-1998 = {
+1996 = {
-	holding = city_holding
+	holding = church_holding
 }
 1989 = {
 	holding = city_holding
 }
 1957 = {
-	holding = city_holding
+	holding = none
 }
 
 #k_aragon
@@ -830,6 +800,12 @@
 	holding = church_holding
 }
 ###c_alto_aragon
+1873 = {
+	culture = basque
+	religion = penitente
+	holding = castle_holding
+	1035.10.18 = { culture = aragonese }
+}
 1807 = {
 	culture = basque
 	religion = penitente
@@ -842,12 +818,6 @@
 	}
 	}
 }
-1873 = {
-	culture = basque
-	religion = penitente
-	holding = castle_holding
-	1035.10.18 = { culture = aragonese }
-}
 1872 = {
 	culture = basque
 	religion = penitente
@@ -977,25 +947,25 @@
 8735 = {
 	culture = visigothic
 	religion = sevillian
-	holding = castle_holding
+	holding = city_holding
 	800.1.1 = { culture = balearic }
 	928.1.1 = { religion = sevillian }
 	1245.1.1 = { religion = sevillian }
 }
 2001 = {
-	holding = city_holding
+	holding = castle_holding
 }
 ###c_menorca
 2002 = {
 	culture = balearic
 	religion = sevillian
-	holding = castle_holding
+	holding = city_holding
 }
 ###c_iviza
 2000 = {
 	culture = sharoni
 	religion = congregationist
-	holding = castle_holding
+	holding = city_holding
 }
 ##d_barcelona
 ###c_lleida
@@ -1413,14 +1383,14 @@
 	holding = none
 }
 ###c_alcacer_do_sal
-1752 = {
-	holding = church_holding
-}
 1780 = {
 	holding = castle_holding
 	culture = portuguese
 	religion = iberian
 }
+1752 = {
+	holding = church_holding
+}
 ###c_elvas
 1776 = {
 	culture = portuguese
@@ -1446,30 +1416,30 @@
 	holding = city_holding
 }
 ###c_silves
-1747 = {
-	holding = church_holding
-}
 1746 = {
 	culture = portuguese
 	religion = iberian
 	holding = castle_holding
 }
-##d_coimbra
+1747 = {
-###c_coimbra
-1758 = {
 	holding = church_holding
 }
+##d_coimbra
+###c_coimbra
 1757 = {
 	culture = portuguese
 	religion = iberian
 	holding = castle_holding
 }
-1759 = {
+1758 = {
-	holding = castle_holding
+	holding = church_holding
 }
 1756 = {
 	holding = city_holding
 }
+1759 = {
+	holding = castle_holding
+}
 ###c_viseu
 1769 = {
 	culture = portuguese

N3OW/history/provinces/e_scandinavia.txt

@@ -145,206 +145,8 @@
 }
 
 #k_sweden
-##d_aarjetje
-###c_sjeltie
-430 = {
-	culture = svealandsk
-	religion = midnighter
-	holding = tribal_holding
-}
-431 = {
-	holding = none
-}
-432 = {
-	holding = none
-}
-###c_ubmejeiednuo
-428 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-429 = {
-	holding = none
-}
-8781 = {
-	holding = none
-}
-381 = {
-	holding = none
-}
-###c_jahkamakke
-373 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-376 = {
-	holding = none
-}
-##d_vuovdisamieana
-###c_biton
-422 = {
-	holding = none
-}
-375 = {
-	holding = none
-}
-382 = {
-	holding = none
-}
-###c_pite
-374 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-427 = {
-	holding = none
-}
-377 = {
-	holding = none
-}
-###c_julevadno
-421 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-423 = {
-	holding = none
-}
-424 = {
-	holding = none
-}
-###c_kittila
-385 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-387 = {
-	holding = none
-}
-8785 = {
-	holding = none
-}
-###c_torne
-8782 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-8783 = {
-	holding = none
-}
-8784 = {
-	holding = none
-}
-##d_duortnoseatnu
-###c_siggevara
-380 = {
-	holding = none
-}
-379 = {
-	holding = none
-}
-378 = {
-	holding = none
-}
-###c_suondavara
-384 = {
-	holding = none
-}
-}
-392 = {
-	holding = none
-}
-###c_rounala
-393 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-383 = {
-	holding = none
-}
-###c_aviovara
-395 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-394 = {
-	holding = none
-}
-397 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-391 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-424 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-###c_karasjohka
-399 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-396 = {
-	holding = none
-}
-398 = {
-	holding = none
-}
-###c_karasjohka
-425 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-388 = {
-	holding = none
-}
-426 = {
-	holding = none
-}
-8786 = {
-	holding = none
-}
-8785 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-385 = {
-	holding = none
-}
-419 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-390 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
-8789 = {
-	culture = sami
-	religion = finnish_pagan
-	holding = tribal_holding
-}
 ##d_svealand
-###c_upland
+###c_stockholm
 9777 = {
 	culture = svealandsk
 	religion = lutheran
@@ -373,6 +175,7 @@
 	holding = church_holding
 	}
 }
+###c_upland
 342 = {
 	culture = svealandsk
 	religion = lutheran
@@ -385,25 +188,6 @@
 344 = {
 	holding = none
 }
-###c_gastrikland
-354 = {
-	culture = norse
-	religion = norse_pagan
-	holding = tribal_holding
-	1066.1.1 = {
-	culture = svealandsk
-	holding = castle_holding
-	}
-	1085.1.1 = {
-	religion = folketro
-	}
-}
-355 = {
-	holding = none
-}
-356 = {
-	holding = none
-}
 ###c_sodermannaland
 339 = {
 	1066.1.1 = {
@@ -556,6 +340,9 @@
 	holding = castle_holding
 	}
 }
+87 = {
+	holding = none
+}
 ###c_halland
 74 = {
 	culture = skansk
@@ -590,9 +377,6 @@
 	holding = city_holding
 	}
 }
-87 = {
-	holding = none
-}
 80 = {
 	holding = none
 }
@@ -935,6 +719,12 @@
 306 = {
 	holding = none
 }
+300 = {
+	holding = none
+	1020.1.1 = {
+	holding = city_holding
+	}
+}
 ###c_njudung
 335 = {
 	culture = norse
@@ -958,7 +748,6 @@
 313 = {
 	holding = none
 }
-###c_finnveden
 301 = {
 	culture = norse
 	religion = norse_pagan
@@ -969,12 +758,6 @@
 	holding = castle_holding
 	}
 }
-300 = {
-	holding = none
-	1020.1.1 = {
-	holding = city_holding
-	}
-}
 ###c_oland
 314 = {
 	culture = norse
@@ -993,28 +776,6 @@
 	}
 }
 ##d_norrland
-###c_halsingland
-360 = {
-	culture = norse
-	religion = norse_pagan
-	holding = tribal_holding
-	1066.1.1 = {
-	culture = svealandsk
-	holding = castle_holding
-	}
-	1085.1.1 = {
-	religion = folketro
-	}
-}
-357 = {
-	holding = none
-}
-358 = {
-	holding = none
-}
-359 = {
-	holding = none
-}
 ###c_medelpad
 361 = {
 	culture = norse
@@ -1055,10 +816,47 @@
 367 = {
 	holding = none
 }
-368 = {
+##d_gavleborg
-	culture = svealandsk
+###c_gastrikland
-	religion = midnighter
+354 = {
+	culture = norse
+	religion = norse_pagan
 	holding = tribal_holding
+	1066.1.1 = {
+	culture = svealandsk
+	holding = castle_holding
+	}
+	1085.1.1 = {
+	religion = folketro
+	}
+}
+355 = {
+	holding = none
+}
+356 = {
+	holding = none
+}
+###c_halsingland
+360 = {
+	culture = norse
+	religion = norse_pagan
+	holding = tribal_holding
+	1066.1.1 = {
+	culture = svealandsk
+	holding = castle_holding
+	}
+	1085.1.1 = {
+	religion = folketro
+	}
+}
+357 = {
+	holding = none
+}
+358 = {
+	holding = none
+}
+359 = {
+	holding = none
 }
 ##d_gotland
 ###c_gutland
@@ -1429,17 +1227,6 @@
 	}
 	}
 }
-231 = {
-	culture = ostsk
-	religion = lutheran
-	holding = none
-	1016.1.1 = {
-	holding = city_holding
-	}
-}
-285 = {
-	holding = none
-}
 232 = {
 	holding = none
 	1000.1.1 = {
@@ -1470,6 +1257,7 @@
 	holding = city_holding
 	}
 }
+###c_buskerud
 246 = {
 	culture = ostsk
 	religion = lutheran
@@ -1495,6 +1283,18 @@
 247 = {
 	holding = none
 }
+###c_ostfold
+231 = {
+	culture = ostsk
+	religion = lutheran
+	holding = none
+	1016.1.1 = {
+	holding = city_holding
+	}
+}
+285 = {
+	holding = none
+}
 ##d_agder
 ###c_nedenes
 249 = {
@@ -1603,6 +1403,20 @@
 263 = {
 	holding = none
 }
+###c_firdafylki
+265 = {
+	culture = norse
+	religion = norse_pagan
+	holding = tribal_holding
+	1020.1.1 = {
+	culture = vestsk
+	religion = nobelian
+	holding = castle_holding
+	}
+}
+266 = {
+	holding = none
+}
 ##d_trandalog
 ###c_trandheim
 270 = {
@@ -1658,20 +1472,47 @@
 267 = {
 	holding = none
 }
-###c_firdafylki
+###c_namdalfylki
-265 = {
+245 = {
 	culture = norse
 	religion = norse_pagan
 	holding = tribal_holding
 	1020.1.1 = {
 	culture = vestsk
-	religion = nobelian
+	}
+	1070.1.1 = {
+	religion = viking
+	}
+}
+244 = {
+	holding = none
+}
+274 = {
+	holding = none
+}
+283 = {
+	holding = none
+}
+###c_gauldala
+241 = {
+	culture = norse
+	religion = norse_pagan
+	holding = tribal_holding
+	1020.1.1 = {
+	culture = vestsk
+	religion = vaesenite
 	holding = castle_holding
 	}
 }
-266 = {
+242 = {
 	holding = none
 }
+###c_orkdala
+271 = {
+	culture = vestsk
+	religion = vaesenite
+	holding = castle_holding
+}
 ##d_dalir
 ###c_hedmork
 236 = {
@@ -1710,11 +1551,6 @@
 	holding = city_holding
 	}
 }
-271 = {
-	culture = vestsk
-	religion = vaesenite
-	holding = castle_holding
-}
 ###c_eystridalir
 239 = {
 	culture = norse
@@ -1729,20 +1565,6 @@
 240 = {
 	holding = none
 }
-###c_gauldala
-241 = {
-	culture = norse
-	religion = norse_pagan
-	holding = tribal_holding
-	1020.1.1 = {
-	culture = vestsk
-	religion = vaesenite
-	holding = castle_holding
-	}
-}
-242 = {
-	holding = none
-}
 ##d_halogaland
 ###c_vastvag
 280 = {
@@ -1783,24 +1605,228 @@
 276 = {
 	holding = none
 }
-###c_namdalfylki
+
-245 = {
+#k_sapmi
-	culture = norse
+##d_vasterbottena
-	religion = norse_pagan
+###c_ubmeje
+368 = {
+	culture = svealandsk
+	religion = midnighter
 	holding = tribal_holding
-	1020.1.1 = {
-	culture = vestsk
-	}
-	1070.1.1 = {
-	religion = viking
-	}
 }
-244 = {
+375 = {
 	holding = none
 }
-274 = {
+382 = {
 	holding = none
 }
-283 = {
+###c_sjeltie
+430 = {
+	culture = svealandsk
+	religion = midnighter
+	holding = tribal_holding
+}
+431 = {
+	holding = none
+}
+432 = {
+	holding = none
+}
+###c_ubmejeiednuo
+428 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+429 = {
+	holding = none
+}
+8781 = {
+	holding = none
+}
+381 = {
+	holding = none
+}
+##d_norrbottena
+###c_julevadno
+421 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+423 = {
+	holding = none
+}
+422 = {
+	holding = none
+}
+###c_torne
+8782 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+8783 = {
+	holding = none
+}
+380 = {
+	holding = none
+}
+###c_pite
+374 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+427 = {
+	holding = none
+}
+377 = {
+	holding = none
+}
+###c_jahkamakke
+373 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+376 = {
+	holding = none
+}
+383 = {
+	holding = none
+}
+378 = {
+	holding = none
+}
+379 = {
+	holding = none
+}
+##d_torniolaakso
+##d_finnmarku
+###c_rounala
+393 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+###c_karasjohka
+397 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+392 = {
+	holding = none
+}
+###c_aviovara
+395 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+394 = {
+	holding = none
+}
+###c_cahcesuolu
+399 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+396 = {
+	holding = none
+}
+400 = {
+	holding = none
+}
+##d_giemajohka
+###c_giepma
+425 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+426 = {
+	holding = none
+}
+8786 = {
+	holding = none
+}
+###c_roavvenjarga
+8785 = {
+	holding = none
+}
+387 = {
+	holding = none
+}
+388 = {
+	holding = none
+}
+###c_kitka
+419 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+418 = {
+	holding = none
+}
+420 = {
+	holding = none
+}
+###c_sombio
+390 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+401 = {
+	holding = none
+}
+403 = {
+	holding = none
+}
+408 = {
+	holding = none
+}
+###c_skolt
+8789 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+404 = {
+	holding = none
+}
+402 = {
+	holding = none
+}
+###c_kittila
+385 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+384 = {
+	holding = none
+}
+###c_tornionlaakso
+424 = {
+	holding = none
+}
+8784 = {
+	holding = none
+}
+###c_inari
+391 = {
+	culture = sami
+	religion = finnish_pagan
+	holding = tribal_holding
+}
+8788 = {
+	holding = none
+}
+398 = {
 	holding = none
 }

N3OW/history/titles/k_aragon.txt

@@ -6,6 +6,11 @@ k_aragon = {
 		holder = hispania0007
 	}
 }
+c_castellon = {
+	2550.1.1 = {
+		holder = hispania0007
+	}
+}
 
 c_zaragoza = {
 	2541.7.21 = {
@@ -16,10 +21,77 @@ c_zaragoza = {
 		liege = k_aragon
 	}
 }
-
+c_fraga = {
+	2541.7.21 = {
+		holder = hispania0014
+	}
+	2550.1.10 = {
+		holder = hispania0015
+		liege = k_aragon
+	}
+}
+c_alto_aragon = {
+	2541.7.21 = {
+		holder = hispania0014
+	}
+	2550.1.10 = {
+		holder = hispania0015
+		liege = k_aragon
+	}
+}
 c_teruel = {
 	2554.7.26 = {
 		holder = hispania0021
 		liege = k_aragon
 	}
 }
+c_calatayud = {
+	2554.7.26 = {
+		holder = hispania0021
+		liege = k_aragon
+	}
+}
+
+d_valencia = {
+	2550.1.1 = {
+		holder = aragon_bermond_figueroa
+		liege = k_aragon
+	}
+}
+c_valencia = {
+	2550.1.1 = {
+		holder = aragon_bermond_figueroa
+		liege = k_aragon
+	}
+}
+c_alicante = {
+	2550.1.1 = {
+		holder = aragon_bermond_figueroa
+		liege = k_aragon
+	}
+}
+
+d_mallorca = {
+	2550.7.18 = {
+		holder = aragon_berenguer_ribera
+		liege = k_aragon
+	}
+}
+c_mallorca = {
+	2550.7.18 = {
+		holder = aragon_berenguer_ribera
+		liege = k_aragon
+	}
+}
+c_iviza = {
+	2550.7.18 = {
+		holder = aragon_berenguer_ribera
+		liege = k_aragon
+	}
+}
+c_menorca = {
+	2550.7.18 = {
+		holder = aragon_berenguer_ribera
+		liege = k_aragon
+	}
+}

N3OW/history/titles/k_castille.txt

@@ -19,3 +19,48 @@ d_badajoz = {
 		holder = hispania0003
 	}
 }
+
+d_leon = {
+	2550.1.1 = {
+		holder = castille_fernando_bourbon
+		liege = k_castille_leon
+	}
+}
+c_valladolid = {
+	2550.1.1 = {
+		holder = castille_fernando_bourbon
+		liege = k_castille_leon
+	}
+}
+
+c_olmedo = {
+	2550.1.1 = {
+		holder = castille_pedro_adgaz
+		liege = k_castille_leon
+	}
+}
+c_cuellar = {
+	2550.1.1 = {
+		holder = castille_pedro_adgaz
+		liege = k_castille_leon
+	}
+}
+c_soria = {
+	2550.1.1 = {
+		holder = castille_pedro_adgaz
+		liege = k_castille_leon
+	}
+}
+
+c_burgos = {
+	2550.1.1 = {
+		holder = castille_suero_alonso
+		liege = k_castille_leon
+	}
+}
+c_amaya = {
+	2550.1.1 = {
+		holder = castille_suero_alonso
+		liege = k_castille_leon
+	}
+}

N3OW/history/titles/k_spanish_galicia.txt

@@ -9,3 +9,23 @@ k_spanish_galicia = {
 		holder = hispania0004
 	}
 }
+
+c_pravia = {
+	2550.1.1 = {
+		holder = s_galicia_sanchu_melendez
+		liege = k_spanish_galicia
+	}
+}
+c_asturias_de_oviedo = {
+	2550.1.1 = {
+		holder = s_galicia_sanchu_melendez
+		liege = k_spanish_galicia
+	}
+}
+
+
+c_asturias_de_santillana = {
+	2550.1.1 = {
+		holder = s_galicia_savaricu_estevez
+	}
+}

N3OW/localization/english/replace/NEOW_game_concepts_l_english.yml

@@ -62,6 +62,9 @@ game_concept_neow_singularity_desc: "Romano-Futurists believe that, far into the
 game_concept_neow_new_rome: "New Rome"
 game_concept_neow_new_rome_desc: "For Romano-Futurists, New Rome is not merely a place on earth, but a state of spiritual ascension. New Rome is where Futuro dwells surrounded by his steel angels, it is where the universe began and where it will end, and it is where the cosmic forces will naturally diverge up until the very end of time, culminating in a clean slate from which a new universe can be born."
 
+game_concept_neow_quinternity: "The Five Humanities"
+game_concept_neow_quinternity_desc: "The Five Humanities, or Quinternity, is the council which rules Empyrean in the absence of Deus. They are Philosophia, Poesis, Historia, Rhethorica and Theologia, each representing the divine gifts which Deus bestowed upon Humanity. Only by embracing their teachings, will a person be able to complete their journey in the afterlife from Inferno to Paradiso. It is said those who have earned the favor of the Quinternity will be accompanied by the guide, Durante on the path to Paradiso."
+
 # Tsarist stuff
 
 game_concept_neow_tsar: "Tsars"

N3OW/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml

@@ -323,6 +323,13 @@
  dynn_teruel_moctezuma:0 "Teruel-Moctezuma"
  dynn_borja:0 "Borja"
  dynn_boatswain:0 "Boatswain"
+ dynn_figueroa:0 "Figueroa"
+ dynn_ribera:0 "Ribera"
+ dynn_adgaz:0 "Adgaz"
+ dynn_alonso:0 "Alonso"
+ dynn_melendez:0 "Meléndez"
+ dynn_estevez:0 "Estévez"
+ 
 
  #e_italia
 

N3OW/localization/english/replace/religion/NEOW_religion_europeanist_l_english.yml

@@ -71,6 +71,28 @@
  trenchsinger_religious_head_title:0 "WIP"
  trenchsinger_religious_head_title_name:0 "WIP"
  
+ trenchsinger_religious_symbol:0 "red cross" #no “The/the” here
+ trenchsinger_health_god_name:0 "Father Jenner"
+ trenchsinger_health_god_name_possessive:0 "Father Jenner's"
+ trenchsinger_fertility_god_name:0 "Father Semmelweis"
+ trenchsinger_fertility_god_name_possessive:0 "Father Semmelweis'"
+ trenchsinger_wealth_god_name:0 "Father Dunant"
+ trenchsinger_wealth_god_name_possessive:0 "Father Dunant's" 
+ trenchsinger_household_god_name:0 "Mother Nightingale"
+ trenchsinger_household_god_name_possessive:0 "Mother Nightingale's"
+ trenchsinger_fate_god_name:0 "Father Schweitzer"
+ trenchsinger_fate_god_name_possessive:0 "Father Schweitzer's"
+ trenchsinger_knowledge_god_name:0 "Father Koch"
+ trenchsinger_knowledge_god_name_possessive:0 "Father Koch's"
+ trenchsinger_war_god_name:0 "$europeanist_devil_name$"
+ trenchsinger_war_god_name_possessive:0 "$europeanist_death_deity_name_possessive$"
+ trenchsinger_trickster_god_name:0 "$europeanist_trickster_god_name$"
+ trenchsinger_trickster_god_name_possessive:0 "$europeanist_trickster_god_name$"
+ trenchsinger_night_god_name:0 "$europeanist_witch_god_name$"
+ trenchsinger_night_god_name_possessive:0 "$europeanist_witch_god_name$"
+ trenchsinger_water_god_name:0 "Father Marshall"
+ trenchsinger_water_god_name_possessive:0 "Father Marshall's"
+ 
  heimwehler:0 "National Unity Movement"
  heimwehler_adj:0 "Heimwehler"
  heimwehler_adherent:0 "Heimwehler"

N3OW/localization/english/replace/religion/NEOW_religion_resurgentist_l_english.yml

@@ -123,7 +123,7 @@
  humanist_adj:0 "Humanist"
  humanist_adherent:0 "Humanist"
  humanist_adherent_plural:0 "Humanists"
- humanist_desc:0 "Humanists are characterised by their belief in the Five Humanities, individual freedoms and in experiencing life to the fullest. For Humanists, reaching the Rinascimento - the Rebirth of Civilisation - is the most important goal, in order to bring forth an Enlightened Era so their creator may return from his self-imposed exile. Thus among Humanists, the funding of Artists, Architects and Academics is mandatory in order to bring the collective closer to enlightenment and the Rinascimento after each passing generation. They also advocate for peaceful coexistence with other faiths, as all belief systems hold within them truths that, if lost, would forever deepen the chasm formed between Deus and the world. However, Deus created this world to be experienced and enjoyed by humanity, so Humanists are allowed to partake in worldly pleasures as long as they do so in moderation and maintain their civic duties."
+ humanist_desc:0 "Humanists are characterised by their belief in [Concept('neow_quinternity','the Five Humanities')|E], individual freedoms and in experiencing life to the fullest. For Humanists, reaching the Rinascimento - the Rebirth of Civilisation - is the most important goal, in order to bring forth an Enlightened Era so their creator may return from his self-imposed exile. Thus among Humanists, the funding of Artists, Architects and Academics is mandatory in order to bring the collective closer to enlightenment and the Rinascimento after each passing generation. They also advocate for peaceful coexistence with other faiths, as all belief systems hold within them truths that, if lost, would forever deepen the chasm formed between Deus and the world. However, Deus created this world to be experienced and enjoyed by humanity, so Humanists are allowed to partake in worldly pleasures as long as they do so in moderation and maintain their civic duties."
  humanist_religious_head_title:0 "WIP"
  humanist_religious_head_title_name:0 "WIP"
  

N3OW/localization/english/titles_l_english.yml

@@ -94,10 +94,10 @@
  k_andorra_adj:0 "Andorran"
  k_tirol:0 "Tirol"
  k_tirol_adj:0 "Tiroler"
- c_perpignan:0 "Pyrénées-Oriantales"
+ c_perpignan:0 "Roussillon"
- c_perpignan_adj:0 "Pyrénées"
+ c_perpignan_adj:0 "Roussillian"
- c_almonte:0 "Almonte"
+ c_almonte:0 "Lebrija"
- c_almonte_adj:0 "Almonter"
+ c_almonte_adj:0 "Lebrijan"
  d_abruzzo:0 "Abruzzo"
  d_abruzzo_adj:0 "Abruzzoan"
  d_napoli:0 "Napoli"
@@ -109,6 +109,8 @@
  b_aalts:0 "Aalts"
  d_trier:0 "Trier"
  d_trier_adj:0 "Trierean"
+ d_la_mancha:0 "La Mancha"
+ d_la_mancha_adj:0 "La Manchan"
  d_la_rochelle:0 "Charente"
  d_la_rochelle_adj:0 "Rochellean"
  d_ile_de_france:0 "Île-de-France"
@@ -182,7 +184,7 @@
  b_abivard:0 "Abivard"
  b_abiward:0 "Abiward"
  b_abiz:0 "Abiz"
- b_ablanque:1 "Atienza"
+ b_ablanque:1 "Sigüenza"
  b_abohar:0 "Abohar"
  b_aboniteichos:0 "Aboniteichos"
  b_abqaiq:0 "Abqaoq"
@@ -302,7 +304,7 @@
  b_aguedal:0 "Aguedal"
  b_aguelhok:0 "Aguelhok"
  b_aguilardecampo:0 "Aguilar de Campo"
- b_aguilas:0 "Aguilas"
+ b_aguilas:0 "Lorca"
  b_agurto:0 "Agurto"
  b_ahanjaran: "Mandesh" 
  b_ahar:0 "Ahar"
@@ -431,16 +433,16 @@
  b_alamut:0 "Alamut"
  b_alancha:0 "El Ancha"
  b_alarbadi:0 "Al Arbadi"
- b_alarcon:0 "Alarcón"
+ b_alarcon:0 "Villarrobledo"
- b_alarcos:0 "Alarcos"
+ b_alarcos:0 "Almodóvar del Campo"
  b_alashtar:0 "Alashtar"
  b_alatyr:0 "Alatyr"
  b_alava:0 "Álava"
  b_alaverdi:0 "Alaverdi"
  b_alawbhali:0 "Al Awbhali"
- b_alba:0 "Alba"
+ b_alba:0 "Alcañices"
  b_alba_di_monferrato:0 "Alba di Monferrato"
- b_albacete:0 "Albacete"
+ b_albacete:0 "Elda"
  b_albadetormes:0 "Alba de Tormes"
  b_albaharah:0 "Al-Baharah"
  b_albalaromaine:0 "Alba-la-Romaine"
@@ -464,7 +466,7 @@
  b_alcaniz:0 "Alcañiz"
  b_alcantara:0 "Alcantara"
  b_alcantarilla:0 "Alcantarilla"
- b_alcaraz:0 "Alcaraz"
+ b_alcaraz:0 "San Clemente"
  b_alcarno:0 "Alcarno"
  b_alcazar:0 "Alcazar"
  b_alcazardesanjuan:0 "Alcázar de San Juan"
@@ -496,7 +498,7 @@
  b_alftanes:0 "Alftanes"
  b_alga:0 "Alga"
  b_algaida:0 "Algaida"
- b_algeciras:0 "Algeciras"
+ b_algeciras:0 "Fuengirola"
  b_alghazalah:0 "Al-Ghazalah"
  b_alghero:0 "Alghero"
  b_alghiran:0 "Al Ghiran"
@@ -551,14 +553,14 @@
  b_allianoi:0 "Allianoi"
  b_alliata:0 "Alliata"
  b_almadeo:0 "Almadeo"
- b_almader:1 "Almadén"
+ b_almader:1 "Herrera del Duque"
  b_almahallah:0 "Al-Mahallah"
  b_almaklah:0 "Al-Maklah"
  b_almaliq:0 "Almaliq"
- b_almansa:1 "Alcoy"
+ b_almansa:1 "Gandia"
  b_almaqah:0 "Almaqah"
  b_almar:0 "Almar"
- b_almaraz:0 "Almaraz"
+ b_almaraz:0 "Navalmoral de la Mata"
  b_almatin:0 "Al Matin"
  b_almatu:0 "Almatu"
  b_almaty:0 "Almaty"
@@ -571,7 +573,7 @@
  b_almodovar:0 "Almodôvar"
  b_almodovardelcampo:0 "Almodovar-del-Campo"
  b_almonasterlareal:0 "Almonaster la Real"
- b_almonte:0 "Almonte"
+ b_almonte:0 "Camas"
  b_almubarraz:0 "Al Mubarraz"
  b_almudevar:0 "Almudévar"
  b_alnif:0 "Alnif"
@@ -582,7 +584,7 @@
  b_alopibagh:0 "Alopibagh"
  b_alouarta:0 "El Ouarta"
  b_aloyoon:0 "Al Oyoon"
- b_alpuente:0 "Alpuente"
+ b_alpuente:0 "Quintanar del Rey"
  b_alqadmus:0 "Al-Qadmus"
  b_alqaim:0 "Al-Qa'im"
  b_alqaiyah:0 "Al-Qaiyah"
@@ -611,7 +613,7 @@
  b_alto_aragon:0 "Tarazona"
  b_altona:0 "Altona"
  b_altopascio:0 "Altopascio"
- b_altotajo:1 "Huélamo"
+ b_altotajo:1 "Priego"
  b_altstatten:0 "Ältstatten"
  b_alucra:0 "Alucra"
  b_aluksne:0 "Aluksne"
@@ -639,7 +641,7 @@
  b_amasia:0 "Amasia"
  b_amastrine:0 "Amastrine"
  b_amastris:0 "Amastris"
- b_amaya:0 "Amaya"
+ b_amaya:0 "Guardo"
  b_amba_maderiya:0 "Amba Maderiya"
  b_ambadapura:0 "Ambadapura"
  b_ambaras:0 "Ambaras"
@@ -718,7 +720,7 @@
  b_andria:0 "Andria"
  b_andros:0 "Andros"
  b_androusa:0 "Androusa"
- b_andujar:0 "Andújar"
+ b_andujar:0 "Lucena"
  b_anegundi:0 "Anegundi"
  b_anemurium:0 "Anemurium"
  b_anfa:0 "Anfa"
@@ -743,7 +745,7 @@
  b_anse:0 "Anse"
  b_ansongo:0 "Ansongo"
  b_antalla:0 "Antalla"
- b_antequera:0 "Antequera"
+ b_antequera:0 "Puente Genil"
  b_anthemusias:0 "Anthemusias"
  b_anthrachs:0 "Anthrachs"
  b_antibes:0 "Antibes"
@@ -837,7 +839,7 @@
  b_arezzo:0 "Arezzo"
  b_argan:0 "Argan"
  b_argana:0 "Argana"
- b_arganda:0 "Arganda"
+ b_arganda:0 "Alcalá de Henares"
  b_argentan:0 "Argentan"
  b_argentano:0 "Argentano"
  b_arges:0 "Argeș"
@@ -992,7 +994,7 @@
  b_aszczeatrik:0 "Aszcze-Atrik"
  b_atajab:0 "Atajab"
  b_atamasthana:0 "Atamasthana"
- b_atapuerca:0 "Atapuerca"
+ b_atapuerca:0 "Melgar de Fernamental"
  b_ataq:0 "Ataq"
  b_atasu:0 "Atasu"
  b_atbara:0 "Atbara"
@@ -1066,7 +1068,7 @@
  b_avesnes:0 "Avesnes"
  b_avezzano:0 "Avezzano"
  b_avignon:0 "Avignon"
- b_avila:0 "Avila"
+ b_avila:0 "Medina del Campo"
  b_aviovara:0 "Hámmerfeasta"
  b_avis:0 "Ponte de Sor"
  b_avlonas:0 "Avlonas"
@@ -1082,7 +1084,7 @@
  b_axbridge:0 "Axbridge"
  b_axminster:0 "Axminster"
  b_ayagoz:0 "Ayagoz"
- b_ayamonte:0 "Ayamonte"
+ b_ayamonte:0 "Almonte"
  b_aydhab:0 "Aydhab"
  b_aydoun:0 "Aydoun"
  b_ayerbe:0 "Ayerbe"
@@ -1432,7 +1434,7 @@
  b_beja:0 "Castro Verde"
  b_bejaia:0 "Bejaia"
  b_bejaija:0 "Bejaija"
- b_bejar:0 "Bejar"
+ b_bejar:0 "Vitigudino"
  b_bejestan:0 "Bejestan"
  b_bekdas:0 "Bekdas"
  b_bekobod:0 "Bekobod"
@@ -2012,11 +2014,11 @@
  b_bykovskaya:0 "Bykovskaya"
  b_bytom:0 "Bytom"
  b_bzyb:0 "Bzyb"
- b_cabaneros:0 "Cabaneros"
+ b_cabaneros:0 "Los Navalucillos"
  b_cabanillasdelcampo:0 "Cabanillas del Campo"
  b_cabaret:0 "Cabaret"
  b_cabira:0 "Cabira"
- b_cabra:0 "Cabra"
+ b_cabra:0 "Montoro"
  b_cacabelos:0 "Cacabelos"
  b_caceres:0 "Cáceres"
  b_cadi:0 "Cado"
@@ -2052,7 +2054,7 @@
  b_calarasi:0 "Călărași"
  b_calatafimi:0 "Calatafimi"
  b_calatayud:0 "Calatayud"
- b_calatrava:0 "Calatrava"
+ b_calatrava:0 "Ciudad Real"
  b_calcinaia:0 "Calcinaia"
  b_calicut:0 "Calicut"
  b_calimanesti:0 "Calimanesti"
@@ -2112,7 +2114,7 @@
  b_caraoasis:0 "Cara"
  b_caravacadelacruz:0 "Caravaca de la Cruz"
  b_carbajosadelasagrada:0 "Carbajosa de la Sagrada"
- b_carballido:0 "Carballido"
+ b_carballido:0 "Ponferrada"
  b_carbonara:0 "Carbonara"
  b_carbonia:0 "Carbonia"
  b_carcassonne:0 "Carcassonne"
@@ -2127,7 +2129,7 @@
  b_carlow:0 "Carlow"
  b_cary:0 "Cary"
  b_carmarthen:1 "Carmarthen"
- b_carmona:0 "Carmona"
+ b_carmona:0 "Morón de la Frontera"
  b_carpentras:0 "Carpentras"
  b_carpi:0 "Carpi"
  b_carrick:0 "Callan"
@@ -2149,7 +2151,7 @@
  b_cashel:0 "Cashel"
  b_caslav:0 "Čáslav"
  b_casnewydd:2 "Newport"
- b_caspe:0 "Caspe"
+ b_caspe:0 "Benicarló"
  b_cassano:0 "Cassano"
  b_cassel:0 "Cassel"
  b_cassino:0 "Cassino"
@@ -2175,7 +2177,7 @@
  b_castelsarrasin:0 "Castelsarrasin"
  b_castelvertrano:0 "Castelvertrano"
  b_castiglione:0 "Castiglione"
- b_castilblanco:0 "Castilblanco"
+ b_castilblanco:0 "Guadalupe"
  b_castillon:0 "Castillon"
  b_castle_cary:0 "Castle Cary"
  b_castle_rising:0 "Castle Rising"
@@ -2550,10 +2552,10 @@
  b_coparia:0 "Coparia"
  b_copparo:0 "Copparo"
  b_corabia:0 "Corabia"
- b_coracera:0 "Coracera"
+ b_coracera:0 "Ávila"
  b_corbie:0 "Péronne"
  b_corby:0 "Corby"
- b_cordoba:0 "Cordoba"
+ b_cordoba:0 "Córdoba"
  b_corduene:0 "Corduene"
  b_corfe:0 "Corfe"
  b_corfu:0 "Corfu"
@@ -2824,7 +2826,7 @@
  b_demyansk:0 "Demyansk"
  b_denbigh:1 "Denbigh"
  b_dendermonde:0 "Dendermonde"
- b_denia:0 "Dénia"
+ b_denia:0 "Benidorm"
  b_deogarh2:0 "Deogarh"
  b_deogarh:0 "Deogarh"
  b_deols:0 "La Châtre"
@@ -2997,7 +2999,7 @@
  b_dongola:0 "Dongola"
  b_donjastubica:0 "Donja Stubica"
  b_donjilapac:0 "Donji Lapac"
- b_donllorente:1 "La Serena"
+ b_donllorente:1 "Don Benito"
  b_donskoy:0 "Donskoy"
  b_donzy:0 "Conse-Cours-sur-Loire"
  b_doornik:0 "Doornik"
@@ -3171,7 +3173,7 @@
  b_ebita:0 "Ebita"
  b_ecbatana:0 "Ecbatana"
  b_echallens:0 "Échallens"
- b_ecija:0 "Écija "
+ b_ecija:0 "Écija"
  b_eckero:0 "Eckerö"
  b_eckersberg:0 "Eckersberg"
  b_edam:0 "Purmerend"
@@ -3980,11 +3982,11 @@
  b_grybow:0 "Grybow"
  b_guadalajara:0 "Guadalajara"
  b_guadalupe:0 "Guadalupe"
- b_guadiato:0 "Guadiato"
+ b_guadiato:0 "Almendralejo"
  b_guadix:0 "Guadíx"
  b_guadiz:1 "Guadix"
  b_guarda:0 "Guarda"
- b_guardo:1 "Cea"
+ b_guardo:1 "Valencia de Don Juan"
  b_guarena:0 "Guareña"
  b_guastalla:0 "Guastalla"
  b_gubadag:0 "Gubadag"
@@ -4059,7 +4061,7 @@
  b_hadyach:0 "Hadyach"
  b_hafaralbatin:0 "Hafar al Batin"
  b_haffouz:0 "Haffouz"
- b_hafn:0 "Hafn"
+ b_hafn:0 "Copenhagen"
  b_hafra:0 "Hafrä"
  b_hagelsrum:0 "Hagelsrum"
  b_hagen:0 "Hagen"
@@ -4248,7 +4250,7 @@
  b_helsingborg:0 "Helsingborg"
  b_helsinge:0 "Helsinge"
  b_helsingor:0 "Helsingør"
- b_helsingora:0 "Helsingora"
+ b_helsingora:0 "Helsingør"
  b_helston:0 "Truro"
  b_helwan:0 "Helwan"
  b_hemagudda:0 "Hemagudda"
@@ -4277,7 +4279,7 @@
  b_herstal:0 "Herstal"
  b_herta:0 "Herta"
  b_hertford:0 "Hertford"
- b_hervas:0 "Hervás"
+ b_hervas:0 "Plasencia"
  b_hesare-taq:0 "Hesare-Taq"
  b_hesare:0 "Hesare"
  b_hesbaie:0 "Hesbaie"
@@ -4353,7 +4355,7 @@
  b_horki:0 "Horki"
  b_hormuz:0 "Hormuz"
  b_horn:0 "Horn"
- b_hornachos:0 "Hornachos"
+ b_hornachos:0 "Azuaga"
  b_horodnia:0 "Horodnia"
  b_horsens:0 "Horsens"
  b_horten:0 "Horten"
@@ -4384,8 +4386,8 @@
  b_huelma:0 "Huelma"
  b_huelva:0 "Huelva"
  b_huesca:0 "Huesca"
- b_huescar:1 "Cotillas"
+ b_huescar:1 "Elche de la Sierra"
- b_huete:0 "Huete"
+ b_huete:0 "Villanueva de Alcorón"
  b_huhu:0 "Huhu"
  b_huidre:0 "Huidre"
  b_hukeswag:1 "Hückeswagen"
@@ -4463,7 +4465,7 @@
  b_ikonion:0 "Ikonion"
  b_ilam:0 "Ilam"
  b_ilchester:0 "Bridgwater"
- b_ilerena:1 "Llerena"
+ b_ilerena:1 "Uafra"
  b_iligh:0 "Iligh"
  b_ilion:0 "Ilion"
  b_illanz:0 "Illanz"
@@ -4692,14 +4694,14 @@
  b_jekabpils:0 "Jekabpils"
  b_jekanskoi:0 "Jekanskoi"
  b_jelgava:0 "Jelgava"
- b_jelling:0 "Jelling"
+ b_jelling:0 "Vejle"
  b_jena:0 "Jena"
  b_jenbach:0 "Jenbach"
  b_jendouba:0 "Jendouba"
  b_jerada:0 "Jerada"
  b_jerash:0 "Jerash"
  b_jerba:0 "Jerba"
- b_jerez:0 "Jeréz"
+ b_jerez:0 "Jerez de la Frontera"
  b_jerezdeloscaballeros:0 "Jeréz de los Caballeros "
  b_jericho:0 "Jericho"
  b_jerm:0 "Jerm"
@@ -5726,7 +5728,7 @@
  b_la_tremouille:0 "Bourganeuf"
  b_laa:0 "Laa"
  b_laach:0 "Laach"
- b_laadrada:0 "La Adrada"
+ b_laadrada:0 "Arévalo"
  b_laalgaba:0 "La Algaba"
  b_laane:0 "Lääne"
  b_labastideclairence:0 "La Bastide-Clairence"
@@ -5769,7 +5771,7 @@
  b_laibach:0 "Laibach"
  b_lais:0 "Lais"
  b_laish:0 "Laish"
- b_lajara:0 "La Jara"
+ b_lajara:0 "Castilblanco"
  b_lajazzo:0 "Lajazzo"
  b_lakhimpur:0 "Lakhimpur"
  b_lakhisarai:0 "Lakhisarai"
@@ -5824,7 +5826,7 @@
  b_lapalma:0 "La Palma"
  b_laplume:0 "Laplume"
  b_lappeenranta:0 "Lappeenranta"
- b_lapueblademontalban:0 "La Puebla de Montalban"
+ b_lapueblademontalban:0 "Sonseca"
  b_lapusna:0 "Lăpușna"
  b_lapy:0 "Lapy"
  b_lapytnangk:0 "Lapyt Nangk"
@@ -5950,7 +5952,7 @@
  b_leptismagna:0 "Leptis Magna"
  b_lepuiset:0 "Le Puiset"
  b_lepuy:0 "Le Puy"
- b_lerma:0 "Lerma"
+ b_lerma:0 "Baltanás"
  b_lerminet:0 "L'Erminet"
  b_lescar:0 "Lescar"
  b_lesmahagow:0 "Lesmahagow"
@@ -6015,7 +6017,7 @@
  b_limyra:0 "Limyra"
  b_lincoln:0 "Lincoln"
  b_lindau:0 "Lindau"
- b_lindholm:0 "Lindholm"
+ b_lindholm:0 "Hjørring"
  b_lindisfarne:0 "Berwick-upon-Tweed"
  b_lindos:0 "Lindos"
  b_lindow:0 "Lindow"
@@ -6116,7 +6118,7 @@
  b_lopnor:0 "Lopnor"
  b_loq:0 "Loq"
  b_loralai:0 "Loralai"
- b_lorca:0 "Lorca"
+ b_lorca:0 "Huércal-Overa"
  b_loredo:1 "Blanes"
  b_lori:0 "Lori"
  b_lori_berd:0 "Lori Berd"
@@ -6342,7 +6344,7 @@
  b_maladzyechna:0 "Maladzyechna"
  b_malaga:0 "Malaga"
  b_malagina:0 "Malaginan"
- b_malagon:0 "Malagon"
+ b_malagon:0 "Malagón"
  b_malaka:0 "Malaka"
  b_malangen:0 "Malangen"
  b_malaya_rata:1 "Samantakuta"
@@ -6434,7 +6436,7 @@
  b_manziljamal:0 "Manzil Jamal"
  b_mapa:0 "Mapa"
  b_mapan:0 "Mapan"
- b_maqueda:0 "Maqueda"
+ b_maqueda:0 "Torrijos"
  b_mar:0 "Mar"
  b_marabout:0 "Marabout"
  b_maraclea:0 "Maraclea"
@@ -6592,15 +6594,15 @@
  b_medak:0 "Medak"
  b_medantaka:0 "Medantaka"
  b_medea:0 "Médéa"
- b_medellin:0 "Medellin"
+ b_medellin:0 "Calamonte"
  b_medemblik:0 "Hoorn"
  b_medeniken:0 "Medeniken"
  b_medenine:0 "Medenine"
  b_medianadearagon:0 "Mediana de Aragón"
  b_medina:0 "Medina"
- b_medinaceli:0 "Medinaceli"
+ b_medinaceli:0 "Arcos de Jalón"
  b_medinacelli:0 "Medinacelli"
- b_medinadelcampo:0 "Medina del Campo"
+ b_medinadelcampo:0 "Béjar"
  b_medinadepomar:0 "Medina de Pomar"
  b_medinasidonia:0 "Medina Sidonia"
  b_medinasiyasa:0 "Medina Siyâsa"
@@ -6658,7 +6660,7 @@
  b_meneith:0 "Meneith"
  b_menen:0 "Menen"
  b_menorca:0 "Maó"
- b_mentesa:0 "Mentesa"
+ b_mentesa:0 "Villanueva de los Infantes"
  b_mentone:0 "Mentone"
  b_meppen:0 "Meppen"
  b_meran:0 "Meran"
@@ -6760,7 +6762,7 @@
  b_miran:0 "Miran"
  b_miranda_do_duoro:1 "Miranda do Douro"
  b_miranda_do_duoro_adj:0 "Mirandan"
- b_mirandadeebro:0 "Miranda de Ebro"
+ b_mirandadeebro:0 "Astudillo"
  b_mirande:0 "Mirande"
  b_mirandola:0 "Mirandola"
  b_mirath:0 "Mirath"
@@ -6856,7 +6858,7 @@
  b_montalban:0 "Montalbán"
  b_montalcino:0 "Montalcino"
  b_montallegro:0 "Montallegro"
- b_montanejos:0 "Montanejos"
+ b_montanejos:0 "Utiel"
  b_montaner:0 "Montaner"
  b_montargis:0 "Montargis"
  b_montauban:0 "Montauban"
@@ -6919,7 +6921,7 @@
  b_mopsuestia:0 "Mopsuestia"
  b_moqor:0 "Moqor"
  b_mor:0 "Morum"
- b_mora:0 "Mora"
+ b_mora:0 "Ocaña"
  b_moraca:0 "Moraca"
  b_moraleja:0 "Moraleja"
  b_moramar:0 "Moramar"
@@ -6932,7 +6934,7 @@
  b_morki:0 "Morki"
  b_morlaas:0 "Morlaàs"
  b_morlaix:0 "Morlaix"
- b_moron:0 "Moron"
+ b_moron:0 "Écija"
  b_morosini:0 "Morosini"
  b_morpeth:0 "Morpeth"
  b_morphou:0 "Morphou"
@@ -7033,7 +7035,7 @@
  b_murol:0 "Murol"
  b_murom:0 "Murom"
  b_murten:0 "Murten"
- b_murviedro:0 "Murviedro"
+ b_murviedro:0 "Ontinyent"
  b_murzzuschlag:1 "Mürzzuschlag"
  b_musanagar:0 "Musanagar"
  b_musangi:0 "Musangi"
@@ -7125,7 +7127,7 @@
  b_nakhshab:0 "Nakhshab"
  b_naklo:0 "Nakło"
  b_nakoleia:0 "Nakoleia"
- b_nakskov:0 "Nakskov"
+ b_nakskov:0 "Maribo"
  b_nakur:0 "Nakur"
  b_nalanda:0 "Nalanda"
  b_naldurg:0 "Naldurg"
@@ -7244,7 +7246,7 @@
  b_nerektha:0 "Nerektha"
  b_neretva:0 "Neretva"
  b_nerezisca:0 "Nerežišca"
- b_nerja:0 "Nerja"
+ b_nerja:0 "Vélez-Málaga"
  b_nerunkot:0 "Nerunkot"
  b_nerva:0 "Nerva"
  b_nes:0 "Nes"
@@ -7287,7 +7289,7 @@
  b_nidaros:1 "Trondheim"
  b_nidda:0 "Nidda"
  b_nidugallu:0 "Nidugallu"
- b_niebla:0 "Niebla"
+ b_niebla:0 "Valverde del Camino"
  b_niederschonenfeld:0 "Niederschönenfeld"
  b_niemcza:0 "Niemcza"
  b_nienburg:0 "Nienburg"
@@ -7464,7 +7466,7 @@
  b_obrosovo:0 "Obrosovo"
  b_obrovac:0 "Obrovac"
  b_obrzycko:0 "Obrzycko"
- b_ocana:1 "Ocaña"
+ b_ocana:1 "Mora"
  b_occhiobello:0 "Occhiobello"
  b_ochakiv:0 "Ochakiv"
  b_ockelbo:0 "Ockelbo"
@@ -7514,7 +7516,7 @@
  b_olivienza:0 "Olivienza"
  b_olkusz:0 "Olkusz"
  b_olmeda:0 "Olmeda"
- b_olmedo:0 "Olmedo"
+ b_olmedo:0 "Piedrahíta"
  b_olomouc:0 "Olomouc"
  b_olonne:0 "Olonne"
  b_oloron:0 "Oloron"
@@ -7803,7 +7805,7 @@
  b_peddapalli:0 "Peddapalli"
  b_pedersore:0 "Pietarsaari"
  b_pedondo:0 "Pedondo"
- b_pedroche:0 "Pedroche"
+ b_pedroche:0 "Pozoblanco"
  b_peebles:0 "Annandale"
  b_peel:0 "Peel"
  b_pefkos:0 "Pefkos"
@@ -7994,7 +7996,7 @@
  b_pomposa:0 "Pomposa"
  b_pomuk:0 "Pomuk"
  b_pondori:0 "Pondori"
- b_ponferrada:0 "Ponferrada"
+ b_ponferrada:0 "Puebla de Sanabria"
  b_ponoy:0 "Ponoy"
  b_pontarlier:0 "Pontarlier"
  b_pontedelima:0 "Ponte de Lima"
@@ -8219,11 +8221,11 @@
  b_quercy:0 "Gourdon"
  b_querfurt:0 "Querfurt"
  b_queribus:0 "Quéribus"
- b_quesada:1 "Huescar"
+ b_quesada:1 "Cazorla"
  b_quimper:0 "Quimper"
  b_quimperle:0 "Quimperle"
  b_quingey:0 "Louhans"
- b_quintanar:0 "Quintanar"
+ b_quintanar:0 "Quintanar de la Orden"
  b_quintanardelrey:0 "Quintanar del Rey"
  b_quintin:0 "Quintin"
  b_qula:0 "Qula"
@@ -8341,7 +8343,7 @@
  b_randa:0 "Randa"
  b_rander:0 "Rander"
  b_randers:0 "Randers"
- b_randros:0 "Randrøs"
+ b_randros:0 "Randers"
  b_ranikot:0 "Ranikot"
  b_ranipur:0 "Ranipur"
  b_rannoch:0 "Rannoch"
@@ -8424,7 +8426,7 @@
  b_renfrew:0 "Renfrew"
  b_reni:0 "Reni"
  b_rennes:0 "Rennes"
- b_reolid:1 "Montiel"
+ b_reolid:1 "La Carolina"
  b_repel:0 "Repel"
  b_reppenstedt:0 "Reppenstedt"
  b_repton:0 "Repton"
@@ -8453,7 +8455,7 @@
  b_rhosus:0 "Rhosus"
  b_rhuddlan:0 "Rhuddlan"
  b_rialto:0 "Rialto"
- b_riano:0 "Riano"
+ b_riano:0 "Puebla de Lillo"
  b_ribadelago:0 "Ribadelago"
  b_ribagorza:0 "Ribagorza"
  b_ribat-e-karyan:0 "Ribat-e-Karyan"
@@ -8817,7 +8819,7 @@
  b_sandomierz:0 "Sandomierz"
  b_sandur:0 "Sandur"
  b_sandwich:0 "Sandwich"
- b_sanesteban:0 "San Esteban"
+ b_sanesteban:0 "Landete"
  b_sanfernando:0 "San Fernando"
  b_sangan:0 "Sangan"
  b_sanganer:0 "Sanganer"
@@ -8842,7 +8844,7 @@
  b_sankt_gallen:0 "Sankt Gallen"
  b_sankt_polten:0 "Sankt Pölten"
  b_sankt_veit:0 "Sankt Veit"
- b_sanleonardodeyague:1 "San Leonardo"
+ b_sanleonardodeyague:1 "Quintanar de la Sierra"
  b_sanlucadebarrameda:0 "Sanlúcar de Barrameda"
  b_sanluri:0 "Sanluri"
  b_sanmarcodalunzio:0 "San Marco d'Alunzio"
@@ -8929,7 +8931,7 @@
  b_sarov:0 "Sarov"
  b_sarqinya:0 "Sarqinya"
  b_sarrebourg:0 "Sarrebourg"
- b_sarria:0 "Sarria"
+ b_sarria:0 "Astorga"
  b_sarsink:0 "Sarsink"
  b_sarskoyegorodishche:0 "Sarskoye Gorodishche"
  b_sartene:0 "Sartène"
@@ -9026,7 +9028,7 @@
  b_sebseb:0 "Sebseb"
  b_seckau:0 "Seckau"
  b_sedam:0 "Sedam"
- b_sedano:0 "Sedano"
+ b_sedano:0 "Saldaña"
  b_sedeh:0 "Sedeh"
  b_sedlec:0 "Sedlec"
  b_sees:1 "Verneuil"
@@ -9036,9 +9038,9 @@
  b_segeberg:0 "Segeberg"
  b_segezha:0 "Segezha"
  b_segni:0 "Segni"
- b_segorbe:0 "Segorbe"
+ b_segorbe:0 "Onda"
  b_segovia:0 "Segovia"
- b_segura:1 "Albacete"
+ b_segura:1 "Hellín"
  b_seilanger:0 "Seilanger"
  b_seiniai:0 "Seiniai"
  b_seiyun:0 "Seiyun"
@@ -9275,7 +9277,7 @@
  b_siegen:0 "Siegen"
  b_siena:0 "Siena"
  b_sieradz:0 "Sieradz"
- b_sierradegredos:1 "Gredos"
+ b_sierradegredos:1 "Hervás"
  b_sierradesanjust:1 "Utrillas"
  b_siggevara:0 "Siggevara"
  b_sighnaghi:0 "Sighnaghi"
@@ -9283,7 +9285,7 @@
  b_sigmaringen:0 "Sigmaringen"
  b_signy:0 "Signy"
  b_sigtuna:0 "Sigtuna"
- b_siguenza:0 "Sigüenza"
+ b_siguenza:0 "Almazán"
  b_sihor:0 "Sihor"
  b_sijilmasa:0 "Sijilmasa"
  b_siklos:0 "Siklós"
@@ -9297,7 +9299,7 @@
  b_silos:0 "Silos"
  b_silves:0 "Silves"
  b_silyana:0 "Silyana"
- b_simancas:0 "Simancas"
+ b_simancas:0 "Arroyo de la Encomienda"
  b_simaramapura:0 "Simaramapura"
  b_simbirsk:0 "Simbirsk"
  b_simhachalam:0 "Simhachalam"
@@ -9987,10 +9989,10 @@
  b_targu_neamnt:0 "Târgu Neamț"
  b_targuist:0 "Targuist"
  b_tarhalet:0 "Tarhalet"
- b_tarifa:0 "Tarifa"
+ b_tarifa:0 "Algeciras"
  b_taris:0 "Taris"
  b_tarki:0 "Tarki"
- b_tarm:0 "Tarm"
+ b_tarm:0 "Varde"
  b_tarnow:0 "Tarnów"
  b_tarom:0 "Tarom"
  b_taroudaut:0 "Taroudaut"
@@ -10262,7 +10264,7 @@
  b_tolz:0 "Tölz"
  b_tomar:0 "Tomar"
  b_tomarza:0 "Tomarza"
- b_tomelloso:1 "Valdepeñas"
+ b_tomelloso:1 "Tomelloso"
  b_tommerup:0 "Tommerup"
  b_tomot:0 "Tomot"
  b_tonbridge:0 "Tonbridge"
@@ -10293,7 +10295,7 @@
  b_torki:0 "Torki"
  b_tornea:0 "Torneå"
  b_tornio:0 "Tornio"
- b_toro:0 "Toro"
+ b_toro:0 "Íscar"
  b_toron:0 "Toron"
  b_toropets:0 "Toropets"
  b_torp:0 "Torp"
@@ -10366,7 +10368,7 @@
  b_treviglio:0 "Treviglio"
  b_treviso:0 "Treviso"
  b_triacastela:0 "Triacastela"
- b_triana:1 "Aznalcóllar"
+ b_triana:1 "Lebrija"
  b_tribandapura:0 "Tribandapura"
  b_tribeni:0 "Tribeni"
  b_triberg:0 "Triberg"
@@ -10422,7 +10424,7 @@
  b_tubirett:0 "Tubirett"
  b_tubna:0 "Tubna"
  b_tuchel:0 "Tuchel"
- b_tudela:0 "Tudela"
+ b_tudela:0 "Ólvega"
  b_tudgha:0 "Tudgha"
  b_tuggurt:0 "Tuggurt"
  b_tugulym:0 "Tugulym"
@@ -10500,13 +10502,13 @@
  b_tzamandos:0 "Tzamandos"
  b_tzimisca:0 "Tzimisca"
  b_tzofar:0 "Tzofar"
- b_ubeda:0 "Ubeda"
+ b_ubeda:0 "Linares"
  b_uberlingen:0 "Überlingen"
  b_ubmeje:0 "Ubmeje"
- b_uceda:0 "Uceda"
+ b_uceda:0 "Nava de la Asunción"
  b_uch:0 "Uch"
  b_uchangidurga:0 "Uchangidurga"
- b_ucles:0 "Ucles"
+ b_ucles:0 "Tarancón"
  b_udabhanda:0 "Udabhanda"
  b_udabno:0 "Udabno"
  b_udagai:0 "Udagai"
@@ -10690,9 +10692,9 @@
  b_valencay:0 "Le Blanc"
  b_valence:0 "Valence"
  b_valencia:0 "València"
- b_valenciadecampos:0 "Valencia de Campos"
+ b_valenciadecampos:0 "Mayorga"
  b_valenciennes:0 "Valenciennes"
- b_valeria:0 "Valeria"
+ b_valeria:0 "Albacete"
  b_valga:1 "Walko"
  b_valjala:0 "Valjala"
  b_valkenburg:0 "Valkenburg"
@@ -10730,7 +10732,7 @@
  b_varazdin:0 "Varazdin"
  b_varberg:0 "Varberg"
  b_varbitsz:0 "Varbitsz"
- b_varde:0 "Varde"
+ b_varde:0 "Esbjerg"
  b_vardhamana:0 "Vardhamāna"
  b_vardohus:0 "Vardøhus"
  b_vardzia:0 "Vardzia"
@@ -10809,7 +10811,7 @@
  b_vengipura:0 "Vengipura"
  b_venosa:0 "Venosa"
  b_ventadelmoral:0 "Venta del Moral"
- b_ventadelmoro:1 "Iniesta"
+ b_ventadelmoro:1 "Almansa"
  b_ventadour:0 "Tulle"
  b_ventava:0 "Ventava"
  b_ventimiglia:0 "Ventimiglia"
@@ -10894,14 +10896,14 @@
  b_vilkmerge:1 "Vilkmerge"
  b_villa_real:0 "Villa Real"
  b_villa_real_adj:0 "Realian"
- b_villablino:0 "Villablino"
+ b_villablino:0 "La Bañeza"
  b_villach:0 "Villach"
- b_villafafila:0 "Villafafila"
+ b_villafafila:0 "Fuentesaúco"
  b_villalba:0 "Villalba"
  b_villalbadelosbarros:0 "Villalba de los Barros"
  b_villanuevadelajara:0 "Villanueva de la Jara"
  b_villareal:0 "Villa Real"
- b_villarejodesalvanes:0 "Villarejo de Salvanes"
+ b_villarejodesalvanes:0 "Villarejo Azuqueca de Henares"
  b_villarrobledo:0 "Villarrobledo"
  b_villaviciosa:0 "Llanes"
  b_villefranche:0 "Villefrance"
@@ -10970,7 +10972,7 @@
  b_volzhsk:0 "Volzhsk"
  b_vonitsa:0 "Vonitsa"
  b_vonitsza:0 "Vonitsza"
- b_vorbasse:0 "Vorbasse"
+ b_vorbasse:0 "Billund"
  b_vordingborg:0 "Vordingborg"
  b_vorgashor:0 "Vorgashor"
  b_vorkuta:0 "Vorkuta"
@@ -11260,7 +11262,7 @@
  b_yazd:0 "Yazd"
  b_yazhma:0 "Yazhma"
  b_yazur:0 "Yazur"
- b_ycost:0 "Ycost"
+ b_ycost:0 "Herning"
  b_yecheng:0 "Yecheng"
  b_yecla:0 "Yecla"
  b_yedisu:0 "Yedisu"
@@ -11334,7 +11336,7 @@
  b_zakopane:0 "Zakopane"
  b_zakroczym:0 "Zakroczym"
  b_zakynthos:0 "Zakynthos"
- b_zalaca:0 "Zalaca"
+ b_zalaca:0 "San Vicente"
  b_zalese:0 "Zales'e"
  b_zalischyky:0 "Zalischyky"
  b_zaliscus:0 "Zaliscus"
@@ -11460,7 +11462,7 @@
  b_zurabad:0 "Zurabad"
  b_zurbatiyah:0 "Zurbayiyah"
  b_zurich:0 "Zürich"
- b_zurita:1 "Zorita"
+ b_zurita:1 "Huete"
  b_zussow:0 "Züssow"
  b_zutphen:0 "Arnhem"
  b_zuwara:0 "Zuwara"
@@ -11577,8 +11579,8 @@
  c_aland_adj:0 "Ålander"
  c_alania:0 "Alania"
  c_alania_adj:0 "Alanian"
- c_alarcon:0 "Alarcon"
+ c_alarcon:0 "Albacete"
- c_alarcon_adj:0 "Alarconian"
+ c_alarcon_adj:0 "Albacetan"
  c_albania:0 "Albania"
  c_albania_adj:0 "Albanian"
  c_albania_pre:0 "Albano"
@@ -11594,8 +11596,8 @@
  c_alcaniz_adj:0 "Alcanizan"
  c_alcantara:0 "Alcantara"
  c_alcantara_adj:0 "Alcantaran"
- c_alcaraz:0 "Alcaraz"
+ c_alcaraz:0 "Hellín"
- c_alcaraz_adj:0 "Alcarazan"
+ c_alcaraz_adj:0 "Hellínian"
  c_alencon:0 "Orne"
  c_alencon_adj:0 "Ornean"
  c_aleppo:0 "Aleppo"
@@ -11614,7 +11616,7 @@
  c_almader_adj:1 "Alarcosian"
  c_almansa:0 "Almansa"
  c_almansa_adj:0 "Almansan"
- c_almeria:0 "Almeria"
+ c_almeria:0 "Almería"
  c_almeria_adj:0 "Almerian"
  c_alodia:0 "Alodia"
  c_alodia_adj:1 "Alodian"
@@ -11634,8 +11636,8 @@
  c_amalfi_adj:0 "Amalfite"
  c_amaravati:0 "Amaravati"
  c_amaravati_adj:0 "Amaravati"
- c_amaya:0 "Amaya"
+ c_amaya:0 "Palencia"
- c_amaya_adj:0 "Amayan"
+ c_amaya_adj:0 "Palencian"
  c_amida:0 "Amida"
  c_amida_adj:0 "Amidan"
  c_amiens:0 "Amiens"
@@ -12119,10 +12121,10 @@
  c_byzantion_adj:0 "Byzantine"
  c_cabra:0 "Cabra"
  c_cabra_adj:0 "Cabran"
- c_caceres:0 "Caceres"
+ c_caceres:0 "Cáceres"
- c_caceres_adj:0 "Caceresian"
+ c_caceres_adj:0 "Cáceresian"
- c_cadiz:0 "Cadiz"
+ c_cadiz:0 "Cádiz"
- c_cadiz_adj:0 "Cadizian"
+ c_cadiz_adj:0 "Cádizian"
  c_caernarfonshire:2 "Gwynedd"
  c_cagliari:0 "Cagliari"
  c_cagliari_adj:0 "Cagliarian"
@@ -12138,8 +12140,8 @@
  c_calarasi_adj:0 "Călărașian"
  c_calatayud:0 "Calatayud"
  c_calatayud_adj:0 "Calatayudian"
- c_calatrava:0 "Calatrava"
+ c_calatrava:0 "Ciudad Real"
- c_calatrava_adj:0 "Calatravan"
+ c_calatrava_adj:0 "Ciudad Realan"
  c_camarda:0 "Camarda"
  c_camarda_adj:0 "Camardan"
  c_cambray:0 "Cambrai"
@@ -12282,8 +12284,8 @@
  c_constantia:0 "Constantia"
  c_constantia_adj:0 "Constantian"
  c_constantine:0 "Constantine"
- c_cordoba:0 "Cordoba"
+ c_cordoba:0 "Córdoba"
- c_cordoba_adj:0 "Cordoban"
+ c_cordoba_adj:0 "Córdoban"
  c_cornouaille:0 "Cornouaille"
  c_cornouaille_adj:0 "Cornouaillian"
  c_cornwall:0 "Cornwall"
@@ -12306,8 +12308,8 @@
  c_crimea_adj:0 "Crimean"
  c_csanad:0 "Csanad"
  c_csanad_adj:0 "Csanadian"
- c_cuellar:0 "Cuellar"
+ c_cuellar:0 "Segovia"
- c_cuellar_adj:0 "Cuellarian"
+ c_cuellar_adj:0 "Segovian"
  c_cuenca:0 "Cuenca"
  c_cuenca_adj:0 "Cuencan"
  c_cumberland:0 "Cumberland"
@@ -13463,10 +13465,10 @@
  c_makran_adj:0 "Makran"
  c_makuria:0 "Makuria"
  c_makuria_adj:0 "Makurian"
- c_malaga:0 "Malaga"
+ c_malaga:0 "Málaga"
  c_malaga_adj:0 "Málagan"
- c_malagon:0 "Cabaneros"
+ c_malagon:0 "Sonseca"
- c_malagon_adj:0 "Cabanerese"
+ c_malagon_adj:0 "Sonsecan"
  c_maldives_article:0 "the "
  c_maldives:0 "Maldives"
  c_maldives_adj:0 "Maldivian"
@@ -13549,8 +13551,8 @@
  c_medantaka_adj:0 "Medantakan"
  c_medapata:0 "Medapata"
  c_medapata_adj:0 "Medapatan"
- c_medellin:0 "Medellin"
+ c_medellin:0 "Don Benito"
- c_medellin_adj:0 "Medellinan"
+ c_medellin_adj:0 "Benitan"
  c_medelpad:0 "Medelpad"
  c_medelpad_adj:0 "Medelpadian"
  c_medina:0 "Medina"
@@ -13616,8 +13618,8 @@
  c_modrus_adj:0 "Modrušan"
  c_mohadavasaka:0 "Mohadavasaka"
  c_mohadavasaka_adj:0 "Mohadavasakan"
- c_molina:0 "Molina"
+ c_molina:0 "Guadalajara"
- c_molina_adj:0 "Molinan"
+ c_molina_adj:0 "Guadalajaran"
  c_monemvasia:0 "Monemvasia"
  c_monemvasia_adj:0 "Monemvasian"
  c_monferrato:0 "Monferrato"
@@ -13638,8 +13640,8 @@
  c_montpelliard_adj:0 "Montpelliard"
  c_montpellier:0 "Gard"
  c_montpellier_adj:0 "Gardian"
- c_mora:1 "Mora"
+ c_mora:1 "Tarancón"
- c_mora_adj:1 "Morese"
+ c_mora_adj:1 "Tarancónian"
  c_ponferrada:0 "Ponferrada"
  c_ponferrada_adj:0 "Ponferradan"
  c_andorra:0 "Andorra"
@@ -13780,8 +13782,8 @@
  c_nice_adj:0 "Niçois"
  c_nicopolis:1 "Nicopolis"
  c_nicopolis_adj:0 "Nicopolitan"
- c_niebla:0 "Niebla"
+ c_niebla:0 "Huelva"
- c_niebla_adj:0 "Nieblan"
+ c_niebla_adj:0 "Huelvan"
  c_niederbayern:0 "Niederbayern"
  c_niederbayern_adj:0 "Niederbayerian"
  c_nih:0 "Nih"
@@ -13855,7 +13857,7 @@
  c_oldenburg_adj:0 "Oldenburgian"
  c_oleshye:1 "Kyzyl Jar"
  c_oleshye_adj:0 "Oleshyan"
- c_olmedo:0 "Olmedo"
+ c_olmedo:0 "Ávila"
  c_olomouc:0 "Olomouc"
  c_olomouc_adj:0 "Olomoucian"
  c_olvia:0 "Olvia"
@@ -13982,8 +13984,8 @@
  c_pereyaslavl_zalessky:1 "Pereyaslavl Zalessky"
  c_pereyaslavl_zalessky_adj:0 "Pereyaslavl Zalesskyian"
  c_perfeddwlad_adj:0 "Perfeddwladian"
- c_perigord:1 "Dordogne"
+ c_perigord:1 "Périgord"
- c_perigord_adj:1 "Dordognian"
+ c_perigord_adj:1 "Périgordian"
  c_perm:0 "Perm"
  c_perm_adj:0 "Permian"
  c_pest:0 "Pest"
@@ -15019,7 +15021,8 @@
  c_volkovysk:0 "Volkovysk"
  c_vologda:0 "Vologda"
  c_vologda_adj:0 "Vologdan"
- c_vorbasse:0 "Vorbasse"
+ c_vorbasse:0 "Vejle"
+ c_vorbasse_adj:0 "Vejlean"
  c_vosges:0 "Vosges"
  c_vosges_adj:0 "Vosges"
  c_votyaki:0 "Votyaki"
@@ -15230,8 +15233,8 @@
  d_angria_adj:0 "Angarian"
  d_anhalt:0 "Anhalt"
  d_anhalt_adj:0 "Anhalter"
- d_anjou:0 "Pays de la Loire"
+ d_anjou:0 "Anjou"
- d_anjou_adj:0 "Loirin"
+ d_anjou_adj:0 "Anjou"
  d_antioch:0 "Antioch"
  d_antioch_adj:0 "Antiochian"
  d_anupa:0 "Anupa"
@@ -15245,7 +15248,7 @@
  d_arabia_petrae_adj:0 "Arabian"
  d_arabs:0 "Arabs"
  d_arabs_adj:0 "Arabian"
- d_aragon:0 "Aragon"
+ d_aragon:0 "Aragón"
  d_aragon_adj:0 "Aragonese"
  d_ardennes:0 "Ardennes"
  d_ardennes_adj:0 "Ardennian"
@@ -15426,8 +15429,8 @@
  d_connacht_adj:0 "Connachtian"
  d_constantine:0 "Constantine"
  d_constantine_adj:0 "Constantinian"
- d_cordoba:0 "Cordoba"
+ d_cordoba:0 "Córdoba"
- d_cordoba_adj:0 "Cordoban"
+ d_cordoba_adj:0 "Córdoban"
  d_cornwall:0 "Cornwall"
  d_cornwall_adj:0 "Cornish"
  d_corsica:0 "Corsica"
@@ -16124,6 +16127,8 @@
  d_severians_adj:0 "Severian"
  d_sevilla:0 "Seville"
  d_sevilla_adj:0 "Sevillan"
+ d_sevillian_state:0 "Sevillian State"
+ d_sevillian_state:0 "Sevillan"
  d_shewa:0 "Shewa"
  d_shewa_adj:0 "Shewa"
  d_shiite:0 "Shia Caliphate"
@@ -16641,8 +16646,8 @@
  k_brittany_adj:0 "Breton"
  k_bulgaria:0 "Bulgaria"
  k_bulgaria_adj:0 "Bulgarian"
- k_burgundy:0 "Rhodanie"
+ k_burgundy:0 "Rhonie"
- k_burgundy_adj:0 "Rhodanian"
+ k_burgundy_adj:0 "Rhodanien"
  k_byzantium:0 "Greece"
  k_byzantium_adj:0 "Greek"
  k_byzantium_pre:0 "Greco"
@@ -16744,8 +16749,8 @@
  k_tuscany_adj:0 "Tuscan"
  k_san_marino:0 "San Marino"
  k_san_marino_adj:0 "San Marinese"
- k_castille_leon:0 "Castilleón"
+ k_castille_leon:0 "Castileón"
- k_castille_leon_adj:0 "Castilleónese"
+ k_castille_leon_adj:0 "Castileónese"
  d_bremen:0 "Bremen"
  d_bremen_adj:0 "Bremener"
  k_brandenburg:0 "Brandenburg"