Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

2026-08-07 14:33:34 +01:00 · 2026-08-07 14:33:34 +01:00 · 702c808d3c
commit 702c808d3c
parent 0fbe2c93e6 7d465a3bd2
33 changed files with 858 additions and 275 deletions
--- a/localization/english/replace/culture/cultures_l_english.yml
+++ b/localization/english/replace/culture/cultures_l_english.yml
@ -137,12 +137,6 @@
 celtic_group_collective_noun:0 "Celts"
 goidelic_group:0 "Goidelic"
 goidelic_group_collective_noun:0 "Goidels"
- irish:0 "Hibernian"
- irish_prefix:0 "Hibernian"
- irish_collective_noun:0 "Hibernian"
- gaelic:0 "Albannach"
- gaelic_prefix:0 "Gaelo"
- gaelic_collective_noun:0 "Gaels"
 #Brythonic group
 brythonic_group:0 "Brythonic"
 brythonic_group_collective_noun:0 "Brythons"
@ -458,9 +452,6 @@
 roman:0 "Roman"
 roman_prefix:0 "Romano"
 roman_collective_noun:1 "Romans"
- sardinian:0 "Sardu"
- sardinian_prefix:0 "Sardino"
- sardinian_collective_noun:0 "Sardinians"
 sicilian:0 "Sicilianu"
 sicilian_prefix:0 "Sicilo"
 sicilian_collective_noun:0 "Sicilians"
@ -568,16 +559,6 @@
 old_saxon:0 "Old Saxon"
 old_saxon_prefix:0 "Saxo"
 old_saxon_collective_noun:1 "Old Saxons"
- frisian:0 "Friisk"
- frisian_prefix:0 "Friso"
- frisian_collective_noun:1 "Frisians"
- dutch:2 "Nederlander"
- dutch_prefix:0 "Batavo"
- dutch_collective_noun:2 "Dutch"
- scottish:1 "Scots"
- scottish_prefix:0 "Scoto"
- scottish_collective_noun:1 "Scots"
- scottish_group: "Scottish"
 #West Slavic group
 west_slavic_group:0 "West Slavic"
 west_slavic_group_collective_noun:0 "West Slavs"
@ -596,9 +577,6 @@
 polabian:0 "Polabian"
 polabian_prefix:0 "Polabo"
 polabian_collective_noun:1 "Polabians"
- NEOW_carantanian:0 "Koroški"
- NEOW_carantanian_prefix:0 "Carantano"
- NEOW_carantanian_collective_noun:0 "Carantanians"
 #Tibetan
 tibetan_group:0 "Tibetan"
 tibetan_group_collective_noun:0 "Tibetans"
--- a/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml
+++ b/localization/english/replace/culture/traditions/zz_NEOW_cultural_heritages_l_english.yml
@ -39,8 +39,8 @@
 heritage_sardic_collective_noun:0 "Sards"
 heritage_scottish_name:0 "Scottish"
 heritage_scottish_collective_noun:0 "Scots"
- heritage_turkish_name:0 "Turkish"
- heritage_turkish_collective_noun:0 "Turks"
+ heritage_turkish_name:0 "Oghuz"
+ heritage_turkish_collective_noun:0 "Oghuz Turks"
 heritage_romanian_name:0 "Romanian"
 heritage_romanian_collective_noun:0 "Romanians"
 heritage_esperantisto_name:0 "Esperantisto"
--- a/localization/english/replace/culture/traditions/zz_NEOW_cultural_languages_l_english.yml
+++ b/localization/english/replace/culture/traditions/zz_NEOW_cultural_languages_l_english.yml
@ -128,8 +128,9 @@
 NEOW_language_esperanto_name:0 "Esperanto"
 NEOW_language_finnic_name:0 "Finnic"
 NEOW_language_eastern_yiddish_name:0 "Eastern Yiddish"
- NEOW_language_neo_aramaic:0 "Neo-Aramaic"
- NEOW_language_arabic:0 "Arabic"
+ NEOW_language_neo_aramaic_name:0 "Neo-Aramaic"
+ NEOW_language_arabic_name:0 "Arabic"
+ NEOW_language_turkmen_name:0 "Turkmen"

 #########################################
 #  Grouping Stuff
--- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml
+++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml
@ -596,9 +596,9 @@
 szeklers:0 "Székely"
 szeklers_collective_noun:0 "Székelys"
 szeklers_prefix:0 "Székely" 
