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

common/culture/name_equivalency/00_NEOW_female_names.txt

@@ -21,7 +21,7 @@ anastasia_female = { Anastasi_e_act_ }
 andrea_female = { Andrea Andriveto }
 angela_female = { Aela Aelia Aelig Ang_e_grv_lo_female Angela Engelina }
 angelica_female = { Angelico_female Angelika Angelique Lieke }
-anna_female = { Ana Ana_i_uml_s Aneto Anita Anja Anna Annaig Anne Anneke Annette Annick Annie Annigje Ano Anouk Antje Hannah Hanne Naig }
+anna_female = { Ana Ana_i_uml_s Aneto Anita Anja Anna Annaig Anne Anneke Annette Anni Annick Annie Annigje Ano Anouk Antje Hannah Hanne Naig }
 annaclara_female = { Ano-Claro }
 annaeleonora_female = { Hannelore }
 annalaura_female = { Ano-Lauro }
@@ -52,7 +52,7 @@ bernarda_female = { Berendina Bernadeto Bernadette Bernardina Bernado }
 bertha_female = { Berta Bertha Berto_female }
 bertranda_female = { Bertrando }
 blanche_female = { Bianca Blanco_female }
-bridget_female = { Birgit Birgitt Brec_pst_hed Bregido Brigitte Britt Gitte }
+bridget_female = { Birgit Birgitt Birgitte Birthe Brec_pst_hed Bregido Brigitte Britt Gitte }
 brittany_female = { Britney }
 bushra_female = { Bouchra }
 camilla_female = { Camiho Camilla Kamilla }
@@ -60,7 +60,7 @@ carla_female = { Carla Carleno_female Carola Carole Carolo_female }
 carmen_female = { Carmen Carmina }
 carolina_female = { Carolina Caroline Caroulino Karoline }
 cassandra_female = { Cassandro }
-catherine_female = { Carina Catarino Catharina Karin Karina Karine Katell Katharina Katja Katrin Katrine Nienke Trijntje Trine }
+catherine_female = { Carina Catarino Catharina Karen Karin Karina Karine Katell Katharina Katja Katrin Katrine Nienke Trijntje Trine }
 cecilia_female = { Cecilie Cecilo Cilly Silke Sille Sisse }
 celestina_female = { Celestino_female Celesto_female }
 celia_female = { Celi_a_grv_ }
@@ -69,7 +69,7 @@ charlotte_female = { Charloto Charlotte Lotte }
 chloe_female = { Clou_e_grv_ }
 christa_female = { Christa }
 christelle_female = { Kristell }
-christina_female = { Christiane Christina Christine Crestino Kerstin Kirsten Kristen Kristin Kristina Kristine Stine Tine }
+christina_female = { Carsten Christiane Christina Christine Crestino Kerstin Kirsten Kristen Kristin Kristina Kristine Stine Tine }
 chun_female = { Chun Shun }
 claire_female = { Clara Clarisso Claro_female Klara Sklaerenn }
 claudia_female = { Claudia Glaudeto Glaudino Glaudo_female Klaoda Klaodina }
@@ -89,13 +89,13 @@ demetria_female = { Demi }
 denise_female = { Daniso Deneza Denise }
 diana_female = { Diana Diano }
 dominica_female = { Dominique_female Doumenico_female }
-dorothy_female = { Dorothea Dourout_e_grv_io }
+dorothy_female = { Dorothea Dorthe Dourout_e_grv_io }
 edith_female = { Edith Editha Edito }
 edmunda_female = { Edmunda }
 eleanor_female = { A_e_act_nor Eleonore Eliounor Elizabeth Leounoro Lore }
 eliana_female = { Eliano }
 elisa_female = { Elisa Elise Eliso }
-elizabeth_female = { Bab_e_grv_u_female Babette Bettina Eisab_e_grv_u Elesbed Elisabeth Elsbeth Liesel Lisette Liz }
+elizabeth_female = { Bab_e_grv_u_female Babette Bettina Eisab_e_grv_u Elesbed Elisabeth Elsbeth Liesel Lis Lisbeth Lisette Liz }
 elizabethcharlotte_female = { Liselotte }
 elodie_female = { _E_act_lodie Eloud_i_grv_o }
 elsa_female = { Els_a_grv_ Else Ilse }
