From 5dd3780264638c47b910dcb074741b1d0968f345 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Mon, 29 Dec 2025 14:16:15 +0100 Subject: [PATCH] More Britannia locs + more Austro-Bavarian names --- .../coat_of_arms/01_landed_titles.txt | 2 +- .../coat_of_arms/NEOW_landed_titles.txt | 2 +- .../name_equivalency/00_NEOW_male_names.txt | 18 +- .../culture/name_lists/NEOW_bavarian.txt | 157 +++++++ N3OW/common/landed_titles/britannia.txt | 410 ++++-------------- .../01_province_properties.txt | 4 +- N3OW/history/provinces/e_britannia.txt | 2 +- N3OW/history/titles/k_scotland.txt | 2 +- .../NEOW_dynasty_names_l_english.yml | 29 ++ .../names/NEOW_character_names_l_english.yml | 5 + .../titles_cultural_names_l_english.yml | 169 +++----- .../localization/english/titles_l_english.yml | 387 +++++++++-------- N3OW/map_data/definition.csv | 4 +- 13 files changed, 554 insertions(+), 637 deletions(-) diff --git a/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index ebbb21c0..ca909872 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/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" diff --git a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index edb11c9f..b618ba3a 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/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 diff --git a/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt b/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt index 8ab92267..082e8f83 100644 --- a/N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/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 } diff --git a/N3OW/common/culture/name_lists/NEOW_bavarian.txt b/N3OW/common/culture/name_lists/NEOW_bavarian.txt index 10af73d5..a3e48bfe 100644 --- a/N3OW/common/culture/name_lists/NEOW_bavarian.txt +++ b/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 + } } diff --git a/N3OW/common/landed_titles/britannia.txt b/N3OW/common/landed_titles/britannia.txt index cc28e3eb..bc4b9fe9 100644 --- a/N3OW/common/landed_titles/britannia.txt +++ b/N3OW/common/landed_titles/britannia.txt @@ -1290,27 +1290,27 @@ e_britannia = { name_list_welsh = cn_y_trallwng } } - b_newtown = { #Machynlleth + b_newtown = { # Machynlleth province = 1664 color = { 110 25 25 } } } - c_sir_faesyfed = { #Llandrindod + c_sir_faesyfed = { # Llandrindod color = { 1 139 88 } b_llandrindod = { province = 1661 color = { 95 30 30 } } - b_rhayader = { #Llanidloes + b_rhayader = { # Llanidloes province = 1662 color = { 95 30 30 } } } - c_brecknockshire = { #Brycheiniog + c_brecknockshire = { # Brycheiniog color = { 1 151 74 } - b_brecon = { #Aberhonddu + b_brecon = { # Aberhonddu province = 1659 color = { 215 150 115 } @@ -1344,7 +1344,7 @@ e_britannia = { name_list_welsh = cn_gaerfyrddin } } - b_llandovery = { #Ammanford + b_llandovery = { # Ammanford province = 1653 color = { 245 170 100 } @@ -1353,10 +1353,10 @@ e_britannia = { } } } - c_cardiganshire = { #Ceredigion + c_cardiganshire = { # Ceredigion color = { 99 133 73 } - b_cardigan = { #Aberaeron + b_cardigan = { # Aberaeron province = 1657 color = { 110 10 0 } } @@ -1372,7 +1372,7 @@ e_britannia = { name_list_welsh = cn_sir_benfro } - b_pembroke = { #Milford Haven + b_pembroke = { # Milford Haven province = 1654 color = { 210 140 90 } @@ -1380,15 +1380,15 @@ e_britannia = { name_list_welsh = cn_aberdaugleddau } } - b_st_davids = { #Haverfordwest + b_st_davids = { # Haverfordwest province = 1655 color = { 210 140 90 } cultural_names = { - name_list_welsh = cn_hwiffordd + name_list_welsh = cn_hwlffordd } } - b_fishguard = { #Abergwaun + b_fishguard = { province = 1656 color = { 210 140 90 } @@ -1398,32 +1398,27 @@ e_britannia = { } } } - d_gwent = { + d_gwent = { # Morgwent color = { 1 146 1 } - - capital = c_glamorgan # Gwent + capital = c_glamorgan # Cardiff - c_monmouthshire = { #Gwent + c_monmouthshire = { # Gwent color = { 73 151 1 } cultural_names = { - name_list_normaund = cn_monmouthshire name_list_english = cn_monmouthshire } - b_casnewydd = { #Newport + b_casnewydd = { # Newport province = 1630 - color = { 210 165 60 } cultural_names = { name_list_welsh = cn_casnewydd } } - - b_monmouth = { #Trefynwy + b_monmouth = { # Abergavenny province = 1631 - color = { 210 165 60 } cultural_names = { @@ -1431,38 +1426,31 @@ e_britannia = { } } } - - c_glamorgan = { #Morgannwg + c_glamorgan = { # Morgannwg color = { 1 133 1 } cultural_names = { - name_list_normaund = cn_glamorgan name_list_english = cn_glamorgan } - b_cardiff = { #Caerdydd + b_cardiff = { # Caerdydd province = 1651 - color = { 220 190 145 } cultural_names = { name_list_welsh = cn_caerdydd } } - - b_swansea = { #Abertawe + b_swansea = { # Abertawe province = 1650 - color = { 220 190 145 } cultural_names = { name_list_welsh = cn_abertawe } } - - b_caerphilly = { #The Vale + b_caerphilly = { # The Vale province = 1649 - color = { 220 190 145 } cultural_names = { @@ -1479,10 +1467,12 @@ e_britannia = { capital = c_lothian #Edinburgh cultural_names = { - name_list_irish = cn_alba + name_list_irish = cn_albain name_list_gaelic = cn_alba - name_list_pictish = cn_pictland name_list_brittannic = cn_scwtlandd + name_list_welsh = cn_yr_alban + name_list_cornish = cn_alban + name_list_breton = cn_bro_skos } ai_primary_priority = { @@ -1491,7 +1481,6 @@ e_britannia = { OR = { culture = culture:scottish culture = culture:gaelic - culture = culture:pictish } } add = @correct_culture_primary_score @@ -1507,16 +1496,6 @@ e_britannia = { d_albany = { color = { 1 63 175 } - cultural_names = { - name_list_irish = cn_circinn - name_list_gaelic = cn_circinn - name_list_pictish = cn_circinn - name_list_welsh = cn_circinn - name_list_cumbrian = cn_circinn - name_list_cornish = cn_circinn - name_list_breton = cn_circinn - } - capital = c_gowrie # Perth/St Johnston c_gowrie = { @@ -1524,18 +1503,14 @@ e_britannia = { b_st_johnston = { province = 1741 - color = { 220 130 0 } } - - b_coupar_angus = { + b_coupar_angus = { # Scone province = 1742 - color = { 220 130 0 } } b_crieff = { province = 1745 - color = { 220 130 0 } } } @@ -1544,23 +1519,18 @@ e_britannia = { b_dunfermline = { province = 1724 - color = { 210 115 5 } } - b_kircaldy = { province = 1725 - color = { 210 115 5 } } b_st_andrews = { province = 1726 - color = { 210 115 5 } } b_clackmannan = { province = 1736 - color = { 245 130 0 } } } @@ -1569,22 +1539,18 @@ e_britannia = { b_stirling = { province = 1734 - color = { 245 130 0 } } b_callander = { province = 1735 - color = { 245 130 0 } } b_falkirk = { province = 1733 - color = { 185 115 25 } } - b_meneith = { + b_menteith = { province = 1697 - color = { 230 150 50 } } } @@ -1593,62 +1559,44 @@ e_britannia = { b_dunkeld = { province = 1743 - color = { 225 155 20 } } b_aberfeldy = { province = 1744 - color = { 225 155 20 } } } } - d_stratclyde = { + d_strathclyde = { color = { 20 80 162 } capital = c_lennox # Lennox + cultural_names = { + name_list_welsh = cn_ystrad_clud + name_list_gaelic = cn_srath_chluaidh + name_list_irish = cn_srath_chluaidh + } c_lennox = { color = { 37 95 223 } - ai_primary_priority = { - if = { - limit = { - culture = culture:cumbrian - } - add = @correct_culture_primary_score - } - } - - cultural_names = { - name_list_pictish = cn_alt_clut - name_list_breton = cn_alt_clut - name_list_cornish = cn_alt_clut - name_list_cumbrian = cn_alt_clut - name_list_welsh = cn_alt_clut - } b_glasgow = { province = 1696 - color = { 230 150 50 } } b_strathgryte = { province = 1687 - color = { 230 145 50 } } b_dumbarton = { province = 1695 - color = { 230 150 50 } cultural_names = { - name_list_pictish = cn_alclud - name_list_breton = cn_alclud - name_list_cornish = cn_alclud - name_list_cumbrian = cn_alclud - name_list_welsh = cn_alclud + name_list_welsh = cn_din_alclud + name_list_gaelic = cn_d_u_grv_n_breatann + name_list_irish = cn_d_u_grv_n_breatann } } } @@ -1657,17 +1605,14 @@ e_britannia = { b_lanark = { province = 1737 - color = { 195 100 35 } } b_cadyou = { province = 1738 - color = { 195 100 35 } } b_biggar = { province = 1739 - color = { 195 100 35 } } } @@ -1675,46 +1620,32 @@ e_britannia = { color = { 83 110 184 } cultural_names = { - name_list_pictish = cn_aeron - name_list_cumbrian = cn_aeron - name_list_welsh = cn_aeron - name_list_breton = cn_aeron - name_list_cornish = cn_aeron + name_list_gaelic = cn_inbhir__a_grv_ir + name_list_irish = cn_inbhir__a_grv_ir } b_kyle = { province = 1686 - color = { 230 145 50 } } b_cunningham = { province = 1688 - color = { 230 145 50 } } b_arran = { province = 1690 - color = { 255 200 10 } - - cultural_names = { - name_list_norse = cn_hereyjar - name_list_norwegian = cn_hereyjar - } } b_maybole = { province = 1680 - color = { 250 105 70 } } b_girvan = { province = 1685 - color = { 250 105 70 } } b_cumnock = { province = 9694 - color = { 250 105 70 } } } @@ -1722,23 +1653,15 @@ e_britannia = { d_galloway = { color = { 69 111 179 } - capital = c_galloway cultural_names = { - name_list_gaelic = cn_galloway - name_list_irish = cn_galloway - name_list_norse = cn_galvei - name_list_norwegian = cn_galvei + name_list_gaelic=cn_gall_gh_a_grv_idhealaibh + name_list_irish=cn_gall_gh_a_grv_idhealaibh + name_list_scottish=cn_gallowa } ai_primary_priority = { - if = { - limit = { - culture = culture:cumbrian - } - add = @correct_culture_primary_score - } if = { limit = { culture = culture:welsh @@ -1750,30 +1673,24 @@ e_britannia = { } c_galloway = { - cultural_names = { - name_list_pictish = cn_galwyddel - name_list_cumbrian = cn_galwyddel - name_list_welsh = cn_galwyddel - name_list_breton = cn_galwyddel - name_list_cornish = cn_galwyddel - name_list_norse = cn_galvei - name_list_norwegian = cn_galvei - } color = { 1 109 234 } + + cultural_names = { + name_list_gaelic=cn_gall_gh_a_grv_idhealaibh + name_list_irish=cn_gall_gh_a_grv_idhealaibh + name_list_scottish=cn_gallowa + } b_kilcudbrite = { province = 1682 - color = { 230 120 65 } } b_sanquhar = { province = 1683 - color = { 230 120 65 } } b_wigtown = { province = 1684 - color = { 230 120 65 } } } @@ -1782,12 +1699,10 @@ e_britannia = { b_annan = { province = 1679 - color = { 215 140 55 } } b_dumfries = { province = 1681 - color = { 215 140 55 } } } @@ -1795,7 +1710,6 @@ e_britannia = { d_highlands = { color = { 25 70 180 } - capital = c_inverness c_inverness = { @@ -1803,265 +1717,138 @@ e_britannia = { b_inverness = { province = 1709 - color = { 240 160 45 } } b_glenfinnan = { province = 1711 - color = { 240 160 45 } } b_urquhart = { province = 8775 - color = { 240 160 45 } } b_glencoe = { province = 1701 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_dysjarstadr - name_list_norwegian = cn_dysjarstadr - } } b_badenoch = { province = 1710 - color = { 240 160 45 } } } c_ross = { color = { 1 59 179 } - cultural_names = { - name_list_norse = cn_ros - name_list_norwegian = cn_ros - } - b_dingwall = { province = 1703 - color = { 250 210 85 } } b_gairloch = { province = 1704 - color = { 250 210 85 } } b_glenelg = { province = 8776 - color = { 240 160 45 } } b_tain = { province = 8777 - color = { 250 210 85 } } b_applecross = { province = 8778 - color = { 250 210 85 } } } c_sutherland = { color = { 23 43 110 } - cultural_names = { - name_list_norse = cn_sudrland - name_list_norwegian = cn_sudrland - } - b_dornoch = { province = 1705 - color = { 255 205 115 } - - cultural_names = { - name_list_norse = cn_hjalmundalr - name_list_norwegian = cn_hjalmundalr - } } b_durness = { province = 1706 - color = { 255 205 115 } - - cultural_names = { - name_list_norse = cn_dyrnes - name_list_norwegian = cn_dyrnes - } } b_assynt = { province = 8779 - color = { 255 205 115 } } } - c_caithness = { color = { 1 37 152 } - cultural_names = { - name_list_norse = cn_c_katanes - name_list_norwegian = cn_c_katanes - } - b_thurso = { province = 1707 - color = { 240 220 145 } - - cultural_names = { - name_list_norse = cn_thorsa - name_list_norwegian = cn_thorsa - } } b_wick = { province = 1708 - color = { 240 220 145 } - - cultural_names = { - name_list_norse = cn_vik - name_list_norwegian = cn_vik - } } } } - d_western_isles = { + d_western_isles = { # The Isles color = { 47 69 107 } - capital = c_inner_hebrides #Islay definite_form = yes - cultural_names = { - name_list_norse = cn_sudreyjar - name_list_norwegian = cn_sudreyjar - } c_argyll = { color = { 1 62 104 } - cultural_names = { - name_list_norse = cn_argjall - name_list_norwegian = cn_argjall - } - b_kilmarten = { province = 1700 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_kjarbarey - name_list_norwegian = cn_kjarbarey - } } b_lomond = { province = 1702 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_lokolofni - name_list_norwegian = cn_lokolofni - } } b_helensburg = { province = 9695 - color = { 215 200 15 } } } c_inner_hebrides = { color = { 64 89 125 } - cultural_names = { - name_list_norse = cn_innri_sudreyjar - name_list_norwegian = cn_innri_sudreyjar - } - b_islay = { province = 1689 - color = { 255 200 10 } - - cultural_names = { - name_list_norse = cn_il - name_list_norwegian = cn_il - } } b_ardnamurchon = { province = 35 - color = { 215 200 15 } - - cultural_names = { - name_list_norse = cn_mylarsund - name_list_norwegian = cn_mylarsund - } } - b_mull = { + b_mull = { # Iona province = 1691 - color = { 255 200 10 } - - cultural_names = { - name_list_norse = cn_myl - name_list_norwegian = cn_myl - } } } c_outer_hebrides = { color = { 60 79 112 } - cultural_names = { - name_list_norse = cn_ytri_sudreyjar - name_list_norwegian = cn_ytri_sudreyjar - } - b_skye = { province = 1692 - color = { 255 225 55 } - - cultural_names = { - name_list_norse = cn_skid - name_list_norwegian = cn_skid - } } - b_lewis = { + b_lewis = { # Stornoway province = 1693 - color = { 255 225 55 } - - cultural_names = { - name_list_norse = cn_ljodhus - name_list_norwegian = cn_ljodhus - } } - b_the_uists = { + b_the_uists = { # Balivanich province = 1694 - color = { 255 225 55 } - - cultural_names = { - name_list_norse = cn_vist - name_list_norwegian = cn_vist - } } b_lochboisdale = { province = 9696 - color = { 255 255 55 } } b_tarbert = { province = 9697 - color = { 255 255 55} } } @@ -2069,14 +1856,12 @@ e_britannia = { d_lothian = { color = { 1 59 239 } - capital = c_lothian # Edinburgh cultural_names = { - name_list_breton = cn_gododdin - name_list_cornish = cn_gododdin - name_list_cumbrian = cn_gododdin - name_list_welsh = cn_gododdin + name_list_gaelic = cn_lodainn + name_list_irish = cn_lodainn + name_list_scottish = cn_lowden } c_lothian = { @@ -2084,55 +1869,46 @@ e_britannia = { b_edinburgh = { province = 1727 - color = { 185 90 25 } } b_haddington = { province = 1728 - color = { 185 90 25 } } b_penicuick = { province = 1730 - color = { 185 90 25 } } b_dunbar = { province = 1676 - color = { 190 75 30 } } } c_dunbar = { # Berwickshire color = { 1 63 209 } - b_berwick = { + b_berwick = { # Duns province = 1675 - color = { 190 75 30 } } b_galashiels = { province = 1729 - color = { 185 90 25 } } } - c_teviotdale = { + c_teviotdale = { # Roxburghshire color = { 29 32 208 } b_kelso = { province = 1677 - color = { 198 70 23 } } b_jedburgh = { province = 1678 - color = { 198 70 23 } } b_selkirk = { province = 1740 - color = { 198 70 23 } } } @@ -2141,12 +1917,10 @@ e_britannia = { b_linlithgow = { province = 1731 - color = { 185 115 25 } } b_queensferry = { province = 1732 - color = { 185 115 25 } } } @@ -2154,30 +1928,21 @@ e_britannia = { d_moray = { color = { 1 54 121 } - - capital = c_mearns # Elgin - - cultural_names = { - name_list_norse = cn_katanes - name_list_norwegian = cn_katanes - } + capital = c_mearns # Aberdeen c_moray = { color = { 46 69 138 } b_elgin = { province = 1715 - color = { 255 180 60 } } b_keith = { province = 1716 - color = { 255 180 60 } } b_garioch = { province = 1717 - color = { 255 180 60 } } } @@ -2186,17 +1951,14 @@ e_britannia = { b_dundee = { province = 1720 - color = { 225 125 20 } } b_kirriemuir = { province = 1721 - color = { 225 125 20 } } b_kincardine = { province = 1719 - color = { 230 140 10 } } } @@ -2205,95 +1967,83 @@ e_britannia = { b_peterhead = { province = 1714 - color = { 255 175 75 } } b_banff = { province = 1712 - color = { 255 175 75 } } b_mortlach = { province = 1713 - color = { 255 175 75 } } } - c_mearns = { + c_mearns = { # Abderdeenshire color = { 1 42 205 } b_aberdeen = { province = 1718 - color = { 230 140 10 } } b_ballater = { province = 1722 - color = { 230 140 10 } } b_mar = { province = 1723 - color = { 225 125 20 } } } } d_northern_isles = { color = { 195 75 75 } - - capital = c_faereyar # Orkney + capital = c_orkney # Orkney definite_form = yes - cultural_names = { - name_list_norse = cn_nordreyjar - } - c_orkney = { color = { 195 75 75 } - - cultural_names = { - name_list_norse = cn_orkneyjar - name_list_norwegian = cn_orkneyjar + + cultural_names = { + name_list_gaelic = cn_arcaibh + name_list_irish = cn_inse_orc + name_list_welsh = cn_ynysoedd_erch + name_list_breton = cn_inizi_orc_pst_h + name_list_icelander = cn_orkneyjar + name_list_faerosk = cn_orknoyggjar } b_kirkwall = { province = 8 - color = { 195 75 75 } cultural_names = { - name_list_norwegian = cn_kirkuvag - name_list_danish = cn_kyrkovik - name_list_swedish = cn_kyrkovik - name_list_norse = cn_kirkuvag - name_list_pictish = cn_icluasctreh - name_list_welsh = cn_eglwystref - name_list_irish = cn_baile_na_h_eaglais + name_list_gaelic = cn_b_a_grv_gh_na_h_eaglaise + name_list_irish = cn_b_a_grv_gh_na_h_eaglaise + name_list_icelander = cn_kirkjuvogur + name_list_scottish = cn_kirkwaa } } } - c_shetland = { color = { 205 65 65 } cultural_names = { - name_list_norse = cn_hjaltland - name_list_norwegian = cn_hjaltland + name_list_icelander = cn_hjaltland + name_list_faerosk = cn_hetland + name_list_irish = cn_sealtainn + name_list_gaelic = cn_sealtainn } - b_scalloway = { + b_lerwick = { province = 7 - color = { 205 65 65 } cultural_names = { - name_list_norse = cn_skalavagr - name_list_norwegian = cn_skalavagr - name_list_pictish = cn_bachuuon_maurt - name_list_welsh = cn_bachwyon_mawrty - name_list_irish = cn_batin_mortaigh + name_list_icelander = cn_leirv_i_act_k + name_list_scottish = cn_lerook + name_list_irish = cn_li_u_grv_rabhaig + name_list_gaelic = cn_li_u_grv_rabhaig } } } diff --git a/N3OW/common/province_terrain/01_province_properties.txt b/N3OW/common/province_terrain/01_province_properties.txt index 39c62435..53090c1a 100644 --- a/N3OW/common/province_terrain/01_province_properties.txt +++ b/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 } diff --git a/N3OW/history/provinces/e_britannia.txt b/N3OW/history/provinces/e_britannia.txt index 1a23665f..62a694b9 100644 --- a/N3OW/history/provinces/e_britannia.txt +++ b/N3OW/history/provinces/e_britannia.txt @@ -1109,7 +1109,7 @@ 1719 = { holding = none } -##d_stratclyde +##d_strathclyde ###c_lennox 1695 = { holding = castle_holding diff --git a/N3OW/history/titles/k_scotland.txt b/N3OW/history/titles/k_scotland.txt index f2ecfa56..f9686348 100644 --- a/N3OW/history/titles/k_scotland.txt +++ b/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 diff --git a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml index aabde22d..69bdbb16 100644 --- a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml +++ b/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" @@ -849,3 +865,16 @@ dynn_wrihtssen:0 "Wrihtssen" dynn_bookwyrm:0 "Bookwyrm" dynn_cool:0 "Cúchulainn" + dynn_H_o_uml_sl:0 "Hösl" + 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" diff --git a/N3OW/localization/english/names/NEOW_character_names_l_english.yml b/N3OW/localization/english/names/NEOW_character_names_l_english.yml index fc1f5958..aaf209a2 100644 --- a/N3OW/localization/english/names/NEOW_character_names_l_english.yml +++ b/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" diff --git a/N3OW/localization/english/titles_cultural_names_l_english.yml b/N3OW/localization/english/titles_cultural_names_l_english.yml index 06ee6b7c..d8acb8ba 100644 --- a/N3OW/localization/english/titles_cultural_names_l_english.yml +++ b/N3OW/localization/english/titles_cultural_names_l_english.yml @@ -56,6 +56,60 @@ 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 + # 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 +161,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 +191,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 +718,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 +726,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 +917,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 +951,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 +1121,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 +1138,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" diff --git a/N3OW/localization/english/titles_l_english.yml b/N3OW/localization/english/titles_l_english.yml index c506af01..9bae7c66 100644 --- a/N3OW/localization/english/titles_l_english.yml +++ b/N3OW/localization/english/titles_l_english.yml @@ -190,7 +190,7 @@ b_burnham_on_sea:0 "Burnham-on-Sea" ## Lincoln d_lincoln:0 "Lincoln" - d_lincoln_adj:0 "Lincoln" + d_lincoln_adj:0 "Lincolnian" # Lincolnshire c_lincolnshire:0 "Lincolnshire" c_lincolnshire_adj:0 "Lincolnian" @@ -462,6 +462,217 @@ c_cardiganshire_adj:0 "Ceredigionian" b_cardigan:0 "Aberaeron" b_aberystwyth:0 "Aberystwyth" + # Pembrokeshire + c_pembrokeshire:0 "Pembrokeshire" + c_pembrokeshire_adj:0 "Pembrokian" + b_pembroke:0 "Milford Haven" + b_st_davids:0 "Haverfordwest" + b_fishguard:0 "Fishguard" + ## Gwent/Morgwent + d_gwent:0 "Morgwent" + d_gwent_adj:0 "Morgwentian" + # Montmouthshire/Gwent + c_monmouthshire:0 "Gwent" + c_monmouthshire_adj:0 "Gwentian" + b_casnewydd:0 "Newport" + b_monmouth:0 "Abergavenny" + # Glamorgan/Morgannwg + c_glamorgan:0 "Morgannwg" + c_glamorgan_adj:0 "Morgannwgian" + b_cardiff:0 "Cardiff" + b_swansea:0 "Swansea" + b_caerphilly:0 "The Vale" + ### Scotland + k_scotland:0 "Scotland" + k_scotland_adj:0 "Scottish" + ## Albany + d_albany:0 "Albany" + d_albany_adj:0 "Albanite" + # Gowrie + c_gowrie:0 "Gowrie" + c_gowrie_adj:0 "Gowrian" + b_st_johnston:0 "St Johnston" + b_coupar_angus:0 "Scone" + b_crieff:0 "Crieff" + # Fife + c_fife:0 "Fife" + c_fife_adj:0 "Fifenian" + b_dunfermline:0 "Dunfermline" + b_kircaldy:0 "Kircaldy" + b_st_andrews:0 "St. Andrews" + b_clackmannan:0 "Clackmannan" + # Strathearn + c_strathearn:0 "Strathearn" + c_strathearn_adj:0 "Strathearnian" + b_stirling:0 "Stirling" + b_callander:0 "Callander" + b_falkirk:0 "Falkirk" + b_menteith:0 "Menteith" + # Atholl + c_atholl:0 "Atholl" + c_atholl_adj:0 "Athollian" + b_dunkeld:0 "Dunkeld" + b_aberfeldy:0 "Aberfeldy" + ## Strathclyde + d_strathclyde:0 "Strathclyde" + d_strathclyde_adj:0 "Strathclydian" + # Lennox + c_lennox:0 "Lennox" + c_lennox_adj:0 "Lennoxian" + b_glasgow:0 "Glasgow" + b_strathgryte:0 "Strathgryte" + b_dumbarton:0 "Dumbarton" + # Lanarkshire + c_lanarkshire:0 "Lanarkshire" + c_lanarkshire_adj:0 "Lanarkian" + b_lanark:0 "Lanark" + b_cadyou:0 "Cadyou" + b_biggar:0 "Biggar" + # Ayrshire + c_ayrshire:0 "Ayrshire" + c_ayrshire_adj:0 "Ayrshirite" + b_kyle:0 "Kyle" + b_cunningham:0 "Cunningham" + b_arran:0 "Arran" + b_maybole:0 "Maybole" + b_girvan:0 "Girvan" + b_cumnock:0 "Cumnock" + ## Galloway + d_galloway:0 "Galloway" + d_galloway_adj:0 "Gallovidian" + # Galloway + c_galloway:0 "Galloway" + c_galloway_adj:1 "Gallovidian" + b_kilcudbrite:0 "Kilcudbrite" + b_sanquhar:0 "Sanquhar" + b_wigtown:0 "Wigtown" + # Annandale + c_annandale:0 "Annandale" + c_annandale_adj:0 "Annandalerian" + b_annan:0 "Annan" + b_dumfries:0 "Dumfries" + ## The Highlands + d_highlands_article:0 "the " + d_highlands:0 "Highlands" + d_highlands_adj:0 "Highlander" + # Inverness + c_inverness:0 "Inverness" + c_inverness_adj:0 "Invernesian" + b_inverness:0 "Inverness" + b_glenfinnan:0 "Glenfinnan" + b_urquhart:0 "Urquhart" + b_glencoe:0 "Glencoe" + b_badenoch:0 "Badenoch" + # Ross + c_ross:0 "Ross" + c_ross_adj:0 "Rossian" + b_dingwall:0 "Dingwall" + b_gairloch:0 "Gairloch" + b_glenelg:0 "Glenelg" + b_tain:0 "Tain" + b_applecross:0 "Applecross" + # Sutherland + c_sutherland:0 "Sutherland" + c_sutherland_adj:0 "Sutherlander" + b_dornoch:0 "Dornoch" + b_durness:0 "Durness" + b_assynt:0 "Assynt" + # Caithness + c_caithness:0 "Caithness" + c_caithness_adj:0 "Caithnessian" + b_thurso:0 "Thurso" + b_wick:0 "Wick" + ## Western Isles/The Isles + d_western_isles_article:0 "the " + d_western_isles:0 "Isles" + d_western_isles_adj:0 "Islander" + # Argyll + c_argyll:0 "Argyll" + c_argyll_adj:0 "Argyllian" + b_kilmarten:0 "Kilmarten" + b_lomond:0 "Lomond" + b_helensburg:0 "Helensburg" + # The Inner Hebrides + c_inner_hebrides_article:0 "the " + c_inner_hebrides:0 "Inner Hebrides" + c_inner_hebrides_adj:0 "Inner Hebridean" + b_islay:0 "Islay" + b_ardnamurchon:0 "Ardnamurchon" + b_mull:0 "Iona" + # The Outer Hebrides + c_outer_hebrides_article:0 "the " + c_outer_hebrides:0 "Outer Hebrides" + c_outer_hebrides_adj:0 "Outer Hebridean" + b_skye:0 "Skye" + b_lewis:0 "Stornoway" + b_the_uists:0 "Balivanich" + b_lochboisdale:0 "Lochboisdale" + b_tarbert:0 "Tarbert" + ## Lothian + d_lothian:0 "Lothian" + d_lothian_adj:0 "Lothian" + # Lothian + c_lothian:0 "Lothian" + c_lothian_adj:0 "Lothian" + b_edinburgh:0 "Edinburgh" + b_haddington:0 "Haddington" + b_penicuick:0 "Penicuick" + b_dunbar:0 "Dunbar" + # Dunbar/Berwickshire + c_dunbar:0 "Berwickshire" + c_dunbar_adj:0 "Berwickian" + b_berwick:0 "Duns" + b_galashiels:0 "Galashiels" + # Teviotdale/Roxburghshire + c_teviotdale:0 "Roxburghshire" + c_teviotdale_adj:0 "Roxburghian" + b_kelso:0 "Kelso" + b_jedburgh:0 "Jedburgh" + b_selkirk:0 "Selkirk" + # Linlithgowshire/Falkirk + c_linlithgowshire:0 "Falkirk" + c_linlithgowshire_adj:0 "Falkirkian" + b_linlithgow:0 "Linlithgow" + b_queensferry:0 "Queensferry" + ## Moray + d_moray:0 "Moray" + d_moray_adj:0 "Moravian" + # Moray + c_moray:0 "Moray" + c_moray_adj:0 "Moravian" + b_elgin:0 "Elgin" + b_keith:0 "Keith" + b_garioch:0 "Garioch" + # Angus + c_angus:0 "Angus" + c_angus_adj:0 "Angusian" + b_dundee:0 "Dundee" + b_kirriemuir:0 "Kirriemuir" + b_kincardine:0 "Kincardine" + # Buchan/Peterhead + c_buchan:0 "Peterhead" + c_buchan_adj:0 "Peterheadian" + b_peterhead:0 "Peterhead" + b_banff:0 "Banff" + b_mortlach:0 "Mortlach" + # Mearns/Aberdeenshire + c_mearns:0 "Aberdeenshire" + c_mearns_adj:0 "Aberdeenian" + b_aberdeen:0 "Aberdeen" + b_ballater:0 "Ballater" + b_mar:0 "Mar" + ## The Northern Isles + d_northern_isles_article:0 "the " + d_northern_isles:0 "Northern Isles" + d_northern_isles_adj:0 "Northislanders" + # Orkney + c_orkney:0 "Orkney" + c_orkney_adj:1 "Orcadian" + b_kirkwall:0 "Kirkwall" + # Shetland + c_shetland:0 "Shetland" + c_shetland_adj:0 "Shetlander" + b_lerwick:0 "Lerwick" # Custom (changed from default) title names: LOTHARINGIA:0 "$k_lotharingia$" @@ -625,8 +836,6 @@ b_abenberg:0 "Abenberg" b_abensberg:0 "Abensberg" b_abercorn:0 "Abercorn" - b_aberdeen:0 "Aberdeen" - b_aberfeldy:0 "Aberfeldy" b_aberffraw:0 "Aberffraw" b_abergavenny:0 "Abergavenny" b_abernethy:0 "Abernethy" @@ -1186,7 +1395,6 @@ b_ankyra:0 "Ancyra" b_annaba:0 "Annaba" b_annabah:0 "Annabah" - b_annan:0 "Annan" b_ansbach:0 "Ansbach" b_anse:0 "Anse" b_ansongo:0 "Ansongo" @@ -1218,7 +1426,6 @@ b_apoldoa:0 "Apoldoa" b_appenzell:0 "Appenzell" b_appingedam:0 "Groningen" - b_applecross:0 "Applecross" b_apraksino:0 "Apraksino" b_aprutium_penne:0 "Penne" b_aqabah:0 "Aqabah" @@ -1275,7 +1482,6 @@ b_ardestan:0 "Ardestan" b_ardfert:0 "Ardfert" b_ardistan:0 "Ardistan" - b_ardnamurchon:0 "Ardnamurchon" b_ardres:0 "Ardres" b_arendall:1 "Arendal" b_areni:0 "Areni" @@ -1329,7 +1535,6 @@ b_arrah:0 "Arrah" b_arrajan:0 "Arrajan" b_arraml:0 "Ar-Raml" - b_arran:0 "Arran" b_arraqai:0 "Ar Raqai" b_arras:0 "Arras" b_arrawdatayn:0 "Ar Rawdatayn" @@ -1572,7 +1777,6 @@ b_badakhshan:0 "Badakhshan" b_badelunda:0 "Badelunda" b_baden:0 "Baden" - b_badenoch:0 "Badenoch" b_badin:0 "Badin" b_badis:0 "Badis" b_badra:0 "Badra" @@ -1661,7 +1865,6 @@ b_ballana:0 "Ballana" b_ballantrae:0 "Ballantrae" b_ballarpur:0 "Ballarpur" - b_ballater:0 "Ballater" b_ballia:0 "Ballia" b_balligavi:0 "Balligavi" b_ballymacswiney:0 "Ballymacswiney" @@ -1697,7 +1900,6 @@ b_bandhugadha:1 "Bāndhūgadha" b_bandja:0 "Bandja" b_baneuil:0 "Baneuil" - b_banff:0 "Banff" b_bangarh:0 "Bangarh" b_bangor:0 "Bangor" b_bangor_fawr:0 "Bangor Fawr" @@ -1945,7 +2147,6 @@ b_beroun:0 "Beroun" b_berrechid:0 "Berrechid" b_bertrand_de_comminges:1 "Lannemezan" - b_berwick:0 "Duns" b_berze:0 "Berzé" b_besalu:0 "Besalú" b_besancon:0 "Besançon" @@ -2036,7 +2237,6 @@ b_bielsko:0 "Bielsko" b_bielskobiala:0 "Bielsko-Biala" b_bigeh:0 "Bigeh" - b_biggar:0 "Biggar" b_bigou:0 "Bigou" b_bih:0 "Bih" b_bihac:0 "Bihac" @@ -2433,12 +2633,10 @@ b_cadi:0 "Cado" b_cadiz:0 "Cádiz" b_cadolzburg:0 "Cadolzburg" - b_cadyou:0 "Cadyou" b_cadzand:0 "Cadzand" b_cadzow:0 "Cadzow" b_caen:0 "Caen" b_caerleon:0 "Caerleon" - b_caerphilly:1 "The Vale" b_caersws:0 "Caersws" b_caerwent:0 "Caerwent" b_caetani:0 "Caetani" @@ -2466,7 +2664,6 @@ b_calicut:0 "Calicut" b_calimanesti:0 "Calimanesti" b_callan:0 "Callan" - b_callander:0 "Callander" b_calmarza:0 "Calmarza" b_calpe:0 "Calpe" b_caltabellotta:0 "Caltabellotta" @@ -2521,7 +2718,6 @@ b_carballido:0 "Ponferrada" b_carcassonne:0 "Carcassonne" b_carcastillo:0 "Carcastillo" - b_cardiff:1 "Cardiff" b_carhaix:0 "Carhaix" b_carissa:0 "Carissa" b_carlat:0 "?airs" @@ -2547,7 +2743,6 @@ b_caserta:0 "Caserta" b_cashel:0 "Cashel" b_caslav:0 "Čáslav" - b_casnewydd:2 "Newport" b_caspe:0 "Benicarló" b_cassano:0 "Cassano" b_cassel:0 "Cassel" @@ -2855,7 +3050,6 @@ b_civitavecchia:0 "Civitavecchia" b_civray:0 "Civray" b_cizre:0 "Cizre" - b_clackmannan:0 "Clackmannan" b_clairvaux:0 "Selongey" b_chatillon_sur_seine:0 "Châtillon-sur-Seine" b_clamecy:0 "Clamecy" @@ -2963,7 +3157,6 @@ b_coucy:0 "Montdidier" b_coulogne:0 "Coulogne" b_coulommiers:0 "Coulommiers" - b_coupar_angus:1 "Scone" b_courcillon:0 "Montval-sur-Loir" b_courtenay:0 "Pithiviers" b_courtrai:0 "Courtrai" @@ -2987,7 +3180,6 @@ b_cres:0 "Cres" b_crevacuore:0 "Crevacuore" b_crichton:0 "Crichton" - b_crieff:0 "Crieff" b_crikvenica:0 "Crikvenica" b_crisan:0 "Crisan" b_crisenon:0 "Crisenon" @@ -3018,9 +3210,7 @@ b_cukksual:0 "Ču'kksuâl" b_culzean:0 "Culzean" b_cumae:0 "Cumae" - b_cumnock:0 "Cumnock" b_cuneo:0 "Cuneo" - b_cunningham:0 "Cunningham" b_cunningsburgh:0 "Cunningsburgh" b_cupar:0 "Cupar" b_curtatone:0 "Curtatone" @@ -3308,7 +3498,6 @@ b_dinder:0 "Dinder" b_dindigul:0 "Dindigul" b_dinefwr:0 "Dinefwr" - b_dingwall:0 "Dingwall" b_dinkot:0 "Dinkot" b_dioclea:0 "Dioclea" b_dipalpur:0 "Dipalpur" @@ -3380,7 +3569,6 @@ b_dornberg:0 "Dornberg" b_dornbirn:0 "Dornbirn" b_dornburg:0 "Dornburg" - b_dornoch:0 "Dornoch" b_dorogobuzh:0 "Dorogobuzh" b_doroh:0 "Doroh" b_dorohoi:0 "Dorohoi" @@ -3453,25 +3641,19 @@ b_duma:0 "Duma" b_dumat_al_jandal:0 "Dumat Al Jandal" b_dumat_al_jundal:0 "Dumat Al Jundat" - b_dumbarton:0 "Dumbarton" b_dumbawand:0 "Dumbawand" b_dumbraveni:0 "Dumbrăveni" - b_dumfries:0 "Dumfries" b_dun:0 "Dun" b_dunasead:0 "Dunasead" b_dunaszerdahely:0 "Dunaszerdahely" - b_dunbar:0 "Dunbar" b_dunbeath:0 "Dunbeath" b_dunblane:0 "Dunblane" b_dundaga:0 "Dundaga" b_dundalk:0 "Dundalk" - b_dundee:0 "Dundee" - b_dunfermline:0 "Dunfermline" b_dungada:0 "Dungada" b_dungannon:0 "Dungannon" b_dungiven:0 "Dungiven" b_dunhuang:1 "Luobupo" - b_dunkeld:0 "Dunkeld" b_dunkerque:0 "Dunkerque" b_dunkheger:0 "Dünkheger" b_dunkirk:1 "Dunkerque" @@ -3498,7 +3680,6 @@ b_durkheim:0 "Dürkheim" b_durlach:0 "Durlach" b_durmberg:0 "Dürmberg" - b_durness:0 "Durness" b_durrah:0 "Durrah" b_durrow:0 "Durrow" b_durtojle:0 "Dürtöjle" @@ -3542,7 +3723,6 @@ b_edessa:0 "Edessa" b_edesurfa:0 "Urfa" b_edfu:0 "Edfu" - b_edinburgh:0 "Edinburgh" b_edmonton:0 "Edmonton" b_ednam:0 "Ednam" b_egarosindur:0 "Egarosindur" @@ -3604,7 +3784,6 @@ b_elemtaih:0 "Elemtaih" b_elena:0 "Elena" b_elesd:0 "Élesd" - b_elgin:0 "Elgin" b_elhachem:0 "El Hachem" b_elhaicaiba:0 "El Haicaiba" b_elhajeb:0 "El Hajeb" @@ -3754,7 +3933,6 @@ b_faliero:0 "Faliero" b_falkenberg:0 "Falkenberg" b_falkenstein:0 "Falkenstein" - b_falkirk:0 "Falkirk" b_falkland:0 "Falkland" b_falkoping:0 "Falköping" b_famagusta:0 "Famagusta" @@ -3853,7 +4031,6 @@ b_firuzan:0 "Firuzan" b_firuzkuh:0 "Firuzkuh" b_fischhausen:0 "Fischhausen" - b_fishguard:2 "Fishguard" b_fiume:0 "Fiume" b_fjarlandi:1 "Sýrströnd" b_flaviopolis:0 "Flaviopolis" @@ -3972,7 +4149,6 @@ b_gagraun:0 "Gagraun" b_gailen:0 "Gailen" b_gainsborough:0 "Gainsborough" - b_gairloch:0 "Gairloch" b_gajor:0 "Gajor" b_galafi:0 "Galafi" b_galakvist:0 "Gälakvist" @@ -3980,7 +4156,6 @@ b_galanta:0 "Galánta" b_galaroza:0 "Galaroza" b_galaseatnu:0 "Gáláseatnu" - b_galashiels:0 "Galashiels" b_galata:0 "Galata" b_galati:0 "Galați" b_galgani:0 "Galgani" @@ -4027,7 +4202,6 @@ b_garha:0 "Garha" b_garhbeta:0 "Garhbeta" b_gari:0 "Gari" - b_garioch:0 "Garioch" b_garmo:0 "Garmo" b_garmsar:0 "Garmsar" b_garna:0 "Klintehamn" @@ -4147,7 +4321,6 @@ b_girjakh:0 "Girjakh" b_girnar:0 "Girnar" b_girona:0 "Girona" - b_girvan:0 "Girvan" b_gisburn:0 "Gisburn" b_gishabay:0 "Gish Abay" b_gisors:0 "Gisors" @@ -4160,7 +4333,6 @@ b_glamoc:0 "Glamoč" b_glarus:0 "Glarus" b_glascwm:0 "Glascwm" - b_glasgow:0 "Glasgow" b_glastonbury:0 "Glastonbury" b_glatz:0 "Glatz" b_glaumbaer:0 "Glaumbaer" @@ -4171,9 +4343,7 @@ b_gleichen:0 "Gleichen" b_gleichenstein:0 "Gleichenstein" b_glen_dochart:0 "Glen Dochart" - b_glencoe:0 "Glencoe" b_glendalough:0 "Glendalough" - b_glenfinnan:0 "Glenfinnan" b_glenluce:0 "Glenluce" b_glogow:1 "Głogów" b_glogowek:1 "Glogówek" @@ -4399,7 +4569,6 @@ b_hadaftimo:0 "Hadaftimo" b_hadamakert:0 "Hadamakert" b_haddej:0 "Haddej" - b_haddington:0 "Haddington" b_haddraa:0 "Had Draa" b_haderslev:0 "Haderslev" b_hadyach:0 "Hadyach" @@ -4581,7 +4750,6 @@ b_hejde:0 "Hejde" b_hejnum:0 "Hejnum" b_helen:0 "Helen" - b_helensburg:0 "Helensburg" b_helfenstein:0 "Helfenstein" b_helgum:0 "Helgum" b_heliopolis:0 "Heliopolis" @@ -4834,7 +5002,6 @@ b_inta:0 "Inta" b_interlaken:0 "Interlaken" b_inverary:0 "Inverary" - b_inverness:0 "Inverness" b_inverurie:0 "Inverurie" b_ioaninna:0 "Ioannina" b_ioannina:0 "Ioannina" @@ -4877,7 +5044,6 @@ b_iskandariya:0 "Iskandriya" b_iskar:0 "Iskar" b_iskorosten:0 "Iskorosten" - b_islay:0 "Islay" b_ismaillia:0 "Isma'illa" b_ismant:0 "Ismant" b_isny:0 "Isny" @@ -5017,7 +5183,6 @@ b_jayapura:0 "Jayapura" b_jayzan:0 "Jayzan" b_jebeladda:0 "Jebel Adda" - b_jedburgh:0 "Jedburgh" b_jeddah:0 "Jeddah" b_jedrzejow:0 "Jędrzejów" b_jeenmata:0 "Jeenmata" @@ -5418,13 +5583,11 @@ b_kefalonia:0 "Kefalonia" b_keheilli:0 "Keheilli" b_keitele:0 "Keitele" - b_keith:0 "Keith" b_kelainai:0 "Kelainai" b_kelibia:0 "Kelibia" b_kelkit:0 "Kelkit" b_kells:0 "Kells" b_kelpin:0 "Kelpin" - b_kelso:0 "Kelso" b_kelycyre:0 "Këlcyrë" b_kem:0 "Kem" b_kembolcha:0 "Kembolcha" @@ -5602,7 +5765,6 @@ b_kiknur:0 "Kiknur" b_kil:0 "Kil" b_kilakarai:0 "Kilakarai" - b_kilcudbrite:0 "Kilcudbrite" b_kildare:0 "Kildare" b_kilemary:0 "Kilemary" b_kilfenora:0 "Kilfenora" @@ -5611,7 +5773,6 @@ b_killala:0 "Killala" b_killaloe:0 "Killaloe" b_killarney:0 "Killarney" - b_kilmarten:0 "Kilmarten" b_kilmore:0 "Kilmore" b_kilmun:0 "Kilmun" b_kilmacrenan:0 "Killmacrenan" @@ -5619,7 +5780,6 @@ b_kimmerikon:0 "Kimmerikon" b_kimzha:0 "Kimzha" b_kinanah:0 "Kinanah" - b_kincardine:0 "Kincardine" b_kinel:0 "Kinel'" b_kingisepp:0 "Yama" b_kinilov:0 "Kinilov" @@ -5637,7 +5797,6 @@ b_kiranapura:0 "Kiranapura" b_kirandul:0 "Kirandul" b_kiratakupa:0 "Kiratakupa" - b_kircaldy:0 "Kircaldy" b_kirchberg:0 "Kirchenberg" b_kirchroth:0 "Kirchroth" b_kirghiz:0 "Kirghiz" @@ -5652,10 +5811,8 @@ b_kirkjubour:0 "Kirkjubour" b_kirklarkilisesi:0 "Kirklar Kilisesi" b_kirkuk:0 "Kirkuk" - b_kirkwall:0 "Kirkwall" b_kirman:0 "Kirman" b_kirpili:0 "Kirpili" - b_kirriemuir:0 "Kirriemuir" b_kirrumpa:0 "Kirrumpä" b_kirsanov:0 "Kirsanov" b_kiruna:0 "Kiruna" @@ -6026,7 +6183,6 @@ b_kyasovagora:0 "Duboviki" b_kyburg:0 "Kyburg" b_kydonia:0 "Kydonia" - b_kyle:0 "Kyle" b_kymi:0 "Kými" b_kypsela:0 "Kypsela" b_kyrenia:0 "Kyrenia" @@ -6121,7 +6277,6 @@ b_lampozhnya:0 "Lampozhnya" b_lampron:0 "Lampron" b_lampsakos:0 "Lampsakos" - b_lanark:0 "Lanark" b_lanciano:0 "Lanciano" b_lancy:0 "Lancy" b_landau:0 "Landau" @@ -6289,7 +6444,6 @@ b_levanger:0 "Levanger" b_levanluhta:0 "Levänluhta" b_levkovo:0 "Levkovo" - b_lewis:0 "Stornoway" b_leylan:0 "Leylan" b_leyre:0 "Leyre" b_lezergue:0 "Lezergue" @@ -6339,7 +6493,6 @@ b_linewerd:0 "Linewerd" b_lingen:0 "Lingen" b_linkoping:0 "Linköping" - b_linlithgow:0 "Linlithgow" b_linz:0 "Linz" b_liongby:0 "Liongby" b_liozno:0 "Liozno" @@ -6383,7 +6536,6 @@ b_locarno:0 "Locarno" b_loch_awe:0 "Loch Awe" b_loch_doon:0 "Loch Doon" - b_lochboisdale:0 "Lochboisdale" b_loches:1 "Loches" b_lochindorb:0 "Lochindorb" b_lochore:0 "Lochore" @@ -6409,7 +6561,6 @@ b_lomagne:0 "Mazamet" b_loman:0 "Loman" b_lombez:0 "Lombez" - b_lomond:0 "Lomond" b_lomza:0 "Łomża" b_lonar:0 "Lonar" b_longford:0 "Longford" @@ -6736,7 +6887,6 @@ b_mapa:0 "Mapa" b_mapan:0 "Mapan" b_maqueda:0 "Torrijos" - b_mar:0 "Mar" b_marabout:0 "Marabout" b_maraclea:0 "Maraclea" b_maragha:0 "Maragha" @@ -6856,7 +7006,6 @@ b_maxwell:0 "Maxwell" b_mayadin:0 "Mayadin" b_mayafaraqin:0 "Mayafaraqin" - b_maybole:0 "Maybole" b_maydara:0 "Maydara" b_maydh:0 "Maydh" b_mayenne:0 "Mayenne" @@ -6954,7 +7103,6 @@ b_menaka:0 "Ménaka" b_mende:0 "Mende" b_mendrisio:0 "Mendrisio" - b_meneith:0 "Meneith" b_menen:0 "Menen" b_menorca:0 "Maó" b_mentesa:0 "Villanueva de los Infantes" @@ -7143,7 +7291,6 @@ b_monfortedelemos:0 "Monforte de Lemos" b_monkchester:0 "Monkchester" b_monkontour:0 "Monkontour" - b_monmouth:1 "Abergavenny" b_monreal:0 "Monreal" b_monreale:0 "Monreale" b_mons:0 "Mons" @@ -7236,7 +7383,6 @@ b_mortain:0 "Flers" b_morteau:0 "Morteau" b_mortemer:0 "Mortemer" - b_mortlach:0 "Mortlach" b_morvan:1 "Decize" b_morvi:0 "Morvi" b_mosas:0 "Mosås" @@ -7294,7 +7440,6 @@ b_mulavagil:0 "Mulavagil" b_mulaybuselham:0 "Mulay Buselham" b_mulhouse:0 "Mulhouse" - b_mull:1 "Iona" b_mullaitivu:0 "Mullaitivu" b_multan:0 "Multan" b_muncheberg:0 "Müncheberg" @@ -8086,12 +8231,10 @@ b_pella:0 "Pella" b_pelopia:0 "Pelopia" b_pelusia:0 "Pelusia" - b_pembroke:1 "Milford Haven" b_pempton:0 "Pempton" b_penafiel:0 "Peñafiel" b_pendosis:0 "Pendosis" b_penela:0 "Penela" - b_penicuick:0 "Penicuick" b_penne:0 "P'enne" b_penuballi:0 "Penuballi" b_penugonda:0 "Penugonda" @@ -8135,7 +8278,6 @@ b_pessinus:0 "Pessinus" b_pest:0 "Pest" b_pestovo:0 "Pestovo" - b_peterhead:0 "Peterhead" b_petervasara:0 "Pétervására" b_petobriga:0 "Petobriga" b_petra:0 "Petra" @@ -8478,7 +8620,6 @@ b_quba:0 "Quba" b_qubban:0 "Qubban" b_quchan:0 "Quchan" - b_queensferry:0 "Queensferry" b_quena:0 "Quena" b_quercy:0 "Gourdon" b_querfurt:0 "Querfurt" @@ -9097,7 +9238,6 @@ b_sanok:0 "Sanok" b_sanpawl:0 "San Pawl" b_sanpedrodeperix:0 "San Pedro de Périx" - b_sanquhar:0 "Sanquhar" b_sanremo:0 "Sanremo" b_sanroque:0 "San Roque" b_sansebastian:0 "San Sebastián" @@ -9232,7 +9372,6 @@ b_sayutes:0 "Say-Utes" b_sborishte:0 "Sborishte" b_scalea:0 "Scalea" - b_scalloway:0 "Scalloway" b_scandalon:0 "Scandalon" b_scaptopara:0 "Scaptopara" b_schaffhausen:0 "Schaffhausen" @@ -9292,7 +9431,6 @@ b_seligenstadt:0 "Seligenstadt" b_selinus:0 "Selinus" b_seljord:0 "Seljord" - b_selkirk:0 "Selkirk" b_selmana:0 "Selmana" b_selpils:0 "Selpils" b_selymbria:0 "Selymbria" @@ -9630,7 +9768,6 @@ b_skorokhod:0 "Skorokhod" b_skrapar:0 "Skrapar" b_skulnas:0 "Skulnäs" - b_skye:0 "Skye" b_skynzekkeberge:0 "Skynzekkeberge" b_skyros:0 "Skyros" b_slagelse:0 "Slagelse" @@ -9790,15 +9927,12 @@ b_sruk:0 "Sruk" b_srvljig:0 "Srvljig" b_st_albans:0 "St Albans" - b_st_andrews:0 "St. Andrews" b_st_brieuc:0 "St. Brieuc" b_st_brigit:0 "St Brigit" b_st_cuthbert:0 "St Cuthbert" - b_st_davids:1 "Haverfordwest" b_st_ethelberts:0 "St Ethelberts" b_st_germans:0 "St. Germans" b_st_gildas:0 "St. Gildas" - b_st_johnston:0 "St Johnston" b_st_kentigern:0 "St Kentigern" b_st_machar:0 "St Machar" b_st_malo:0 "St. Malo" @@ -9876,7 +10010,6 @@ b_stigliano:0 "Stigliano" b_stimier:0 "Saint-Imier" b_stipon:0 "Stipon" - b_stirling:0 "Stirling" b_stjeanbaptiste:0 "St Jean-Baptiste" b_stjeandangely:0 "St Jean-d'Angély" b_stjeandelosne:0 "St Jean-de-Losne" @@ -9905,7 +10038,6 @@ b_strassburg:0 "Strassburg" b_strasswalchen:0 "Strasswalchen" b_strathardle:0 "Strathardle" - b_strathgryte:0 "Strathgryte" b_strehaia:0 "Strehaia" b_strehla:0 "Strehla" b_strehlitz:0 "Strehlitz" @@ -10035,7 +10167,6 @@ b_sviatohirsk:0 "Sviatohirsk" b_svrljig:0 "Svrljig" b_svyatogorki:0 "Svyatogorki" - b_swansea:1 "Swansea" b_swargdwari:0 "Swargdwari" b_sween:0 "Seen" b_swetakapura:0 "Swetakapura" @@ -10122,7 +10253,6 @@ b_tahtani:0 "Tahtani" b_taif:0 "Ta'if" b_taillebourg:0 "Surgères" - b_tain:0 "Tain" b_taipale:0 "Taipale" b_taiwi:0 "Taiwi" b_taji:0 "Taji" @@ -10203,7 +10333,6 @@ b_taraz:0 "Taraz" b_tarazona:1 "Olite" b_tarbes:0 "Tarbes" - b_tarbert:0 "Tarbert" b_tarentaise:0 "Tarentaise" b_targoviste:0 "Târgoviște" b_targsor:0 "Târgșor" @@ -10340,7 +10469,6 @@ b_tharros:0 "Tharros" b_thasos:0 "Thasos" b_thatta:0 "Thatta" - b_the_uists:0 "Balivanich" b_thebes:0 "Thebes" b_thebeshellas:0 "Thebes" b_theiheim:0 "Theiheim" @@ -10369,7 +10497,6 @@ b_threave:0 "Threave" b_thughra:0 "Thughra" b_thun:0 "Thun" - b_thurso:0 "Thurso" b_thyatira:0 "Thyatira" b_tiace:0 "Tiace" b_tiaret:0 "Tiaret" @@ -10811,7 +10938,6 @@ b_urgut:0 "Urgut" b_urim:0 "Urim" b_urmiah:0 "Urmiah" - b_urquhart:0 "Urquhart" b_urso:0 "Urso" b_ursova:0 "Ursova" b_urtseki:0 "Urtseki" @@ -11316,7 +11442,6 @@ b_wherwell:0 "Wherwell" b_whitchurch:0 "Whitchurch" b_whithorn:0 "Whithorn" - b_wick:0 "Wick" b_wicklow:0 "Wicklow" b_wiedenbruck:1 "Wiedenbrück" b_wielbark:0 "Wielbark" @@ -11325,7 +11450,6 @@ b_wien:0 "Vienna" b_wiesbaden:0 "Wiesbaden" b_wieselburg:0 "Wieselburg" - b_wigtown:0 "Wigtown" b_wilczyce:0 "Wilczyce" b_wild:1 "Raabs" b_wildalpen:0 "Wildalpen" @@ -11828,8 +11952,6 @@ c_angermanland_adj:0 "Ångermanlander" c_angouleme:1 "Angoulême" c_angouleme_adj:1 "Angoulêmian" - c_angus:0 "Angus" - c_angus_adj:0 "Angusian" c_anhalt:0 "Anhalt" c_anhalt_adj:0 "Anhaltian" c_ani:0 "Ani" @@ -11842,8 +11964,6 @@ c_ankyra_adj:0 "Ancyran" c_annaba:0 "Annaba" c_annaba_adj:0 "Annaban" - c_annandale:0 "Annandale" - c_annandale_adj:0 "Annandalerian" c_ansbach:0 "Ansbach" c_ansbach_adj:0 "Ansbacher" c_antalo:0 "Antalo" @@ -11887,8 +12007,6 @@ c_ardestan_adj:0 "Ardestani" c_arezzo:0 "Arezzo" c_arezzo_adj:0 "Arezzan" - c_argyll:0 "Argyll" - c_argyll_adj:0 "Argyllian" c_arigh:0 "Arigh" c_arigh_adj:0 "Arighan" c_arles:0 "Arles" @@ -11950,8 +12068,6 @@ c_rochester_adj:0 "Chathamian" c_roscommon:0 "Roscommon" c_roscommon_adj:0 "Roscommonian" - c_atholl:0 "Atholl" - c_atholl_adj:0 "Athollian" c_atlas_mnt:0 "Atlas Mnt" c_atlas_mnt_adj:0 "Atlas Mountainian" c_attaleia:0 "Attaleia" @@ -11988,8 +12104,6 @@ c_aydhab_adj:0 "Aydhab" c_ayodhya:0 "Ayodhyā" c_ayodhya_adj:0 "Ayodhyān" - c_ayrshire:0 "Ayrshire" - c_ayrshire_adj:0 "Ayrshirite" c_aytos:0 "Aytos" c_aytos_adj:0 "Aytosan" c_az_zarqa:0 "Az Zarqa" @@ -12233,8 +12347,6 @@ c_brysis_adj:0 "Brysisian" c_brzeg:0 "Brzeg" c_brzeg_adj:0 "Brzegian" - c_buchan:2 "Peterhead" - c_buchan_adj:3 "Peterheadian" c_bucuresti:2 "Ialomita" c_bucuresti_adj:2 "Ialomitian" c_buhairya:0 "Buhairya" @@ -12269,8 +12381,6 @@ c_cadiz_adj:0 "Cádizian" c_cairo:0 "Cairo" c_cairo_adj:0 "Cairene" - c_caithness:0 "Caithness" - c_caithness_adj:0 "Caithnessian" c_cakrakuta:0 "Cakrakuta" c_cakrakuta_adj:0 "Cakrakutan" c_calafat:0 "Calafat" @@ -12572,8 +12682,6 @@ c_dublin_adj:0 "Dubliner" c_duklja:0 "Duklja" c_duklja_adj:0 "Dukljani" - c_dunbar:0 "Berwickshire" - c_dunbar_adj:0 "Berwickian" c_dunhuang:1 "Miran" c_dunhuang_adj:0 "Miran" c_dunkheger:0 "Dunkheger" @@ -12668,8 +12776,6 @@ c_ferrara_adj:0 "Ferrarian" c_fes:0 "Fes" c_fes_adj:0 "Fesian" - c_fife:0 "Fife" - c_fife_adj:0 "Fifenian" c_figuig:0 "Figuig" c_figuig_adj:0 "Figuigian" c_finistere:0 "Finistère" @@ -12731,8 +12837,6 @@ c_galich_mersky_adj:0 "Galich Merskyian" c_galindia:0 "Galindia" c_galindia_adj:0 "Galindian" - c_galloway:0 "Galloway" - c_galloway_adj:1 "Gallovidian" c_gallura:0 "Gallura" c_gallura_adj:0 "Galluran" c_gao:0 "Gao" @@ -12779,8 +12883,6 @@ c_giurgiu_adj:0 "Giurgian" c_gizeh:0 "Gizeh" c_gizeh_adj:0 "Gizehian" - c_glamorgan:1 "Morgannwg" - c_glamorgan_adj:1 "Morgannwgian" c_gleichenstein:0 "Gleichenstein" c_gleichenstein_adj:0 "Gleichensteiner" c_gloucester_adj:0 "Gloucesterian" @@ -12810,8 +12912,6 @@ c_gostyninska_adj:0 "Gostynian" c_gotland:0 "Gotland" c_gotland_adj:0 "Gotlander" - c_gowrie:0 "Gowrie" - c_gowrie_adj:0 "Gowrian" c_granada:0 "Granada" c_granada_adj:0 "Granadan" c_grassland_cheremisa:0 "Grassland Cheremisa" @@ -12990,13 +13090,8 @@ c_infa_adj:1 "Infanian" c_ingolstadt:0 "Ingolstadt" c_ingolstadt_adj:0 "Ingoler" - c_inner_hebrides_article:0 "the " - c_inner_hebrides:0 "Inner Hebrides" - c_inner_hebrides_adj:0 "Inner Hebridean" c_innsbruck:0 "Innsbruck" c_innsbruck_adj:0 "Innsbruckian" - c_inverness:0 "Inverness" - c_inverness_adj:0 "Invernesian" c_ipuskoa:0 "Ipuskoa" c_ipuskoa_adj:0 "Ipuskoan" c_irahistan:0 "Irahistan" @@ -13363,8 +13458,6 @@ c_lakomelza_adj:0 "Lakomelza" c_laksmanavati:0 "Laksmanāvati" c_laksmanavati_adj:0 "Laksmanāvatian" - c_lanarkshire:0 "Lanarkshire" - c_lanarkshire_adj:0 "Lanarkian" c_lanciano:0 "Lanciano" c_lanciano_adj:0 "Lancianean" c_langres:0 "Haute-Marne" @@ -13393,9 +13486,6 @@ c_leinster_adj:0 "Wexfordian" c_lemdiyya:0 "Lemdiyya" c_lemdiyya_adj:0 "Lemdiyyan" - c_lennox_adjective:0 "the " - c_lennox:0 "Lennox" - c_lennox_adj:0 "Lennoxian" c_leon:0 "Leon" c_leon_adj:0 "Léonian" c_leonsberg:0 "Leonsberg" @@ -13424,9 +13514,6 @@ c_limisol_adj:0 "Limisolian" c_limousin:0 "Haute-Vienne" c_limousin_adj:0 "Viennan" - c_lincoln_adj:0 "Lincolnian" - c_linlithgowshire:0 "Falkirk" - c_linlithgowshire_adj:0 "Falkirkian" c_linz:0 "Linz" c_linz_adj:0 "Linzian" c_lisboa:0 "Lisboa" @@ -13454,8 +13541,6 @@ c_lori:0 "Lori" c_lorraine:0 "Lorraine" c_lorraine_adj:0 "Lorrainian" - c_lothian:0 "Lothian" - c_lothian_adj:0 "Lothian" c_loulan:0 "Loulan" c_lower_dniepr:0 "Lower Dniepr" c_lower_dniepr_adj:0 "Lower Dnieprian" @@ -13601,8 +13686,6 @@ c_maymana_adj:0 "Maymanan" c_mazandaran:0 "Mazandaran" c_mazandaran_adj:0 "Mazandarian" - c_mearns:0 "Aberdeenshire" - c_mearns_adj:0 "Aberdeenian" c_meaux:0 "Meaux" c_meaux_adj:0 "Meauvian" c_mecca:0 "Mecca" @@ -13686,8 +13769,6 @@ c_monemvasia_adj:0 "Monemvasian" c_monferrato:0 "Monferrato" c_monferrato_adj:0 "Monferratian" - c_monmouthshire:1 "Gwent" - c_monmouthshire_adj:0 "Gwentian" c_monreal:0 "Monreal" c_monreal_adj:0 "Monrealian" c_montaigu:0 "Vendée" @@ -13710,8 +13791,6 @@ c_andorra_adj:0 "Andorran" c_morarna:1 "Mórar" c_morarna_adj:0 "Móran" - c_moray:0 "Moray" - c_moray_adj:0 "Moravian" c_mordva:0 "Mordva" c_mordva_adj:0 "Mordvian" c_more:0 "Kalmar" @@ -13926,8 +14005,6 @@ c_orhei_adj:0 "Orheian" c_oriel:0 "Louth" c_oriel_adj:0 "Louthian" - c_orkney:0 "Orkney" - c_orkney_adj:1 "Orcadian" c_orlamunde:0 "Orlamünde" c_orlamunde_adj:0 "Orlamünder" c_orleans:1 "Orléans" @@ -13966,9 +14043,6 @@ c_ouled_nail_adj:0 "Ouled Nailian" c_oulu:0 "Oulu" c_oulu_adj:0 "Oulu" - c_outer_hebrides_article:0 "the " - c_outer_hebrides:0 "Outer Hebrides" - c_outer_hebrides_adj:0 "Outer Hebridean" c_oversticht:0 "Overijssel" c_oversticht_adj:0 "Overjisselian" c_offaly:0 "Offaly" @@ -14009,8 +14083,6 @@ c_pedersore_adj:0 "Pietarsaarian" c_pelusia:0 "Pelusia" c_pelusia_adj:0 "Pelusian" - c_pembrokeshire:1 "Pembrokeshire" - c_pembrokeshire_adj:0 "Pembrokian" c_penthievre:1 "Côtes-d'Armor" c_penthievre_adj:0 "Armorian" c_penugonda:0 "Penugonda" @@ -14233,8 +14305,6 @@ c_rosello_adj:0 "Rosellian" c_roslavl:0 "Roslavl" c_roslavl_adj:0 "Roslavlian" - c_ross:0 "Ross" - c_ross_adj:0 "Rossian" c_rossano:0 "Rossano" c_rossano_adj:0 "Rossanian" c_rostock:0 "Rostock" @@ -14403,8 +14473,6 @@ c_sharukan_adj:0 "Sharukanian" c_shemakha:0 "Shemakha" c_shemakha_adj:0 "Shemakhan" - c_shetland:0 "Shetland" - c_shetland_adj:0 "Shetlander" c_shiraz:0 "Shiraz" c_shiraz_adj:0 "Shirazian" c_shirvan:0 "Shirvan" @@ -14531,8 +14599,6 @@ c_stoenesti_adj:0 "Stoeneștian" c_strassburg:0 "Strassburg" c_strassburg_adj:0 "Strassburger" - c_strathearn:0 "Strathearn" - c_strathearn_adj:0 "Strathearnian" c_strumica:0 "Strumica" c_strumica_adj:0 "Strumican" c_strymon:0 "Strymon" @@ -14551,8 +14617,6 @@ c_sumadija_adj:0 "Šumadijan" c_sundgau:0 "Sundgau" c_sundgau_adj:0 "Sundgauer" - c_sutherland:0 "Sutherland" - c_sutherland_adj:0 "Sutherlander" c_suvarnagram:0 "Suvarnagram" c_suvarnagram_adj:0 "Suvarnagraman" c_suvarnapura:0 "Suvarnapura" @@ -14666,8 +14730,6 @@ c_teruel_adj:0 "Teruelian" c_terschelling:0 "Terschelling" c_terschelling_adj:0 "Terschellinger" - c_teviotdale:0 "Roxburghshire" - c_teviotdale_adj:0 "Roxburghian" c_thalner:0 "Thalner" c_thalner_adj:0 "Thalner" c_thana:0 "Thana" @@ -15188,8 +15250,6 @@ d_alan_band_adj:0 "Alan" d_alania:0 "Alania" d_alania_adj:0 "Alanian" - d_albany:0 "Albany" - d_albany_adj:0 "Albanite" d_aleppo:0 "Aleppo" d_aleppo_adj:0 "Aleppan" d_alexandria:0 "Alexandria" @@ -15526,8 +15586,6 @@ d_galicia_adj:0 "Galician" d_galilee:0 "Galilee" d_galilee_adj:0 "Galilean" - d_galloway:1 "Galloway" - d_galloway_adj:1 "Gallowayian" d_gandhara:0 "Gandhara" d_gandhara_adj:0 "Gandharan" d_gangavadi:0 "Gangavadi" @@ -15601,9 +15659,6 @@ d_limousin:0 "Limousin" d_hesse:0 "Hesse" d_hesse_adj:0 "Hessian" - d_highlands_article:0 "the " - d_highlands:0 "Highlands" - d_highlands_adj:0 "Highlander" d_hlynov:0 "Ugra" d_hlynov_adj:0 "Ugran" d_holland:0 "Holland" @@ -15771,7 +15826,6 @@ d_lombard_band_adj:0 "Lombard" d_lombardia:0 "Lombardy" d_lombardia_adj:0 "Lombard" - d_lothian:0 "Lothian" d_lower_lorraine:1 "North Rhine" d_lower_lorraine_adj:1 "North Rhenish" d_lower_silesia:1 "Silesia" @@ -15836,8 +15890,6 @@ d_moldova_adj:0 "Moldavian" d_moravia:0 "Moravia" d_moravia_adj:0 "Moravian" - d_moray:0 "Moray" - d_moray_adj:0 "Moravian" d_mordvins:0 "Mordva" d_mordvins_adj:0 "Mordvin" d_moskva:0 "Moskva" @@ -15891,9 +15943,6 @@ d_norse_pagan_reformed_adj:0 "Norse" d_savo:0 "Savo" d_savo_adj:0 "Savonian" - d_northern_isles_article:0 "the " - d_northern_isles:1 "Northern Isles" - d_northern_isles_adj:0 "Northislanders" d_novgorod-seversk:0 "Bryansk" d_novgorod-seversk_adj:0 "Bryanskian" d_novgorod:0 "Novgorod" @@ -15966,8 +16015,6 @@ d_pomerelia_adj:0 "Pomerelian" d_porto:0 "Douro" d_porto_adj:0 "Douran" - d_gwent:0 "Morgwent" - d_gwent_adj:0 "Morgwentian" d_pressburg:0 "Pressburg" d_pressburg_adj:0 "Pressburger" d_pronsk:0 "Pronsk" @@ -16125,8 +16172,6 @@ d_star_company_adj:0 "Star" d_steyermark:0 "Steyermark" d_steyermark_adj:0 "Styrian" - d_stratclyde:0 "Stratclyde" - d_stratclyde_adj:0 "Stratclydian" d_stravani:0 "Stravani" d_strymon:0 "Strymon" d_strymon_adj:0 "Strymonian" @@ -16342,9 +16387,6 @@ d_west_african_pagan_reformed_adj:0 "West African" d_west_franconia:0 "West Franconia" d_west_franconia_adj:0 "West Franconian" - d_western_isles_article:0 "the " - d_western_isles:1 "Isles" - d_western_isles_adj:0 "Islander" d_westfalen:0 "Westfalen" d_westfalen_adj:0 "Westfaler" d_white_company:0 "White Company" @@ -16783,9 +16825,6 @@ k_saxony:0 "Hanover" k_saxony_adj:0 "Hanoveran" k_saxony_pre:0 "Hanovo" - k_scotland:0 "Scotland" - k_scotland_adj:0 "Scottish" - k_scotland_pre:0 "Scotto" k_seljuk_turks_adj:0 "Turkish" k_seljuk_turks_pre:0 "Turko" k_serbia:0 "Serbia" @@ -24377,8 +24416,6 @@ b_hofn:0 "Höfn" b_vopnafjordur:1 "Húsavík" b_klaustur:1 "Klaustur" - b_glenelg:0 "Glenelg" - b_assynt:0 "Assynt" b_ume:0 "Ume" b_vettanen:0 "Vettänen" b_ylikainuu:0 "Ylikainuu" diff --git a/N3OW/map_data/definition.csv b/N3OW/map_data/definition.csv index b702b97e..5b8d8aaa 100644 --- a/N3OW/map_data/definition.csv +++ b/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