- # szeklers
- rumeli:0 "Rumeli"
- rumeli_collective_noun:0 "Rumeli"
+ # Rumelili
+ rumeli:0 "Rumelili"
+ rumeli_collective_noun:0 "Rumelili"
 rumeli_prefix:0 "Rumel" 
 
 #Nakh
@ -724,4 +724,39 @@
 #Saxon
 saxon:0 "Sächsisch"
 saxon_prefix:0 "Saxo"
- saxon_collective_noun:0 "Saxons"
+ saxon_collective_noun:0 "Saxons"
+ 
+ #Sardinian
+ sardinian:0 "Sardu"
+ sardinian_prefix:0 "Sardino"
+ sardinian_collective_noun:0 "Sardinians"
+ 
+ #Highlander/Albannach
+ gaelic:0 "Albannach"
+ gaelic_prefix:0 "Gaelo"
+ gaelic_collective_noun:0 "Gaels"
+ 
+ #Hibernian
+ irish:0 "Hibernian"
+ irish_prefix:0 "Hibernian"
+ irish_collective_noun:0 "Hibernian"
+ 
+ #Scots
+ scottish:1 "Scots"
+ scottish_prefix:0 "Scoto"
+ scottish_collective_noun:1 "Scots"
+ 
+ #Carantanian
+ NEOW_carantanian:0 "Koroški"
+ NEOW_carantanian_prefix:0 "Carantano"
+ NEOW_carantanian_collective_noun:0 "Carantanians"
+ 
+ #Dutch
+ dutch:2 "Nederlander"
+ dutch_prefix:0 "Batavo"
+ dutch_collective_noun:2 "Dutch"
+ 
+ #Frisian
+ frisian:0 "Friisk"
+ frisian_prefix:0 "Friso"
+ frisian_collective_noun:1 "Frisians"
--- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml
+++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml
@ -6481,3 +6481,15 @@
 dynn_Agany_y_act_azow:0 "Aganyýazow"
 dynn_Ba_s_ced_irow:0 "Başirow"
 dynn_Ba_y_act_myradow:0 "Baýmyradow"
+ dynn_Hrabar_pst_:0 "Hrabar'"
+ dynn_Ka_c_crn_mar_c_crn_yk:0 "Kačmarčyk"
+ dynn_Ertu_g_brv_rulo_g_brv_lu:0 "Ertuğruloğlu"
+ dynn_Lend_pst_el:0 "Lend'el"
+ dynn_Duchnovi_c_crn_:0 "Duchnovič"
+ dynn_Rak:0 "Rak"
+ dynn_Felde_s_crn__i_hat_:0 "Feldešî"
+ dynn_Gerovskyj:0 "Gerovskyj"
+ dynn_Besk_i_hat_d:0 "Beskîd"
+ dynn_B_i_hat_l_pst_n_pst_a:0 "Bîl'n'a"
+ dynn_Val_pst_kovskyj:0 "Val'kovskyj"
+ dynn_Vehe_s_crn_:0 "Veheš"
--- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml
+++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml
@ -93,6 +93,10 @@
 #Turkmen
 dynnpat_suf_ogly:0 " ogly"
 dynnpat_suf_gyzy:0 " gyzy"
+ 
+ #Rusyn
+ dynnpat_suf_ov_i_hat__c_crn_:0 "ovîč"
+ 
 ############################################################
 # Names
 ############################################################
--- a/localization/english/replace/names/NEOW_character_names_l_english.yml
+++ b/localization/english/replace/names/NEOW_character_names_l_english.yml
@ -19469,3 +19469,12 @@
 Chrysoval_a_act_nto:0 "Chrysovalánto"
 Chant_e_act_:0 "Chanté"
 Chatitz_e_act_:0 "Chatitzé"
+ Teofil_pst_:0 "Teofil'"
+ Zoltan:0 "Zoltan"
+ _S_crn_t_pst_epan:0 "Št'epan"
+ D_i_hat_m_i_hat_trij:0 "Dîmîtrij"
+ Jul_i_hat_j:0 "Julîj"
+ Aleksej:0 "Aleksej"
+ Vlad_i_hat_m_i_hat_r:0 "Vladîmîr"
+ M_i_hat_chajlo:0 "Mîchajlo"
+ M_i_hat_kola:0 "Mîkola"
--- a/localization/english/replace/titles_cultural_names_l_english.yml
+++ b/localization/english/replace/titles_cultural_names_l_english.yml
@ -4632,6 +4632,27 @@
 cn_dola:0 "Dola"
 cn_p_o_hat_legni:0 "Pôlegni"
 cn_san_y_a_hat_dou:0 "San-Yâdou"
