merge

N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt

@@ -25236,7 +25236,7 @@ b_wycombe = {
 	}
 }
 
-b_meneith = {
+b_menteith = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"
 	color2 = "red"

N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt

@@ -1655,7 +1655,7 @@ d_channel_islands={
 }
 
 
-d_stratclyde={
+d_strathclyde={
 	pattern="pattern_horizontal_split_01.dds"
 	color1=blue
 	color2=red

N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -104,7 +104,7 @@ david_male = { D_a_grv_vi David Davy Dewi Divi }
 denis_male = { Danis Denez Denis }
 desiderius_male = { Deidi_e_act_ Didier }
 dimitri_male = { Dem_e_grv_tri Dimitri }
-dominic_male = { Dominique_male Doumenge }
+dominic_male = { Dominik Dominique_male Doumenge }
 dorian_male = { Dourian }
 eberhard_male = { Eberhard }
 edmund_male = { Edmond Edmound Edmund }
@@ -137,7 +137,7 @@ fidel_male = { Fidelis }
 firmin_male = { Fermin }
 flavian_male = { Flavian }
 florent_male = { Flour_e_grv_ns }
-florian_male = { Flourian }
+florian_male = { Florian Flourian }
 francis_male = { Chichoues Fa_n_tld_ch Fra_n_tld_sez Franc_e_act_s Francoun Frank Franz }
 francisxavier_male = { Franc_e_act_s-Savi_e_act_ }
 frederick_male = { Frederi Frederig Frieder Friedrich Fritz }
@@ -201,7 +201,7 @@ jeremy_male = { Jerem_i_grv_a }
 jesus_male = { Issa }
 joachim_male = { Joachim Jochen Jouachin }
 joel_male = { Jou_e_grv_l }
-john_male = { Hannes Hans Ian Jan Janick Jannick Jaouen Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann }
+john_male = { Hannes Hans Ian Jan Janick Jannick Jaouen Johannes Yan Yann Yannick Yannig Yoan Yoann Yohan Yohann }
 johnbaptist_male = { Jan-Batisto Johann_spc_Baptist Yann-Vadezour }
 johnbernard_male = { Jan-Bernat }
 johncharles_male = { Jan-Carle Yann-Charlez }
@@ -246,14 +246,14 @@ lambert_male = { Lambert Lamprecht }
 latif_male = { Latuf }
 lawrence_male = { Laora_n_tld_s Laur_e_grv_ns Lorenz }
 lenaig_male = { L_e_act_na_i_uml_c Lenaig }
-leo_male = { Leon Leoun }
+leo_male = { Leo Leon Leoun }
 leonard_male = { Lienard Lienhardt }
 leopold_male = { Leopold Leoupold }
 lionel_male = { Lionel Liounel }
 lothar_male = { Clotaire Lothar }
 louis_male = { Aloys Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Loeiz Lou_i_uml_s Ludwig Luis }
 lucian_male = { Lucian Lucien }
-luke_male = { Lu Lucas }
+luke_male = { Lu Lucas Lukas }
 lutfi_male = { Lotfi }
 mael_male = { Ma_e_uml_l Ma_e_uml_lan Mael }
 mahdi_male = { Medhi Mehdi }
@@ -287,7 +287,7 @@ naim_male = { Na_i_uml_m }
 najib_male = { N_e_act_jib }
 nasr_male = { Nasser Nassur }
 nathan_male = { Natan }
-nicholas_male = { Klaus Nicoulau Nikolaus Nikolaz }
+nicholas_male = { Klaus Nicoulau Niklas Nikolaus Nikolaz }
 noah_male = { Nou_e_grv_ }
 noel_male = { Calendau }
 norbert_male = { Norbert Nourbert }
@@ -316,7 +316,7 @@ qasim_male = { Kassim }
 quentin_male = { Quentin }
 rafiq_male = { Rafik }
 ragnar_male = { Rainer }
-raphael_male = { Raf_e_grv_u }
+raphael_male = { Raf_e_grv_u Raphael }
 rashid_male = { Rachid }
 raoul_male = { Ravous }
 rauf_male = { Raouf }
@@ -344,14 +344,14 @@ said_male = { Sa_i_uml_d }
 salim_male = { Salim Selim Slim }
 salvador_male = { Sauvaire }
 samir_male = { Samir }
-samuel_male = { Samu_e_grv_l }
+samuel_male = { Samu_e_grv_l Samuel }
 sebastian_male = { Bastian Sebastian }
 sergius_male = { S_e_grv_rgi Serj }
 severinus_male = { Severin }
 shamsuddin_male = { Chems-Eddine }
 shaykh_male = { Cheikh }
 siegfried_male = { Siegfried }
-simon_male = { Simoun }
+simon_male = { Simon Simoun }
 solomon_male = { Slimane Souleymane }
 stanislaus_male = { Estanislau }
 stephen_male = { _E_act_tienne Est_e_grv_ve Estefan Stefan Stephan Steven }

N3OW/common/culture/name_lists/NEOW_bavarian.txt

@@ -2,7 +2,9 @@ name_list_bavarian_wip = {
 
 	cadet_dynasty_names = {
 		"dynn_Aigner"
+		"dynn_Anderl"
 		"dynn_Auer"
+		"dynn_Bacher"
 		"dynn_Bauer"
 		"dynn_Baumgartner"
 		"dynn_Berger"
@@ -16,19 +18,28 @@ name_list_bavarian_wip = {
 		"dynn_Edbauer"
 		"dynn_Eder"
 		"dynn_Egger"
+		"dynn_Englmeier"
+		"dynn_Esser"
+		"dynn_Ettl"
 		"dynn_Fischer"
 		"dynn_Florian"
 		"dynn_Fuchs"
 		"dynn_G_o_uml_tz"
+		"dynn_Grau"
 		"dynn_Gruber"
+		"dynn_H_o_uml_cherl"
+		"dynn_H_o_uml_sl"
 		"dynn_Haas"
 		"dynn_Haider"
+		"dynn_Haingartner"
 		"dynn_Hartmann"
+		"dynn_Hinterdorfer"
 		"dynn_Hofer"
 		"dynn_Hoffmann"
 		"dynn_Hofmann"
 		"dynn_Holzer"
 		"dynn_Jetz"
+		"dynn_Kienberger"
 		"dynn_Kienzl"
 		"dynn_Klein"
 		"dynn_Koller"
@@ -38,8 +49,10 @@ name_list_bavarian_wip = {
 		"dynn_Lechner"
 		"dynn_Lehner"
 		"dynn_Leitner"
+		"dynn_Lenger"
 		"dynn_Lichtinger"
 		"dynn_Liebl"
+		"dynn_Lobnik"
 		"dynn_M_u_uml_ller"
 		"dynn_Maier"
 		"dynn_Mair"
@@ -48,21 +61,36 @@ name_list_bavarian_wip = {
 		"dynn_Mayr"
 		"dynn_Meier"
 		"dynn_Meyer"
+		"dynn_Moll"
 		"dynn_Moser"
+		"dynn_Napetschnig"
 		"dynn_Pichler"
 		"dynn_Pickl"
 		"dynn_Probst"
+		"dynn_Rath"
+		"dynn_Reichhold"
 		"dynn_Reiter"
 		"dynn_Riegler"
+		"dynn_Ruber"
+		"dynn_Sattler"
+		"dynn_Sch_o_uml_tz"
+		"dynn_Schiffer"
 		"dynn_Schmid"
 		"dynn_Schmidt"
 		"dynn_Schmitt"
 		"dynn_Schneider"
 		"dynn_Schuster"
 		"dynn_Schwarz"
+		"dynn_Soller"
 		"dynn_Stadler"
+		"dynn_Stefitz"
 		"dynn_Steiner"
+		"dynn_Strahlhofer"
 		"dynn_Strasser"
+		"dynn_Tafeit"
+		"dynn_Unger"
+		"dynn_Visotschnig"
+		"dynn_Waas"
 		"dynn_Wagner"
 		"dynn_Wallner"
 		"dynn_Weber"
@@ -72,9 +100,138 @@ name_list_bavarian_wip = {
 		"dynn_Winkler"
 		"dynn_Winter"
 		"dynn_Wolf"
+		"dynn_Zirngibl"
 	}
 	
 	dynasty_names = {
+		"dynn_Aigner"
+		"dynn_Anderl"
+		"dynn_Auer"
+		"dynn_Bacher"
+		"dynn_Bauer"
+		"dynn_Baumgartner"
+		"dynn_Berger"
+		"dynn_Bergmann"
+		"dynn_Binder"
+		"dynn_Braun"
+		"dynn_Brunner"
+		"dynn_Busl"
+		"dynn_Dobmeier"
+		"dynn_Ebner"
+		"dynn_Edbauer"
+		"dynn_Eder"
+		"dynn_Egger"
+		"dynn_Englmeier"
+		"dynn_Esser"
+		"dynn_Ettl"
+		"dynn_Fischer"
+		"dynn_Florian"
+		"dynn_Fuchs"
+		"dynn_G_o_uml_tz"
+		"dynn_Grau"
+		"dynn_Gruber"
+		"dynn_H_o_uml_cherl"
+		"dynn_H_o_uml_sl"
+		"dynn_Haas"
+		"dynn_Haider"
+		"dynn_Haingartner"
+		"dynn_Hartmann"
+		"dynn_Hinterdorfer"
+		"dynn_Hofer"
+		"dynn_Hoffmann"
+		"dynn_Hofmann"
+		"dynn_Holzer"
+		"dynn_Jetz"
+		"dynn_Kienberger"
+		"dynn_Kienzl"
+		"dynn_Klein"
+		"dynn_Koller"
+		"dynn_Kranz"
+		"dynn_Kraus"
+		"dynn_Lang"
+		"dynn_Lechner"
+		"dynn_Lehner"
+		"dynn_Leitner"
+		"dynn_Lenger"
+		"dynn_Lichtinger"
+		"dynn_Liebl"
+		"dynn_Lobnik"
+		"dynn_M_u_uml_ller"
+		"dynn_Maier"
+		"dynn_Mair"
+		"dynn_Maurer"
+		"dynn_Mayer"
+		"dynn_Mayr"
+		"dynn_Meier"
+		"dynn_Meyer"
+		"dynn_Moll"
+		"dynn_Moser"
+		"dynn_Napetschnig"
+		"dynn_Pichler"
+		"dynn_Pickl"
+		"dynn_Probst"
+		"dynn_Rath"
+		"dynn_Reichhold"
+		"dynn_Reiter"
+		"dynn_Riegler"
+		"dynn_Ruber"
+		"dynn_Sattler"
+		"dynn_Sch_o_uml_tz"
+		"dynn_Schiffer"
+		"dynn_Schmid"
+		"dynn_Schmidt"
+		"dynn_Schmitt"
+		"dynn_Schneider"
+		"dynn_Schuster"
+		"dynn_Schwarz"
+		"dynn_Soller"
+		"dynn_Stadler"
+		"dynn_Stefitz"
+		"dynn_Steiner"
+		"dynn_Strahlhofer"
+		"dynn_Strasser"
+		"dynn_Tafeit"
+		"dynn_Unger"
+		"dynn_Visotschnig"
+		"dynn_Waas"
+		"dynn_Wagner"
+		"dynn_Wallner"
+		"dynn_Weber"
+		"dynn_Wei_ss_"
+		"dynn_Wieser"
+		"dynn_Wimmer"
+		"dynn_Winkler"
+		"dynn_Winter"
+		"dynn_Wolf"
+		"dynn_Zirngibl"
 	}
 	
+	male_names = {
+		2 = {
+			Alexander Andreas Anton 
+			Daniel David 
+			Florian 
+			Horst 
+			Jakob Johannes 
+			Ludwig 
+			Martin Max Michael 
+			Paul Philipp 
+			Reinhold 
+			Sebastian 
+			Tobias 
+		}
+		1 = {
+			Benedikt Benjamin 
+			Dominik 
+			Elias Emil 
+			Fabian Felix 
+			Jonas 
+			Leo Leon Lukas 
+			Marcel Maximilian Moritz 
+			Niklas 
+			Oskar 
+			Raphael 
+			Samuel Simon 
+			Valentin 
+		}
 }

N3OW/common/province_terrain/01_province_properties.txt

@@ -901,7 +901,7 @@
 1696 ={
 	winter_severity_bias = 0.55
 }
-# b_meneith 
+# b_menteith 
 1697 ={
 	winter_severity_bias = 0.55
 }
@@ -8956,7 +8956,7 @@
 	winter_severity_bias = 0.80
 }
 ## c_shetland 
-# b_scalloway 
+# b_lerwick 
 7 ={
 	winter_severity_bias = 0.80
 }

N3OW/history/characters/NEOW_e_britannia.txt

@@ -1582,7 +1582,7 @@ britannia_duns_john = {
 britannia_chatain_coiseam = {
 	name = "Còiseam"
 	dynasty = dynn_britannia_chatain
-	religion = "presbyterian"
+	religion = "old_thelema"
 	culture = gaelic
 	trait = education_diplomacy_4
 	trait = patient

N3OW/history/provinces/e_britannia.txt

@@ -211,7 +211,7 @@
 ###c_gloucestershire
 1580 = {
 	culture = prytoneg
-	religion = arcane
+	religion = avalonian
 	holding = castle_holding
 	767.1.1 = {
 	special_building = dean_mines_01
@@ -287,7 +287,7 @@
 ###c_kent
 1502 = {
 	culture = soueyrneg
-	religion = anglican_england
+	religion = victorian
 	holding = castle_holding
 	1066.1.1 = {
 	buildings = {
@@ -335,7 +335,7 @@
 ###c_sussex
 1506 = {
 	culture = soueyrneg
-	religion = old_thelema
+	religion = victorian
 	holding = castle_holding
 }
 1507 = {
@@ -389,7 +389,7 @@
 ###c_wiltshire
 1561 = {
 	culture = souflander
-	religion = avalonian
+	religion = arcane
 	holding = castle_holding
 	2.1.1 = {
 	special_building = stonehenge_01
@@ -568,7 +568,7 @@
 ###c_cumberland
 1635 = {
 	culture = strafclideg
-	religion = old_thelema
+	religion = victorian
 	holding = castle_holding
 	122.1.1 = {
 	special_building = hadrians_wall_01
@@ -589,7 +589,7 @@
 ###c_westmorland
 1637 = {
 	culture = scouseg
-	religion = victorian
+	religion = anglican_england
 	holding = castle_holding
 }
 1638 = {
@@ -661,7 +661,7 @@
 ###c_richmond
 1598 = {
 	culture = norflander
-	religion = old_thelema
+	religion = anglican_england
 	holding = castle_holding
 }
 1500 = {
@@ -670,7 +670,7 @@
 ###c_east_riding
 1588 = {
 	culture = norflander
-	religion = old_thelema
+	religion = anglican_england
 	holding = castle_holding
 }
 1589 = {
@@ -700,7 +700,7 @@
 ###c_doncaster
 1592 = {
 	culture = norflander
-	religion = old_thelema
+	religion = anglican_england
 	holding = city_holding
 }
 1594 = {
@@ -918,7 +918,7 @@
 ###c_warwickshire
 1603 = {
 	culture = prytoneg
-	religion = victorian
+	religion = arcane
 	holding = castle_holding
 }
 1604 = {
@@ -945,7 +945,7 @@
 ###c_sir_faesyfed
 1661 = {
 	culture = prytoneg
-	religion = anglican_england
+	religion = avalonian
 	holding = castle_holding
 }
 1662 = {
@@ -1100,7 +1100,7 @@
 ###c_angus
 1720 = {
 	culture = scottish
-	religion = presbyterian
+	religion = old_thelema
 	holding = tribal_holding
 }
 1721 = {
@@ -1109,7 +1109,7 @@
 1719 = {
 	holding = none
 }
-##d_stratclyde
+##d_strathclyde
 ###c_lennox
 1695 = {
 		holding = castle_holding
@@ -1117,7 +1117,7 @@
 1696 = {
 	holding = city_holding
 	culture = strafclideg
-	religion = victorian
+	religion = old_thelema
 }
 1697 = {
 	holding = castle_holding
@@ -1125,7 +1125,7 @@
 ###c_ayrshire
 1686 = {
 	culture = strafclideg
-	religion = victorian
+	religion = old_thelema
 	holding = castle_holding
 }
 1687 = {
@@ -1327,7 +1327,7 @@
 ###c_teviotdale
 1677 = {
 	culture = scottish
-	religion = old_thelema
+	religion = victorian
 	holding = castle_holding
 }
 1678 = {

N3OW/history/provinces/e_germany.txt

@@ -16,7 +16,7 @@
 ###c_schwerin
 2808 = {
 	culture = NEOW_pomeranian
-	religion = volksmarchen
+	religion = lutheran
 	holding = none
 	1050.1.1 = {
 	holding = city_holding
@@ -475,7 +475,7 @@
 	holding = castle_holding
 	1120.1.1 = {
 	culture = low_saxon
-	religion = volksmarchen
+	religion = lutheran
 	}
 }
 2894 = {
@@ -1236,7 +1236,7 @@
 	#holding = castle_holding
 	#}
 	1178.1.1 = {
-	religion = heimwehler
+	religion = volksmarchen
 	}
 }
 3028 = {
@@ -1258,7 +1258,7 @@
 3027 = {
 	holding = tribal_holding
 	culture = saxon
-	religion = heimwehler
+	religion = volksmarchen
 }
 3035 = {
 	holding = none

N3OW/history/provinces/e_scandinavia.txt

@@ -970,7 +970,7 @@
 ###c_fyn
 65 = {
 	culture = dansk
-	religion = nobelian
+	religion = lutheran
 	holding = tribal_holding
 	988.1.1 ={
 	holding = castle_holding
@@ -1005,7 +1005,7 @@
 ###c_aarhus
 57 = {
 	culture = dansk
-	religion = grundtvigian
+	religion = lutheran
 	holding = castle_holding
 }
 58 = {
@@ -1038,7 +1038,7 @@
 	holding = tribal_holding
 	965.1.1 = {
 	culture = dansk
-	religion = lutheran
+	religion = grundtvigian
 	holding = castle_holding
 	}
 }
@@ -1131,7 +1131,7 @@
 ###c_ribe
 60 = {
 	culture = slesvigsk
-	religion = grundtvigian
+	religion = lutheran
 	holding = castle_holding
 	1066.1.1 = {
 	buildings = {

N3OW/history/titles/k_scotland.txt

@@ -9,7 +9,7 @@
 #	}
 #}
 
-d_stratclyde = {
+d_strathclyde = {
 	2540.1.1 = {
 		holder = britannia_wall_williaim # Williaim Wall
 		government = administrative_government

N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml

@@ -446,7 +446,15 @@
  dynn_Lahm:0 "Lahm"
  dynn_Mann:0 "Mann"
  dynn_Gruber:0 "Gruber"
+ dynn_Ruber:0 "Ruber"
  dynn_Pichler:0 "Pichler"
+ dynn_Ettl:0 "Ettl"
+ dynn_H_o_uml_cherl:0 "Höcherl"
+ dynn_Sch_o_uml_tz:0 "Schötz"
+ dynn_Sattler:0 "Sattler"
+ dynn_Unger:0 "Unger"
+ dynn_Hinterdorfer:0 "Hinterdorfer"
+ dynn_Strahlhofer:0 "Strahlhofer"
  dynn_Moser:0 "Moser"
  dynn_Steiner:0 "Steiner"
  dynn_Berger:0 "Berger"
@@ -454,6 +462,9 @@
  dynn_J_a_uml_ger:0 "Jäger"
  dynn_Werndl:0 "Werndl"
  dynn_Lechge:0 "Lechge"
+ dynn_Lenger:0 "Lenger"
+ dynn_Schiffer:0 "Schiffer"
+ dynn_Soller:0 "Soller"
  dynn_Wendlenger:0 "Wendlenger"
  dynn_Br_u_uml_derle:0 "Brüderle"
  dynn_Pfeiffer:0 "Pfeiffer"
@@ -505,6 +516,9 @@
  dynn_Baumgartner:0 "Baumgartner"
  dynn_Brunner:0 "Brunner"
  dynn_Wallner:0 "Wallner"
+ dynn_Lobnik:0 "Lobnik"
+ dynn_Stefitz:0 "Stefitz"
+ dynn_Waas:0 "Waas"
  dynn_Waldman:0 "Waldman"
  dynn_Nguyen_dsh_Bloch:0 "Nguyen-Bloch"
  dynn_Hastenteufel:0 "Hastenteufel"
@@ -552,6 +566,7 @@
  dynn_Eisenhardt:0 "Eisenhardt"
  dynn_Els_a_uml_sser:0 "Elsässer"
  dynn_Engelsing:0 "Engelsing"
+ dynn_Rath:0 "Rath"
  dynn_Erath:0 "Erath"
  dynn_Ettwein:0 "Ettwein"
  dynn_Exle:0 "Exle"
@@ -562,6 +577,7 @@
  dynn_Federolf:0 "Federolf"
  dynn_Feifel:0 "Feifel"
  dynn_Fischer:0 "Fischer"
+ dynn_Kienberger:0 "Kienberger"
  dynn_Fodi:0 "Fodi"
  dynn_Frank:0 "Frank"
  dynn_Frey:0 "Frey"
@@ -850,3 +866,15 @@
  dynn_bookwyrm:0 "Bookwyrm"
  dynn_cool:0 "Cúchulainn"
  dynn_rostagnac:0 "Rostagnac"
+ dynn_Bacher:0 "Bacher"
+ dynn_Zirngibl:0 "Zirngibl"
+ dynn_Esser:0 "Esser"
+ dynn_Haingartner:0 "Haingartner"
+ dynn_Grau:0 "Grau"
+ dynn_Tafeit:0 "Tafeit"
+ dynn_Reichhold:0 "Reichhold"
+ dynn_Moll:0 "Moll"
+ dynn_Anderl:0 "Anderl"
+ dynn_Englmeier:0 "Englmeier"
+ dynn_Napetschnig:0 "Napetschnig"
+ dynn_Visotschnig:0 "Visotschnig"

N3OW/localization/english/names/NEOW_character_names_l_english.yml

@@ -1735,3 +1735,8 @@
  Veruschka:0 "Veruschka"
  Wera:0 "Wera"
  Wilhelmine:0 "Wilhelmine"
+ Florian:0 "Florian"
+ Lukas:0 "Lukas"
+ Simon:0 "Simon"
+ Dominik:0 "Dominik"
+ Niklas:0 "Niklas"

N3OW/localization/english/titles_cultural_names_l_english.yml

@@ -56,6 +56,64 @@
  cn_gaerfyrddin:0 "Gaerfyrddin"
  cn_rhydaman:0 "Rhydaman"
  cn_sir_gaerfyrddin:0 "Sir Gaerfyrddin"
+ # Pembrokeshire
+ cn_aberdaugleddau:0 "Aberdaugleddau"
+ cn_abergwaun:0 "Abergwaun"
+ cn_hwlffordd:0 "Hwlffordd"
+ cn_sir_benfro:0 "Sir Benfro"
+ ## Gwent/Morgwent
+ # Monmouthshire/Gwent
+ cn_casnewydd:0 "Casnewydd"
+ cn_monmouthshire:0 "Monmouthshire"
+ cn_y_fenni:0 "Y Fenni"
+ # Glamorgan/Morgannwg
+ cn_abertawe:0 "Abertawe"
+ cn_bro_morgannwg:0 "Bro Morgannwg"
+ cn_caerdydd:0 "Caerdydd"
+ cn_glamorgan:0 "Glamorgan"
+ ### Scotland
+ cn_alba:0 "Alba"
+ cn_albain:0 "Albain"
+ cn_alban:0 "Alban"
+ cn_bro_skos:0 "Bro-Skos"
+ cn_scwtlandd:0 "Scwtlandd"
+ cn_yr_alban:0 "yr Alban"
+ ## Strathclyde
+ cn_srath_chluaidh:0 "Srath Chluaidh"
+ cn_ystrad_clud:0 "Ystrad Clud"
+ # Dumbarton
+ cn_d_u_grv_n_breatann:0 "Dùn Breatann"
+ cn_din_alclud:0 "Din Alclud"
+ # Ayrshire
+ cn_inbhir__a_grv_ir:0 "Inbhir Àir"
+ ## Galloway
+ cn_gall_gh_a_grv_idhealaibh:0 "Gall-Ghàidhealaibh"
+ cn_gallowa:0 "Gallowa"
+ ## Lothian
+ cn_lodainn:0 "Lodainn"
+ cn_lowden:0 "Lowden"
+ ## The Northern Isles
+ cn_na_h_eileanan_a_tuath:0 "na h-Eileanan a Tuath"
+ cn_nor_d_stk_oyar:0 "Norðoyar"
+ cn_nor_d_stk_ureyjar:0 "Norðureyjar"
+ cn_northren_isles:0 "Northren Isles"
+ # Orkney
+ cn_arcaibh:0 "Arcaibh"
+ cn_b_a_grv_gh_na_h_eaglaise:0 "Bàgh na h-Eaglaise"
+ cn_inizi_orc_pst_h:0 "Inizi Orc'h"
+ cn_inse_orc:0 "Inse Orc"
+ cn_kirkjuvogur:0 "Kirkjuvogur"
+ cn_kirkwaa:0 "Kirkwaa"
+ cn_orkneyjar:0 "Orkneyjar"
+ cn_orknoyggjar:0 "Orknoyggjar"
+ cn_ynysoedd_erch:0 "Ynysoedd Erch"
+ # Shetland
+ cn_hetland:0 "Hetland"
+ cn_hjaltland:0 "Hjaltland"
+ cn_leirv_i_act_k:0 "Leirvík"
+ cn_lerook:0 "Lerook"
+ cn_li_u_grv_rabhaig:0 "Liùrabhaig"
+ cn_sealtainn:0 "Sealtainn"
  
  cn_konstantiniyye:0 "Konstantiniyye"
  cn_konstantiniyye_adj:0 "Konstantiniyyian"
@@ -107,27 +165,8 @@
  cn_krolewiec_adj:0 "Królewiecian"
  
  # Britain
- cn_alba:0 "Alba"
- cn_alba_adj:0 "Alban"
- cn_pictland:0 "Pictland"
- cn_pictland_adj:0 "Pictish"
  cn_pictavia:0 "Pictavia"
  cn_pictavia_adj:0 "Pictavian"
- cn_gododdin:0 "Gododdin"
- cn_gododdin_adj:0 "Gododdin"
- cn_galloway:0 "Galloway"
- cn_galloway_adj:0 "Gallovidian"
- cn_alclud:0 "Alclud"
- cn_alclud_adj:0 "Alclud"
- cn_alt_clut:0 "Alt Clut"
- cn_aeron:0 "Aeron"
- cn_aeron_adj:0 "Aeron"
- cn_galwyddel:0 "Galwyddel"
- cn_galwyddel_adj:0 "Galwyddellian"
- cn_galvei:0 "Galvei"
- cn_galvei_adj:0 "Galveian"
- cn_circinn:0 "Circinn"
- cn_circinn_adj:0 "Circinn"
  cn_eryri:0 "Eryri"
  cn_eryri_adj:0 "Eryrian"
  cn_middle_seaxe:0 "Middle Seaxe"
@@ -156,11 +195,9 @@
  cn_pembroke:0 "Pembroke"
  cn_st_davids:0 "St. Davids"
  cn_fiscard:0 "Fiscard"
- cn_glamorgan:0 "Glamorgan"
  cn_cardiff:0 "Cardiff"
  cn_swansea:0 "Swansea"
  cn_caerphilly:0 "Caerphilly"
- cn_monmouthshire:0 "Monmouthshire"
  cn_caerleon:0 "Caerleon"
  cn_monmouth:0 "Monmouth"
  cn_brecknockshire:0 "Brecknockshire"
@@ -685,19 +722,6 @@
  cn_angar:0 "Angar"
  
  #Northern Isles
- cn_nordreyjar_article:0 ""
- cn_nordreyjar:0 "Norðreyjar"
- cn_nordreyjar_adj:1 "Norðreyjer"
- cn_kirkuvag:1 "Kirkjuvágr"
- cn_kirkuvag_adj:1 "Kirkjuváger"
- cn_kyrkovik:0 "Kyrkovik"
- cn_kyrkovik_adj:0 "Kyrkoviker"
- cn_icluasctreh:0 "Icluasctreh"
- cn_icluasctreh_adj:0 "Icluasctrehian"
- cn_eglwystref:0 "Eglwystref"
- cn_eglwystref_adj:0 "Eglwystrefian"
- cn_baile_na_h_eaglais:0 "Baile na h-Eaglais"
- cn_baile_na_h_eaglais_adj:0 "Baile na h-Eaglaisian"
  cn_torshavn:0 "Tórshavn"
  cn_torshavn_adj:0 "Tórshavner"
  cn_pirth_taran:0 "Pirth Taran"
@@ -706,18 +730,6 @@
  cn_porth_taran_adj:0 "Porth Taranian"
  cn_port_turenn:0 "Port Turenn"
  cn_port_turenn_adj:0 "Port Turennian"
- cn_skalavagr:0 "Skálavágr"
- cn_skalavagr_adj:0 "Skálavágrer"
- cn_bachuuon_maurt:0 "Bachuuon Maurt"
- cn_bachuuon_maurt_adj:0 "Bachuuon Maurtian"
- cn_bachwyon_mawrty:0 "Bachwyon Mawrty"
- cn_bachwyon_mawrty_adj:0 "Bachwyon Mawrtyian"
- cn_batin_mortaigh:0 "Batin Môrtaigh"
- cn_batin_mortaigh_adj:0 "Batin Môrtaighian"
- cn_hjaltland:0 "Hjaltland"
- cn_hjaltland_adj:0 "Hjaltlander"
- cn_orkneyjar:0 "Orkneyjar"
- cn_orkneyjar_adj:0 "Orkneyjer"
  
  #Finland
  cn_raseborg:0 "Raseborg"
@@ -909,43 +921,6 @@
  cn_island:0 "Ísland"
 
  #Southern Isles & Norse Scotland
- cn_katanes:0 "Katanes"
- cn_katanes_adj:0 "Katanesian"
- cn_c_katanes:0 "Katanes"
- cn_c_katanes_adj:0 "Katanesian"
- cn_vik:0 "Vík"
- cn_thorsa:0 "Þórsá"
- cn_sudrland:0 "Suðrland"
- cn_sudrland_adj:0 "Suðrlander"
- cn_hjalmundalr:0 "Hjálmundalr"
- cn_dyrnes:0 "Dýrnes"
- cn_sudreyjar_article:0 ""
- cn_sudreyjar:0 "Suðreyjar"
- cn_sudreyjar_adj:0 "Suðreyjer"
- cn_innri_sudreyjar_article:0 ""
- cn_innri_sudreyjar:0 "Innri Suðreyjar"
- cn_innri_sudreyjar_adj:0 "Inner Suðreyjer"
- cn_il:0 "Íl"
- cn_myl:0 "Mýl"
- cn_hereyjar:0 "Hereyjar"
- cn_ytri_sudreyjar_article:0 ""
- cn_ytri_sudreyjar:0 "Ytri Suðreyjar"
- cn_ytri_sudreyjar_adj:0 "Outer Suðreyjer"
- cn_skid:0 "Skíð"
- cn_ljodhus:0 "Ljóðhús"
- cn_vist_article:0 ""
- cn_vist:0 "Ívist"
- cn_argjall:0 "Argjáll"
- cn_argjall_adj:0 "Argjáler"
- cn_mylarsund:0 "Mýlarsund"
- cn_kjarbarey:0 "Kjarbarey"
- cn_lokolofni:0 "Lokolofni"
- cn_dysjarstadr:0 "Dysjarstaðr"
- cn_c_mon_article:0 ""
- cn_c_mon:0 "Mön"
- cn_c_mon_adj:0 "Manx"
- cn_ros:0 "Ros"
- cn_ros_adj:0 "Rosian"
  cn_husavik:0 "Húsavík"
  cn_husavik_adj:0 "Húsavíki"
  
@@ -980,10 +955,6 @@
  cn_penfro_adj:0 "Penfroan"
  cn_tyddewi:0 "Tyddewi"
  cn_tyddewi_adj:0 "Tyddewian"
- cn_abergwaun:0 "Abergwaun"
- cn_abergwaun_adj:0 "Abergwaunian"
- cn_abertawe:0 "Abertawe"
- cn_abertawe_adj:0 "Abertawean"
  cn_dyflinn:0 "Dyflinn"
  cn_dyflinn_adj:0 "Dyflinner"
  cn_ath_cliath:0 "Bhaile Atha Cliath"
@@ -1154,28 +1125,8 @@
  cn_kyrenia_adj:0 "Kyrenian"
  cn_girne:0 "Girne"
  cn_girne_adj:0 "Girnean"
- cn_scwtlandd:0 "Scwtlandd"
- cn_alba:0 "Alba"
- cn_alba_adj:0 "Alban"
- cn_pictland:0 "Pictland"
- cn_pictland_adj:0 "Pictish"
  cn_pictavia:0 "Pictavia"
  cn_pictavia_adj:0 "Pictavian"
- cn_gododdin:0 "Gododdin"
- cn_gododdin_adj:0 "Gododdin"
- cn_galloway:0 "Galloway"
- cn_galloway_adj:0 "Gallovidian"
- cn_alclud:0 "Alclud"
- cn_alclud_adj:0 "Alclud"
- cn_alt_clut:0 "Alt Clut"
- cn_aeron:0 "Aeron"
- cn_aeron_adj:0 "Aeron"
- cn_galwyddel:0 "Galwyddel"
- cn_galwyddel_adj:0 "Galwyddellian"
- cn_galvei:0 "Galvei"
- cn_galvei_adj:0 "Galveian"
- cn_circinn:0 "Circinn"
- cn_circinn_adj:0 "Circinn"
  cn_eryri:0 "Eryri"
  cn_eryri_adj:0 "Eryrian"
  cn_merionethshire:0 "Merionethshire"
@@ -1191,18 +1142,10 @@
  cn_radnorshire:0 "Radnorshire"
  cn_llandrindod_wells:0 "Llandrindod Wells"
  cn_rhayader:0 "Rhayader"
- cn_glamorgan:0 "Glamorgan"
- cn_monmouthshire:0 "Monmouthshire"
  cn_brecknockshire:0 "Brecknockshire"
  cn_brecknock:0 "Brecknock"
  cn_brytanna:0 "Brytanna"
  cn_brytanna_adj:0 "Brytanna"
- cn_casnewydd:0 "Casnewydd"
- cn_y_fenni:0 "Y Fenni"
- cn_caerdydd:0 "Caerdydd"
- cn_bro_morgannwg:0 "Bro Morgannwg"
- cn_aberdaugleddau:0 "Aberdaugleddau"
- cn_hwiffordd:0 "Hwifford"
  
  #Anatolia
  cn_iznik:0 "İznik"

N3OW/map_data/definition.csv

@@ -5,7 +5,7 @@
 4;168;12;2;REYDARFJALL;x
 5;0;15;130;HUSAVIK;x
 6;168;45;177;TORSHAVN;x
-7;84;21;131;SCALLOWAY;x
+7;84;21;131;LERWICK;x
 8;126;24;4;KIRKWALL;x
 9;168;27;132;DONEGAL;x
 10;0;30;5;RAPHOE;x
@@ -1695,7 +1695,7 @@
 1694;169;183;47;THE UISTS;x
 1695;1;186;175;DUMBARTON;x
 1696;43;189;48;GLASGOW;x
-1697;85;192;176;MENEITH;x
+1697;85;192;176;MENTEITH;x
 1698;127;195;49;CASTLETOWN;x
 1699;169;198;177;RAMSEY;x
 1700;1;201;50;KILMARTEN;x