@@ -185,7 +185,7 @@ joelle_female = { Jo_e_uml_lle Jouelo_female }
 josepha_female = { J_o_act_usefino Josefine Josepha Josephina }
 josette_female = { Jouseto_female }
 josiane_female = { Josiane Jousiano }
-judith_female = { Judit Judith Jutta }
+judith_female = { Judit Judith Jutta Jytte }
 julia_female = { J_u_grv_li_female Julia Julie }
 juliana_female = { Juliane Juliano_female Liane }
 juliet_female = { Julieto }
@@ -204,7 +204,7 @@ lea_female = { Le_a_grv Lea }
 leonie_female = { Leonie Leoun_i_grv_o Leountino }
 liliana_female = { Lilian_female Liliano }
 linda_female = { Lindo_female Lynda }
-lisa_female = { Lisa Liseto Liso_female Liza }
+lisa_female = { Lisa Lise Liseto Liso_female Liza }
 lorraine_female = { Lourreno }
 louise_female = { Aloisia Lizig Lo_i_uml_za Loeiza Lou_i_uml_so_female Lou_i_uml_sono Louisa Louise Ludwiga Luisa Zaig }
 lubna_female = { Lobna }
@@ -222,6 +222,7 @@ maria_female = { Maaike Maja Manon Manoun Mar_i_grv_o_female Mari Mari_e_uml_lle
 mariaangel_female = { Mar_i_grv_o-Ange }
 mariaanna_female = { Mar_i_grv_o-Ano Maria_spc_Anna Mariannick Marie-Annick Maryannick Rianne }
 mariaantonia_female = { Mar_i_grv_o-Antouneto }
+mariabrigitta_female = { Majbritt }
 mariacatherine_female = { Mar_i_grv_o-Catarino }
 mariacharlotte_female = { Marie_spc_Charlotte }
 mariachristina_female = { Mar_i_grv_o-Crestino Maria-Kristina }

common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -301,7 +301,7 @@ max_male = { Mas Max }
 maximilian_male = { Maximilian }
 maximus_male = { Maime Maxime }
 merlin_male = { Merlijn }
-michael_male = { Chiel Maikel Mich_e_grv_u Michael Michel Michiel Micka_e_uml_l Mikael Mike Mikkel Miqu_e_grv_u Misha_e_uml_l }
+michael_male = { Chiel Maikel Meik Mich_e_grv_u Michael Michel Michiel Micka_e_uml_l Mikael Mike Mikkel Miqu_e_grv_u Misha_e_uml_l }
 morgan_male = { Morgan Morgann }
 moses_male = { Moussa }
 muhammad_male = { Mamadou Mohamed Mohammad Mohammed }
@@ -314,7 +314,7 @@ naim_male = { Na_i_uml_m }
 najib_male = { N_e_act_jib }
 nasr_male = { Nasser Nassur }
 nathan_male = { Natan }
-nicholas_male = { Klaas Klaus Nick Nicklas Nicolaas Nicolai Nicoulau Niek Niels Niklas Nikolaj Nikolaus Nikolaz }
+nicholas_male = { Claus Klaas Klaus Nick Nicklas Nicolaas Nicolai Nicoulau Niek Niels Niklas Nikolaj Nikolaus Nikolaz }
 noah_male = { Noah Nou_e_grv_ }
 noel_male = { Calendau }
 norbert_male = { Norbert Nourbert }
@@ -332,7 +332,7 @@ patel_male = { Patyl Patyll }
 patrick_male = { Padrig Patrice Patrick Patrig }
 paul_male = { Palle Paol Pau Paul Paulus Pol Poul }
 pauljohn_male = { Paul_spc_Johannes }
-peter_male = { P_e_grv_ire P_e_hat_r Per Peran Peter Petrus Pierrick Piet Pieter }
+peter_male = { P_e_grv_ire P_e_hat_r Pelle Per Peran Peter Petrus Pierrick Piet Pieter }
 peteranthony_male = { P_e_grv_ire-Ant_o_grv_ni }
 peterjames_male = { P_e_hat_r-Jakez }
 peterjohn_male = { P_e_grv_ire-Jan }
@@ -389,6 +389,7 @@ siegmund_male = { Sigismund Sigmund }
 simon_male = { Simon Simoun }
 solomon_male = { Slimane Souleymane }
 stanislaus_male = { Estanislau }
+stein_male = { Steen }
 stephen_male = { _E_act_tienne Est_e_grv_ve Estefan Stef Stefan Steffen Stephan Steven }
 sufyan_male = { Seufyann Sofian Sofiane Soufian }
 sven_male = { Sven Svend }
@@ -405,6 +406,7 @@ theodoric_male = { Derk Dieter Dietrich Dirk Terris Thierry }
 theophilus_male = { Teoufile Theophil }
 thomas_male = { Thomas Tom Tomaz Toumas }
 thorbjorn_male = { Torben }
+thorgeir_male = { Toke }
 thorgils_male = { Troels }
 thorstein_male = { Thorsten }
 tiberius_male = { Tiberius }

common/culture/name_lists/NEOW_danish.txt

@@ -210,25 +210,25 @@ name_list_danish = {
 		3 = {
 			Anders Andreas Arne 
 			Bent Bjarne Brian 
-			Carl Casper Christian 
+			Carl Carsten Casper Christian Claus 
 			Daniel David Dennis 
-			Emil Erik 
-			Finn Flemming Frederik 
+			Emil Erik Erling 
+			Finn Flemming Frank Frederik 
 			Hans Henrik 
-			J_o_stk_rgen J_o_stk_rn Jacob Jakob Jan Jens Jeppe Jesper Jonas 
-			Kaj Kasper Kenneth Kim Klaus Knud Kristian 
+			J_o_stk_rgen J_o_stk_rn Jacob Jakob Jan Jens Jeppe Jesper John Jonas 
+			Kaj Kasper Kenneth Kim Klaus Knud Kristian Kurt 
 			Lars Lasse 
 			Mads Martin Mathias Michael Mikkel Morten 
 			Nicolai Niels Nikolaj 
 			Ole 
 			Palle Peter Per Poul 
 			Rasmus Ren_e_act_ Rune 
-			S_o_stk_ren Simon Steffen Stig Svend 
+			S_o_stk_ren Simon Steen Steffen Stig Svend 
 			Thomas Torben Troels 
 			Ulrik 
 		}
 		2 = {
-			Aage Alexander Anton Asbj_o_stk_rn Asger 
+			Aage Alexander Anton Asbj_o_stk_rn Asger Axel 
 			B_o_stk_rge Benjamin 
 			Charles Christoffer 
 			Ernst 
@@ -243,32 +243,34 @@ name_list_danish = {
 			Patrick Philip 
 			Richard 
 			Sebastian Stephan Sven 
-			Theis Thor Tobias 
+			Theis Thor Tobias Toke 
 			Victor Viggo 
 			William 
 		}
 		1 = {
 			Bernhardt Bj_o_stk_rner Boje Buster 
+			Ingvard 
 			Lars-Viggo Lauge Lucas Lukas 
-			Matias 
+			Marinus Matias Meik 
 			Oscar 
+			Pelle 
 			Remond 
 			Sigfred 
 		}
 	}
 	female_names = {
 		3 = {
-			Anja Anna Anne Annette 
-			Bente Birgit Bodil 
+			Anja Anna Anne Annette Anni 
+			Bente Bettina Birgit Birgitte Birthe Bodil 
 			Camilla Carina Cecilie Charlotte Christina 
-			Ditte 
+			Ditte Dorthe 
 			Eva 
 			Gitte 
 			Hanne Heidi Helle Henriette 
 			Ida Inge Inger Irene Isabella 
-			Jette Julie 
-			Karina Katrine Kirsten Kristina 
-			Lene Line Lone Louise 
+			Jette Julie Jytte 
+			Karen Karina Katrine Kirsten Kristina 
+			Lene Line Lis Lisbeth Lise Lone Louise 
 			Maja Malene Maria Marianne Marie Merete Mette Mia Michelle Mona 
 			Nanna Nina 
 			Pernille Pia 
@@ -283,10 +285,11 @@ name_list_danish = {
 			Dagny Dina 
 			Emilie Emma 
 			Frederikke Freja Frida 
-			Janni Jeanne Johanne Josefine 
+			Ingelise 
+			Janni Jeanne Jeannette Johanne Josefine 
 			Kamilla Kristine 
 			L_ae_rke Laura Linette 
-			Margrethe Marlene Mathilde Mie Mike 
+			Majbritt Margrethe Marlene Mathilde Mie Mike 
 			Nadia Natasja Nicoline 
 			Olga 
 			Rebecca 

common/landed_titles/britannia.txt

@@ -5157,46 +5157,82 @@
 					color = { 255 175 75 }
 			
 					cultural_names = {
-						name_list_irish = cn_srath__e_act_ireann
-						name_list_NEOW_manx = cn_srath__e_grv_ireann
-						name_list_gaelic = cn_srath__e_grv_ireann
-						name_list_NEOW_scottish = cn_stirlin
-						name_list_brittannic = cn_strafyarn
-						name_list_prytoneg = cn_strhafyarhn
-						name_list_scouseg = cn_strafyarn
-						name_list_strafclideg = cn_straiteairn
+						name_list_irish = cn_banbh
+						name_list_NEOW_manx = cn_banbh
+						name_list_gaelic = cn_banbh
+						name_list_NEOW_scottish = cn_bamff
+						name_list_strafclideg = cn_bainff
 					}
 				}
-				b_mortlach = {
+				b_mortlach = { # Huntly
 					province = 1713
 					color = { 255 175 75 }
 			
 					cultural_names = {
-						name_list_irish = cn_srath__e_act_ireann
-						name_list_NEOW_manx = cn_srath__e_grv_ireann
-						name_list_gaelic = cn_srath__e_grv_ireann
-						name_list_NEOW_scottish = cn_stirlin
-						name_list_brittannic = cn_strafyarn
-						name_list_prytoneg = cn_strhafyarhn
-						name_list_scouseg = cn_strafyarn
-						name_list_strafclideg = cn_straiteairn
+						name_list_irish = cn_hunndaidh
+						name_list_NEOW_manx = cn_hunndaidh
+						name_list_gaelic = cn_hunndaidh
+						name_list_scouseg = cn_huntlly
+						name_list_strafclideg = cn_huntli
 					}
 				}
 			}
-			c_mearns = { # Abderdeenshire
+			c_mearns = { # Aberdeenshire
 				color = { 19 28 76 }
+			
+				cultural_names = {
+					name_list_irish = cn_siorrachd_obar_dheathain
+					name_list_NEOW_manx = cn_sheer_aberdon
+					name_list_gaelic = cn_siorrachd_obar_dheathain
+					name_list_NEOW_scottish = cn_aiberdeenshire
+					name_list_brittannic = cn_abyrddyynshyry
+					name_list_prytoneg = cn_abyrhddyynshyrhy
+					name_list_scouseg = cn_abyrddyynshyry
+					name_list_strafclideg = cn_aiberddeenshire
+				}
 
 				b_aberdeen = {
 					province = 1718
 					color = { 230 140 10 }
+			
+					cultural_names = {
+						name_list_irish = cn_obar_dheathain
+						name_list_NEOW_manx = cn_aberdon
+						name_list_gaelic = cn_obar_dheathain
+						name_list_NEOW_scottish = cn_aiberdeen
+						name_list_brittannic = cn_abyrddyyn
+						name_list_prytoneg = cn_abyrhddyyn
+						name_list_scouseg = cn_abyrddyyn
+						name_list_strafclideg = cn_aiberddeen
+					}
 				}
 				b_ballater = {
 					province = 1722
 					color = { 230 140 10 }
+			
+					cultural_names = {
+						name_list_irish = cn_bealadair
+						name_list_NEOW_manx = cn_bealadair
+						name_list_gaelic = cn_bealadair
+						name_list_brittannic = cn_ballatyr
+						name_list_prytoneg = cn_ballatyrh
+						name_list_scouseg = cn_ballatyr
+						name_list_strafclideg = cn_baillaiter
+					}
 				}
-				b_mar = {
+				b_mar = { # Braemar
 					province = 1723
 					color = { 225 125 20 }
+			
+					cultural_names = {
+						name_list_irish = cn_br_a_grv_igh_mh_a_grv_rr
+						name_list_NEOW_manx = cn_br_a_grv_igh_mh_a_grv_rr
+						name_list_gaelic = cn_br_a_grv_igh_mh_a_grv_rr
+						name_list_brittannic = cn_braymar
+						name_list_prytoneg = cn_brhaymarh
+						name_list_scouseg = cn_braymar
+						name_list_strafclideg = cn_braiemair
+					}
 				}
 			}
 		}
@@ -5210,8 +5246,13 @@
 				name_list_icelander = cn_nor_d_stk_ureyjar
 				name_list_faerosk = cn_nor_d_stk_oyar
 				name_list_irish = cn_na_h_eileanan_a_tuath
+				name_list_NEOW_manx = cn_na_h_eileanan_a_tuath
 				name_list_gaelic = cn_na_h_eileanan_a_tuath
 				name_list_NEOW_scottish = cn_northren_isles
+				name_list_brittannic = cn_norfyrn_yslys
+				name_list_prytoneg = cn_norhfyrhn_yslys
+				name_list_scouseg = cn_norfyrn_ysllys
+				name_list_strafclideg = cn_nortern_isles
 			}
 
 			c_orkney = {
@@ -5220,10 +5261,15 @@
 				cultural_names = {
 					name_list_gaelic = cn_arcaibh
 					name_list_irish = cn_inse_orc
+					name_list_NEOW_manx = cn_yn_orkaid
 					name_list_NEOW_welsh = cn_ynysoedd_erch
 					name_list_NEOW_breton = cn_inizi_orc_pst_h
 					name_list_icelander = cn_orkneyjar
 					name_list_faerosk = cn_orknoyggjar
+					name_list_brittannic = cn_orknyy
+					name_list_prytoneg = cn_orhcnyy
+					name_list_scouseg = cn_orcnyy
+					name_list_strafclideg = cn_orknei
 				}
 
 				b_kirkwall = {
@@ -5235,6 +5281,10 @@
 						name_list_irish = cn_b_a_grv_gh_na_h_eaglaise
 						name_list_icelander = cn_kirkjuvogur
 						name_list_NEOW_scottish = cn_kirkwaa
+						name_list_brittannic = cn_kyrkwall
+						name_list_prytoneg = cn_cyrhcwall
+						name_list_scouseg = cn_cyrcwall
+						name_list_strafclideg = cn_kirkwaill
 					}
 				}
 			}
@@ -5246,6 +5296,11 @@
 					name_list_faerosk = cn_hetland
 					name_list_irish = cn_sealtainn
 					name_list_gaelic = cn_sealtainn
+					name_list_NEOW_manx = cn_shetlynn
+					name_list_brittannic = cn_shetlandd
+					name_list_prytoneg = cn_shetlandd
+					name_list_scouseg = cn_shetllandd
+					name_list_strafclideg = cn_shetlandd
 				}
 
 				b_lerwick = {
@@ -5257,6 +5312,10 @@
 						name_list_NEOW_scottish = cn_lerook
 						name_list_irish = cn_li_u_grv_rabhaig
 						name_list_gaelic = cn_li_u_grv_rabhaig
+						name_list_NEOW_manx = cn_li_u_grv_rabhaig
+						name_list_brittannic = cn_lyrwyk
+						name_list_prytoneg = cn_lyrhwyc
+						name_list_scouseg = cn_llyrwyc
 					}
 				}
 			}