+ #### Scandinavia
+ cn_skandinav_i_act_a:0 "Skandinavía"
+ cn_skandinavia:0 "Skandinavia"
+ cn_skandinavien:0 "Skandinavien"
+ ### Iceland
+ cn__i_act_sland:0 "Ísland"
+ cn_isl_a_act_nda:0 "Islánda"
+ cn_island:0 "Island"
+ cn_islanti:0 "Islanti"
+ ## Iceland
+ # Vestisland/Vesturland
+ cn_reykjavik:0 "Reykjavik"
+ ## Faroes
+ cn_f_a_uml_r_o_uml_arna:0 "Färöarna"
+ cn_f_a_uml_rsaaret:0 "Färsaaret"
+ cn_f_ae_r_o_stk_erne:0 "Færøerne"
+ cn_f_ae_r_o_stk_yane:0 "Færøyane"
+ cn_f_ae_r_o_stk_yene:0 "Færøyene"
+ cn_f_ae_reyjar:0 "Færeyjar"
+ cn_f_o_stk_royar:0 "Føroyar"
+ cn_fearsullot:0 "Fearsullot"
 
 # Custom (changed from default) title names:
 cn_bratislava:0 "Bratislava"
@ -5323,12 +5344,7 @@
 cn_b_vargo:0 "Vargey"
 cn_b_vardo:0 "Varðey"
 cn_finnmork:0 "Finnmörk"
- cn_island:0 "Ísland"

- #Southern Isles & Norse Scotland
- cn_husavik:0 "Húsavík"
- cn_husavik_adj:0 "Húsavíki"
- 
 #Denmark
 cn_nastved:0 "Nästved"
 cn_nastved_adj:0 "Nästveder"
--- a/localization/english/replace/titles_l_english.yml
+++ b/localization/english/replace/titles_l_english.yml
@ -3386,6 +3386,45 @@
 b_lons_le_saunier:0 "Lons-le-Saunier"
 b_salins:0 "Poligny"
 b_champagnole:0 "Saint-Claude"
+ #### Scandinavia
+ e_scandinavia:0 "Scandinavia"
+ e_scandinavia_adj:0 "Scandinavian"
+ e_scandinavia_pre:0 "Scando"
+ ### Iceland
+ k_iceland:0 "Iceland"
+ k_iceland_adj:0 "Icelander"
+ ## Iceland
+ d_iceland:0 "Iceland"
+ d_iceland_adj:0 "Icelandic"
+ # Vestisland/Vesturland
+ c_vestisland:1 "Vesturland"
+ c_vestisland_adj:0 "Vesturlander"
+ b_reykjavik:1 "Reykjavík"
+ b_vestfirdir:0 "Ísafjörður"
+ b_olafsvik:1 "Akranes"
+ # Nordrland/Norðurland
+ c_nordrland:1 "Norðurland"
+ c_nordrland_adj:1 "Norðurlander"
+ b_husavik:1 "Akureyri"
+ b_vopnafjordur:1 "Húsavík"
+ # Austisland/Austurland
+ c_austisland:1 "Austurland"
+ c_austisland_adj:0 "Austurlander"
+ b_reydarfjall:1 "Egilsstaðir"
+ b_hofn:0 "Höfn"
+ # Sudurland/Suðurland
+ c_sudurland:1 "Suðurland"
+ c_sudurland_adj:1 "Suðurlander"
+ b_stokkseyri:1 "Selfoss"
+ b_klaustur:1 "Klaustur"
+ ## Faroes
+ d_faroes:0 "Faroes"
+ d_faroes_adj:0 "Faroese"
+ d_faroes_article:0 "the "
+ # Faereyar/Faroes
+ c_faereyar:1 "Faroes"
+ c_faereyar_adj:1 "Faroese"
+ c_faereyar_article:0 "the "
 
 # Custom (changed from default) title names:
 LOTHARINGIA:0 "$k_lotharingia$"
@ -7123,7 +7162,6 @@
 b_husaby:0 "Husaby"
 b_husaiba:0 "Husaiba"
 b_husan:0 "Husån"
- b_husavik:1 "Akureyri"
 b_husby:0 "Husby"
 b_husi:0 "Huși"
 b_husseiniya:0 "Husseiniya"
@ -10700,8 +10738,6 @@
 b_reus:0 "Reus"
 b_reuss:0 "Reuss"
 b_reval:1 "Lindanisa"
