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

common/culture/name_equivalency/00_NEOW_female_names.txt

@@ -22,11 +22,11 @@ anastasia_female = { Anastasi_e_act_ }
 andrea_female = { Andrea Andrine 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 Anette Anita Anja Ann Anna Annaig Anne Anneke Annette Anni Annick Annie Annigje Anniken Ano Anouk Antje Hannah Hanne Naig }
+anna_female = { Ana Ana_i_uml_s Ane Aneto Anette Anita Anja Ann Anna Annaig Anne Anneke Annette Anni Annick Annie Annigje Anniken Ano Anouk Antje Hannah Hanne Naig }
 annaclara_female = { Ano-Claro }
 annaeleonora_female = { Hannelore }
 annalaura_female = { Ano-Lauro }
-annalisa_female = { Annelise Ano-Liso }
+annalisa_female = { Anneliese Annelise Ano-Liso }
 annamargaret_female = { Anne-Margrete Anne-Mette }
 annamaria_female = { Anna-Vari Annemarie Anne-Marie Annemie Annemieke Ano-Mar_i_grv_o }
 annasophia_female = { Ano-Souf_i_grv_o }
@@ -62,7 +62,7 @@ carmen_female = { Carmen Carmina }
 carolina_female = { Carolina Caroline Caroulino Karoline }
 cassandra_female = { Cassandro }
 catherine_female = { Carina Catarino Catharina Karen Kari Karin Karina Karine Katell Katharina Katja Katrin Katrine Nienke Trijntje Trine }
-cecilia_female = { Cecilia Cecilie Cecilo Cilly Silje Silke Sille Sisse }
+cecilia_female = { Cecilia Cecilie Cecilo Cilly Silje Silke Sille Sisse Sissel }
 celestina_female = { Celestino_female Celesto_female }
 celia_female = { Celi_a_grv_ }
 celine_female = { C_e_act_line Celino Selina }
@@ -99,7 +99,7 @@ elisa_female = { Elisa Elise Eliso }
 elizabeth_female = { Bab_e_grv_u_female Babette Bettina Eisab_e_grv_u Elesbed Elisabet Elisabeth Elizabeth Elsbeth Elsebeth Liesel Lill Lis Lisbeth Lisette Liz Lizzie }
 elizabethcharlotte_female = { Liselotte }
 elodie_female = { _E_act_lodie Eloud_i_grv_o }
-elsa_female = { Els_a_grv_ Else Ilse }
+elsa_female = { Els_a_grv_ Elsa Else Ilse }
 elvira_female = { Elvira }
 emeline_female = { Emelino }
 emerald_female = { Esmeraudo }
@@ -338,7 +338,7 @@ thekla_female = { Thekla }
 theodora_female = { Theodora }
 theodorica_female = { Dirkje }
 theresa_female = { Ter_e_grv_so Terese Tess Tessa Theresa Therese Theresia }
-thora_female = { Tone Tonje }
+thora_female = { Tone Tonje Torny }
 thorfrid_female = { Tove Turid }
 ulrika_female = { Ulrike }
 ursula_female = { Oursulo Ursel Ursula }

common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -24,42 +24,44 @@ alan_male = { Alain Alan Allan }
 albanus_male = { Alban Auban }
 albert_male = { Adalbert Albert Albertus Alberzh Albrecht Albyrt Aubert }
 albinus_male = { Aubin }
+alex_male = { Alyks }
 alexander_male = { Aleissandre Aleksander Aleksandr Alexander Alexandre Alyksanddyr Sander }
 alexis_male = { Al_e_grv_ssi Alexis }
 alfonso_male = { Alfons Alphonse Anfous }
-alfred_male = { Alfred Alfret }
+alfred_male = { Alffrydd Alfred Alfret }
 ali_male = { Ali Aly }
 amabilus_male = { Amable }
 amadeus_male = { Am_e_act_d_e_act_e Amadi_e_act_u Gottlob }
 amalric_male = { Amaudri Amaury }
 amatus_male = { Amat }
-ambrosius_male = { Ambr_o_grv_si }
+ambrosius_male = { Ambr_o_grv_si Ambrosyws }
 amin_male = { Amine Elamine }
 amir_male = { Amir }
 anatolius_male = { Anat_o_grv_li Anatol }
