From bdffa3de643c632915e1c9f8fb39c5556613a591 Mon Sep 17 00:00:00 2001 From: Nicholas Escalona Date: Sun, 16 Aug 2015 03:29:49 -0400 Subject: [PATCH 1/4] provinces syria --- .../landed_titles/swmh_landed_titles.txt | 37 +++++ SED2/localisation/A SWMHcounties.csv | 70 +++++++++ SED2/localisation/A SWMHprovinces.csv | 25 ++++ .../landed_titles/swmh_landed_titles.csv | 74 ++++----- templates/localisation/A SWMHcounties.csv | 140 +++++++++--------- templates/localisation/A SWMHprovinces.csv | 50 +++---- 6 files changed, 264 insertions(+), 132 deletions(-) diff --git a/SED2/common/landed_titles/swmh_landed_titles.txt b/SED2/common/landed_titles/swmh_landed_titles.txt index 8f24cb7..5339d74 100644 --- a/SED2/common/landed_titles/swmh_landed_titles.txt +++ b/SED2/common/landed_titles/swmh_landed_titles.txt @@ -7763,6 +7763,8 @@ k_jerusalem = { # Jerusalem c_petra = { # Elim (722) color = { 133 208 14 } color2 = { 255 255 255 } + greek = "Aqaba" + roman = "Aqaba" b_pharaohosisland = {} b_jordanaqba = {} b_syrarandal = {} @@ -7882,6 +7884,14 @@ k_jerusalem = { # Jerusalem c_safed = { # Toron (769) color = { 14 208 73 } color2 = { 255 255 255 } + greek = "Banias" + bedouin_arabic = "Safed" + maghreb_arabic = "Safed" + levantine_arabic = "Safed" + egyptian_arabic = "Safed" + sicilian_arabic = "Safed" + ashkenazi = "Safed" + roman = "Banias" b_safed = {} b_banyas = {} b_chastelet = {} @@ -8029,6 +8039,15 @@ k_antioch = { # Antioche c_archa = { # Berzieh (765) color = { 109 194 47 } color2 = { 255 255 255 } + frankish = "Apamea" + norman = "Apamea" + andalusian_arabic = "Qalaat al-Madiq" + greek = "Apamea" + bedouin_arabic = "Qalaat al-Madiq" + maghreb_arabic = "Qalaat al-Madiq" + levantine_arabic = "Qalaat al-Madiq" + egyptian_arabic = "Qalaat al-Madiq" + sicilian_arabic = "Qalaat al-Madiq" b_sarmeniasyria = {} b_albarasyria = {} b_famia = {} @@ -8208,6 +8227,10 @@ k_syria = { # Al-Sham holy_site = samaritan holy_site = karaite holy_site = shiite + frankish = "Damascus" + norman = "Damascus" + greek = "Damascus" + roman = "Damascus" b_citadelofdamascus = {} b_damascus = {} b_martalqamonestary = {} @@ -8222,6 +8245,10 @@ k_syria = { # Al-Sham c_baalbek = { # Bekaa (768) color = { 77 156 38 } color2 = { 255 255 255 } + frankish = "Baalbek" + norman = "Baalbek" + greek = "Baalbek" + roman = "Baalbek" b_baalbek = {} b_rasbaalek = {} b_nimrodcastle = {} @@ -8232,6 +8259,8 @@ k_syria = { # Al-Sham c_syria = { # Hauran (727) color = { 37 234 22 } color2 = { 255 255 255 } + greek = "Bosra" + roman = "Bosra" b_ramtah = {} b_suwaida = {} b_nimreh = {} @@ -8243,6 +8272,8 @@ k_syria = { # Al-Sham c_suwaida = { # Bathaniyya (712) color = { 41 238 26 } color2 = { 255 255 255 } + greek = "Shahba" + roman = "Shahba" b_salah = {} b_shahba = {} b_adrasyria = {} @@ -8251,6 +8282,8 @@ k_syria = { # Al-Sham c_irbid = { # Jaulan (725) color = { 128 255 9 } color2 = { 255 255 255 } + greek = "Irbid" + roman = "Irbid" b_irbid = {} b_nawasyria = {} b_hasbaya = {} @@ -8267,6 +8300,10 @@ k_syria = { # Al-Sham c_amman = { # Balqa (724) color = { 131 255 12 } color2 = { 255 255 255 } + frankish = "Amman" + norman = "Amman" + greek = "Amman" + roman = "Amman" b_amman = {} b_dhiban = {} b_salt = {} diff --git a/SED2/localisation/A SWMHcounties.csv b/SED2/localisation/A SWMHcounties.csv index c92a6db..94df0ec 100644 --- a/SED2/localisation/A SWMHcounties.csv +++ b/SED2/localisation/A SWMHcounties.csv @@ -432,9 +432,51 @@ c_anamur_adj_levantine_arabic;Mamure;;;;;;;;;;;;; c_anamur_adj_egyptian_arabic;Mamure;;;;;;;;;;;;; c_anamur_adj_andalusian_arabic;Mamure;;;;;;;;;;;;; c_anamur_adj_sicilian_arabic;Mamure;;;;;;;;;;;;; +c_jerusalem_adj_bedouin_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_maghreb_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_levantine_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_egyptian_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_andalusian_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_sicilian_arabic;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_sanhaja;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_tagelmust;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_tuareg;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_masmuda;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_zanata;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_greek;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_oghuz;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_turkmen;Jerusalemite;;;;;;;;;;;;; +c_jerusalem_adj_turkish;Jerusalemite;;;;;;;;;;;;; +c_beersheb_adj_greek;Nablus;;;;;;;;;;;;; +c_beersheb_adj_bedouin_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_maghreb_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_levantine_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_egyptian_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_andalusian_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_sicilian_arabic;Nablus;;;;;;;;;;;;; +c_beersheb_adj_sanhaja;Nablus;;;;;;;;;;;;; +c_beersheb_adj_tagelmust;Nablus;;;;;;;;;;;;; +c_beersheb_adj_tuareg;Nablus;;;;;;;;;;;;; +c_beersheb_adj_masmuda;Nablus;;;;;;;;;;;;; +c_beersheb_adj_zanata;Nablus;;;;;;;;;;;;; c_caesarea_adj;Caesarean;;;;;;;;;;;;; +c_hebron_adj_greek;Hebron;;;;;;;;;;;;; +c_hebron_adj_bedouin_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_maghreb_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_levantine_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_egyptian_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_andalusian_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_sicilian_arabic;Hebron;;;;;;;;;;;;; +c_hebron_adj_sanhaja;Hebron;;;;;;;;;;;;; +c_hebron_adj_tagelmust;Hebron;;;;;;;;;;;;; +c_hebron_adj_tuareg;Hebron;;;;;;;;;;;;; +c_hebron_adj_masmuda;Hebron;;;;;;;;;;;;; +c_hebron_adj_zanata;Hebron;;;;;;;;;;;;; c_sidon_adj;Sidonian;;;;;;;;;;;;; c_nazareth_adj;Nazarene;;;;;;;;;;;;; +c_tell_bashir_adj_oghuz;Turbessel;;;;;;;;;;;;; +c_tell_bashir_adj_turkmen;Turbessel;;;;;;;;;;;;; +c_tell_bashir_adj_turkish;Turbessel;;;;;;;;;;;;; c_aintab_adj_norman;Gaziantep;;;;;;;;;;;;; c_aintab_adj_frankish;Gaziantep;;;;;;;;;;;;; c_aintab_adj_bedouin_arabic;Gaziantep;;;;;;;;;;;;; @@ -450,11 +492,39 @@ c_saone_adj_levantine_arabic;Latakian;;;;;;;;;;;;; c_saone_adj_egyptian_arabic;Latakian;;;;;;;;;;;;; c_saone_adj_andalusian_arabic;Latakian;;;;;;;;;;;;; c_saone_adj_sicilian_arabic;Latakian;;;;;;;;;;;;; +c_archa_adj_greek;Apamea;;;;;;;;;;;;; +c_archa_adj_bedouin_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_maghreb_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_levantine_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_egyptian_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_andalusian_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_sicilian_arabic;Qalaat al-Madiq;;;;;;;;;;;;; +c_archa_adj_frankish;Apamea;;;;;;;;;;;;; +c_archa_adj_norman;Apamea;;;;;;;;;;;;; c_gibelet_adj;Byblian;;;;;;;;;;;;; +c_aleppo_adj_greek;Aleppo;;;;;;;;;;;;; +c_aleppo_adj_frankish;Aleppo;;;;;;;;;;;;; +c_aleppo_adj_norman;Aleppo;;;;;;;;;;;;; c_kafrtab_adj;Kafartab;;;;;;;;;;;;; c_kafrtab_adj_greek;Maarat al-Numaan;;;;;;;;;;;;; c_kafrtab_adj_frankish;Maarat al-Numaan;;;;;;;;;;;;; c_kafrtab_adj_norman;Maarat al-Numaan;;;;;;;;;;;;; +c_homs_adj_greek;Homsi;;;;;;;;;;;;; +c_homs_adj_frankish;Homsi;;;;;;;;;;;;; +c_homs_adj_norman;Homsi;;;;;;;;;;;;; +c_damascus_adj_greek;Damascus;;;;;;;;;;;;; +c_damascus_adj_frankish;Damascus;;;;;;;;;;;;; +c_damascus_adj_norman;Damascus;;;;;;;;;;;;; +c_suwaida_adj_greek;Shahba;;;;;;;;;;;;; +c_irbid_adj_greek;Irbid;;;;;;;;;;;;; +c_amman_adj_greek;Ammani;;;;;;;;;;;;; +c_amman_adj_frankish;Ammani;;;;;;;;;;;;; +c_amman_adj_norman;Ammani;;;;;;;;;;;;; +c_az_zarqa_adj_greek;Azraq;;;;;;;;;;;;; +c_madaba_adj_greek;Jerash;;;;;;;;;;;;; +c_madaba_adj_frankish;Jerash;;;;;;;;;;;;; +c_madaba_adj_norman;Jerash;;;;;;;;;;;;; +c_asas_adj_greek;Al-Raqqah;;;;;;;;;;;;; c_eivissa_adj;Ibizan;;;;;;;;;;;;; c_lemos_adj;Monforte;;;;;;;;;;;;; c_palencia_adj;Palencian;;;;;;;;;;;;; diff --git a/SED2/localisation/A SWMHprovinces.csv b/SED2/localisation/A SWMHprovinces.csv index 363f204..357323b 100644 --- a/SED2/localisation/A SWMHprovinces.csv +++ b/SED2/localisation/A SWMHprovinces.csv @@ -240,6 +240,31 @@ PROV1997;Sakarya;;;;;;;;;;;;; PROV1998;Divrigi;;;;;;;;;;;;; PROV2000;Lydia;;;;;;;;;;;;; PROV1980;Zamanti;;;;;;;;;;;;; +PROV765;Bourzey;;;;;;;;;;;;; +PROV726;Qasr al-Hayr al-Gharbi;;;;;;;;;;;;; +PROV714;Azraq;;;;;;;;;;;;; +PROV709;Al-Raqqah;;;;;;;;;;;;; +PROV731;Homs;;;;;;;;;;;;; +PROV768;Beqaa;;;;;;;;;;;;; +PROV725;Golan;;;;;;;;;;;;; +PROV728;Ghouta;;;;;;;;;;;;; +PROV727;Hauran;;;;;;;;;;;;; +PROV712;Batanaea;;;;;;;;;;;;; +PROV724;Balqa’;;;;;;;;;;;;; +PROV708;Turbessel;;;;;;;;;;;;; +PROV723;Jerash;;;;;;;;;;;;; +PROV713;Qasr al-Hayr al-Sharqi;;;;;;;;;;;;; +PROV729;Al-Qa’im;;;;;;;;;;;;; +PROV733;Aleppo;;;;;;;;;;;;; +PROV722;Elim;;;;;;;;;;;;; +PROV769;Toron;;;;;;;;;;;;; +PROV779;Nablus;;;;;;;;;;;;; +PROV776;Hebron;;;;;;;;;;;;; +PROV782;Negev;;;;;;;;;;;;; +PROV774;Jerusalem;;;;;;;;;;;;; +PROV781;Deir al-Balah;;;;;;;;;;;;; +PROV786;Mount Catherine;;;;;;;;;;;;; +PROV785;Nekhel;;;;;;;;;;;;; PROV484;Cyclades;;;;;;;;;;;;; PROV486;Chios;;;;;;;;;;;;; PROV487;Aegean Islands;;;;;;;;;;;;; diff --git a/templates/common/landed_titles/swmh_landed_titles.csv b/templates/common/landed_titles/swmh_landed_titles.csv index ceccafa..51a4a3d 100644 --- a/templates/common/landed_titles/swmh_landed_titles.csv +++ b/templates/common/landed_titles/swmh_landed_titles.csv @@ -3650,8 +3650,8 @@ c_monreal ;tagelmust ; ;Shobak c_monreal ;masmuda ; ;Shobak c_monreal ;zanata ; ;Shobak c_monreal ;tuareg ; ;Shobak -c_petra ;greek ; ;Aila -c_petra ;roman ; ;Aila +c_petra ;greek ;Aqaba ;Aila +c_petra ;roman ;Aqaba ;Aila c_kerak ;andalusian_arabic ; ;Al-Karak c_kerak ;bedouin_arabic ; ;Al-Karak c_kerak ;maghreb_arabic ; ;Al-Karak @@ -3720,14 +3720,14 @@ c_sidon ;masmuda ; ;Sayda c_sidon ;zanata ; ;Sayda c_sidon ;tuareg ; ;Sayda c_safed ;andalusian_arabic ; ;Safad -c_safed ;greek ; ;Paneas -c_safed ;bedouin_arabic ; ;Safad -c_safed ;maghreb_arabic ; ;Safad -c_safed ;levantine_arabic ; ;Safad -c_safed ;egyptian_arabic ; ;Safad -c_safed ;sicilian_arabic ; ;Safad -c_safed ;ashkenazi ; ;Tsfat -c_safed ;roman ; ;Paneas +c_safed ;greek ;Banias ;Paneas +c_safed ;bedouin_arabic ;Safed ;Safad +c_safed ;maghreb_arabic ;Safed ;Safad +c_safed ;levantine_arabic ;Safed ;Safad +c_safed ;egyptian_arabic ;Safed ;Safad +c_safed ;sicilian_arabic ;Safed ;Safad +c_safed ;ashkenazi ;Safed ;Tsfat +c_safed ;roman ;Banias ;Paneas k_antioch ;andalusian_arabic ;al-Awasim;Awasim k_antioch ;greek ; ;Antiócheias k_antioch ;bedouin_arabic ;al-Awasim;Awasim @@ -3842,15 +3842,15 @@ c_saone ;maghreb_arabic ;Latakia ;al-Ladiqiya c_saone ;levantine_arabic ;Latakia ;al-Ladiqiya c_saone ;egyptian_arabic ;Latakia ;al-Ladiqiya c_saone ;sicilian_arabic ;Latakia ;al-Ladiqiya -c_archa ;frankish ; ;Apamée -c_archa ;norman ; ;Apamée -c_archa ;andalusian_arabic ; ;Fâmieh -c_archa ;greek ; ;Apameia -c_archa ;bedouin_arabic ; ;Fâmieh -c_archa ;maghreb_arabic ; ;Fâmieh -c_archa ;levantine_arabic ; ;Fâmieh -c_archa ;egyptian_arabic ; ;Fâmieh -c_archa ;sicilian_arabic ; ;Fâmieh +c_archa ;frankish ;Apamea ;Apamée +c_archa ;norman ;Apamea ;Apamée +c_archa ;andalusian_arabic ;Qalaat al-Madiq;Fâmieh +c_archa ;greek ;Apamea ;Apameia +c_archa ;bedouin_arabic ;Qalaat al-Madiq;Fâmieh +c_archa ;maghreb_arabic ;Qalaat al-Madiq;Fâmieh +c_archa ;levantine_arabic ;Qalaat al-Madiq;Fâmieh +c_archa ;egyptian_arabic ;Qalaat al-Madiq;Fâmieh +c_archa ;sicilian_arabic ;Qalaat al-Madiq;Fâmieh d_tripoli ;name_tier ;count ;count d_tripoli ;andalusian_arabic ; ;Tarabulus d_tripoli ;greek ;Phoenice;Phoenice @@ -3945,27 +3945,27 @@ c_salamiyah ;roman ; ;Salamias d_damascus ;title_prefix ;JUND_OF ;JUND_OF d_damascus ;greek ;Phoenice Libanensis;Phoenice Libanensis d_damascus ;roman ;Phoenice Libanensis;Phoenice Libanensis -c_damascus ;frankish ; ;Damascus -c_damascus ;norman ; ;Damascus -c_damascus ;greek ; ;Damaskos -c_damascus ;roman ; ;Damascus -c_baalbek ;frankish ; ;Balbec -c_baalbek ;norman ; ;Balbec -c_baalbek ;greek ; ;Helioupolis -c_baalbek ;roman ; ;Heliopolis -c_syria ;greek ; ;Bostra -c_syria ;roman ; ;Bostra -c_suwaida ;greek ; ;Philippopolis -c_suwaida ;roman ; ;Philippopolis -c_irbid ;greek ; ;Arbela -c_irbid ;roman ; ;Arbela +c_damascus ;frankish ;Damascus;Damascus +c_damascus ;norman ;Damascus;Damascus +c_damascus ;greek ;Damascus;Damaskos +c_damascus ;roman ;Damascus;Damascus +c_baalbek ;frankish ;Baalbek ;Balbec +c_baalbek ;norman ;Baalbek ;Balbec +c_baalbek ;greek ;Baalbek ;Helioupolis +c_baalbek ;roman ;Baalbek ;Heliopolis +c_syria ;greek ;Bosra ;Bostra +c_syria ;roman ;Bosra ;Bostra +c_suwaida ;greek ;Shahba ;Philippopolis +c_suwaida ;roman ;Shahba ;Philippopolis +c_irbid ;greek ;Irbid ;Arbela +c_irbid ;roman ;Irbid ;Arbela d_jordan ;title_prefix ;JUND_OF ;JUND_OF d_jordan ;greek ;Arabia Petraea;Arabia Prima d_jordan ;roman ;Arabia Petraea;Arabia Prima -c_amman ;frankish ; ;Ahamant -c_amman ;norman ; ;Ahamant -c_amman ;greek ; ;Philadelpheia -c_amman ;roman ; ;Philadelphia +c_amman ;frankish ;Amman ;Ahamant +c_amman ;norman ;Amman ;Ahamant +c_amman ;greek ;Amman ;Philadelpheia +c_amman ;roman ;Amman ;Philadelphia c_az_zarqa ;greek ; ;Basienis c_az_zarqa ;roman ; ;Basienis c_madaba ;frankish ; ;Gerasa diff --git a/templates/localisation/A SWMHcounties.csv b/templates/localisation/A SWMHcounties.csv index 9ed25b7..15424eb 100644 --- a/templates/localisation/A SWMHcounties.csv +++ b/templates/localisation/A SWMHcounties.csv @@ -1503,47 +1503,47 @@ c_anamur_adj_andalusian_arabic ;Mamure ;Ma'muriyan;;; c_anamur_adj_sicilian_arabic ;Mamure ;Ma'muriyan;;; #Holyland,,,,,,,,,,,,,,;;;;; ##,Jerusalem,,,,,,,,,,,,,;;;;; -c_jerusalem_adj_bedouin_arabic ; ;Qudsian;;; -c_jerusalem_adj_maghreb_arabic ; ;Qudsian;;; -c_jerusalem_adj_levantine_arabic ; ;Qudsian;;; -c_jerusalem_adj_egyptian_arabic ; ;Qudsian;;; -c_jerusalem_adj_andalusian_arabic ; ;Qudsian;;; -c_jerusalem_adj_sicilian_arabic ; ;Qudsian;;; -c_jerusalem_adj_sanhaja ; ;Qudsian;;; -c_jerusalem_adj_tagelmust ; ;Qudsian;;; -c_jerusalem_adj_tuareg ; ;Qudsian;;; -c_jerusalem_adj_masmuda ; ;Qudsian;;; -c_jerusalem_adj_zanata ; ;Qudsian;;; -c_jerusalem_adj_greek ; ;Hierosolyman;;; -c_jerusalem_adj_oghuz ; ;Küdüsi;;; -c_jerusalem_adj_turkmen ; ;Küdüsi;;; -c_jerusalem_adj_turkish ; ;Küdüsi;;; -c_beersheb_adj_greek ; ;Neapolitan;;; -c_beersheb_adj_bedouin_arabic ; ;Nablusi;;; -c_beersheb_adj_maghreb_arabic ; ;Nablusi;;; -c_beersheb_adj_levantine_arabic ; ;Nablusi;;; -c_beersheb_adj_egyptian_arabic ; ;Nablusi;;; -c_beersheb_adj_andalusian_arabic ; ;Nablusi;;; -c_beersheb_adj_sicilian_arabic ; ;Nablusi;;; -c_beersheb_adj_sanhaja ; ;Nablusi;;; -c_beersheb_adj_tagelmust ; ;Nablusi;;; -c_beersheb_adj_tuareg ; ;Nablusi;;; -c_beersheb_adj_masmuda ; ;Nablusi;;; -c_beersheb_adj_zanata ; ;Nablusi;;; +c_jerusalem_adj_bedouin_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_maghreb_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_levantine_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_egyptian_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_andalusian_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_sicilian_arabic ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_sanhaja ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_tagelmust ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_tuareg ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_masmuda ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_zanata ;Jerusalemite;Qudsian;;; +c_jerusalem_adj_greek ;Jerusalemite;Hierosolyman;;; +c_jerusalem_adj_oghuz ;Jerusalemite;Küdüsi;;; +c_jerusalem_adj_turkmen ;Jerusalemite;Küdüsi;;; +c_jerusalem_adj_turkish ;Jerusalemite;Küdüsi;;; +c_beersheb_adj_greek ;Nablus ;Neapolitan;;; +c_beersheb_adj_bedouin_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_maghreb_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_levantine_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_egyptian_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_andalusian_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_sicilian_arabic ;Nablus ;Nablusi;;; +c_beersheb_adj_sanhaja ;Nablus ;Nablusi;;; +c_beersheb_adj_tagelmust ;Nablus ;Nablusi;;; +c_beersheb_adj_tuareg ;Nablus ;Nablusi;;; +c_beersheb_adj_masmuda ;Nablus ;Nablusi;;; +c_beersheb_adj_zanata ;Nablus ;Nablusi;;; c_caesarea_adj ;Caesarean;Caesarean;;; c_caesarea_adj_greek ; ;Kaisáreian;;; -c_hebron_adj_greek ; ;Hebrónan;;; -c_hebron_adj_bedouin_arabic ; ;Khailan;;; -c_hebron_adj_maghreb_arabic ; ;Khailan;;; -c_hebron_adj_levantine_arabic ; ;Khailan;;; -c_hebron_adj_egyptian_arabic ; ;Khailan;;; -c_hebron_adj_andalusian_arabic ; ;Khailan;;; -c_hebron_adj_sicilian_arabic ; ;Khailan;;; -c_hebron_adj_sanhaja ; ;Khailan;;; -c_hebron_adj_tagelmust ; ;Khailan;;; -c_hebron_adj_tuareg ; ;Khailan;;; -c_hebron_adj_masmuda ; ;Khailan;;; -c_hebron_adj_zanata ; ;Khailan;;; +c_hebron_adj_greek ;Hebron ;Hebrónan;;; +c_hebron_adj_bedouin_arabic ;Hebron ;Khailan;;; +c_hebron_adj_maghreb_arabic ;Hebron ;Khailan;;; +c_hebron_adj_levantine_arabic ;Hebron ;Khailan;;; +c_hebron_adj_egyptian_arabic ;Hebron ;Khailan;;; +c_hebron_adj_andalusian_arabic ;Hebron ;Khailan;;; +c_hebron_adj_sicilian_arabic ;Hebron ;Khailan;;; +c_hebron_adj_sanhaja ;Hebron ;Khailan;;; +c_hebron_adj_tagelmust ;Hebron ;Khailan;;; +c_hebron_adj_tuareg ;Hebron ;Khailan;;; +c_hebron_adj_masmuda ;Hebron ;Khailan;;; +c_hebron_adj_zanata ;Hebron ;Khailan;;; ##,Acre,,,,,,,,,,,,,;;;;; c_acre_adj_greek ; ;Ptolemaian;;; c_acre_adj_bedouin_arabic ; ;Akkan;;; @@ -1629,9 +1629,9 @@ c_edessa_adj_oghuz ; ;Urfan;;; c_edessa_adj_turkmen ; ;Urfan;;; c_edessa_adj_turkish ; ;Urfan;;; c_edessa_adj_kurdish ; ;Rihan;;; -c_tell_bashir_adj_oghuz ; ;Tilbesaran;;; -c_tell_bashir_adj_turkmen ; ;Tilbesaran;;; -c_tell_bashir_adj_turkish ; ;Tilbesaran;;; +c_tell_bashir_adj_oghuz ;Turbessel;Tilbesaran;;; +c_tell_bashir_adj_turkmen ;Turbessel;Tilbesaran;;; +c_tell_bashir_adj_turkish ;Turbessel;Tilbesaran;;; c_aintab_adj_norman ;Gaziantep;Hamtaban;;; c_aintab_adj_frankish ;Gaziantep;Hamtaban;;; c_aintab_adj_bedouin_arabic ;Gaziantep;Ayn Taban;;; @@ -1679,15 +1679,15 @@ c_saone_adj_levantine_arabic ;Latakian;Ladiqiyan;;; c_saone_adj_egyptian_arabic ;Latakian;Ladiqiyan;;; c_saone_adj_andalusian_arabic ;Latakian;Ladiqiyan;;; c_saone_adj_sicilian_arabic ;Latakian;Ladiqiyan;;; -c_archa_adj_greek ; ;Apameian;;; -c_archa_adj_bedouin_arabic ; ;Fâmiean;;; -c_archa_adj_maghreb_arabic ; ;Fâmiean;;; -c_archa_adj_levantine_arabic ; ;Fâmiean;;; -c_archa_adj_egyptian_arabic ; ;Fâmiean;;; -c_archa_adj_andalusian_arabic ; ;Fâmiean;;; -c_archa_adj_sicilian_arabic ; ;Fâmiean;;; -c_archa_adj_frankish ; ;Apaméan;;; -c_archa_adj_norman ; ;Apaméan;;; +c_archa_adj_greek ;Apamea ;Apameian;;; +c_archa_adj_bedouin_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_maghreb_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_levantine_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_egyptian_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_andalusian_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_sicilian_arabic ;Qalaat al-Madiq;Fâmiean;;; +c_archa_adj_frankish ;Apamea ;Apaméan;;; +c_archa_adj_norman ;Apamea ;Apaméan;;; ##,Tripoli,,,,,,,,,,,,,;;;;; c_tortosa_adj_greek ; ;Antaradan;;; c_tortosa_adj_bedouin_arabic ; ;Antartan;;; @@ -1740,9 +1740,9 @@ c_gibelet_adj_masmuda ; ;Jebailan;;; c_gibelet_adj_zanata ; ;Jebailan;;; c_gibelet_adj_greek ; ;Byblian;;; ##,Aleppo,,,,,,,,,,,,,;;;;; -c_aleppo_adj_greek ; ;Berroian;;; -c_aleppo_adj_frankish ; ;Halapian;;; -c_aleppo_adj_norman ; ;Halapian;;; +c_aleppo_adj_greek ;Aleppo ;Berroian;;; +c_aleppo_adj_frankish ;Aleppo ;Halapian;;; +c_aleppo_adj_norman ;Aleppo ;Halapian;;; c_manbij_adj ; ;Manbijan;;; c_manbij_adj_greek ; ;Hierapolitan;;; c_manbij_adj_frankish ; ;Mombechan;;; @@ -1753,29 +1753,29 @@ c_kafrtab_adj_frankish ;Maarat al-Numaan;La Marran;;; c_kafrtab_adj_norman ;Maarat al-Numaan;La Marran;;; c_hama_adj_greek ; ;Epiphanian;;; ##,Homs,,,,,,,,,,,,,;;;;; -c_homs_adj_greek ; ;Emesan;;; -c_homs_adj_frankish ; ;La Chamellan;;; -c_homs_adj_norman ; ;La Chamellan;;; +c_homs_adj_greek ;Homsi ;Emesan;;; +c_homs_adj_frankish ;Homsi ;La Chamellan;;; +c_homs_adj_norman ;Homsi ;La Chamellan;;; c_salamiyah_adj ; ;Salamiyan;;; c_salamiyah_adj_greek ; ;Salamian;;; ##,Damascus,,,,,,,,,,,,,;;;;; -c_damascus_adj_greek ; ;Damaskian;;; -c_damascus_adj_frankish ; ;Damascian;;; -c_damascus_adj_norman ; ;Damascian;;; +c_damascus_adj_greek ;Damascus;Damaskian;;; +c_damascus_adj_frankish ;Damascus;Damascian;;; +c_damascus_adj_norman ;Damascus;Damascian;;; c_baalbek_adj_greek ; ;Helioupolitan;;; c_baalbek_adj_frankish ; ;Balbecan;;; c_baalbek_adj_norman ; ;Balbecan;;; c_syria_adj_greek ; ;Bostran;;; -c_suwaida_adj_greek ; ;Philippopolitan;;; -c_irbid_adj_greek ; ;Arbelan;;; +c_suwaida_adj_greek ;Shahba ;Philippopolitan;;; +c_irbid_adj_greek ;Irbid ;Arbelan;;; ##,Jordan,,,,,,,,,,,,,;;;;; -c_amman_adj_greek ; ;Philadelpheian;;; -c_amman_adj_frankish ; ;Ahamantan;;; -c_amman_adj_norman ; ;Ahamantan;;; -c_az_zarqa_adj_greek ; ;Basienan;;; -c_madaba_adj_greek ; ;Gerasan;;; -c_madaba_adj_frankish ; ;Gerasan;;; -c_madaba_adj_norman ; ;Gerasan;;; +c_amman_adj_greek ;Ammani ;Philadelpheian;;; +c_amman_adj_frankish ;Ammani ;Ahamantan;;; +c_amman_adj_norman ;Ammani ;Ahamantan;;; +c_az_zarqa_adj_greek ;Azraq ;Basienan;;; +c_madaba_adj_greek ;Jerash ;Gerasan;;; +c_madaba_adj_frankish ;Jerash ;Gerasan;;; +c_madaba_adj_norman ;Jerash ;Gerasan;;; ##,Mosul,,,,,,,,,,,,,;;;;; c_mosul_adj_greek ; ;Mepsilan;;; c_sinjar_adj_greek ; ;Singaran;;; @@ -1786,7 +1786,7 @@ c_nisibin_adj_egyptian_arabic ; ;Barqa'idan;;; c_nisibin_adj_andalusian_arabic ; ;Barqa'idan;;; c_nisibin_adj_sicilian_arabic ; ;Barqa'idan;;; ##,Jazira,,,,,,,,,,,,,;;;;; -c_asas_adj_greek ; ;Kallinikan;;; +c_asas_adj_greek ;Al-Raqqah;Kallinikan;;; c_al_bichri_adj_greek ; ;Kirkesian;;; c_harran_adj ; ;Harranan;;; c_harran_adj_greek ; ;Karraian;;; diff --git a/templates/localisation/A SWMHprovinces.csv b/templates/localisation/A SWMHprovinces.csv index 3de6ec1..05475f1 100644 --- a/templates/localisation/A SWMHprovinces.csv +++ b/templates/localisation/A SWMHprovinces.csv @@ -302,31 +302,31 @@ PROV1980;Zamanti ;Tzamandos;c_tzamandos,Sarkisla,Dzamintav;; ########################################,,,,,,,,,,,,,,;;;;; #Syria,,,,,,,,,,,,,,;;;;; ########################################,,,,,,,,,,,,,,;;;;; -PROV765 ; ;Berzieh;c_archa,Fâmieh,Apamée,Apameia;;Archa -PROV726 ; ;Qasr al-Hayr al-Gharbi;c_al_mafraq;;Al Mafraq -PROV714 ; ;Azraq;c_az_zarqa,Basienis;;Az Zarqa -PROV709 ; ;Ar-Raqqah;c_asas,Callinicum,Kallinikos;;Asas -PROV731 ; ;Hims;c_homs,La Chamelle,Emesa;;Homs -PROV768 ; ;Bekaa;c_baalbek,Balbec,Heliopolis,Helioupolis;;Baalbek -PROV725 ; ;Jaulan;c_irbid,Arbela;;Irbid -PROV728 ; ;Ghutah;c_damascus,Damascus,Damaskos;;Damascus -PROV727 ; ;Hauran;c_syria,Bostra;;Bostra -PROV712 ; ;Bathaniyya;c_suwaida,Philippopolis;;Suwaida -PROV724 ; ;Balqa;c_amman,Philadelphia,Philadelpheia,Ahamant;;Amman -PROV708 ; ;Turbessel;c_tell_bashir,Tell Bashir,Tilbesar;;Tell Bashir -PROV723 ; ;Jarash;c_madaba,Gerasa;;Madaba -PROV713 ; ;Qasr al-Hayr al-Sharqi;c_druz;;Druz -PROV729 ; ;Alqaim;c_tadmor;;Al-Sukhnah -PROV733 ; ;Halab;c_aleppo,Beroea,Berroia,Halapia;;Aleppo -PROV722 ; ;Elim;c_petra,Aila;;Petra -PROV769 ; ;Toron;c_safed,Paneas,Tsfat,Safad;;Safed -PROV779 ; ;Naples;c_beersheb,Nablus,Neapolis;;Beersheb -PROV776 ; ;St-Abraham;c_hebron,El-Khail,Hebron,Hebrón;;Hebron -PROV782 ; ;Negev desert;;;Negev -PROV774 ; ;Jérusalem;c_jerusalem,Al-Quds,Kudüs,Ierosolyma,Hierosolyma;;Jerusalem -PROV781 ; ;Darom;c_darum;;Darum -PROV786 ; ;Jabal Katrina;c_eilat;;Eilat -PROV785 ; ;Nekhel;c_sinai;;Sinai +PROV765 ;Bourzey ;Berzieh;c_archa,Fâmieh,Apamée,Apameia;;Archa +PROV726 ;Qasr al-Hayr al-Gharbi;Qasr al-Hayr al-Gharbi;c_al_mafraq;;Al Mafraq +PROV714 ;Azraq ;Azraq;c_az_zarqa,Basienis;;Az Zarqa +PROV709 ;Al-Raqqah;Ar-Raqqah;c_asas,Callinicum,Kallinikos;;Asas +PROV731 ;Homs ;Hims;c_homs,La Chamelle,Emesa;;Homs +PROV768 ;Beqaa ;Bekaa;c_baalbek,Balbec,Heliopolis,Helioupolis;;Baalbek +PROV725 ;Golan ;Jaulan;c_irbid,Arbela;;Irbid +PROV728 ;Ghouta ;Ghutah;c_damascus,Damascus,Damaskos;;Damascus +PROV727 ;Hauran ;Hauran;c_syria,Bostra;;Bostra +PROV712 ;Batanaea;Bathaniyya;c_suwaida,Philippopolis;;Suwaida +PROV724 ;Balqa’ ;Balqa;c_amman,Philadelphia,Philadelpheia,Ahamant;;Amman +PROV708 ;Turbessel;Turbessel;c_tell_bashir,Tell Bashir,Tilbesar;;Tell Bashir +PROV723 ;Jerash ;Jarash;c_madaba,Gerasa;;Madaba +PROV713 ;Qasr al-Hayr al-Sharqi;Qasr al-Hayr al-Sharqi;c_druz;;Druz +PROV729 ;Al-Qa’im;Alqaim;c_tadmor;;Al-Sukhnah +PROV733 ;Aleppo ;Halab;c_aleppo,Beroea,Berroia,Halapia;;Aleppo +PROV722 ;Elim ;Elim;c_petra,Aila;;Petra +PROV769 ;Toron ;Toron;c_safed,Paneas,Tsfat,Safad;;Safed +PROV779 ;Nablus ;Naples;c_beersheb,Nablus,Neapolis;;Beersheb +PROV776 ;Hebron ;St-Abraham;c_hebron,El-Khail,Hebron,Hebrón;;Hebron +PROV782 ;Negev ;Negev desert;;;Negev +PROV774 ;Jerusalem;Jérusalem;c_jerusalem,Al-Quds,Kudüs,Ierosolyma,Hierosolyma;;Jerusalem +PROV781 ;Deir al-Balah;Darom;c_darum;;Darum +PROV786 ;Mount Catherine;Jabal Katrina;c_eilat;;Eilat +PROV785 ;Nekhel ;Nekhel;c_sinai;;Sinai ########################################,,,,,,,,,,,,,,;;;;; #Grecce,,,,,,,,,,,,,,;;;;; ########################################,,,,,,,,,,,,,,;;;;; From b17597c625ab1aa55dc0b481bdae08d8057e2e47 Mon Sep 17 00:00:00 2001 From: Nicholas Escalona Date: Sun, 16 Aug 2015 11:20:30 -0400 Subject: [PATCH 2/4] provinces greek --- .../landed_titles/swmh_landed_titles.txt | 140 ++++++ SED2/localisation/A SWMHcounties.csv | 229 +++++++++ SED2/localisation/A SWMHprovinces.csv | 25 + .../landed_titles/swmh_landed_titles.csv | 280 +++++------ templates/localisation/A SWMHcounties.csv | 458 +++++++++--------- templates/localisation/A SWMHprovinces.csv | 50 +- 6 files changed, 788 insertions(+), 394 deletions(-) diff --git a/SED2/common/landed_titles/swmh_landed_titles.txt b/SED2/common/landed_titles/swmh_landed_titles.txt index 5339d74..0d2acdd 100644 --- a/SED2/common/landed_titles/swmh_landed_titles.txt +++ b/SED2/common/landed_titles/swmh_landed_titles.txt @@ -4339,6 +4339,12 @@ e_byzantium = { # Basileia Rh c_strymon = { # Strymonos (492) color = { 139 29 101 } color2 = { 255 255 255 } + turkish = "Serres" + turkmen = "Serres" + oghuz = "Serres" + pecheneg = "Serres" + serbian = "Serres" + bulgarian = "Serres" b_serres = {} b_kavala = {} b_philippi = {} @@ -4431,6 +4437,10 @@ e_byzantium = { # Basileia Rh c_demetrias = { # Demetrias (488) color = { 209 69 161 } color2 = { 255 255 255 } + turkish = "Volos" + turkmen = "Volos" + oghuz = "Volos" + pecheneg = "Volos" b_demetrias = {} b_halmyros = {} b_velestino = {} @@ -4439,6 +4449,10 @@ e_byzantium = { # Basileia Rh c_upper_wallachia = { # Megále Vlachia (1528) color = { 212 72 164 } color2 = { 255 255 255 } + turkish = "Trikala" + turkmen = "Trikala" + oghuz = "Trikala" + pecheneg = "Trikala" b_kalabaka = {} b_trikala = {} b_grevena = {} @@ -4525,6 +4539,9 @@ e_byzantium = { # Basileia Rh c_epeiros = { # Epeiros (472) color = { 138 67 113 } color2 = { 255 255 255 } + turkish = "Ioannina" + turkmen = "Ioannina" + oghuz = "Ioannina" b_butrint = {} b_ioannina = {} b_dryinoupolis = {} @@ -4542,6 +4559,23 @@ e_byzantium = { # Basileia Rh c_arta = { # Nikopolis (473) color = { 142 71 117 } color2 = { 255 255 255 } + frankish = "Arta" + norman = "Arta" + turkish = "Arta" + turkmen = "Arta" + oghuz = "Arta" + pecheneg = "Arta" + sardinian = "Arta" + sicilian = "Arta" + corsican = "Arta" + central_italian = "Arta" + southern_italian = "Arta" + neapolitan = "Arta" + tuscan = "Arta" + ligurian = "Arta" + italian = "Arta" + venetian = "Arta" + dalmatian = "Arta" b_angelokastron = {} b_preveza = {} b_arta = {} @@ -4633,6 +4667,24 @@ e_byzantium = { # Basileia Rh c_thebai = { # Boiotía (1999) color = { 209 69 161 } color2 = { 255 255 255 } + frankish = "Thebes" + norman = "Thebes" + catalan = "Thebes" + turkish = "Thebes" + turkmen = "Thebes" + oghuz = "Thebes" + pecheneg = "Thebes" + sardinian = "Thebes" + sicilian = "Thebes" + corsican = "Thebes" + central_italian = "Thebes" + southern_italian = "Thebes" + neapolitan = "Thebes" + tuscan = "Thebes" + ligurian = "Thebes" + italian = "Thebes" + venetian = "Thebes" + dalmatian = "Thebes" b_thebes = {} b_amfissa = {} b_levadia = {} @@ -4642,6 +4694,26 @@ e_byzantium = { # Basileia Rh c_euboia = { # Euripos (485) color = { 151 59 119 } color2 = { 255 255 255 } + frankish = "Euboea" + norman = "Euboea" + catalan = "Euboea" + turkish = "Euboea" + turkmen = "Egriboz" + oghuz = "Egriboz" + pecheneg = "Egriboz" + croatian = "Euboea" + serbian = "Euboea" + sardinian = "Euboea" + sicilian = "Euboea" + corsican = "Euboea" + central_italian = "Euboea" + southern_italian = "Euboea" + neapolitan = "Euboea" + tuscan = "Euboea" + ligurian = "Euboea" + italian = "Euboea" + venetian = "Euboea" + dalmatian = "Euboea" b_chalkis = {} b_karystos = {} b_armena = {} @@ -4651,6 +4723,24 @@ e_byzantium = { # Basileia Rh color = { 215 75 167 } color2 = { 255 255 255 } holy_site = hellenic_pagan + frankish = "Athens" + norman = "Athens" + catalan = "Athens" + turkish = "Athens" + turkmen = "Athens" + oghuz = "Athens" + pecheneg = "Athens" + sardinian = "Athens" + sicilian = "Athens" + corsican = "Athens" + central_italian = "Athens" + southern_italian = "Athens" + neapolitan = "Athens" + tuscan = "Athens" + ligurian = "Athens" + italian = "Athens" + venetian = "Athens" + dalmatian = "Athens" b_athens = {} b_megara = {} b_oropos = {} @@ -4703,6 +4793,17 @@ e_byzantium = { # Basileia Rh c_methone = { # Messinia (477) color = { 196 35 140 } color2 = { 255 255 255 } + sardinian = "Methoni" + sicilian = "Methoni" + corsican = "Methoni" + central_italian = "Methoni" + southern_italian = "Methoni" + neapolitan = "Methoni" + tuscan = "Methoni" + ligurian = "Methoni" + italian = "Methoni" + venetian = "Methoni" + dalmatian = "Methoni" b_kalamata = {} b_modon = {} b_coron = {} @@ -4712,6 +4813,25 @@ e_byzantium = { # Basileia Rh c_monemvasia = { # Lakonia (478) color = { 198 37 142 } color2 = { 255 255 255 } + frankish = "Chaconie" + norman = "Chaconie" + turkish = "Monemvasia" + turkmen = "Monemvasia" + oghuz = "Monemvasia" + pecheneg = "Monemvasia" + croatian = "Monemvasia" + serbian = "Monemvasia" + sardinian = "Monemvasia" + sicilian = "Monemvasia" + corsican = "Monemvasia" + central_italian = "Monemvasia" + southern_italian = "Monemvasia" + neapolitan = "Monemvasia" + tuscan = "Monemvasia" + ligurian = "Monemvasia" + italian = "Monemvasia" + venetian = "Monemvasia" + dalmatian = "Monemvasia" b_monemvasia = {} b_lacedaemonia = {} b_elos = {} @@ -4722,6 +4842,10 @@ e_byzantium = { # Basileia Rh c_arcadia = { # Arkadia (1986) color = { 198 37 142 } color2 = { 255 255 255 } + turkish = "Tripoli" + turkmen = "Tripoli" + oghuz = "Tripoli" + pecheneg = "Tripoli" b_nikli = {} b_veligosti = {} b_akova = {} @@ -5091,6 +5215,22 @@ e_byzantium = { # Basileia Rh c_rhodos = { # Dodekánisa (483) color = { 116 37 88 } color2 = { 255 255 255 } + frankish = "Rhodes" + norman = "Rhodes" + turkish = "Rhodes" + turkmen = "Rhodes" + oghuz = "Rhodes" + sardinian = "Rhodes" + sicilian = "Rhodes" + corsican = "Rhodes" + central_italian = "Rhodes" + southern_italian = "Rhodes" + neapolitan = "Rhodes" + tuscan = "Rhodes" + ligurian = "Rhodes" + italian = "Rhodes" + venetian = "Rhodes" + dalmatian = "Rhodes" b_rhodos = {} b_kos = {} b_lindos = {} diff --git a/SED2/localisation/A SWMHcounties.csv b/SED2/localisation/A SWMHcounties.csv index 94df0ec..774e713 100644 --- a/SED2/localisation/A SWMHcounties.csv +++ b/SED2/localisation/A SWMHcounties.csv @@ -134,9 +134,214 @@ c_carlades_adj;Carlades;;;;;;;;;;;;; c_bourges_adj;Bourges;;;;;;;;;;;;; c_brie_adj;Brie;;;;;;;;;;;;; c_dauphinedeauvergne_adj;Auvergne;;;;;;;;;;;;; +c_hellas_adj_greek;Naupactus;;;;;;;;;;;;; +c_hellas_adj_oghuz;Naupactus;;;;;;;;;;;;; +c_hellas_adj_pecheneg;Naupactus;;;;;;;;;;;;; +c_hellas_adj_turkmen;Naupactus;;;;;;;;;;;;; +c_hellas_adj_turkish;Naupactus;;;;;;;;;;;;; +c_hellas_adj_dalmatian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_italian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_venetian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_ligurian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_central_italian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_southern_italian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_tuscan;Naupactus;;;;;;;;;;;;; +c_hellas_adj_neapolitan;Naupactus;;;;;;;;;;;;; +c_hellas_adj_corsican;Naupactus;;;;;;;;;;;;; +c_hellas_adj_sardinian;Naupactus;;;;;;;;;;;;; +c_hellas_adj_sicilian;Naupactus;;;;;;;;;;;;; +c_epeiros_adj_greek;Epirote;;;;;;;;;;;;; +c_epeiros_adj_oghuz;Ioannina;;;;;;;;;;;;; +c_epeiros_adj_turkmen;Ioannina;;;;;;;;;;;;; +c_epeiros_adj_pecheneg;Ioannina;;;;;;;;;;;;; +c_epeiros_adj_turkish;Ioannina;;;;;;;;;;;;; +c_epeiros_adj_dalmatian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_venetian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_ligurian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_central_italian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_southern_italian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_tuscan;Epirote;;;;;;;;;;;;; +c_epeiros_adj_neapolitan;Epirote;;;;;;;;;;;;; +c_epeiros_adj_corsican;Epirote;;;;;;;;;;;;; +c_epeiros_adj_sardinian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_sicilian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_italian;Epirote;;;;;;;;;;;;; +c_epeiros_adj_arberian;Epirote;;;;;;;;;;;;; +c_arta_adj_greek;Arta;;;;;;;;;;;;; +c_arta_adj_oghuz;Arta;;;;;;;;;;;;; +c_arta_adj_turkmen;Arta;;;;;;;;;;;;; +c_arta_adj_turkish;Arta;;;;;;;;;;;;; +c_arta_adj_dalmatian;Arta;;;;;;;;;;;;; +c_arta_adj_venetian;Arta;;;;;;;;;;;;; +c_arta_adj_ligurian;Arta;;;;;;;;;;;;; +c_arta_adj_central_italian;Arta;;;;;;;;;;;;; +c_arta_adj_southern_italian;Arta;;;;;;;;;;;;; +c_arta_adj_tuscan;Arta;;;;;;;;;;;;; +c_arta_adj_neapolitan;Arta;;;;;;;;;;;;; +c_arta_adj_corsican;Arta;;;;;;;;;;;;; +c_arta_adj_sardinian;Arta;;;;;;;;;;;;; +c_arta_adj_sicilian;Arta;;;;;;;;;;;;; +c_arta_adj_italian;Arta;;;;;;;;;;;;; +c_arta_adj_frankish;Arta;;;;;;;;;;;;; +c_arta_adj_norman;Arta;;;;;;;;;;;;; +c_cephalonia_adj_greek;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_oghuz;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_turkmen;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_turkish;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_dalmatian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_venetian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_ligurian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_central_italian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_southern_italian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_tuscan;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_neapolitan;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_corsican;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_sardinian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_sicilian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_italian;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_frankish;Cephalonian;;;;;;;;;;;;; +c_cephalonia_adj_norman;Cephalonian;;;;;;;;;;;;; +c_atheniai_adj_oghuz;Athenian;;;;;;;;;;;;; +c_atheniai_adj_turkmen;Athenian;;;;;;;;;;;;; +c_atheniai_adj_turkish;Athenian;;;;;;;;;;;;; +c_atheniai_adj_dalmatian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_italian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_venetian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_ligurian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_central_italian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_southern_italian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_tuscan;Athenian;;;;;;;;;;;;; +c_atheniai_adj_neapolitan;Athenian;;;;;;;;;;;;; +c_atheniai_adj_corsican;Athenian;;;;;;;;;;;;; +c_atheniai_adj_sardinian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_sicilian;Athenian;;;;;;;;;;;;; +c_atheniai_adj_frankish;Athenian;;;;;;;;;;;;; +c_atheniai_adj_norman;Athenian;;;;;;;;;;;;; +c_thebai_adj;Boeotian;;;;;;;;;;;;; +c_thebai_adj_oghuz;Theban;;;;;;;;;;;;; +c_thebai_adj_pecheneg;Theban;;;;;;;;;;;;; +c_thebai_adj_turkmen;Theban;;;;;;;;;;;;; +c_thebai_adj_turkish;Theban;;;;;;;;;;;;; +c_thebai_adj_dalmatian;Theban;;;;;;;;;;;;; +c_thebai_adj_italian;Theban;;;;;;;;;;;;; +c_thebai_adj_venetian;Theban;;;;;;;;;;;;; +c_thebai_adj_ligurian;Theban;;;;;;;;;;;;; +c_thebai_adj_central_italian;Theban;;;;;;;;;;;;; +c_thebai_adj_southern_italian;Theban;;;;;;;;;;;;; +c_thebai_adj_tuscan;Theban;;;;;;;;;;;;; +c_thebai_adj_neapolitan;Theban;;;;;;;;;;;;; +c_thebai_adj_corsican;Theban;;;;;;;;;;;;; +c_thebai_adj_sardinian;Theban;;;;;;;;;;;;; +c_thebai_adj_sicilian;Theban;;;;;;;;;;;;; +c_thebai_adj_frankish;Theban;;;;;;;;;;;;; +c_thebai_adj_norman;Theban;;;;;;;;;;;;; +c_euboia_adj_oghuz;Egriboz;;;;;;;;;;;;; +c_euboia_adj_pecheneg;Egriboz;;;;;;;;;;;;; +c_euboia_adj_turkmen;Egriboz;;;;;;;;;;;;; +c_euboia_adj_turkish;Egriboz;;;;;;;;;;;;; +c_korinthos_adj_greek;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_oghuz;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_turkmen;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_turkish;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_dalmatian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_venetian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_ligurian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_central_italian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_southern_italian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_tuscan;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_neapolitan;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_corsican;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_sardinian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_sicilian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_italian;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_frankish;Corinthian;;;;;;;;;;;;; +c_korinthos_adj_norman;Corinthian;;;;;;;;;;;;; +c_arcadia_adj;Arcadian;;;;;;;;;;;;; +c_arcadia_adj_oghuz;Tripoli;;;;;;;;;;;;; +c_arcadia_adj_turkmen;Tripoli;;;;;;;;;;;;; +c_arcadia_adj_turkish;Tripoli;;;;;;;;;;;;; +c_achaia_adj_greek;Achaean;;;;;;;;;;;;; +c_achaia_adj_oghuz;Achaean;;;;;;;;;;;;; +c_achaia_adj_turkmen;Achaean;;;;;;;;;;;;; +c_achaia_adj_turkish;Achaean;;;;;;;;;;;;; +c_achaia_adj_dalmatian;Achaean;;;;;;;;;;;;; +c_achaia_adj_venetian;Achaean;;;;;;;;;;;;; +c_achaia_adj_ligurian;Achaean;;;;;;;;;;;;; +c_achaia_adj_central_italian;Achaean;;;;;;;;;;;;; +c_achaia_adj_southern_italian;Achaean;;;;;;;;;;;;; +c_achaia_adj_tuscan;Achaean;;;;;;;;;;;;; +c_achaia_adj_neapolitan;Achaean;;;;;;;;;;;;; +c_achaia_adj_corsican;Achaean;;;;;;;;;;;;; +c_achaia_adj_sardinian;Achaean;;;;;;;;;;;;; +c_achaia_adj_sicilian;Achaean;;;;;;;;;;;;; +c_achaia_adj_italian;Achaean;;;;;;;;;;;;; +c_achaia_adj_frankish;Achaean;;;;;;;;;;;;; +c_achaia_adj_norman;Achaean;;;;;;;;;;;;; +c_methone_adj_greek;Messenian;;;;;;;;;;;;; +c_methone_adj_dalmatian;Methoni;;;;;;;;;;;;; +c_methone_adj_venetian;Methoni;;;;;;;;;;;;; +c_methone_adj_ligurian;Methoni;;;;;;;;;;;;; +c_methone_adj_central_italian;Methoni;;;;;;;;;;;;; +c_methone_adj_southern_italian;Methoni;;;;;;;;;;;;; +c_methone_adj_tuscan;Methoni;;;;;;;;;;;;; +c_methone_adj_neapolitan;Methoni;;;;;;;;;;;;; +c_methone_adj_corsican;Methoni;;;;;;;;;;;;; +c_methone_adj_sardinian;Methoni;;;;;;;;;;;;; +c_methone_adj_sicilian;Methoni;;;;;;;;;;;;; +c_methone_adj_italian;Methoni;;;;;;;;;;;;; +c_methone_adj_frankish;Messenian;;;;;;;;;;;;; +c_methone_adj_norman;Messenian;;;;;;;;;;;;; +c_dyrrachion_adj;Durrës;;;;;;;;;;;;; c_arbanon_adj_oghuz;Albanian;;;;;;;;;;;;; c_arbanon_adj_turkmen;Albanian;;;;;;;;;;;;; c_arbanon_adj_turkish;Albanian;;;;;;;;;;;;; +c_upper_wallachia_adj;Vlach;;;;;;;;;;;;; +c_upper_wallachia_adj_oghuz;Trikala;;;;;;;;;;;;; +c_upper_wallachia_adj_turkmen;Trikala;;;;;;;;;;;;; +c_upper_wallachia_adj_turkish;Trikala;;;;;;;;;;;;; +c_demetrias_adj;Demetrias;;;;;;;;;;;;; +c_demetrias_adj_oghuz;Volos;;;;;;;;;;;;; +c_demetrias_adj_turkmen;Volos;;;;;;;;;;;;; +c_demetrias_adj_turkish;Volos;;;;;;;;;;;;; +c_thessalia_adj;Thessalian;;;;;;;;;;;;; +c_veria_adj;Veria;;;;;;;;;;;;; +c_thessalonike_adj_oghuz;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_turkmen;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_turkish;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_russian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_bohemian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_moravian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_polish;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_pommeranian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_croatian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_bosnian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_serbian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_karantanci;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_bulgarian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_dalmatian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_venetian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_ligurian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_central_italian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_southern_italian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_tuscan;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_neapolitan;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_corsican;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_sardinian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_sicilian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_italian;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_frankish;Thessaloniki;;;;;;;;;;;;; +c_thessalonike_adj_norman;Thessaloniki;;;;;;;;;;;;; +c_chalkidike_adj;Chalkidiki;;;;;;;;;;;;; +c_chalkidike_adj_oghuz;Chalkidiki;;;;;;;;;;;;; +c_chalkidike_adj_turkmen;Chalkidiki;;;;;;;;;;;;; +c_chalkidike_adj_turkish;Chalkidiki;;;;;;;;;;;;; +c_strymon_adj;Strymon;;;;;;;;;;;;; +c_strymon_adj_oghuz;Serres;;;;;;;;;;;;; +c_strymon_adj_turkmen;Serres;;;;;;;;;;;;; +c_strymon_adj_turkish;Serres;;;;;;;;;;;;; +c_strymon_adj_serbian;Serres;;;;;;;;;;;;; +c_strymon_adj_bulgarian;Serres;;;;;;;;;;;;; +c_thrake_adj;Thracian;;;;;;;;;;;;; c_byzantion_adj_oghuz;Constantinopolitan;;;;;;;;;;;;; c_byzantion_adj_turkmen;Constantinopolitan;;;;;;;;;;;;; c_byzantion_adj_turkish;Constantinopolitan;;;;;;;;;;;;; @@ -180,12 +385,20 @@ c_lesbos_adj_italian;Lesbian;;;;;;;;;;;;; c_lesbos_adj_oghuz;Lesbian;;;;;;;;;;;;; c_lesbos_adj_turkmen;Lesbian;;;;;;;;;;;;; c_lesbos_adj_turkish;Lesbian;;;;;;;;;;;;; +c_chios_adj_oghuz;Chios;;;;;;;;;;;;; +c_chios_adj_turkmen;Chios;;;;;;;;;;;;; +c_chios_adj_turkish;Chios;;;;;;;;;;;;; c_abydos_adj_oghuz;Çanakkale;;;;;;;;;;;;; c_abydos_adj_turkmen;Çanakkale;;;;;;;;;;;;; c_abydos_adj_turkish;Çanakkale;;;;;;;;;;;;; c_kyzikos_adj_oghuz;Erdek;;;;;;;;;;;;; c_kyzikos_adj_turkmen;Erdek;;;;;;;;;;;;; c_kyzikos_adj_turkish;Erdek;;;;;;;;;;;;; +c_kaliopolis_adj_oghuz;Gallipoli;;;;;;;;;;;;; +c_kaliopolis_adj_turkmen;Gallipoli;;;;;;;;;;;;; +c_kaliopolis_adj_turkish;Gallipoli;;;;;;;;;;;;; +c_kaneia_adj;Chania;;;;;;;;;;;;; +c_chandax_adj;Heraklion;;;;;;;;;;;;; c_paphlagonia_adj_dalmatian;Paphlagonian;;;;;;;;;;;;; c_paphlagonia_adj_venetian;Paphlagonian;;;;;;;;;;;;; c_paphlagonia_adj_ligurian;Paphlagonian;;;;;;;;;;;;; @@ -320,6 +533,22 @@ c_attaleia_adj_norman;Antalya;;;;;;;;;;;;; c_attaleia_adj_oghuz;Antalya;;;;;;;;;;;;; c_attaleia_adj_turkmen;Antalya;;;;;;;;;;;;; c_attaleia_adj_turkish;Antalya;;;;;;;;;;;;; +c_rhodos_adj_dalmatian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_venetian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_ligurian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_central_italian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_southern_italian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_tuscan;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_neapolitan;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_corsican;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_sardinian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_sicilian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_italian;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_frankish;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_norman;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_oghuz;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_turkmen;Rhodian;;;;;;;;;;;;; +c_rhodos_adj_turkish;Rhodian;;;;;;;;;;;;; c_mylasa_adj;Milas;;;;;;;;;;;;; c_mylasa_adj_oghuz;Mentes;;;;;;;;;;;;; c_mylasa_adj_turkmen;Mentes;;;;;;;;;;;;; diff --git a/SED2/localisation/A SWMHprovinces.csv b/SED2/localisation/A SWMHprovinces.csv index 357323b..3fd889d 100644 --- a/SED2/localisation/A SWMHprovinces.csv +++ b/SED2/localisation/A SWMHprovinces.csv @@ -265,10 +265,35 @@ PROV774;Jerusalem;;;;;;;;;;;;; PROV781;Deir al-Balah;;;;;;;;;;;;; PROV786;Mount Catherine;;;;;;;;;;;;; PROV785;Nekhel;;;;;;;;;;;;; +PROV470;Durrës;;;;;;;;;;;;; +PROV472;Epirus;;;;;;;;;;;;; +PROV473;Nicopolis;;;;;;;;;;;;; +PROV474;Cephalonia;;;;;;;;;;;;; +PROV475;Naupactus;;;;;;;;;;;;; +PROV476;Achaea;;;;;;;;;;;;; +PROV477;Messenia;;;;;;;;;;;;; +PROV478;Laconia;;;;;;;;;;;;; +PROV479;Chania;;;;;;;;;;;;; +PROV480;Heraklion;;;;;;;;;;;;; +PROV481;Corinth;;;;;;;;;;;;; +PROV482;Attica;;;;;;;;;;;;; +PROV483;Dodecanese;;;;;;;;;;;;; PROV484;Cyclades;;;;;;;;;;;;; +PROV485;Euripus;;;;;;;;;;;;; PROV486;Chios;;;;;;;;;;;;; PROV487;Aegean Islands;;;;;;;;;;;;; +PROV488;Demetrias;;;;;;;;;;;;; +PROV489;Thessaly;;;;;;;;;;;;; +PROV490;Thessaloniki;;;;;;;;;;;;; +PROV491;Chalkidiki;;;;;;;;;;;;; +PROV492;Strymon;;;;;;;;;;;;; PROV495;Gallipoli;;;;;;;;;;;;; PROV496;Constantinople;;;;;;;;;;;;; +PROV497;Thrace;;;;;;;;;;;;; PROV1014;Corfu;;;;;;;;;;;;; +PROV1528;Great Vlachia;;;;;;;;;;;;; +PROV1986;Arcadia;;;;;;;;;;;;; +PROV1994;Ypati;;;;;;;;;;;;; PROV1996;Tekirdag;;;;;;;;;;;;; +PROV1999;Boeotia;;;;;;;;;;;;; +PROV1981;Veria;;;;;;;;;;;;; diff --git a/templates/common/landed_titles/swmh_landed_titles.csv b/templates/common/landed_titles/swmh_landed_titles.csv index 51a4a3d..a85c1bd 100644 --- a/templates/common/landed_titles/swmh_landed_titles.csv +++ b/templates/common/landed_titles/swmh_landed_titles.csv @@ -702,12 +702,12 @@ c_traianopolis ;oghuz ;Didymoteicho;Demotika c_traianopolis ;pecheneg ;Didymoteicho;Demotika c_traianopolis ;serbian ;Didymoteicho;Dimotika c_traianopolis ;bulgarian ;Didymoteicho;Dimotika -c_strymon ;turkish ; ;Serez -c_strymon ;turkmen ; ;Serez -c_strymon ;oghuz ; ;Serez -c_strymon ;pecheneg ; ;Serez -c_strymon ;serbian ; ;Ser -c_strymon ;bulgarian ; ;Syar +c_strymon ;turkish ;Serres ;Serez +c_strymon ;turkmen ;Serres ;Serez +c_strymon ;oghuz ;Serres ;Serez +c_strymon ;pecheneg ;Serres ;Serez +c_strymon ;serbian ;Serres ;Ser +c_strymon ;bulgarian ;Serres ;Syar c_mosynopolis ;turkish ;Komotini;Gümülcine c_mosynopolis ;turkmen ;Komotini;Gümülcine c_mosynopolis ;oghuz ;Komotini;Gümülcine @@ -806,10 +806,10 @@ c_thessalia ;venetian ; ;Tessaglia c_thessalia ;dalmatian ; ;Tessaglia c_demetrias ;frankish ; ;Mitre c_demetrias ;norman ; ;Mitre -c_demetrias ;turkish ; ;Golos -c_demetrias ;turkmen ; ;Golos -c_demetrias ;oghuz ; ;Golos -c_demetrias ;pecheneg ; ;Golos +c_demetrias ;turkish ;Volos ;Golos +c_demetrias ;turkmen ;Volos ;Golos +c_demetrias ;oghuz ;Volos ;Golos +c_demetrias ;pecheneg ;Volos ;Golos c_demetrias ;sardinian ; ;Dimitrias c_demetrias ;sicilian ; ;Dimitrias c_demetrias ;corsican ; ;Dimitrias @@ -821,10 +821,10 @@ c_demetrias ;ligurian ; ;Dimitrias c_demetrias ;italian ; ;Dimitrias c_demetrias ;venetian ; ;Dimitrias c_demetrias ;dalmatian ; ;Dimitrias -c_upper_wallachia ;turkish ; ;Tirhala -c_upper_wallachia ;turkmen ; ;Tirhala -c_upper_wallachia ;oghuz ; ;Tirhala -c_upper_wallachia ;pecheneg ; ;Tirhala +c_upper_wallachia ;turkish ;Trikala ;Tirhala +c_upper_wallachia ;turkmen ;Trikala ;Tirhala +c_upper_wallachia ;oghuz ;Trikala ;Tirhala +c_upper_wallachia ;pecheneg ;Trikala ;Tirhala c_upper_wallachia ;serbian ; ;Megalovlahija c_neopatras ;frankish ; ;Neopatrie c_neopatras ;norman ; ;Neopatrie @@ -935,9 +935,9 @@ d_epirus ;italian ;Epirus ;Epirus d_epirus ;venetian ;Epirus ;Epirus d_epirus ;dalmatian ;Epirus ;Epirus c_epeiros ;arberian ; ;Epiri -c_epeiros ;turkish ; ;Yanyâ -c_epeiros ;turkmen ; ;Yanyâ -c_epeiros ;oghuz ; ;Yanyâ +c_epeiros ;turkish ;Ioannina;Yanyâ +c_epeiros ;turkmen ;Ioannina;Yanyâ +c_epeiros ;oghuz ;Ioannina;Yanyâ c_epeiros ;sardinian ; ;Epirus c_epeiros ;sicilian ; ;Epirus c_epeiros ;corsican ; ;Epirus @@ -963,23 +963,23 @@ c_hellas ;ligurian ; ;Lepanto c_hellas ;italian ; ;Lepanto c_hellas ;venetian ; ;Lepanto c_hellas ;dalmatian ; ;Lepanto -c_arta ;frankish ; ;Arthe -c_arta ;norman ; ;Arthe -c_arta ;turkish ; ;Narda -c_arta ;turkmen ; ;Narda -c_arta ;oghuz ; ;Narda -c_arta ;pecheneg ; ;Narda -c_arta ;sardinian ; ;Arta -c_arta ;sicilian ; ;Arta -c_arta ;corsican ; ;Arta -c_arta ;central_italian ; ;Arta -c_arta ;southern_italian ; ;Arta -c_arta ;neapolitan ; ;Arta -c_arta ;tuscan ; ;Arta -c_arta ;ligurian ; ;Arta -c_arta ;italian ; ;Arta -c_arta ;venetian ; ;Arta -c_arta ;dalmatian ; ;Arta +c_arta ;frankish ;Arta ;Arthe +c_arta ;norman ;Arta ;Arthe +c_arta ;turkish ;Arta ;Narda +c_arta ;turkmen ;Arta ;Narda +c_arta ;oghuz ;Arta ;Narda +c_arta ;pecheneg ;Arta ;Narda +c_arta ;sardinian ;Arta ;Arta +c_arta ;sicilian ;Arta ;Arta +c_arta ;corsican ;Arta ;Arta +c_arta ;central_italian ;Arta ;Arta +c_arta ;southern_italian ;Arta ;Arta +c_arta ;neapolitan ;Arta ;Arta +c_arta ;tuscan ;Arta ;Arta +c_arta ;ligurian ;Arta ;Arta +c_arta ;italian ;Arta ;Arta +c_arta ;venetian ;Arta ;Arta +c_arta ;dalmatian ;Arta ;Arta d_cephalonia ;frankish ; ;Céphalonie d_cephalonia ;norman ; ;Céphalonie d_cephalonia ;turkish ;Heptanese;Yedi Adalar @@ -1066,62 +1066,62 @@ d_athens ;ligurian ;Athens ;Atene d_athens ;italian ;Athens ;Atene d_athens ;venetian ;Athens ;Atene d_athens ;dalmatian ;Athens ;Atene -c_thebai ;frankish ; ;Estives -c_thebai ;norman ; ;Estives -c_thebai ;catalan ; ;Stivas -c_thebai ;turkish ; ;Istife -c_thebai ;turkmen ; ;Istife -c_thebai ;oghuz ; ;Istife -c_thebai ;pecheneg ; ;Istife -c_thebai ;sardinian ; ;Stivas -c_thebai ;sicilian ; ;Stivas -c_thebai ;corsican ; ;Stivas -c_thebai ;central_italian ; ;Stivas -c_thebai ;southern_italian ; ;Stivas -c_thebai ;neapolitan ; ;Stivas -c_thebai ;tuscan ; ;Stivas -c_thebai ;ligurian ; ;Stivas -c_thebai ;italian ; ;Stivas -c_thebai ;venetian ; ;Stivas -c_thebai ;dalmatian ; ;Stivas -c_euboia ;frankish ; ;Négrepont -c_euboia ;norman ; ;Négrepont -c_euboia ;catalan ; ;Nigrepont -c_euboia ;turkish ; ;Egriboz -c_euboia ;turkmen ; ;Egriboz -c_euboia ;oghuz ; ;Egriboz -c_euboia ;pecheneg ; ;Egriboz -c_euboia ;croatian ; ;Eubeja -c_euboia ;serbian ; ;Eubeja -c_euboia ;sardinian ; ;Negroponte -c_euboia ;sicilian ; ;Negroponte -c_euboia ;corsican ; ;Negroponte -c_euboia ;central_italian ; ;Negroponte -c_euboia ;southern_italian ; ;Negroponte -c_euboia ;neapolitan ; ;Negroponte -c_euboia ;tuscan ; ;Negroponte -c_euboia ;ligurian ; ;Negroponte -c_euboia ;italian ; ;Negroponte -c_euboia ;venetian ; ;Negroponte -c_euboia ;dalmatian ; ;Negroponte -c_atheniai ;frankish ; ;Athènes -c_atheniai ;norman ; ;Athènes -c_atheniai ;catalan ; ;Atenes -c_atheniai ;turkish ; ;Atina -c_atheniai ;turkmen ; ;Atina -c_atheniai ;oghuz ; ;Atina -c_atheniai ;pecheneg ; ;Atina -c_atheniai ;sardinian ; ;Atene -c_atheniai ;sicilian ; ;Atene -c_atheniai ;corsican ; ;Atene -c_atheniai ;central_italian ; ;Atene -c_atheniai ;southern_italian ; ;Atene -c_atheniai ;neapolitan ; ;Atene -c_atheniai ;tuscan ; ;Atene -c_atheniai ;ligurian ; ;Atene -c_atheniai ;italian ; ;Atene -c_atheniai ;venetian ; ;Atene -c_atheniai ;dalmatian ; ;Atene +c_thebai ;frankish ;Thebes ;Estives +c_thebai ;norman ;Thebes ;Estives +c_thebai ;catalan ;Thebes ;Stivas +c_thebai ;turkish ;Thebes ;Istife +c_thebai ;turkmen ;Thebes ;Istife +c_thebai ;oghuz ;Thebes ;Istife +c_thebai ;pecheneg ;Thebes ;Istife +c_thebai ;sardinian ;Thebes ;Stivas +c_thebai ;sicilian ;Thebes ;Stivas +c_thebai ;corsican ;Thebes ;Stivas +c_thebai ;central_italian ;Thebes ;Stivas +c_thebai ;southern_italian ;Thebes ;Stivas +c_thebai ;neapolitan ;Thebes ;Stivas +c_thebai ;tuscan ;Thebes ;Stivas +c_thebai ;ligurian ;Thebes ;Stivas +c_thebai ;italian ;Thebes ;Stivas +c_thebai ;venetian ;Thebes ;Stivas +c_thebai ;dalmatian ;Thebes ;Stivas +c_euboia ;frankish ;Euboea ;Négrepont +c_euboia ;norman ;Euboea ;Négrepont +c_euboia ;catalan ;Euboea ;Nigrepont +c_euboia ;turkish ;Euboea ;Egriboz +c_euboia ;turkmen ;Egriboz ;Egriboz +c_euboia ;oghuz ;Egriboz ;Egriboz +c_euboia ;pecheneg ;Egriboz ;Egriboz +c_euboia ;croatian ;Euboea ;Eubeja +c_euboia ;serbian ;Euboea ;Eubeja +c_euboia ;sardinian ;Euboea ;Negroponte +c_euboia ;sicilian ;Euboea ;Negroponte +c_euboia ;corsican ;Euboea ;Negroponte +c_euboia ;central_italian ;Euboea ;Negroponte +c_euboia ;southern_italian ;Euboea ;Negroponte +c_euboia ;neapolitan ;Euboea ;Negroponte +c_euboia ;tuscan ;Euboea ;Negroponte +c_euboia ;ligurian ;Euboea ;Negroponte +c_euboia ;italian ;Euboea ;Negroponte +c_euboia ;venetian ;Euboea ;Negroponte +c_euboia ;dalmatian ;Euboea ;Negroponte +c_atheniai ;frankish ;Athens ;Athènes +c_atheniai ;norman ;Athens ;Athènes +c_atheniai ;catalan ;Athens ;Atenes +c_atheniai ;turkish ;Athens ;Atina +c_atheniai ;turkmen ;Athens ;Atina +c_atheniai ;oghuz ;Athens ;Atina +c_atheniai ;pecheneg ;Athens ;Atina +c_atheniai ;sardinian ;Athens ;Atene +c_atheniai ;sicilian ;Athens ;Atene +c_atheniai ;corsican ;Athens ;Atene +c_atheniai ;central_italian ;Athens ;Atene +c_atheniai ;southern_italian ;Athens ;Atene +c_atheniai ;neapolitan ;Athens ;Atene +c_atheniai ;tuscan ;Athens ;Atene +c_atheniai ;ligurian ;Athens ;Atene +c_atheniai ;italian ;Athens ;Atene +c_atheniai ;venetian ;Athens ;Atene +c_atheniai ;dalmatian ;Athens ;Atene d_achaia ;frankish ;Achaea ;Achaïe d_achaia ;norman ;Achaea ;Achaïe d_achaia ;turkish ;Morea ;Morâ @@ -1177,43 +1177,43 @@ c_korinthos ;venetian ; ;Coranto c_korinthos ;dalmatian ; ;Coranto c_methone ;frankish ; ;Messénie c_methone ;norman ; ;Messénie -c_methone ;sardinian ; ;Modon -c_methone ;sicilian ; ;Modon -c_methone ;corsican ; ;Modon -c_methone ;central_italian ; ;Modon -c_methone ;southern_italian ; ;Modon -c_methone ;neapolitan ; ;Modon -c_methone ;tuscan ; ;Modon -c_methone ;ligurian ; ;Modon -c_methone ;italian ; ;Modon -c_methone ;venetian ; ;Modon -c_methone ;dalmatian ; ;Modon -c_monemvasia ;frankish ; ;Chaconie -c_monemvasia ;norman ; ;Chaconie -c_monemvasia ;turkish ; ;Menekse -c_monemvasia ;turkmen ; ;Menekse -c_monemvasia ;oghuz ; ;Menekse -c_monemvasia ;pecheneg ; ;Menekse -c_monemvasia ;croatian ; ;Monemvasija -c_monemvasia ;serbian ; ;Monemvasija -c_monemvasia ;sardinian ; ;Malvasia -c_monemvasia ;sicilian ; ;Malvasia -c_monemvasia ;corsican ; ;Malvasia -c_monemvasia ;central_italian ; ;Malvasia -c_monemvasia ;southern_italian ; ;Malvasia -c_monemvasia ;neapolitan ; ;Malvasia -c_monemvasia ;tuscan ; ;Malvasia -c_monemvasia ;ligurian ; ;Malvasia -c_monemvasia ;italian ; ;Malvasia -c_monemvasia ;venetian ; ;Malvasia -c_monemvasia ;dalmatian ; ;Malvasia +c_methone ;sardinian ;Methoni ;Modon +c_methone ;sicilian ;Methoni ;Modon +c_methone ;corsican ;Methoni ;Modon +c_methone ;central_italian ;Methoni ;Modon +c_methone ;southern_italian ;Methoni ;Modon +c_methone ;neapolitan ;Methoni ;Modon +c_methone ;tuscan ;Methoni ;Modon +c_methone ;ligurian ;Methoni ;Modon +c_methone ;italian ;Methoni ;Modon +c_methone ;venetian ;Methoni ;Modon +c_methone ;dalmatian ;Methoni ;Modon +c_monemvasia ;frankish ;Chaconie;Chaconie +c_monemvasia ;norman ;Chaconie;Chaconie +c_monemvasia ;turkish ;Monemvasia;Menekse +c_monemvasia ;turkmen ;Monemvasia;Menekse +c_monemvasia ;oghuz ;Monemvasia;Menekse +c_monemvasia ;pecheneg ;Monemvasia;Menekse +c_monemvasia ;croatian ;Monemvasia;Monemvasija +c_monemvasia ;serbian ;Monemvasia;Monemvasija +c_monemvasia ;sardinian ;Monemvasia;Malvasia +c_monemvasia ;sicilian ;Monemvasia;Malvasia +c_monemvasia ;corsican ;Monemvasia;Malvasia +c_monemvasia ;central_italian ;Monemvasia;Malvasia +c_monemvasia ;southern_italian ;Monemvasia;Malvasia +c_monemvasia ;neapolitan ;Monemvasia;Malvasia +c_monemvasia ;tuscan ;Monemvasia;Malvasia +c_monemvasia ;ligurian ;Monemvasia;Malvasia +c_monemvasia ;italian ;Monemvasia;Malvasia +c_monemvasia ;venetian ;Monemvasia;Malvasia +c_monemvasia ;dalmatian ;Monemvasia;Malvasia c_arcadia ;frankish ; ;Arcadie c_arcadia ;arpitan ; ;Arcadie c_arcadia ;norman ; ;Arcadie -c_arcadia ;turkish ; ;Tripoliçe -c_arcadia ;turkmen ; ;Tripoliçe -c_arcadia ;oghuz ; ;Tripoliçe -c_arcadia ;pecheneg ; ;Tripoliçe +c_arcadia ;turkish ;Tripoli ;Tripoliçe +c_arcadia ;turkmen ;Tripoli ;Tripoliçe +c_arcadia ;oghuz ;Tripoli ;Tripoliçe +c_arcadia ;pecheneg ;Tripoli ;Tripoliçe c_arcadia ;sardinian ; ;Arcadia c_arcadia ;sicilian ; ;Arcadia c_arcadia ;corsican ; ;Arcadia @@ -1614,22 +1614,22 @@ c_attaleia ;ligurian ; ;Sattalia c_attaleia ;italian ; ;Sattalia c_attaleia ;venetian ; ;Sattalia c_attaleia ;dalmatian ; ;Sattalia -c_rhodos ;frankish ; ;Rhodes -c_rhodos ;norman ; ;Rhodes -c_rhodos ;turkish ; ;Rodos -c_rhodos ;turkmen ; ;Rodos -c_rhodos ;oghuz ; ;Rodos -c_rhodos ;sardinian ; ;Rodi -c_rhodos ;sicilian ; ;Rodi -c_rhodos ;corsican ; ;Rodi -c_rhodos ;central_italian ; ;Rodi -c_rhodos ;southern_italian ; ;Rodi -c_rhodos ;neapolitan ; ;Rodi -c_rhodos ;tuscan ; ;Rodi -c_rhodos ;ligurian ; ;Rodi -c_rhodos ;italian ; ;Rodi -c_rhodos ;venetian ; ;Rodi -c_rhodos ;dalmatian ; ;Rodi +c_rhodos ;frankish ;Rhodes ;Rhodes +c_rhodos ;norman ;Rhodes ;Rhodes +c_rhodos ;turkish ;Rhodes ;Rodos +c_rhodos ;turkmen ;Rhodes ;Rodos +c_rhodos ;oghuz ;Rhodes ;Rodos +c_rhodos ;sardinian ;Rhodes ;Rodi +c_rhodos ;sicilian ;Rhodes ;Rodi +c_rhodos ;corsican ;Rhodes ;Rodi +c_rhodos ;central_italian ;Rhodes ;Rodi +c_rhodos ;southern_italian ;Rhodes ;Rodi +c_rhodos ;neapolitan ;Rhodes ;Rodi +c_rhodos ;tuscan ;Rhodes ;Rodi +c_rhodos ;ligurian ;Rhodes ;Rodi +c_rhodos ;italian ;Rhodes ;Rodi +c_rhodos ;venetian ;Rhodes ;Rodi +c_rhodos ;dalmatian ;Rhodes ;Rodi c_lykia ;frankish ; ;Lycie c_lykia ;norman ; ;Lycie c_lykia ;turkish ; ;Teke diff --git a/templates/localisation/A SWMHcounties.csv b/templates/localisation/A SWMHcounties.csv index 15424eb..aaa61dd 100644 --- a/templates/localisation/A SWMHcounties.csv +++ b/templates/localisation/A SWMHcounties.csv @@ -449,74 +449,74 @@ c_ventadour_adj ; ;Ventadour;;; c_mortain_adj ; ;Mortain;;; #ERE,,,,,,,,,,,,,,;;;;; ##,Epirus,,,,,,,,,,,,,;;;;; -c_hellas_adj_greek ; ;Aiotolian;;; -c_hellas_adj_oghuz ; ;Inebahtian;;; -c_hellas_adj_pecheneg ; ;Inebahtian;;; -c_hellas_adj_turkmen ; ;Inebahtian;;; -c_hellas_adj_turkish ; ;Inebahtian;;; -c_hellas_adj_dalmatian ; ;Lepantian;;; -c_hellas_adj_italian ; ;Lepantian;;; -c_hellas_adj_venetian ; ;Lepantian;;; -c_hellas_adj_ligurian ; ;Lepantian;;; -c_hellas_adj_central_italian ; ;Lepantian;;; -c_hellas_adj_southern_italian ; ;Lepantian;;; -c_hellas_adj_tuscan ; ;Lepantian;;; -c_hellas_adj_neapolitan ; ;Lepantian;;; -c_hellas_adj_corsican ; ;Lepantian;;; -c_hellas_adj_sardinian ; ;Lepantian;;; -c_hellas_adj_sicilian ; ;Lepantian;;; -c_epeiros_adj_greek ; ;Epirote;;; -c_epeiros_adj_oghuz ; ;Yanyân;;; -c_epeiros_adj_turkmen ; ;Yanyân;;; -c_epeiros_adj_pecheneg ; ;Yanyân;;; -c_epeiros_adj_turkish ; ;Yanyân;;; -c_epeiros_adj_dalmatian ; ;Epirote;;; -c_epeiros_adj_venetian ; ;Epirote;;; -c_epeiros_adj_ligurian ; ;Epirote;;; -c_epeiros_adj_central_italian ; ;Epirote;;; -c_epeiros_adj_southern_italian ; ;Epirote;;; -c_epeiros_adj_tuscan ; ;Epirote;;; -c_epeiros_adj_neapolitan ; ;Epirote;;; -c_epeiros_adj_corsican ; ;Epirote;;; -c_epeiros_adj_sardinian ; ;Epirote;;; -c_epeiros_adj_sicilian ; ;Epirote;;; -c_epeiros_adj_italian ; ;Epirote;;; -c_epeiros_adj_arberian ; ;Epirian;;; -c_arta_adj_greek ; ;Artan;;; -c_arta_adj_oghuz ; ;Nardan;;; -c_arta_adj_turkmen ; ;Nardan;;; -c_arta_adj_turkish ; ;Nardan;;; -c_arta_adj_dalmatian ; ;Artan;;; -c_arta_adj_venetian ; ;Artan;;; -c_arta_adj_ligurian ; ;Artan;;; -c_arta_adj_central_italian ; ;Artan;;; -c_arta_adj_southern_italian ; ;Artan;;; -c_arta_adj_tuscan ; ;Artan;;; -c_arta_adj_neapolitan ; ;Artan;;; -c_arta_adj_corsican ; ;Artan;;; -c_arta_adj_sardinian ; ;Artan;;; -c_arta_adj_sicilian ; ;Artan;;; -c_arta_adj_italian ; ;Artan;;; -c_arta_adj_frankish ; ;Arthean;;; -c_arta_adj_norman ; ;Arthean;;; +c_hellas_adj_greek ;Naupactus;Aiotolian;;; +c_hellas_adj_oghuz ;Naupactus;Inebahtian;;; +c_hellas_adj_pecheneg ;Naupactus;Inebahtian;;; +c_hellas_adj_turkmen ;Naupactus;Inebahtian;;; +c_hellas_adj_turkish ;Naupactus;Inebahtian;;; +c_hellas_adj_dalmatian ;Naupactus;Lepantian;;; +c_hellas_adj_italian ;Naupactus;Lepantian;;; +c_hellas_adj_venetian ;Naupactus;Lepantian;;; +c_hellas_adj_ligurian ;Naupactus;Lepantian;;; +c_hellas_adj_central_italian ;Naupactus;Lepantian;;; +c_hellas_adj_southern_italian ;Naupactus;Lepantian;;; +c_hellas_adj_tuscan ;Naupactus;Lepantian;;; +c_hellas_adj_neapolitan ;Naupactus;Lepantian;;; +c_hellas_adj_corsican ;Naupactus;Lepantian;;; +c_hellas_adj_sardinian ;Naupactus;Lepantian;;; +c_hellas_adj_sicilian ;Naupactus;Lepantian;;; +c_epeiros_adj_greek ;Epirote ;Epirote;;; +c_epeiros_adj_oghuz ;Ioannina;Yanyân;;; +c_epeiros_adj_turkmen ;Ioannina;Yanyân;;; +c_epeiros_adj_pecheneg ;Ioannina;Yanyân;;; +c_epeiros_adj_turkish ;Ioannina;Yanyân;;; +c_epeiros_adj_dalmatian ;Epirote ;Epirote;;; +c_epeiros_adj_venetian ;Epirote ;Epirote;;; +c_epeiros_adj_ligurian ;Epirote ;Epirote;;; +c_epeiros_adj_central_italian ;Epirote ;Epirote;;; +c_epeiros_adj_southern_italian ;Epirote ;Epirote;;; +c_epeiros_adj_tuscan ;Epirote ;Epirote;;; +c_epeiros_adj_neapolitan ;Epirote ;Epirote;;; +c_epeiros_adj_corsican ;Epirote ;Epirote;;; +c_epeiros_adj_sardinian ;Epirote ;Epirote;;; +c_epeiros_adj_sicilian ;Epirote ;Epirote;;; +c_epeiros_adj_italian ;Epirote ;Epirote;;; +c_epeiros_adj_arberian ;Epirote ;Epirian;;; +c_arta_adj_greek ;Arta ;Artan;;; +c_arta_adj_oghuz ;Arta ;Nardan;;; +c_arta_adj_turkmen ;Arta ;Nardan;;; +c_arta_adj_turkish ;Arta ;Nardan;;; +c_arta_adj_dalmatian ;Arta ;Artan;;; +c_arta_adj_venetian ;Arta ;Artan;;; +c_arta_adj_ligurian ;Arta ;Artan;;; +c_arta_adj_central_italian ;Arta ;Artan;;; +c_arta_adj_southern_italian ;Arta ;Artan;;; +c_arta_adj_tuscan ;Arta ;Artan;;; +c_arta_adj_neapolitan ;Arta ;Artan;;; +c_arta_adj_corsican ;Arta ;Artan;;; +c_arta_adj_sardinian ;Arta ;Artan;;; +c_arta_adj_sicilian ;Arta ;Artan;;; +c_arta_adj_italian ;Arta ;Artan;;; +c_arta_adj_frankish ;Arta ;Arthean;;; +c_arta_adj_norman ;Arta ;Arthean;;; ##,Cephalonia,,,,,,,,,,,,,;;;;; -c_cephalonia_adj_greek ; ;Cephalonian;;; -c_cephalonia_adj_oghuz ; ;Kefalonyan;;; -c_cephalonia_adj_turkmen ; ;Kefalonyan;;; -c_cephalonia_adj_turkish ; ;Kefalonyan;;; -c_cephalonia_adj_dalmatian ; ;Cephalonian;;; -c_cephalonia_adj_venetian ; ;Cephalonian;;; -c_cephalonia_adj_ligurian ; ;Cephalonian;;; -c_cephalonia_adj_central_italian ; ;Cephalonian;;; -c_cephalonia_adj_southern_italian ; ;Cephalonian;;; -c_cephalonia_adj_tuscan ; ;Cephalonian;;; -c_cephalonia_adj_neapolitan ; ;Cephalonian;;; -c_cephalonia_adj_corsican ; ;Cephalonian;;; -c_cephalonia_adj_sardinian ; ;Cephalonian;;; -c_cephalonia_adj_sicilian ; ;Cephalonian;;; -c_cephalonia_adj_italian ; ;Cephalonian;;; -c_cephalonia_adj_frankish ; ;Cephalonian;;; -c_cephalonia_adj_norman ; ;Cephalonian;;; +c_cephalonia_adj_greek ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_oghuz ;Cephalonian;Kefalonyan;;; +c_cephalonia_adj_turkmen ;Cephalonian;Kefalonyan;;; +c_cephalonia_adj_turkish ;Cephalonian;Kefalonyan;;; +c_cephalonia_adj_dalmatian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_venetian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_ligurian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_central_italian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_southern_italian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_tuscan ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_neapolitan ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_corsican ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_sardinian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_sicilian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_italian ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_frankish ;Cephalonian;Cephalonian;;; +c_cephalonia_adj_norman ;Cephalonian;Cephalonian;;; c_corfu_adj ; ;Kerkyran;;; c_corfu_adj_oghuz ; ;Körfuan;;; c_corfu_adj_turkmen ; ;Körfuan;;; @@ -535,46 +535,46 @@ c_corfu_adj_italian ; ;Corf c_corfu_adj_frankish ; ;Corfuan;;; c_corfu_adj_norman ; ;Corfuan;;; ##,Athens,,,,,,,,,,,,,;;;;; -c_atheniai_adj_oghuz ; ;Atinian;;; -c_atheniai_adj_turkmen ; ;Atinian;;; -c_atheniai_adj_turkish ; ;Atinian;;; -c_atheniai_adj_dalmatian ; ;Atenian;;; -c_atheniai_adj_italian ; ;Atenian;;; -c_atheniai_adj_venetian ; ;Atenian;;; -c_atheniai_adj_ligurian ; ;Atenian;;; -c_atheniai_adj_central_italian ; ;Atenian;;; -c_atheniai_adj_southern_italian ; ;Atenian;;; -c_atheniai_adj_tuscan ; ;Atenian;;; -c_atheniai_adj_neapolitan ; ;Atenian;;; -c_atheniai_adj_corsican ; ;Atenian;;; -c_atheniai_adj_sardinian ; ;Atenian;;; -c_atheniai_adj_sicilian ; ;Atenian;;; -c_atheniai_adj_frankish ; ;Athènian;;; -c_atheniai_adj_norman ; ;Athènian;;; -c_thebai_adj ; ;Theban;;; +c_atheniai_adj_oghuz ;Athenian;Atinian;;; +c_atheniai_adj_turkmen ;Athenian;Atinian;;; +c_atheniai_adj_turkish ;Athenian;Atinian;;; +c_atheniai_adj_dalmatian ;Athenian;Atenian;;; +c_atheniai_adj_italian ;Athenian;Atenian;;; +c_atheniai_adj_venetian ;Athenian;Atenian;;; +c_atheniai_adj_ligurian ;Athenian;Atenian;;; +c_atheniai_adj_central_italian ;Athenian;Atenian;;; +c_atheniai_adj_southern_italian ;Athenian;Atenian;;; +c_atheniai_adj_tuscan ;Athenian;Atenian;;; +c_atheniai_adj_neapolitan ;Athenian;Atenian;;; +c_atheniai_adj_corsican ;Athenian;Atenian;;; +c_atheniai_adj_sardinian ;Athenian;Atenian;;; +c_atheniai_adj_sicilian ;Athenian;Atenian;;; +c_atheniai_adj_frankish ;Athenian;Athènian;;; +c_atheniai_adj_norman ;Athenian;Athènian;;; +c_thebai_adj ;Boeotian;Theban;;; c_thebai_adj_greek ; ;Boiotían;;; -c_thebai_adj_oghuz ; ;Istifan;;; -c_thebai_adj_pecheneg ; ;Istifan;;; -c_thebai_adj_turkmen ; ;Istifan;;; -c_thebai_adj_turkish ; ;Istifan;;; -c_thebai_adj_dalmatian ; ;Stivan;;; -c_thebai_adj_italian ; ;Stivan;;; -c_thebai_adj_venetian ; ;Stivan;;; -c_thebai_adj_ligurian ; ;Stivan;;; -c_thebai_adj_central_italian ; ;Stivan;;; -c_thebai_adj_southern_italian ; ;Stivan;;; -c_thebai_adj_tuscan ; ;Stivan;;; -c_thebai_adj_neapolitan ; ;Stivan;;; -c_thebai_adj_corsican ; ;Stivan;;; -c_thebai_adj_sardinian ; ;Stivan;;; -c_thebai_adj_sicilian ; ;Stivan;;; -c_thebai_adj_frankish ; ;Estivan;;; -c_thebai_adj_norman ; ;Estivan;;; +c_thebai_adj_oghuz ;Theban ;Istifan;;; +c_thebai_adj_pecheneg ;Theban ;Istifan;;; +c_thebai_adj_turkmen ;Theban ;Istifan;;; +c_thebai_adj_turkish ;Theban ;Istifan;;; +c_thebai_adj_dalmatian ;Theban ;Stivan;;; +c_thebai_adj_italian ;Theban ;Stivan;;; +c_thebai_adj_venetian ;Theban ;Stivan;;; +c_thebai_adj_ligurian ;Theban ;Stivan;;; +c_thebai_adj_central_italian ;Theban ;Stivan;;; +c_thebai_adj_southern_italian ;Theban ;Stivan;;; +c_thebai_adj_tuscan ;Theban ;Stivan;;; +c_thebai_adj_neapolitan ;Theban ;Stivan;;; +c_thebai_adj_corsican ;Theban ;Stivan;;; +c_thebai_adj_sardinian ;Theban ;Stivan;;; +c_thebai_adj_sicilian ;Theban ;Stivan;;; +c_thebai_adj_frankish ;Theban ;Estivan;;; +c_thebai_adj_norman ;Theban ;Estivan;;; c_euboia_adj_greek ; ;Euriposian;;; -c_euboia_adj_oghuz ; ;Egribozian;;; -c_euboia_adj_pecheneg ; ;Egribozian;;; -c_euboia_adj_turkmen ; ;Egribozian;;; -c_euboia_adj_turkish ; ;Egribozian;;; +c_euboia_adj_oghuz ;Egriboz ;Egribozian;;; +c_euboia_adj_pecheneg ;Egriboz ;Egribozian;;; +c_euboia_adj_turkmen ;Egriboz ;Egribozian;;; +c_euboia_adj_turkish ;Egriboz ;Egribozian;;; c_euboia_adj_catalan ; ;Nigrepontian;;; c_euboia_adj_dalmatian ; ;Negropontian;;; c_euboia_adj_venetian ; ;Negropontian;;; @@ -590,23 +590,23 @@ c_euboia_adj_italian ; ;Negropontian;;; c_euboia_adj_frankish ; ;Negrepontian;;; c_euboia_adj_norman ; ;Negrepontian;;; ##,Achaia,,,,,,,,,,,,,;;;;; -c_korinthos_adj_greek ; ;Korinthian;;; -c_korinthos_adj_oghuz ; ;Gördesian;;; -c_korinthos_adj_turkmen ; ;Gördesian;;; -c_korinthos_adj_turkish ; ;Gördesian;;; -c_korinthos_adj_dalmatian ; ;Corantian;;; -c_korinthos_adj_venetian ; ;Corantian;;; -c_korinthos_adj_ligurian ; ;Corantian;;; -c_korinthos_adj_central_italian ; ;Corantian;;; -c_korinthos_adj_southern_italian ; ;Corantian;;; -c_korinthos_adj_tuscan ; ;Corantian;;; -c_korinthos_adj_neapolitan ; ;Corantian;;; -c_korinthos_adj_corsican ; ;Corantian;;; -c_korinthos_adj_sardinian ; ;Corantian;;; -c_korinthos_adj_sicilian ; ;Corantian;;; -c_korinthos_adj_italian ; ;Corantian;;; -c_korinthos_adj_frankish ; ;Corinthian;;; -c_korinthos_adj_norman ; ;Corinthian;;; +c_korinthos_adj_greek ;Corinthian;Korinthian;;; +c_korinthos_adj_oghuz ;Corinthian;Gördesian;;; +c_korinthos_adj_turkmen ;Corinthian;Gördesian;;; +c_korinthos_adj_turkish ;Corinthian;Gördesian;;; +c_korinthos_adj_dalmatian ;Corinthian;Corantian;;; +c_korinthos_adj_venetian ;Corinthian;Corantian;;; +c_korinthos_adj_ligurian ;Corinthian;Corantian;;; +c_korinthos_adj_central_italian ;Corinthian;Corantian;;; +c_korinthos_adj_southern_italian ;Corinthian;Corantian;;; +c_korinthos_adj_tuscan ;Corinthian;Corantian;;; +c_korinthos_adj_neapolitan ;Corinthian;Corantian;;; +c_korinthos_adj_corsican ;Corinthian;Corantian;;; +c_korinthos_adj_sardinian ;Corinthian;Corantian;;; +c_korinthos_adj_sicilian ;Corinthian;Corantian;;; +c_korinthos_adj_italian ;Corinthian;Corantian;;; +c_korinthos_adj_frankish ;Corinthian;Corinthian;;; +c_korinthos_adj_norman ;Corinthian;Corinthian;;; c_monemvasia_adj ; ;Monemvasian;;;Monemvasian c_monemvasia_adj_greek ; ;Lakonian;;; c_monemvasia_adj_oghuz ; ;Meneksian;;; @@ -625,11 +625,11 @@ c_monemvasia_adj_sicilian ; ;Malvasian;;; c_monemvasia_adj_italian ; ;Malvasian;;; c_monemvasia_adj_frankish ; ;Chaconian;;; c_monemvasia_adj_norman ; ;Chaconian;;; -c_arcadia_adj ; ;Arcadian;;; +c_arcadia_adj ;Arcadian;Arcadian;;; c_arcadia_adj_greek ; ;Arkadian;;; -c_arcadia_adj_oghuz ; ;Tripolitan;;; -c_arcadia_adj_turkmen ; ;Tripolitan;;; -c_arcadia_adj_turkish ; ;Tripolitan;;; +c_arcadia_adj_oghuz ;Tripoli ;Tripolitan;;; +c_arcadia_adj_turkmen ;Tripoli ;Tripolitan;;; +c_arcadia_adj_turkish ;Tripoli ;Tripolitan;;; c_arcadia_adj_dalmatian ; ;Arcadian;;; c_arcadia_adj_venetian ; ;Arcadian;;; c_arcadia_adj_ligurian ; ;Arcadian;;; @@ -643,37 +643,37 @@ c_arcadia_adj_sicilian ; ;Arcadian;;; c_arcadia_adj_italian ; ;Arcadian;;; c_arcadia_adj_frankish ; ;Arcadian;;; c_arcadia_adj_norman ; ;Arcadian;;; -c_achaia_adj_greek ; ;Achaian;;; -c_achaia_adj_oghuz ; ;Ahayan;;; -c_achaia_adj_turkmen ; ;Ahayan;;; -c_achaia_adj_turkish ; ;Ahayan;;; -c_achaia_adj_dalmatian ; ;Achaian;;; -c_achaia_adj_venetian ; ;Achaian;;; -c_achaia_adj_ligurian ; ;Achaian;;; -c_achaia_adj_central_italian ; ;Achaian;;; -c_achaia_adj_southern_italian ; ;Achaian;;; -c_achaia_adj_tuscan ; ;Achaian;;; -c_achaia_adj_neapolitan ; ;Achaian;;; -c_achaia_adj_corsican ; ;Achaian;;; -c_achaia_adj_sardinian ; ;Achaian;;; -c_achaia_adj_sicilian ; ;Achaian;;; -c_achaia_adj_italian ; ;Achaian;;; -c_achaia_adj_frankish ; ;Achaian;;; -c_achaia_adj_norman ; ;Achaian;;; -c_methone_adj_greek ; ;Messenian;;; -c_methone_adj_dalmatian ; ;Modonian;;; -c_methone_adj_venetian ; ;Modonian;;; -c_methone_adj_ligurian ; ;Modonian;;; -c_methone_adj_central_italian ; ;Modonian;;; -c_methone_adj_southern_italian ; ;Modonian;;; -c_methone_adj_tuscan ; ;Modonian;;; -c_methone_adj_neapolitan ; ;Modonian;;; -c_methone_adj_corsican ; ;Modonian;;; -c_methone_adj_sardinian ; ;Modonian;;; -c_methone_adj_sicilian ; ;Modonian;;; -c_methone_adj_italian ; ;Modonian;;; -c_methone_adj_frankish ; ;Messénian;;; -c_methone_adj_norman ; ;Messénian;;; +c_achaia_adj_greek ;Achaean ;Achaian;;; +c_achaia_adj_oghuz ;Achaean ;Ahayan;;; +c_achaia_adj_turkmen ;Achaean ;Ahayan;;; +c_achaia_adj_turkish ;Achaean ;Ahayan;;; +c_achaia_adj_dalmatian ;Achaean ;Achaian;;; +c_achaia_adj_venetian ;Achaean ;Achaian;;; +c_achaia_adj_ligurian ;Achaean ;Achaian;;; +c_achaia_adj_central_italian ;Achaean ;Achaian;;; +c_achaia_adj_southern_italian ;Achaean ;Achaian;;; +c_achaia_adj_tuscan ;Achaean ;Achaian;;; +c_achaia_adj_neapolitan ;Achaean ;Achaian;;; +c_achaia_adj_corsican ;Achaean ;Achaian;;; +c_achaia_adj_sardinian ;Achaean ;Achaian;;; +c_achaia_adj_sicilian ;Achaean ;Achaian;;; +c_achaia_adj_italian ;Achaean ;Achaian;;; +c_achaia_adj_frankish ;Achaean ;Achaian;;; +c_achaia_adj_norman ;Achaean ;Achaian;;; +c_methone_adj_greek ;Messenian;Messenian;;; +c_methone_adj_dalmatian ;Methoni ;Modonian;;; +c_methone_adj_venetian ;Methoni ;Modonian;;; +c_methone_adj_ligurian ;Methoni ;Modonian;;; +c_methone_adj_central_italian ;Methoni ;Modonian;;; +c_methone_adj_southern_italian ;Methoni ;Modonian;;; +c_methone_adj_tuscan ;Methoni ;Modonian;;; +c_methone_adj_neapolitan ;Methoni ;Modonian;;; +c_methone_adj_corsican ;Methoni ;Modonian;;; +c_methone_adj_sardinian ;Methoni ;Modonian;;; +c_methone_adj_sicilian ;Methoni ;Modonian;;; +c_methone_adj_italian ;Methoni ;Modonian;;; +c_methone_adj_frankish ;Messenian;Messénian;;; +c_methone_adj_norman ;Messenian;Messénian;;; ##,Dyrrachion,,,,,,,,,,,,,;;;;; c_valona_adj ; ;Valonian;;; c_valona_adj_greek ; ;Aulonian;;; @@ -692,7 +692,7 @@ c_valona_adj_oghuz ; ;Avlonyan;;; c_valona_adj_turkmen ; ;Avlonyan;;; c_valona_adj_turkish ; ;Avlonyan;;; c_valona_adj_arberian ; ;Vlorësian;;; -c_dyrrachion_adj ; ;Dyrrachian;;;Dyrrachian +c_dyrrachion_adj ;Durrës ;Dyrrachian;;;Dyrrachian c_dyrrachion_adj_dalmatian ; ;Durazzian;;; c_dyrrachion_adj_venetian ; ;Durazzian;;; c_dyrrachion_adj_ligurian ; ;Durazzian;;; @@ -734,11 +734,11 @@ c_neopatras_adj_catalan ; ;Neopatrian;;; c_neopatras_adj_oghuz ; ;Patracikian;;; c_neopatras_adj_turkmen ; ;Patracikian;;; c_neopatras_adj_turkish ; ;Patracikian;;; -c_upper_wallachia_adj ; ;Vlachian;;; -c_upper_wallachia_adj_oghuz ; ;Tirhalian;;; -c_upper_wallachia_adj_turkmen ; ;Tirhalian;;; -c_upper_wallachia_adj_turkish ; ;Tirhalian;;; -c_demetrias_adj ; ;Demetrian;;;Demetrian +c_upper_wallachia_adj ;Vlach ;Vlachian;;; +c_upper_wallachia_adj_oghuz ;Trikala ;Tirhalian;;; +c_upper_wallachia_adj_turkmen ;Trikala ;Tirhalian;;; +c_upper_wallachia_adj_turkish ;Trikala ;Tirhalian;;; +c_demetrias_adj ;Demetrias;Demetrian;;;Demetrian c_demetrias_adj_dalmatian ; ;Dimitrian;;; c_demetrias_adj_venetian ; ;Dimitrian;;; c_demetrias_adj_ligurian ; ;Dimitrian;;; @@ -752,10 +752,10 @@ c_demetrias_adj_sicilian ; ;Dimitrian;;; c_demetrias_adj_italian ; ;Dimitrian;;; c_demetrias_adj_frankish ; ;Mitrian;;; c_demetrias_adj_norman ; ;Mitrian;;; -c_demetrias_adj_oghuz ; ;Golosian;;; -c_demetrias_adj_turkmen ; ;Golosian;;; -c_demetrias_adj_turkish ; ;Golosian;;; -c_thessalia_adj ; ;Thessalian;;;Thessalian +c_demetrias_adj_oghuz ;Volos ;Golosian;;; +c_demetrias_adj_turkmen ;Volos ;Golosian;;; +c_demetrias_adj_turkish ;Volos ;Golosian;;; +c_thessalia_adj ;Thessalian;Thessalian;;;Thessalian c_thessalia_adj_dalmatian ; ;Tessaglian;;; c_thessalia_adj_venetian ; ;Tessaglian;;; c_thessalia_adj_ligurian ; ;Tessaglian;;; @@ -774,54 +774,54 @@ c_thessalia_adj_oghuz ; ;Tesalyan;;; c_thessalia_adj_turkmen ; ;Tesalyan;;; c_thessalia_adj_turkish ; ;Tesalyan;;; ##,Thessalonika,,,,,,,,,,,,,;;;;; -c_veria_adj ; ;Verroian;;; +c_veria_adj ;Veria ;Verroian;;; c_veria_adj_oghuz ; ;Karaferyan;;; c_veria_adj_turkmen ; ;Karaferyan;;; c_veria_adj_turkish ; ;Karaferyan;;; c_veria_adj_serbian ; ;Berian;;; c_veria_adj_bulgarian ; ;Berian;;; -c_thessalonike_adj_oghuz ; ;Selânikan;;; -c_thessalonike_adj_turkmen ; ;Selânikan;;; -c_thessalonike_adj_turkish ; ;Selânikan;;; -c_thessalonike_adj_russian ; ;Solunskiy;;; -c_thessalonike_adj_bohemian ; ;Solunian;;; -c_thessalonike_adj_moravian ; ;Solunian;;; -c_thessalonike_adj_polish ; ;Solunian;;; -c_thessalonike_adj_pommeranian ; ;Solunian;;; -c_thessalonike_adj_croatian ; ;Solunian;;; -c_thessalonike_adj_bosnian ; ;Solunian;;; -c_thessalonike_adj_serbian ; ;Solunian;;; -c_thessalonike_adj_karantanci ; ;Solunian;;; -c_thessalonike_adj_bulgarian ; ;Solunian;;; -c_thessalonike_adj_dalmatian ; ;Tessalonican;;; -c_thessalonike_adj_venetian ; ;Tessalonican;;; -c_thessalonike_adj_ligurian ; ;Tessalonican;;; -c_thessalonike_adj_central_italian ; ;Tessalonican;;; -c_thessalonike_adj_southern_italian ; ;Tessalonican;;; -c_thessalonike_adj_tuscan ; ;Tessalonican;;; -c_thessalonike_adj_neapolitan ; ;Tessalonican;;; -c_thessalonike_adj_corsican ; ;Tessalonican;;; -c_thessalonike_adj_sardinian ; ;Tessalonican;;; -c_thessalonike_adj_sicilian ; ;Tessalonican;;; -c_thessalonike_adj_italian ; ;Tessalonican;;; -c_thessalonike_adj_frankish ; ;Thessaloniqan;;; -c_thessalonike_adj_norman ; ;Thessaloniqan;;; -c_chalkidike_adj ; ;Chalkidikan;;;Chalkidikian -c_chalkidike_adj_oghuz ; ;Halkidikyan;;; -c_chalkidike_adj_turkmen ; ;Halkidikyan;;; -c_chalkidike_adj_turkish ; ;Halkidikyan;;; +c_thessalonike_adj_oghuz ;Thessaloniki;Selânikan;;; +c_thessalonike_adj_turkmen ;Thessaloniki;Selânikan;;; +c_thessalonike_adj_turkish ;Thessaloniki;Selânikan;;; +c_thessalonike_adj_russian ;Thessaloniki;Solunskiy;;; +c_thessalonike_adj_bohemian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_moravian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_polish ;Thessaloniki;Solunian;;; +c_thessalonike_adj_pommeranian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_croatian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_bosnian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_serbian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_karantanci ;Thessaloniki;Solunian;;; +c_thessalonike_adj_bulgarian ;Thessaloniki;Solunian;;; +c_thessalonike_adj_dalmatian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_venetian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_ligurian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_central_italian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_southern_italian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_tuscan ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_neapolitan ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_corsican ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_sardinian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_sicilian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_italian ;Thessaloniki;Tessalonican;;; +c_thessalonike_adj_frankish ;Thessaloniki;Thessaloniqan;;; +c_thessalonike_adj_norman ;Thessaloniki;Thessaloniqan;;; +c_chalkidike_adj ;Chalkidiki;Chalkidikan;;;Chalkidikian +c_chalkidike_adj_oghuz ;Chalkidiki;Halkidikyan;;; +c_chalkidike_adj_turkmen ;Chalkidiki;Halkidikyan;;; +c_chalkidike_adj_turkish ;Chalkidiki;Halkidikyan;;; ##,Strymon,,,,,,,,,,,,,;;;;; c_mosynopolis_adj ; ;Mosynopolitan;;; c_mosynopolis_adj_oghuz ; ;Gümülcinan;;; c_mosynopolis_adj_turkmen ; ;Gümülcinan;;; c_mosynopolis_adj_turkish ; ;Gümülcinan;;; c_mosynopolis_adj_bulgarian ; ;Gyumyurdzinan;;; -c_strymon_adj ; ;Strymonitan;;;Strymonian -c_strymon_adj_oghuz ; ;Serezian;;; -c_strymon_adj_turkmen ; ;Serezian;;; -c_strymon_adj_turkish ; ;Serezian;;; -c_strymon_adj_serbian ; ;Serian;;; -c_strymon_adj_bulgarian ; ;Syarian;;; +c_strymon_adj ;Strymon ;Strymonitan;;;Strymonian +c_strymon_adj_oghuz ;Serres ;Serezian;;; +c_strymon_adj_turkmen ;Serres ;Serezian;;; +c_strymon_adj_turkish ;Serres ;Serezian;;; +c_strymon_adj_serbian ;Serres ;Serian;;; +c_strymon_adj_bulgarian ;Serres ;Syarian;;; c_traianopolis_adj ; ;Traianopolitan;;; c_traianopolis_adj_oghuz ; ;Demotikan;;; c_traianopolis_adj_turkmen ; ;Demotikan;;; @@ -829,7 +829,7 @@ c_traianopolis_adj_turkish ; ;Demotikan;;; c_traianopolis_adj_serbian ; ;Dimotikan;;; c_traianopolis_adj_bulgarian ; ;Dimotikan;;; ##,Thrace,,,,,,,,,,,,,;;;;; -c_thrake_adj ; ;Thrakian;;;Thrakeian +c_thrake_adj ;Thracian;Thrakian;;;Thrakeian c_thrake_adj_oghuz ; ;Trakyan;;; c_thrake_adj_turkmen ; ;Trakyan;;; c_thrake_adj_turkish ; ;Trakyan;;; @@ -895,9 +895,9 @@ c_lesbos_adj_italian ;Lesbian ;Lesbian;;; c_lesbos_adj_oghuz ;Lesbian ;Midillian;;; c_lesbos_adj_turkmen ;Lesbian ;Midillian;;; c_lesbos_adj_turkish ;Lesbian ;Midillian;;; -c_chios_adj_oghuz ; ;Sakizan;;; -c_chios_adj_turkmen ; ;Sakizan;;; -c_chios_adj_turkish ; ;Sakizan;;; +c_chios_adj_oghuz ;Chios ;Sakizan;;; +c_chios_adj_turkmen ;Chios ;Sakizan;;; +c_chios_adj_turkish ;Chios ;Sakizan;;; c_naxos_adj ; ;Kykladian;;;Naxosian c_naxos_adj_dalmatian ; ;Nassian;;; c_naxos_adj_venetian ; ;Nassian;;; @@ -919,11 +919,11 @@ c_abydos_adj_turkish ; c_kyzikos_adj_oghuz ;Erdek ;Erdekian;;; c_kyzikos_adj_turkmen ;Erdek ;Erdekian;;; c_kyzikos_adj_turkish ;Erdek ;Erdekian;;; -c_kaliopolis_adj_oghuz ; ;Gelibolan;;; -c_kaliopolis_adj_turkmen ; ;Gelibolan;;; -c_kaliopolis_adj_turkish ; ;Gelibolan;;; +c_kaliopolis_adj_oghuz ;Gallipoli;Gelibolan;;; +c_kaliopolis_adj_turkmen ;Gallipoli;Gelibolan;;; +c_kaliopolis_adj_turkish ;Gallipoli;Gelibolan;;; ##,Krete,,,,,,,,,,,,,;;;;; -c_kaneia_adj ; ;Chaneian;;;Kaneian +c_kaneia_adj ;Chania ;Chaneian;;;Kaneian c_kaneia_adj_dalmatian ; ;Canean;;; c_kaneia_adj_venetian ; ;Canean;;; c_kaneia_adj_ligurian ; ;Canean;;; @@ -943,7 +943,7 @@ c_kaneia_adj_maghreb_arabic ; ;Hanimian;;; c_kaneia_adj_levantine_arabic ; ;Hanimian;;; c_kaneia_adj_egyptian_arabic ; ;Hanimian;;; c_kaneia_adj_andalusian_arabic ; ;Hanimian;;; -c_chandax_adj ; ;Khándaxan;;;Chandaxian +c_chandax_adj ;Heraklion;Khándaxan;;;Chandaxian c_chandax_adj_dalmatian ; ;Candian;;; c_chandax_adj_venetian ; ;Candian;;; c_chandax_adj_ligurian ; ;Candian;;; @@ -1206,22 +1206,22 @@ c_attaleia_adj_norman ;Antalya ;Sattalian;;; c_attaleia_adj_oghuz ;Antalya ;Antâliyyan;;; c_attaleia_adj_turkmen ;Antalya ;Antâliyyan;;; c_attaleia_adj_turkish ;Antalya ;Atalyan;;; -c_rhodos_adj_dalmatian ; ;Rodian;;; -c_rhodos_adj_venetian ; ;Rodian;;; -c_rhodos_adj_ligurian ; ;Rodian;;; -c_rhodos_adj_central_italian ; ;Rodian;;; -c_rhodos_adj_southern_italian ; ;Rodian;;; -c_rhodos_adj_tuscan ; ;Rodian;;; -c_rhodos_adj_neapolitan ; ;Rodian;;; -c_rhodos_adj_corsican ; ;Rodian;;; -c_rhodos_adj_sardinian ; ;Rodian;;; -c_rhodos_adj_sicilian ; ;Rodian;;; -c_rhodos_adj_italian ; ;Rodian;;; -c_rhodos_adj_frankish ; ;Rhodian;;; -c_rhodos_adj_norman ; ;Rhodian;;; -c_rhodos_adj_oghuz ; ;Rodian;;; -c_rhodos_adj_turkmen ; ;Rodian;;; -c_rhodos_adj_turkish ; ;Rodian;;; +c_rhodos_adj_dalmatian ;Rhodian ;Rodian;;; +c_rhodos_adj_venetian ;Rhodian ;Rodian;;; +c_rhodos_adj_ligurian ;Rhodian ;Rodian;;; +c_rhodos_adj_central_italian ;Rhodian ;Rodian;;; +c_rhodos_adj_southern_italian ;Rhodian ;Rodian;;; +c_rhodos_adj_tuscan ;Rhodian ;Rodian;;; +c_rhodos_adj_neapolitan ;Rhodian ;Rodian;;; +c_rhodos_adj_corsican ;Rhodian ;Rodian;;; +c_rhodos_adj_sardinian ;Rhodian ;Rodian;;; +c_rhodos_adj_sicilian ;Rhodian ;Rodian;;; +c_rhodos_adj_italian ;Rhodian ;Rodian;;; +c_rhodos_adj_frankish ;Rhodian ;Rhodian;;; +c_rhodos_adj_norman ;Rhodian ;Rhodian;;; +c_rhodos_adj_oghuz ;Rhodian ;Rodian;;; +c_rhodos_adj_turkmen ;Rhodian ;Rodian;;; +c_rhodos_adj_turkish ;Rhodian ;Rodian;;; c_mylasa_adj ;Milas ;Mylasan;;; c_mylasa_adj_oghuz ;Mentes ;Mentešian;;; c_mylasa_adj_turkmen ;Mentes ;Mentešian;;; diff --git a/templates/localisation/A SWMHprovinces.csv b/templates/localisation/A SWMHprovinces.csv index 05475f1..e6660a2 100644 --- a/templates/localisation/A SWMHprovinces.csv +++ b/templates/localisation/A SWMHprovinces.csv @@ -330,38 +330,38 @@ PROV785 ;Nekhel ;Nekhel;c_sinai;;Sinai ########################################,,,,,,,,,,,,,,;;;;; #Grecce,,,,,,,,,,,,,,;;;;; ########################################,,,,,,,,,,,,,,;;;;; -PROV470 ; ;Dyrrakhiou;c_dyrrachion,Drac,Durazzo,Durazzu,Durazo,Durrës,Diraç;;Dyrrachion -PROV472 ; ;Epeiros;c_epeiros,Epirus,Epiri,Yanyâ;;Épieros -PROV473 ; ;Nikopolis;c_arta,Arta,Arthe,Narda;;Árta -PROV474 ; ;Kephallenia;c_cephalonia,Cefalonia,Céphalonie,Kefalonya;;Cephalonia -PROV475 ; ;Naupaktos;c_hellas,Lepanto,Inebahti;;Hellas -PROV476 ; ;Achaía;c_achaia,Achaïe,Achaia,Ahaya;;Achaia -PROV477 ; ;Messinia;c_methone,Messénie,Modon;;Methone -PROV478 ; ;Lakonia;c_monemvasia,Chaconie,Malvasia,Monemvasija,Menekse;;Monemvasia -PROV479 ; ;Chaneia;c_kaneia,Canea,Al-Hanim,Hanya;;Kaneia -PROV480 ; ;Khándax;c_chandax,Candie,Candia,Khandaq,Kandiye;;Chandax -PROV481 ; ;Korinthos;c_korinthos,Corinthe,Coranto,Korint,Gördes;;Korinthos -PROV482 ; ;Attika;c_atheniai,Athènes,Atene,Atenes,Atina;;Atheniai -PROV483 ; ;Dodekánisa;c_rhodos,Rhodes,Rodi,Rodos;;Rhodos +PROV470 ;Durrës ;Dyrrakhiou;c_dyrrachion,Drac,Durazzo,Durazzu,Durazo,Durrës,Diraç;;Dyrrachion +PROV472 ;Epirus ;Epeiros;c_epeiros,Epirus,Epiri,Yanyâ;;Épieros +PROV473 ;Nicopolis;Nikopolis;c_arta,Arta,Arthe,Narda;;Árta +PROV474 ;Cephalonia;Kephallenia;c_cephalonia,Cefalonia,Céphalonie,Kefalonya;;Cephalonia +PROV475 ;Naupactus;Naupaktos;c_hellas,Lepanto,Inebahti;;Hellas +PROV476 ;Achaea ;Achaía;c_achaia,Achaïe,Achaia,Ahaya;;Achaia +PROV477 ;Messenia;Messinia;c_methone,Messénie,Modon;;Methone +PROV478 ;Laconia ;Lakonia;c_monemvasia,Chaconie,Malvasia,Monemvasija,Menekse;;Monemvasia +PROV479 ;Chania ;Chaneia;c_kaneia,Canea,Al-Hanim,Hanya;;Kaneia +PROV480 ;Heraklion;Khándax;c_chandax,Candie,Candia,Khandaq,Kandiye;;Chandax +PROV481 ;Corinth ;Korinthos;c_korinthos,Corinthe,Coranto,Korint,Gördes;;Korinthos +PROV482 ;Attica ;Attika;c_atheniai,Athènes,Atene,Atenes,Atina;;Atheniai +PROV483 ;Dodecanese;Dodekánisa;c_rhodos,Rhodes,Rodi,Rodos;;Rhodos PROV484 ;Cyclades;Kykládes;c_naxos,Kiklad,Nasso;;Naxos -PROV485 ; ;Euripos;c_euboia,Négrepont,Negroponte,Nigrepont,Eubeja,Egriboz;;Euboia +PROV485 ;Euripus ;Euripos;c_euboia,Négrepont,Negroponte,Nigrepont,Eubeja,Egriboz;;Euboia PROV486 ;Chios ;Chios;c_chios,Sakiz;;Chios PROV487 ;Aegean Islands;Nisia Aigaiou;c_lesbos,Lesbos,Midilli;;Lesbos -PROV488 ; ;Demetrias;c_demetrias,Dimitrias,Mitre,Golos;;Demetrias -PROV489 ; ;Thessalía;c_thessalia,Tessaglia,Thessalie,Tessália,Tesalya;;Thessalia -PROV490 ; ;Thessaloníke;c_thessalonike,Thessalonique,Tessalonica,Solun,Selânik;;Thessalonike -PROV491 ; ;Chalkidike;c_chalkidike,Halkidikya;;Chalkidike -PROV492 ; ;Strymonos;c_strymon,Syar,Ser,Serez;;Strymon +PROV488 ;Demetrias;Demetrias;c_demetrias,Dimitrias,Mitre,Golos;;Demetrias +PROV489 ;Thessaly;Thessalía;c_thessalia,Tessaglia,Thessalie,Tessália,Tesalya;;Thessalia +PROV490 ;Thessaloniki;Thessaloníke;c_thessalonike,Thessalonique,Tessalonica,Solun,Selânik;;Thessalonike +PROV491 ;Chalkidiki;Chalkidike;c_chalkidike,Halkidikya;;Chalkidike +PROV492 ;Strymon ;Strymonos;c_strymon,Syar,Ser,Serez;;Strymon PROV495 ;Gallipoli;Kallipolis;c_kaliopolis,Gelibolu;;Kaliopolis PROV496 ;Constantinople;Konstantinoupolis;c_byzantion,Miklagarðr,Carzihrad,Tsargrad,al-Qustantiniyah,Kostantiniye,Konstantinusesburg;;Constantinople -PROV497 ; ;Thráke;c_thrake,Trakija,Trakya;;Thrake +PROV497 ;Thrace ;Thráke;c_thrake,Trakija,Trakya;;Thrake PROV1014;Corfu ;Kérkyra;c_corfu,Corfú,Corfu,Krf,Körfuz;;Coast of Asturias -PROV1528; ;Megále Vlachia;c_upper_wallachia,Tirhala,Megalovlahija;; -PROV1986; ;Arkadia;c_arcadia,Arcadie,Arcadia,Tripoliçe;; -PROV1994; ;Neai Patrai;c_neopatras,Neopatras,Neopatrie,Neopatria,Patracik;; +PROV1528;Great Vlachia;Megále Vlachia;c_upper_wallachia,Tirhala,Megalovlahija;; +PROV1986;Arcadia ;Arkadia;c_arcadia,Arcadie,Arcadia,Tripoliçe;; +PROV1994;Ypati ;Neai Patrai;c_neopatras,Neopatras,Neopatrie,Neopatria,Patracik;; PROV1996;Tekirdag;Raidestos;c_rhadestos,Rodoscuk,Rodosto;; -PROV1999; ;Boiotía;c_thebai,Estives,Stivas,Istife;; -PROV1981; ;Verroia;c_veria,Ber,Karaferye;; +PROV1999;Boeotia ;Boiotía;c_thebai,Estives,Stivas,Istife;; +PROV1981;Veria ;Verroia;c_veria,Ber,Karaferye;; ########################################,,,,,,,,,,,,,,;;;;; #Arabia,,,,,,,,,,,,,,;;;;; ########################################,,,,,,,,,,,,,,;;;;; From 7922b72b25b648af50da35eeac51bfc9e5f6aee5 Mon Sep 17 00:00:00 2001 From: Nicholas Escalona Date: Sun, 16 Aug 2015 18:25:19 -0400 Subject: [PATCH 3/4] 2.0.0 --- SED2/version.txt | 2 +- build.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SED2/version.txt b/SED2/version.txt index bcc8d77..e196308 100644 --- a/SED2/version.txt +++ b/SED2/version.txt @@ -1 +1 @@ -v2.0-BETA - 2015-08-16 +v2.0.0 - 2015-08-16 diff --git a/build.py b/build.py index 58e7767..452d0e5 100755 --- a/build.py +++ b/build.py @@ -8,7 +8,7 @@ import ck2parser import localpaths -version = 'v2.0-BETA' +version = 'v2.0.0' rootpath = localpaths.rootpath swmhpath = rootpath / 'SWMH-BETA/SWMH' From 9ff20ecdebbfc847219a3500704c24d4420a20bb Mon Sep 17 00:00:00 2001 From: Nicholas Escalona Date: Sun, 16 Aug 2015 18:25:51 -0400 Subject: [PATCH 4/4] parser --- ck2parser.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ck2parser.py b/ck2parser.py index 6dbfb74..029282d 100644 --- a/ck2parser.py +++ b/ck2parser.py @@ -62,7 +62,7 @@ def chars(line): ('newline', (r'\r?\n',)), ('op', (r'[={}]',)), ('date', (r'\d*\.\d*\.\d*',)), - ('number', (r'\d+(\.\d+)?',)), + ('number', (r'\d+(\.\d+)?(?!\w)',)), ('quoted_string', (r'"[^"#\r\n]*"',)), ('unquoted_string', (r'[^\s"#={}]+',)) ] @@ -113,6 +113,10 @@ def __iter__(self): def indent(self): return self._indent + @property + def has_pairs(self): + return not self.contents or isinstance(self.contents[0], Pair) + @indent.setter def indent(self, value): self._indent = value @@ -492,7 +496,7 @@ def parse_file(path, encoding='cp1252'): with path.open(encoding=encoding) as f: try: tree = parse(f.read()) - except parser.NoParseError: + except: print(path) raise return tree