- b_reydarfjall:1 "Egilsstaðir"
- b_reykjavik:1 "Reykjavík"
 b_rezekne:0 "Rēzekne"
 b_rezoa:0 "Rezoa"
 b_rgab:0 "Rgab"
@ -11770,7 +11806,6 @@
 b_stmaixent:0 "St Maixent"
 b_stockholm:0 "Stockholm"
 b_stoenesti:0 "Stoenești"
- b_stokkseyri:1 "Selfoss"
 b_stolsheimen:1 "Vik"
 b_ston:0 "Ston"
 b_stornoway:0 "Stornoway"
@ -12837,7 +12872,6 @@
 b_vesely:0 "Vesely"
 b_veset:0 "Veset"
 b_vesilahti:0 "Vesilahti"
- b_vestfirdir:0 "Ísafjörður"
 b_veteli:0 "Veteli"
 b_vetlanda:0 "Vetlanda"
 b_vetulonia:0 "Vetulonia"
@ -13610,8 +13644,6 @@
 c_attica_adj:0 "Attican"
 c_aukshayts:0 "Aukshayts"
 c_aukshayts_adj:0 "Aukshaytsi"
- c_austisland:1 "Austurland"
- c_austisland_adj:0 "Austurlander"
 c_avalois:0 "Avalois"
 c_avalois_adj:0 "Avalois"
 c_aveiro:0 "Aveiro"
@ -14112,8 +14144,6 @@
 c_evora_adj:0 "Évoran"
 c_eystridalir:1 "Østerdalen"
 c_eystridalir_adj:0 "Østerdalenian"
- c_faereyar:1 "Færeyjar"
- c_faereyar_adj:1 "Faroese"
 c_falkenstein:0 "Falkenstein"
 c_falkenstein_adj:0 "Falkensteiner"
 c_famagusta:0 "Famagusta"
@ -16072,8 +16102,6 @@
 c_verona_adj:0 "Veronian"
 c_vestfold:0 "Vestfold"
 c_vestfold_adj:0 "Vestfolder"
- c_vestisland:1 "Vesturland"
- c_vestisland_adj:0 "Vesturlander"
 c_vexin:0 "Vexin"
 c_vexin_adj:0 "Vexinian"
 c_sarajevo:1 "Sarajevo"
@ -16602,8 +16630,6 @@
 d_hormuz:0 "Hormuz"
 d_huitzilopochtli:0 "Cult of Huitzilopochtli"
 d_huitzilopochtli_adj:0 "Huitzilopochtli"
- d_iceland:0 "Iceland"
- d_iceland_adj:0 "Icelandic"
 d_ikh_bogd:0 "Ikh Bogd"
 d_ikh_bogd_adj:0 "Ikh Bogdi"
 d_ikonion:0 "Ikonion"
@ -17403,9 +17429,6 @@
 e_russia:0 "Russia"
 e_russia_adj:0 "Russian"
 e_russia_pre:0 "Russo"
- e_scandinavia:0 "Scandinavia"
- e_scandinavia_adj:0 "Scandinavian"
- e_scandinavia_pre:0 "Scando"
 e_shiite_article:0 "the "
 e_shiite:0 "Shia Caliphate"
 e_shiite_adj:0 "Caliphal"
@ -17662,8 +17685,6 @@
 k_rhineland_adj:0 "Rhineland"
 k_sevillian_state:0 "Sevillian State"
 k_sevillian_state_adj:0 "Sevillian"
- k_iceland:0 "Iceland"
- k_iceland_adj:0 "Icelander"
 k_rum:0 "Rum"
 k_rum_adj:0 "Rumite"
 k_rus:0 "Rus"
@ -25184,10 +25205,6 @@
 d_vuovdisamieana:0 "Vuovdisámieana"
 d_vuovdisamieana_adj:0 "Vuovdisámi"
 
- c_nordrland:1 "Norðurland"
- c_nordrland_adj:1 "Norðurlander"
- c_sudurland:1 "Suðurland"
- c_sudurland_adj:1 "Suðurlander"
 
 c_pite:0 "Pite"
 c_pite_adj:0 "Pitean"
@ -25210,10 +25227,6 @@
 
 b_ski:0 "Ski"
 b_uddevalla:0 "Uddevalla"
- b_olafsvik:1 "Akranes"
- b_hofn:0 "Höfn"
- b_vopnafjordur:1 "Húsavík"
- b_klaustur:1 "Klaustur"
 b_ume:0 "Ume"
 b_vettanen:0 "Vettänen"
 b_ylikainuu:0 "Ylikainuu"