-andrew_male = { Anders Andr_e_act_ Andreas Andri_e_act_u Andries }
+andrew_male = { Anddryw Anders Andr_e_act_ Andreas Andri_e_act_u Andries }
 angel_male = { Ael Ange }
 anselm_male = { Ans_e_grv_ume }
-anthony_male = { Ant_o_grv_ni Anthonie Anthonius Anthony Antoine Anton Antonie Antonius Antoon T_o_grv_ni Teun Teunis }
+anthony_male = { Anfony Ant_o_grv_ni Anthonie Anthonius Anthony Antoine Anton Antonie Antonius Antoon T_o_grv_ni Teun Teunis }
 antoninus_male = { Antounin }
 anwar_male = { Anouar }
+archibald_male = { Arkyballdd }
 aristides_male = { Aristido }
 arne_male = { Anne_male Are Arne }
-arnold_male = { Aart Arend Arnaud Arnault Arno Arnold Arnoldus Arnoud }
+arnold_male = { Aart Arend Arnaud Arnault Arno Arnold Arnoldus Arnolldd Arnoud }
 arnulf_male = { Arnulf }
 arsenius_male = { Arsena }
-arthur_male = { _A_grv_rtus Arthur }
+arthur_male = { _A_grv_rtus Arfur Arthur }
 aryeh_male = { Arie }
 asbjorn_male = { Asbj_o_stk_rn Espen }
 asgeir_male = { Eske }
 augustine_male = { Agustin Augustinus }
-augustus_male = { Aguste August }
+augustus_male = { Aguste August Awgustws }
 aurelian_male = { Aurelian }
-axel_male = { Assel Axel }
+axel_male = { Aksel Assel Axel }
 ayman_male = { Aymen }
 aziz_male = { Anziz Aziz }
 badruddin_male = { Badroudine }
-baldwin_male = { Baudouin }
+baldwin_male = { Balddwyn Baudouin }
 balthazar_male = { Balthasar }
 baptist_male = { Batisto }
 barnaby_male = { Barnab_e_grv_u }
@@ -67,8 +69,9 @@ bartholomew_male = { Bart Barth_e_act_l_e_act_my Bartholom_a_uml_us Bartoumi_e_a
 bashir_male = { B_e_act_chir }
 basil_male = { Basile }
 bassam_male = { Bassem }
-benedict_male = { Bendt Benead Benedikt Benet Benezet Beno_i_hat_t Bent }
-benjamin_male = { Ben Benjamin }
+bedivere_male = { Byddywyyry }
+benedict_male = { Bendiks Bendt Benead Benedikt Benet Benezet Beno_i_hat_t Bent }
+benjamin_male = { Ben Benjamin Bynjamyn }
 berengar_male = { B_e_act_renger Berengui_e_act_ }
 bernard_male = { Berend Bernard Bernardus Bernat Bernhard Bernhardt Bernez }
 bert_male = { Bertus }
@@ -78,6 +81,7 @@ birger_male = { B_o_stk_rge }
 bjorn_male = { Bj_o_stk_rn Bj_o_stk_rner Bj_o_uml_rn Bjarne }
 blasius_male = { Bl_a_grv_si }
 boniface_male = { Bounif_a_grv_ci }
+brandon_male = { Branddon }
 brendan_male = { Brand_a_grv_ni Brendan }
 brian_male = { Brian Bryan }
 brice_male = { Bres }
@@ -98,7 +102,7 @@ chakrabarti_male = { Chacrabarty Shakrabarty }
 charles_male = { Carl Carle Charle Charles Charlez Karel Karl }
 charleshenry_male = { Carle-Enri Karlheinz }
 christian_male = { Carsten Christiaan Christian Christianus Crestian Karsten Kresten Kristen_male Kristian }
-christopher_male = { Christoffer Christoph Christophe Crist_o_grv_u Kristof Kristoffer }
+christopher_male = { Christoffer Christoph Christophe Christopher Crist_o_grv_u Kristof Kristoffer }
 claudius_male = { Claude_male Claudius Gl_a_grv_udi Glaoda Klaod }
 clement_male = { Cl_e_act_ment Clem_e_grv_nt Clemens Klement }
 clovis_male = { Clouvis Clovis }
@@ -113,16 +117,17 @@ cyprian_male = { Ciprian }
 cyril_male = { Cerile Cyril Cyrille }
 cyrus_male = { Cyrus }
 damian_male = { Damian Damien }
-daniel_male = { Daan Dani_e_grv_ Dani_e_uml_l Daniel Danny }
-david_male = { D_a_grv_vi David Davy Dewi Divi }
+daniel_male = { Daan Dani_e_grv_ Dani_e_uml_l Daniel Danny Ddanyyl }
+darius_male = { Ddaryus }
+david_male = { D_a_grv_vi David Davy Ddawyydd Dewi Divi }
 denis_male = { Danis Denez Denis Dennis }
 desiderius_male = { Deidi_e_act_ Didier }
 dimitri_male = { Dem_e_grv_tri Dimitri }
-dominic_male = { Dominik Dominique_male Doumenge }
+dominic_male = { Ddwmynyk Dominik Dominique_male Doumenge }
 dorian_male = { Dourian }
 eberhard_male = { Eberhard Evert }
-edmund_male = { Edmond Edmound Edmund }
-edward_male = { _E_act_douard Audouard Edouard Eduard Edvard Edward }
+edmund_male = { Eddmundd Edmond Edmound Edmund }
+edward_male = { _E_act_douard Audouard Eddwardd Edouard Eduard Edvard Edward }
 edwin_male = { Edwin }
 egbert_male = { Egbert }
 ekkehard_male = { Eike Ekkehard }
@@ -140,6 +145,7 @@ ernest_male = { Ernest Ernst }
 erwin_male = { Erwein Erwin }
 eugene_male = { _E_act_ug_e_grv_ni Eugen Eujen }
 eustace_male = { Eustache }
+eystein_male = { _O_stk_ystein }
 eyvind_male = { _O_stk_yvind Even Eyvind }
 fabian_male = { Fabian }
 fabrice_male = { Fabrice }
@@ -414,11 +420,13 @@ theobald_male = { Tepot Theobald Tibaud }
 theodore_male = { Teoudor Theodor Theodorus }
 theodoric_male = { Derk Dieter Dietrich Dirk Terris Thierry }
 theophilus_male = { Teoufile Theophil }
-thomas_male = { Thomas Tom Tomaz Toumas }
+thomas_male = { Thomas Tom Tomas Tomaz Toumas }
 thor_male = { Thor Tor }
 thorbjorn_male = { Thorbj_o_stk_rn Torben Torbj_o_stk_rn }
-thorgeir_male = { Terje Torgjer Toke }
+thorgeir_male = { Terje Torgeir Torgjer Toke }
 thorgils_male = { Troels }
+thorleif_male = { Tollef }
+thorir_male = { Thore Tore }
 thorstein_male = { Thorsten Torstein }
 tiberius_male = { Tiberius }
 timothy_male = { Tim Timouti_e_act_u }

common/culture/name_lists/NEOW_norwegian.txt

@@ -208,61 +208,64 @@
 	
 	male_names = {
 		3 = {
-			_O_stk_yvind 
+			_A_rng_smund 
+			_O_stk_ystein _O_stk_yvind 
 			Alexander Alf Anders Andreas Arne Atle Aud 
-			Bj_o_stk_rn 
+			Bj_o_stk_rn Bjarne 
 			Christian 
 			Dag Daniel 
-			Einar Eirik Erik Erling Espen 
+			Egil Einar Eirik Erik Erling Espen 
 			Finn Fredrik Frode 
 			Geir Gunnar 
 			H_a_rng_kon H_a_rng_vard Hans Harald Helge Henrik 
-			Ivar 
-			J_o_stk_rgen Jan Johan John Jon 
-			K_a_rng_re Kai Karl Kim Kjell Knut Kristian 
+			Inge Ivar 
+			J_o_stk_rgen J_o_stk_rn Jan Jens Johan John Jon 
+			K_a_rng_re Kai Karl Kenneth Kim Kjell Knut Kristian 
 			Lars Leif 
 			Magne Magnus Marius Martin Morten 
-			Odd Ola Olav Ole 
+			Odd Ola Olav Ole Ove 
 			P_a_rng_l Per Petter 
-			Reidar Roar Rolf Rune 
-			Stian Stig Svein Sverre 
+			Reidar Roar Roger Rolf Rune 
+			Steinar Stian Stig Svein Sverre 
 			Terje Thomas Tom Tor Torbj_o_stk_rn Tore Trond Trygve 
 			Vidar 
 		}
 		2 = {
-			Aage Adrian Aleksander Amund Andr_e_act_ Are Asmund 
-			Benjamin Bj_o_stk_rnar 
-			Christoffer 
+			Aage Adrian Aksel Aleksander Amund Andr_e_act_ Are 
+			B_o_stk_rge Benjamin Bent Bj_o_stk_rnar 
+			Carl Christoffer Christopher 
 			Dagfinn 
 			Edvard Emil Erlend Even 
 			Fritz 
 			Gudmund 
-			Haakon Harry Hermann 
-			Ingolf 
-			Jarl Jo Joakim Jonas 
+			Haakon Hallgeir Harry Hermann 
+			Ingolf Ingvald 
+			Jakob Jarl Jesper Jo Joakim Johannes Jonas 
 			Kristoffer 
-			Ludvig 
+			Lasse Ludvig 
 			Markus Mathias Mats Morgan 
 			Olaf Oskar Ottar 
 			Ragnvald Remi Robin 
 			Sebastian Sigurd Simen Simon Sindre Sondre Stefan Steffen Sveinung 
-			Thorbj_o_stk_rn Tobias Torstein 
+			Thorbj_o_stk_rn Thore Tobias Tomas Torgeir Torstein 
 			Ulf 
 			Vegard 
+			Yngve 
 		}
 		1 = {
 			August 
-			Bj_o_stk_rnstjerne Brand 
+			Bendiks Bj_o_stk_rnstjerne Brand Bror 
 			Fridtjof 
-			Haagen 
+			H_a_rng_rek Haagen 
 			Ingebrigt Isak 
-			Jon-Hermann 
+			Jon-Hermann Julius 
 			Lodve 
 			Nicolay Nikolas 
 			Oddvard Odin 
-			Rolf-Erik 
-			Sander Severin 
-			Torgjer 
+			Per-Kristian 
+			Rikard Rolf-Erik 
+			Sander Severin Sigvald 
+			Tollef Torgjer 
 			Vetle Viking 
 		}
 	}
@@ -279,31 +282,31 @@
 			Jorunn 
 			Kari Karin Kristin Kristine 
 			Laila Lene Linda Line Linn Lise Liv 
-			Maria Marianne Marie Marit Mary May Mette Mona Monica 
+			Maria Marianne Marie Marit Mary May Merete Mette Mona Monica 
 			Nina 
-			Ragnhild Randi Rita Ruth 
-			Signe Silje Siri Solveig Stine Synn_o_stk_ve 
+			Ragnhild Randi Reidun Rita Ruth 
+			Signe Sigrid Silje Siri Sissel Siv Solveig Stine Synn_o_stk_ve 
 			Tone Torill Tove Turid 
 			Vibeke 
 			Wenche 
 		}
 		2 = {
 			_A_rng_got 
-			Agnes Andrea Anniken Astri 
+			Agnes Andrea Ane Annelise Anniken Astri 
 			Beate Bergljot Borghild 
 			Cecilia Christina Christine 
-			Eirin Elisabet Emilie Emma Erna 
+			Eirin Elisabet Elise Elsa Emilie Emma Erna 
 			Frida 
 			Gudrun Gunhild 
 			Harriet Helen Hj_o_stk_rdis 
 			Ingebj_o_stk_rg Ingvild Iren 
 			Jannicke Jeanette Jenny Julia Julie 
-			Karoline Katrine Kirsti  
+			Karoline Katrine Kirsti Kjellaug 
 			Lill 
-			Malin Margit Mariann Marlene Marta Marte Marthe Monika 
+			Magnhild Malin Margit Margrethe Mariann Marlene Marta Marte Marthe Monika 
 			Nora 
-			Oda Olga 
-			Ranveig 
+			Oda Oddbj_o_stk_rg Olga 
+			Ranveig Rigmor 
 			Sara Sigrun Sofie Sonja Sunniva Sylvia Syn_o_stk_ve 
 			Thea Tonje 
 		}
@@ -315,15 +318,16 @@
 			Isalill 
 			Karita 
 			May-Helen Mimmi Mirell 
-			Ragni Rikard 
+			Ragni 
 			Sanna 
+			Torny 
 			Ursula 
-			Valgerd Veslem_o_stk_y Vilde 
+			Valgerd Veslem_o_stk_y Vilde Vivild 
 			Wencke 
 			Ylva 
 		}
 	}
-	dynasty_of_location_prefix = "dynnp_af"
+	dynasty_of_location_prefix = "dynnp_av"
 	
 	patronym_suffix_male = "dynnpat_suf_sen"
 	patronym_suffix_female = "dynnpat_suf_sdatter"