nationality nouns and adjectives in Dictionary: triples like french_A, frenchMasc_N, frenchFem_N. frenchman_N etc should be under frenchMasc_N maybe as the first variant, so that uniform structure is preserved. Fully implemented for Eng Fin Fre Swe, partially for other languages.

2014-06-19 16:35:40 +00:00
parent aad954a8f5
commit a7b9e9f225
10 changed files with 195 additions and 121 deletions
--- a/lib/src/french/ConstructionFre.gf
+++ b/lib/src/french/ConstructionFre.gf
@@ -118,7 +118,7 @@ lin dutch_Language = mkLanguage "hollandais" ;
 lin english_Language = mkLanguage "anglais" ;
 lin estonian_Language = mkLanguage "estonien" ;
 lin finnish_Language = mkLanguage "finnois" ;
-lin french_Language = mkLanguage "francais" ;
+lin french_Language = mkLanguage "français" ;
 lin german_Language = mkLanguage "allemand" ;
 lin greek_Language = mkLanguage "grècque" ;
 lin hebrew_Language = mkLanguage "hebreu" ;
--- a/lib/src/translator/Dictionary.gf
+++ b/lib/src/translator/Dictionary.gf
@@ -10449,7 +10449,6 @@ fun chincherinchee_N : N ;
 fun chinchilla_N : N ;
 fun chinchow_PN : PN ;
 fun chine_N : N ;
-fun chinese_A : A  ;
 fun chinese_A : A ;
 fun chineseMasc_N : N ;
 fun chineseFem_N : N ;
@@ -18233,7 +18232,7 @@ fun dusty_A : A ;
 fun dutch_A : A ;
 fun dutchMasc_N : N ;
 fun dutchFem_N : N ;
-fun dutchman_N : N ;
+--fun dutchman_N : N ;
 fun duteous_A : A ;
 fun dutiable_A : A ;
 fun dutiful_A : A ;
@@ -19323,8 +19322,8 @@ fun england_PN : PN ;
 fun english_A : A ;
 fun englishMasc_N : N ;
 fun englishFem_N : N ;
-fun englishman_N : N ;
-fun englishwoman_N : N ;
+--fun englishman_N : N ;
+--fun englishwoman_N : N ;
 fun engorgement_N : N ;
 fun engraft_V2 : V2 ;
 fun engram_N : N ;
@@ -21702,12 +21701,13 @@ fun fink_N : N ;
 fun fink_on_V2 : V2 ;
 fun fink_out_V : V ;
 fun finland_PN : PN ;
-fun finn_N : N ;
+--fun finn_N : N ;
 fun finnan_N : N ;
 fun finnan_haddie_N : N ;
 fun finnan_haddock_N : N ;
 fun finnish_A : A  ;
-fun finnish_A : A ;
+fun finnishMasc_N : N ;
+fun finnishFem_N : N ;
 fun finnish_N : N ;
 fun fiona_PN : PN ;
 fun fiord_N : N ;
@@ -22981,8 +22981,8 @@ fun freightliner_N : N ;
 fun french_A : A ;
 fun frenchMasc_N : N ;
 fun frenchFem_N : N ;
-fun frenchman_N : N ;
-fun frenchwoman_N : N ;
+--fun frenchman_N : N ;
+--fun frenchwoman_N : N ;
 fun frenetic_A : A ;
 fun frenzied_A : A ;
 fun frenzy_N : N ;
@@ -29112,7 +29112,9 @@ fun india_PN : PN ;
 fun india_rubber_N : N ;
 fun indiaman_N : N ;
 fun indian_A : A ;
-fun indian_N : N ;
+fun indian_N : N ; -- indian of America
+fun indianFem_N : N ; -- national of India
+fun indian_Masc : N ;
 fun indiana_PN : PN ;
 fun indianapolis_PN : PN ;
 --subcat fun indicate_V : V ;
@@ -57143,7 +57145,7 @@ fun sweatshop_N : N ;
 fun sweaty_A : A ;
 fun swedeFem_N : N ;
 fun swedeMasc_N : N ;
-fun swede_A : A ;
+--fun swede_A : A ;
 fun sweden_PN : PN ;
 fun swedish_A : A ;
 fun swedishMasc_N : N ;
--- a/lib/src/translator/DictionaryDut.gf
+++ b/lib/src/translator/DictionaryDut.gf
@@ -5271,6 +5271,9 @@ lin dust_N = L.dust_N ;
 lin dust_V2 = mkV2 (mkV "afstoffen") ; -- status=guess, src=wikt
 lin dustbin_N = mkN "vuilnisbak" masculine ; -- status=guess
 lin dusty_A = mkA "stoffig" ; -- status=guess
+lin dutch_A = mkA "Nederlands" ;
+lin dutchMasc_N = mkN "Nederlander" ;
+lin dutchFem_N = mkN "Nederlander" ;
 lin duty_N = mkN "dienst";
 lin duvet_N = mkN "dekbed" neuter ; -- status=guess
 lin dwarf_N = mkN "dwergster" masculine feminine ; -- status=guess
@@ -6806,8 +6809,9 @@ lin freeze_V = L.freeze_V ;
 lin freeze_V2 = mkV2 (mkV "verstijven") ; -- status=guess, src=wikt
 lin freezer_N = mkN "vriezer" masculine | mkN "diepvriezer" masculine | mkN "diepvries" masculine ; -- status=guess status=guess status=guess
 lin freight_N = mkN "vracht" masculine | mkN "cargo" masculine ; -- status=guess status=guess
-lin frenchMasc_N = mkN "frieten" | mkN "patat" ; -- status=guess status=guess
-lin frenchFem_N = mkN "frieten" | mkN "patat" ; -- status=guess status=guess
+lin french_A = mkA "Frans" ;
+lin frenchMasc_N = mkN "Fransman" "Fransen" masculine ;
+lin frenchFem_N = mkN "Française" "Françaisen" feminine ;
 lin frenetic_A = mkA "frenetiek" | mkA "bezeten" ; -- status=guess status=guess
 lin frenzy_N = mkN "razernij" feminine ; -- status=guess
 lin frequency_N = mkN "frequentiemodulatie" ; -- status=guess
--- a/lib/src/translator/DictionaryEng.gf
+++ b/lib/src/translator/DictionaryEng.gf
@@ -19320,8 +19320,8 @@ lin engineering_N = mkN "engineering";
 lin enginery_N = mkN "enginery" ;
 lin england_PN = mkPN "England";
 lin english_A = compoundA (mkA "English");
-lin englishMasc_N = mkN "English" ;
-lin englishFem_N = mkN "English" ;
+lin englishMasc_N = mkN "Englishman" "Englishmen" ;
+lin englishFem_N = mkN "Englishwoman" "Englishwomen" ;
 lin englishman_N = mkN masculine (mkN "englishman" "englishmen");
 lin englishwoman_N = mkN feminine (mkN "englishwoman" "englishwomen");
 lin engorgement_N = mkN "engorgement" ;
@@ -21701,12 +21701,13 @@ lin fink_N = mkN "fink" ;
 lin fink_on_V2 = prepV2 (mkV "fink") (mkPrep "on");
 lin fink_out_V = partV (mkV "fink") "out";
 lin finland_PN = mkPN "Finland";
-lin finn_N = mkN "finn" "finns";
+lin finn_N = mkN "Finn" "Finns";
 lin finnan_N = mkN "finnan" ;
 lin finnan_haddie_N = mkN "finnan haddie" ;
 lin finnan_haddock_N = mkN "finnan haddock" ;
 lin finnish_A = compoundA (mkA "Finnish");
-lin finnish_N = mkN "Finnish" ;
+lin finnishMasc_N = mkN "Finn" ;
+lin finnishFem_N = mkN "Finn" ;
 lin fiona_PN = mkPN "Fiona";
 lin fiord_N = mkN "fiord" "fiords";
 lin fipple_N = mkN "fipple" ;
@@ -22975,8 +22976,8 @@ lin freight_train_N = mkN "freight-train" "freight-trains";
 lin freighter_N = mkN "freighter" "freighters";
 lin freightliner_N = mkN "freightliner" "freightliners";
 lin french_A = compoundA (mkA "French");
-lin frenchMasc_N = mkN "french" ;
-lin frenchFem_N = mkN "french" ;
+lin frenchMasc_N = mkN "Frenchman" "Frenchmen" ;
+lin frenchFem_N = mkN "Frenchwoman" "Frenchwomen" ;
 lin frenchman_N = mkN masculine (mkN "frenchman" "frenchmen");
 lin frenchwoman_N = mkN feminine (mkN "frenchwoman" "frenchwomen");
 lin frenetic_A = compoundA (mkA "frenetic");
@@ -29105,6 +29106,8 @@ lin india_rubber_N = mkN "india-rubber" "india-rubbers";
 lin indiaman_N = mkN masculine (mkN "indiaman" "indiamen");
 lin indian_A = compoundA (mkA "Indian");
 lin indian_N = mkN "Indian" "Indians";
+lin indianMasc_N = mkN "Indian" "Indians";
+lin indianFem_N = mkN "Indian" "Indians";
 lin indiana_PN = mkPN "Indiana";
 lin indianapolis_PN = mkPN "Indianapolis";
 --subcat lin indicate_V = mkV "indicate";
@@ -57128,8 +57131,8 @@ lin swedeMasc_N = mkN masculine (mkN "Swede" "Swedes");
 lin swede_A = compoundA (mkA "Swedish") ; --- swede is not and adjective
 lin sweden_PN = mkPN "Sweden";
 lin swedish_A = compoundA (mkA "Swedish");
-lin swedishMasc_N = mkN "Swedish" ; -- | language
-lin swedishFem_N = mkN "Swedish" ; -- | language
+lin swedishMasc_N = mkN "Swede" ; 
+lin swedishFem_N = mkN "Swede" ; 
 lin sweep_N = mkN "sweep" "sweeps";
 lin sweep_V = IrregEng.sweep_V;
 lin sweep_V2 = mkV2 (IrregEng.sweep_V);
--- a/lib/src/translator/DictionaryFin.gf
+++ b/lib/src/translator/DictionaryFin.gf
@@ -3583,7 +3583,7 @@ lin asynergic_A = mkWA "asynerginen" ; --UNCHK
 lin asynergy_N = mkWN "asynergia" ; --UNCHK
 lin asystole_N = mkWN (compoundN "sydän" (k39 "pysähdys")) ; --UNCHK
 lin at_N = mkWN "kip" ; --UNCHK
-lin at_Prep = casePrep inessive | casePrep adessive | mkPrep "luona" | mkPrep "tykönä" ; ---- split
+lin at_Prep = casePrep adessive | casePrep inessive | mkPrep "luona" | mkPrep "tykönä" ; ---- split
 lin at_home_Adv = mkAdv "kotona" ;
 lin at_home_N = mkWN (compoundN "vastaan" (k1A "otto")) ; --UNCHK
 lin at_least_AdN = S.at_least_AdN ;
@@ -7049,6 +7049,8 @@ lin bulbous_A = mkWA (compoundA "kupu" (k38 "mainen")) ; --UNCHK
 lin bulbul_N = mkWN "bulbuli" ; --UNCHK
 --geo lin bulgaria_PN = mkPN "Bulgaria" ;
 lin bulgarian_A = mkWA (k38 "bulgarialainen") ; --UNCHK
+lin bulgarianMasc_N = mkN "bulgaari" | mkN "bulgarialainen" ;
+lin bulgarianFem_N = mkN "bulgaari" | mkN "bulgarialainen" ;
 lin bulge_N = mkWN (k48A "uloke") ; --UNCHK
 lin bulge_V = mkWV (k54A "suurentaa") ; --UNCHK
 lin bulge_V2 = mkWV2 (k54A "suurentaa") ; --UNCHK
@@ -8412,8 +8414,8 @@ lin cattleship_N = mkWN (compoundN "karja" (k9 "laiva")) ; --UNCHK
 lin catty_A = mkWA (k15 "ilkeä") ; --UNCHK
 lin catty_N = mkWN (k9 "pauna") ; --UNCHK
 lin catwalk_N = mkWN (k9A "silta") ; --UNCHK
-lin caucasianFem_N = mkWN (k26 "kieli") "kaukasialainen" ; --UNCHK
-lin caucasianMasc_N = mkWN (k26 "kieli") "kaukasialainen" ; --UNCHK
+lin caucasianFem_N = mkN "kaukasialainen" ;
+lin caucasianMasc_N = mkN "kaukasialainen" ; 
 lin caucasian_A = mkWA (k38 "kaukasialainen") ; --UNCHK
 lin caucus_N = mkWN (compoundN "puolue" (k39 "kokous")) ; --UNCHK
 lin cauda_N = mkWN (k10A "häntä") ; --UNCHK
@@ -8543,7 +8545,7 @@ lin cellulosid_A = mkWA "selluloosa-" ; --UNCHK
 lin celom_N = mkWN (compoundN "coe" (k10 "loma")) ; --UNCHK
 lin celt_N = mkWN (k5A "keltti") ; --UNCHK
 lin celtic_A = mkWA (k38 "kelttiläinen") ; --UNCHK
-lin celtic_N = mkWN (k26 "kieli") "kelttiläinen" ; --UNCHK
+lin celtic_N = mkN "kelttiläinen" ; 
 lin celtuce_N = mkWN (compoundN "parsa" (k5A "salaatti")) ; --UNCHK
 lin cement_N = mkWN (compoundN "juuri" (k5A "sementti")) ; --UNCHK
 lin cement_V2 = mkWV2 (k53 "vahvistaa") ; --UNCHK
@@ -8710,7 +8712,7 @@ lin chabazite_N = mkWN "kabasiitti" ; --UNCHK
 lin chachalaca_N = mkWN "kaklattaja" ; --UNCHK
 lin chachka_N = mkWN (k1 "hely") ; --UNCHK
 lin chacma_N = mkWN (compoundN "karhu" (k5 "paviaani")) ; --UNCHK
-lin chad_N = mkWN (k26 "kieli") "tšadilainen" ; --UNCHK
+lin chad_N = mkN "tšadilainen" ; 
 lin chadian_A = mkWA (compoundA "tsadi" (k38 "lainen")) ; --UNCHK
 lin chadian_N = mkWN (compoundN "tsadi" (k38 "lainen")) ; --UNCHK
 lin chador_N = mkWN "burka" ; --UNCHK
@@ -9170,8 +9172,8 @@ lin chincherinchee_N = mkWN (compoundN "afrikan" (k9 "lilja")) ; --UNCHK
 lin chinchilla_N = mkWN (k9 "sinsilla") ; --UNCHK
 lin chine_N = mkWN (compoundN "selkä" (k9A "ranka")) ; --UNCHK
 lin chinese_A = mkWA (k38 "kiinalainen") ;
-lin chineseMasc_N = mkWN (k9 "kiina") ; --UNCHK
-lin chineseFem_N = mkWN (k9 "kiina") ; --UNCHK
+lin chineseMasc_N = mkN "kiinalainen" ;
+lin chineseFem_N = mkN "kiinalainen" | mkN "kiinatar" ;
 lin chink_N = mkWN (k39 "kilahdus") ; --UNCHK
 lin chink_V = mkWV (k53A "aiheuttaa") "halkeama" ; --UNCHK
 lin chink_V2 = mkWV2 (k53A "aiheuttaa") "halkeama" ; --UNCHK
@@ -13038,8 +13040,8 @@ lin dangle_V2 = mkWV2 (k53 "ripustaa") ; --UNCHK
 lin dangleberry_N = mkWN (compoundN "frond" (k10 "osa")) "Gaylussacia" ; --UNCHK
 lin daniel_N = mkWN (k9 "kirja") "profeetta" "Danielin" ; --UNCHK
 lin danish_A = mkWA (k38 "tanskalainen") ;
-lin danishMasc_N = mkWN (k26 "kieli") "tanskan" ; --UNCHK
-lin danishFem_N = mkWN (k26 "kieli") "tanskan" ; --UNCHK
+lin danishMasc_N = mkN "tanskalainen" ;
+lin danishFem_N = mkN "tanskalainen" ;
 lin dank_A = mkWA (k15 "kostea") ; --UNCHK
 lin dankness_N = mkWN (k40 "nihkeys") ; --UNCHK
 lin danse_macabre_N = mkWN (compoundN "kuoleman" (k5 "tanssi")) ; --UNCHK
@@ -15987,8 +15989,8 @@ lin dustmop_N = mkWN (compoundN "pöly" (k5A "moppi")) ; --UNCHK
 lin dustpan_N = mkWN (k6 "kihveli") ; --UNCHK
 lin dusty_A = mkWA (k10 "koinsyömä") ; --UNCHK
 lin dutch_A = mkWA (k38 "hollantilainen") ; --UNCHK
-lin dutchMasc_N = mkWN (k5A "hollanti") ; --UNCHK
-lin dutchFem_N = mkWN (k5A "hollanti") ; --UNCHK
+lin dutchMasc_N = mkN "hollantilainen" ;
+lin dutchFem_N = mkN "hollantilainen" ;
 lin dutchman_N = mkWN (k38 "hollantilainen") ; --UNCHK
 lin duteous_A = mkWA (k38 "kuuliainen") ; --UNCHK
 lin dutiable_A = mkWA (compoundA "tullin" (k38 "alainen")) ; --UNCHK
@@ -16961,8 +16963,8 @@ lin engineer_V2 = mkWV2 (k53A "toteuttaa") ; --UNCHK
 lin engineering_N = mkWN (k12 "teknologia") ; --f64
 lin enginery_N = mkWN (k2 "koneisto") ; --UNCHK
 lin english_A = mkWA (k38 "englantilainen") ;
-lin englishman_N = mkWN (k38 "englantilainen") ; --UNCHK
-lin englishwoman_N = mkWN (k38 "nainen") "englantilainen" ; --UNCHK
+lin englishMasc_N = mkWN (k38 "englantilainen") ; 
+lin englishFem_N = mkN "englantilainen" ;
 lin engorgement_N = mkWN (k9A "ahminta") ; --UNCHK
 lin engraft_V2 = mkWV2 (k53A "asettaa") ; --UNCHK
 lin engram_N = mkWN (compoundN "muisti" (k7A "jälki")) ; --UNCHK
@@ -19107,7 +19109,8 @@ lin finnan_N = mkWN (k10 "kolja") "savustettu" ; --UNCHK
 lin finnan_haddie_N = mkWN (k10 "kolja") "savustettu" ; --UNCHK
 lin finnan_haddock_N = mkWN (k10 "kolja") "savustettu" ; --UNCHK
 lin finnish_A = mkWA (k38 "suomalainen") ; --UNCHK
-lin finnish_N = mkWN (k7 "suomi") ; --UNCHK
+lin finnishFem_N = mkN "suomalainen" ;
+lin finnishMasc_N = mkN "suomalainen" ;
 lin fiord_N = mkWN (k1 "vuono") ; --UNCHK
 lin fipple_N = mkWN (k10A "nokka") ; --UNCHK
 lin fir_N = mkN "kuusi" "kuusia" ;
@@ -19418,7 +19421,7 @@ lin fleet_N = mkWN (k2 "laivasto") ;
 lin fleeting_A = mkWA (k10 "ohikiitävä") ;
 lin fleetness_N = mkWN (k40 "nopeus") ; --UNCHK
 lin flemish_A = mkWA (k38 "flaamilainen") ; --UNCHK
-lin flemish_N = mkWN (k26 "kieli") "flaamin" ; --UNCHK
+lin flemish_N = mkN "flaamilainen" ;
 lin flesh_N = mkWN (k41 "ruumis") ; --UNCHK
 lin flesh_out_V2 = mkWV2 (k52A "tukevoitua") ; --UNCHK
 lin flesh_wound_N = mkWN (k9 "lihashaava") ; --UNCHK
@@ -20205,9 +20208,9 @@ lin freight_N = mkN "rahti" ; ---ARB mkWN (k39 "rahtaus") ;
 lin freight_V2 = mkWV2 (k73A "rahdata") ; --UNCHK
 lin freight_train_N = mkWN (compoundN "tavara" (k10 "juna")) ; --UNCHK
 lin freighter_N = mkWN (compoundN "kauppa-" (k39 "alus")) ; --UNCHK
-lin french_A = mkWA (k38 "gallialainen") ; --UNCHK
-lin frenchMasc_N = mkWN (k9 "ranska") ; --UNCHK
-lin frenchFem_N = mkWN (k9 "ranska") ; --UNCHK
+lin french_A = mkA "ranskalainen" ;
+lin frenchMasc_N = mkN "ranskalainen" ;
+lin frenchFem_N = mkN "ranskalainen" | mkN "ranskatar" ;
 lin frenchman_N = mkWN (k38 "ranskalainen") ; --UNCHK
 lin frenchwoman_N = mkWN (k38 "ranskalainen") ; --UNCHK
 lin frenetic_A = mkWA (k10 "raivoisa") ; --UNCHK
@@ -21076,8 +21079,8 @@ lin geriatric_A = mkWA (k38 "gerontologinen") ; --UNCHK
 lin geriatrician_N = mkWN "gerontologi" ; --UNCHK
 lin geriatrics_N = mkWN (k12 "gerontologia") ; --UNCHK
 lin germ_N = mkWN (k6 "bakteeri") ; --UNCHK
-lin germanFem_N = mkWN (k26 "kieli") "saksan" ; --UNCHK
-lin germanMasc_N = mkWN (k26 "kieli") "saksan" ; --UNCHK
+lin germanFem_N = mkN "saksalainen" ;
+lin germanMasc_N = mkN "saksalainen" ;
 lin german_A = mkA "saksalainen" ;
 lin germander_N = mkWN "germander" ; --UNCHK
 lin germane_A = mkWA (k5A "relevantti") ; --UNCHK
@@ -21937,9 +21940,9 @@ lin grecian_A = mkWA (k38 "helleeninen") ; --UNCHK
 lin greed_N = mkWN (k40 "kyltymättömyys") ; --UNCHK
 lin greediness_N = mkWN (k40 "kyltymättömyys") ; --UNCHK
 lin greedy_A = mkWA (k48 "ahne") ;
-lin greek_A = mkWA (k38 "helleeninen") ; --UNCHK
-lin greekMasc_N = mkWN (k26 "kieli") "helleeninen" ; --UNCHK
-lin greekFem_N = mkWN (k26 "kieli") "helleeninen" ; --UNCHK
+lin greek_A = mkA "kreikkalainen" ;
+lin greekMasc_N = mkN "kreikkalainen" ;
+lin greekFem_N = mkN "kreikkalainen" ;
 lin green_A = L.green_A ;
 lin green_N = mkN "vihreä" ; --mkWN "super" "C" ;
 lin greenback_N = mkWN (k6 "seteli") "dollarin" ; --UNCHK
@@ -25352,8 +25355,10 @@ lin indexless_A = mkWA "indeksitön" ; --UNCHK
 --geo lin india_PN = mkPN "Intia" ;
 lin india_rubber_N = mkWN (k1 "kautsu") ; --UNCHK
 lin indiaman_N = mkWN "Indiaman" ; --UNCHK
-lin indian_A = mkWA (compoundA "intiaan" (k32A "ien")) "Amerikan" ; --UNCHK
-lin indian_N = mkWN (k26 "kieli") "amerikanintiaanien" ; --UNCHK
+lin indian_A = mkA "intialainen" ;
+lin indian_N = mkN "intiaani" ;
+lin indianMasc_N = mkN "intialainen" ;
+lin indianFem_N = mkN "intialainen" ;
 --geo lin indiana_PN = mkPN "Indiana" ;
 --geo lin indianapolis_PN = mkPN "Indianapolis" ;
 lin indicate_V2 = mkWV2 (k53A "osoittaa") ;
@@ -26418,9 +26423,9 @@ lin ipso_facto_Adv = mkWAdv (k99 "itsessään") ; --UNCHK
 lin iq_N = mkWN (k99 "ÄO") ; --UNCHK
 lin ira_N = mkWN (k39 "suuttumus") ;
 --geo lin iran_PN = mkPN "Iran" ;
-lin iranianFem_N = mkWN (k26 "kieli") "persian" ; --UNCHK
-lin iranianMasc_N = mkWN (k26 "kieli") "persian" ; --UNCHK
-lin iranian_A = mkA "iranilainen" ; --WA (k38 "persialainen") ;
+lin iranianFem_N = mkN "iranilainen" ;
+lin iranianMasc_N = mkN "iranilainen" ;
+lin iranian_A = mkA "iranilainen" | mkA "persialainen" ;
 lin iraqi_A = mkWA (compoundA "iraki" (k38 "lainen")) ; --UNCHK
 lin iraqi_N = mkWN (compoundN "Iraki" (k38 "lainen")) ; --UNCHK
 lin irascibility_N = mkWN (k1A "kiukku") ; --UNCHK
@@ -26601,8 +26606,8 @@ lin isthmian_A = mkWA "kannaksen" "muodostava" ; --UNCHK
 lin isthmus_N = mkWN (k10 "sola") ; --UNCHK
 lin it_Pron = S.it_Pron ;
 lin italian_A = mkWA (k38 "italialainen") ; --UNCHK
-lin italianMasc_N = mkWN (k12 "italia") ; --UNCHK
-lin italianFem_N = mkWN (k12 "italia") ; --UNCHK
+lin italianMasc_N = mkN "italialainen" ;
+lin italianFem_N = mkN "italialainen" ;
 lin italic_A = mkWA (compoundA "ita" (k38 "alinen")) ; --UNCHK
 lin italic_N = mkWN (k5 "kursiivi") ; --UNCHK
 lin italicize_V2 = mkWV2 (k62 "kursivoida") ; --UNCHK
@@ -26727,7 +26732,7 @@ lin jauntiness_N = mkWN (k40 "reippaus") ; --UNCHK
 lin jaunting_car_N = mkWN (compoundN "hevos" (k1 "kärry")) ; --UNCHK
 lin jaunty_A = mkWA (k38 "herttainen") ; --UNCHK
 lin javanese_A = mkWA (compoundA "jaav" (k38 "alainen")) ; --UNCHK
-lin javanese_N = mkWN (k26 "kieli") "jaavan" ; --UNCHK
+lin javanese_N = mkN "jaavalainen" ;
 lin javelin_N = mkWN (k41 "keihäs") ; --UNCHK
 lin jaw_N = mkWN (compoundN "kiinnitys" (k9A "leuka")) ; --UNCHK
 lin jaw_V = mkWV (k73 "saarnata") ; --UNCHK
@@ -29988,7 +29993,7 @@ lin many_Det = S.many_Det ;
 lin manzanita_N = mkWN "Arbutus" "menziesii" ; --UNCHK
 lin maoism_N = mkWN (k40 "maolaisuus") ; --UNCHK
 lin maoist_N = mkWN (k38 "maolainen") ; --UNCHK
-lin maori_N = mkWN (k26 "kieli") "maorin" ; --UNCHK
+lin maori_N = mkN "maori" ;
 lin map_N = mkWN (k9A "kartta") ; --UNCHK
 lin map_V2 = mkWV2 (k69 "merkitä") ; --UNCHK
 lin map_out_V = mkWV (k67A "suunnitella") ; --UNCHK
@@ -31734,7 +31739,7 @@ lin mongo_N = mkWN "mongo" ; --UNCHK
 lin mongol_A = mkWA (compoundA "mongoli" (k38 "alainen")) ; --UNCHK
 lin mongol_N = mkWN (k5 "mongoli") ; --UNCHK
 lin mongolian_A = mkWA (compoundA "mongoli" (k38 "alainen")) ; --UNCHK
-lin mongolian_N = mkWN (k26 "kieli") "mongolin" ; --UNCHK
+lin mongolian_N = mkN "mongoli" ;
 lin mongolism_N = mkWN (k10 "syndrooma") "Downin" ; --UNCHK
 lin mongoloid_A = mkWA (k38 "mongolidinen") ; --UNCHK
 lin mongoloid_N = mkWN (k5 "mongoloidi") ; --UNCHK
@@ -33627,8 +33632,8 @@ lin nopal_N = mkWN (compoundN "nopal-" (k39 "kaktus")) ; --UNCHK
 lin nope_Interj = mkInterj "ei" ;
 lin nor_Conj = mkConj "eikä" ;
 lin noradrenaline_N = mkWN (compoundN "nor" (k5 "adrenaliini")) ; --UNCHK
-lin nordic_A = mkWA "Pohjoismaiden" ; --UNCHK
-lin nordic_N = mkWN (k26 "kieli") "pohjoisgermaaninen" ; --UNCHK
+lin nordic_A = mkA "pohjoismainen" ;
+lin nordic_N = mkN "pohjoismaalainen" ;
 lin norethindrone_N = mkWN (compoundN "noretindroni" (k5A "asetaatti")) ; --UNCHK
 lin noria_N = mkWN (compoundN "vedennosto" (k41A "ratas")) ; --UNCHK
 lin norm_N = mkWN (k6 "standardi") ;
@@ -33646,7 +33651,7 @@ lin normative_A = mkWA "ohjaileva" ; --UNCHK
 lin normotensive_A = mkWA "normotensiivinen" ; --UNCHK
 lin normothermia_N = mkWN "normotermia" ; --UNCHK
 lin norse_A = mkWA (k38 "norjalainen") ; --UNCHK
-lin norse_N = mkWN (k26 "kieli") "pohjoisgermaaninen" ; --UNCHK
+lin norse_N = mkN "muinaisnorjalainen" ;
 lin north_A = mkWA (k38 "pohjoinen") ;
 lin north_Adv = mkWAdv (k99 "päin") "pohjoiseen" ; --UNCHK
 lin north_N = mkN (lin NK {s = d38 "pohjoinen"}) ;
@@ -35654,7 +35659,7 @@ lin papovavirus_N = mkWN (compoundN "papova" (k39 "virus")) ; --UNCHK
 lin pappose_A = mkWA (compoundA "sulka" (k38 "haiveninen")) ; --UNCHK
 lin paprika_N = mkWN (compoundN "paprika" (k48 "jauhe")) ; --UNCHK
 lin papuan_A = mkWA (compoundA "papu" (k38 "alainen")) ; --UNCHK
-lin papuan_N = mkWN (k26 "kieli") "papualainen" ; --UNCHK
+lin papuan_N = mkN "papualainen" ;
 lin papule_N = mkWN (k12 "näppylä") ; --UNCHK
 lin papulovesicle_N = mkWN (compoundN "vesi" (k12 "rakkula")) ; --UNCHK
 lin papyrus_N = mkWN (compoundN "papyrus" (k1 "käärö")) ; --UNCHK
@@ -43890,7 +43895,7 @@ lin scandalous_A = mkWA (k15 "röyhkeä") ; --UNCHK
 lin scandalousness_N = mkWN (k40 "hävyttömyys") ; --UNCHK
 lin scandent_A = mkWA "kiipeävä" ; --UNCHK
 lin scandinavian_A = mkWA (k38 "skandinaavinen") ; --UNCHK
-lin scandinavian_N = mkWN (k26 "kieli") "pohjoisgermaaninen" ; --UNCHK
+lin scandinavian_N = mkN "skandinaavi" ;
 lin scandium_N = mkWN "järjestysluku" "21" ; --UNCHK
 lin scanner_N = mkWN (k33 "tutkain") "elektroninen" ; --UNCHK
 lin scanning_N = mkWN (k39 "skannaus") ; --UNCHK
@@ -50898,8 +50903,8 @@ lin textual_A = mkWA (compoundA "tekstua" (k38 "alinen")) ; --UNCHK
 lin texture_N = mkWN (k48A "rakenne") ; --UNCHK
 lin textured_A = mkWA (compoundA "karkea" (k38 "rakenteinen")) ; --UNCHK
 lin thai_A = mkWA (k38 "siamilainen") ; --UNCHK
-lin thaiMasc_N = mkWN (k26 "kieli") "thain" ; --UNCHK
-lin thaiFem_N = mkWN (k26 "kieli") "thain" ; --UNCHK
+lin thaiMasc_N = mkN "thaimaalainen" ;
+lin thaiFem_N = mkN "thaimaalainen" ;
 --geo lin thailand_PN = mkPN "Thaimaa" ;
 lin thalamocortical_A = mkWA (compoundA "talamokortika" (k38 "alinen")) ; --UNCHK
 lin thalamus_N = mkWN (k39 "talamus") ; --UNCHK
@@ -56859,7 +56864,7 @@ lin wordiness_N = mkWN (k40 "pitkäpiimäisyys") ; --UNCHK
 lin wording_N = mkWN (k12 "fraseologia") ; --UNCHK
 lin wordless_A = mkWA (k34A "äänetön") ; --UNCHK
 lin wordmonger_N = mkWN "jaarittelija" ; --UNCHK
-lin words_N = mkWN (k26 "kieli") ; --UNCHK
+lin words_N = mkN "sana" ; ---- plural mkWN (k26 "kieli") ; --UNCHK
 lin wordsmith_N = mkWN (compoundN "sana" (k10A "seppä")) ; --UNCHK
 lin wordy_A = mkWA (k10 "ikävystyttävä") ; --UNCHK
 lin work_1_V = mkV "työskennellä" ;
--- a/lib/src/translator/DictionaryFre.gf
+++ b/lib/src/translator/DictionaryFre.gf
@@ -3837,7 +3837,7 @@ lin coastline_N = mkN "rive" feminine ; -- tocheck
 lin coat_N = L.coat_N ;
 lin coat_V2 = mkV2 (mkV I.couvrir_V2) ; -- tocheck
 lin coating_N = mkN "couche" feminine ; -- tocheck
-lin coauthorFem_N = mkN "coauteure" feminine ; -- tocheck
+lin coauthorFem_N = mkN "coauteur" feminine ; -- tocheck
 lin coauthorMasc_N = mkN "coauteur" masculine ; -- tocheck
 lin coax_V2 = mkV2 (mkV "cajoler") ; -- tocheck
 lin coaxial_A = mkA "coaxial" ; -- tocheck
@@ -6827,8 +6827,6 @@ lin engender_V2 = mkV2 (mkV "engendrer") ; -- tocheck
 lin engine_N = mkN "moteur" masculine | mkN "locomotive" feminine ; -- tocheck
 lin engineer_N = mkN "ingénieur" | mkN "machiniste" masculine ; -- tocheck
 lin engineering_N = mkN "ingénierie" feminine ; -- tocheck
-lin englishMasc_N = mkN "anglais" ; -- tocheck
-lin englishFem_N = mkN "anglais" ; -- tocheck
 lin engrave_V2 = mkV2 (mkV "graver") ; -- tocheck
 lin engraving_N = mkN "gravure" feminine ; -- tocheck
 lin engross_V2 = mkV2 (mkV "accaparer") | mkV2 (mkV "captiver") | mkV2 (mkV "engraisser") ; -- tocheck
@@ -8581,9 +8579,9 @@ lin geothermal_A = mkA "géothermique" ; -- tocheck
 lin geranium_N = mkN "géranium" masculine ; -- tocheck
 lin gerbil_N = mkN "gerbille" feminine ; -- tocheck
 lin geriatrics_N = mkN "gériatrie" feminine ; -- tocheck
-lin germanFem_N = mkN "germaine" feminine ; -- tocheck
-lin germanMasc_N = mkN "germain" masculine ; -- tocheck
-lin german_A = mkA "germain" ; -- tocheck
+--lin germanFem_N = mkN "germaine" feminine ; -- tocheck
+--lin germanMasc_N = mkN "germain" masculine ; -- tocheck
+--lin german_A = mkA "germain" ; -- tocheck
 lin germanium_N = mkN "germanium" masculine ; -- tocheck
 lin gerontocracy_N = mkN "gérontocratie" feminine ; -- tocheck
 lin gerontology_N = mkN "gérontologie" feminine ; -- tocheck
@@ -12571,7 +12569,7 @@ lin mistake_V2 = mkV2 (reflV (mkV "tromper")) | mkV2 (mkV I.méprendre_V2) ; --
 lin mister_N = mkN "monsieur" masculine ; -- tocheck
 lin mistletoe_N = mkN "gui" masculine ; -- tocheck
 lin mistreat_V2 = mkV2 (mkV "maltraiter") ; -- tocheck
-lin mistress_N = mkN "maîtresse" feminine ; -- tocheck
+lin mistress_N = mkN "maîtresse" feminine ; 
 lin mistrust_N = mkN "défiance" ; -- tocheck
 lin misty_A = mkA "brumeux" ; -- tocheck
 lin misunderstanding_N = mkN "malentendu" masculine ; -- tocheck
@@ -19764,7 +19762,7 @@ lin tea_N = mkN "thé" masculine | mkN "tisane" feminine | mkN "goûter" masculi
 lin teach_V = variants{}; -- L.teach_V2 ;
 lin teach_V2 = L.teach_V2 ;
 lin teach_V2V = mkV2V (mkV "guider") | mkV2V (mkV "enseigner") ; -- tocheck
-lin teacherFem_N = mkN "professeure" feminine ;
+lin teacherFem_N = mkN "professeur" feminine | mkN "maîtresse" feminine ;
 lin teacherMasc_N = L.teacher_N | mkN "enseignant" ;
 lin teaching_N = mkN "enseignement" masculine | mkN "doctrine" feminine ; -- tocheck
 lin teak_N = mkN "teck" masculine ; -- tocheck
@@ -22384,6 +22382,9 @@ lin buckley_PN = mkPN "Buckley" ; -- status=guess src=geonames
 lin budapest_PN = mkPN "Budapest" ; -- status=guess src=geonames
 lin buffalo_PN = mkPN "Buffalo" ; -- status=guess src=geonames
 lin bulgaria_PN = mkPN "Bulgarie" ; -- status=guess src=geonames
+lin bulgarian_A = mkA "bulgarien" ;
+lin bulgarianMasc_N = mkN "bulgare" masculine ;
+lin bulgarianFem_N = mkN "bulgare" feminine ;
 lin bulkington_PN = mkPN "Bulkington" ; -- status=guess src=geonames
 lin burgos_PN = mkPN "Burgos" ; -- status=guess src=geonames
 lin burley_PN = mkPN "Burley" ; -- status=guess src=geonames
@@ -22454,7 +22455,10 @@ lin chesterfield_PN = mkPN "Chesterfield" ; -- status=guess src=geonames
 lin chicago_PN = mkPN "Chicago" ; -- status=guess src=geonames
 lin chichester_PN = mkPN "Chichester" ; -- status=guess src=geonames
 lin chile_PN = mkPN "Chili" ; -- status=guess src=geonames
-lin china_PN = mkPN "République populaire de Chine" ; -- status=guess src=geonames
+lin china_PN = mkPN "Chine" ; 
+lin chinese_A = mkA "chinois" ;
+lin chineseMasc_N = mkN "chinois" ;
+lin chineseFem_N = mkN "chinoise" ;
 lin chippenham_PN = mkPN "Chippenham" ; -- status=guess src=geonames
 lin chorley_PN = mkPN "Chorley" ; -- status=guess src=geonames
 lin christchurch_PN = mkPN "Christchurch" ; -- status=guess src=geonames
@@ -22602,6 +22606,9 @@ lin durban_PN = mkPN "Durban" ; -- status=guess src=geonames
 lin durham_PN = mkPN "Durham" ; -- status=guess src=geonames
 lin durrington_PN = mkPN "Durrington" ; -- status=guess src=geonames
 lin dursley_PN = mkPN "Dursley" ; -- status=guess src=geonames
+lin dutch_A = mkA "hollandais" ;
+lin dutchMasc_N = mkN "hollandais" ;
+lin dutchFem_N = mkN "hollandaise" ;
 lin eaglescliffe_PN = mkPN "Eaglescliffe" ; -- status=guess src=geonames
 lin ealing_PN = mkPN "Ealing" ; -- status=guess src=geonames
 lin easington_PN = mkPN "Easington" ; -- status=guess src=geonames
@@ -22630,6 +22637,9 @@ lin ely_PN = mkPN "Ely" ; -- status=guess src=geonames
 lin emsworth_PN = mkPN "Emsworth" ; -- status=guess src=geonames
 lin enfield_PN = mkPN "Enfield" ; -- status=guess src=geonames
 lin england_PN = mkPN "England" ; -- status=guess src=geonames
+lin english_A = mkA "anglais" ;
+lin englishMasc_N = mkN "anglais" ;
+lin englishFem_N = mkN "anglaise" ;
 lin enoch_PN = mkPN "Enoch" ; -- status=guess src=geonames
 lin enschede_PN = mkPN "Enschede" ; -- status=guess src=geonames
 lin epping_PN = mkPN "Epping" ; -- status=guess src=geonames
@@ -22661,6 +22671,9 @@ lin ferryhill_PN = mkPN "Ferryhill" ; -- status=guess src=geonames
 lin fife_PN = mkPN "Fife" ; -- status=guess src=geonames
 lin fiji_PN = mkPN "Fidji" ; -- status=guess src=geonames
 lin finland_PN = mkPN "Finlande" ; -- status=guess src=geonames
+lin finnish_A = mkA "finlandais" ;
+lin finnishMasc_N = mkN "finlandais" ;
+lin finnishFem_N = mkN "finlandaise" ;
 lin fleet_PN = mkPN "Fleet" ; -- status=guess src=geonames
 lin fleetwood_PN = mkPN "Fleetwood" ; -- status=guess src=geonames
 lin flint_PN = mkPN "Flint" ; -- status=guess src=geonames
@@ -22682,6 +22695,9 @@ lin freckleton_PN = mkPN "Freckleton" ; -- status=guess src=geonames
 lin frederick_PN = mkPN "Frederick" ; -- status=guess src=geonames
 lin frederiksberg_PN = mkPN "Frederiksberg" ; -- status=guess src=geonames
 lin freiburg_PN = mkPN "Fribourg-en-Brisgau" ; -- status=guess src=geonames
+lin french_A = mkA "français" ;
+Lin frenchMasc_N = mkN "français" ;
+lin frenchFem_N = mkN "française" ;
 lin freshwater_PN = mkPN "Freshwater" ; -- status=guess src=geonames
 lin frodsham_PN = mkPN "Frodsham" ; -- status=guess src=geonames
 lin frome_PN = mkPN "Frome" ; -- status=guess src=geonames
@@ -22703,7 +22719,10 @@ lin genoa_PN = mkPN "Gênes" ; -- status=guess src=geonames
 lin george_PN = mkPN "George" ; -- status=guess src=geonames
 lin georgia_PN = mkPN "Géorgie" ; -- status=guess src=geonames
 lin gerald_PN = mkPN "Gerald" ; -- status=guess src=geonames
-lin germany_PN = mkPN "Allemagne" ; -- status=guess src=geonames
+lin germany_PN = mkPN "Allemagne" ; 
+lin german_A = mkA "allemand" ;
+lin germanMasc_N = mkN "allemand" ;
+lin germanFem_N = mkN "allemande" ;
 lin ghana_PN = mkPN "Ghana" ; -- status=guess src=geonames
 lin gibraltar_PN = mkPN "Gibraltar" ; -- status=guess src=geonames
 lin giffnock_PN = mkPN "Giffnock" ; -- status=guess src=geonames
@@ -22835,6 +22854,10 @@ lin ilkeston_PN = mkPN "Ilkeston" ; -- status=guess src=geonames
 lin ilkley_PN = mkPN "Ilkley" ; -- status=guess src=geonames
 lin immingham_PN = mkPN "Immingham" ; -- status=guess src=geonames
 lin india_PN = mkPN "Inde" ; -- status=guess src=geonames
+lin indian_A = mkA "indien" ;
+lin indian_N = mkN "indien" ;
+lin indianMasc_N = mkN "indien" ;
+lin indianFem_N = mkN "indienne" ;
 lin indiana_PN = mkPN "Indiana" ; -- status=guess src=geonames
 lin indianapolis_PN = mkPN "Indianapolis" ; -- status=guess src=geonames
 lin indonesia_PN = mkPN "Indes orientales néerlandaises" ; -- status=guess src=geonames
@@ -22855,6 +22878,9 @@ lin isabel_PN = mkPN "Isabel" ; -- status=guess src=geonames
 lin islington_PN = mkPN "District londonien d'Islington" ; -- status=guess src=geonames
 lin israel_PN = mkPN "Israël" ; -- status=guess src=geonames
 lin italy_PN = mkPN "Italie" ; -- status=guess src=geonames
+lin italian_A = mkA "italien" ;
+lin italianMasc_N = mkN "italien" ;
+lin italianFem_N = mkN "italienne" ;
 lin iver_PN = mkPN "Iver" ; -- status=guess src=geonames
 lin jabalpur_PN = mkPN "Jabalpur" ; -- status=guess src=geonames
 lin jacksonville_PN = mkPN "Jacksonville" ; -- status=guess src=geonames
@@ -23461,6 +23487,9 @@ lin south_shields_PN = mkPN "South Shields" ; -- status=guess src=geonames
 lin southampton_PN = mkPN "Southampton" ; -- status=guess src=geonames
 lin southport_PN = mkPN "Southport" ; -- status=guess src=geonames
 lin spain_PN = mkPN "Espagne" ; -- status=guess src=geonames
+lin spanish_A = mkA "espagnol" ;
+lin spanishMasc_N = mkN "espagnol" ;
+lin spanishFem_N = mkN "espagnole" ;
 lin spalding_PN = mkPN "Spalding" ; -- status=guess src=geonames
 lin spennymoor_PN = mkPN "Spennymoor" ; -- status=guess src=geonames
 lin split_PN = mkPN "Split" ; -- status=guess src=geonames
@@ -23506,6 +23535,9 @@ lin swanley_PN = mkPN "Swanley" ; -- status=guess src=geonames
 lin swansea_PN = mkPN "Swansea" ; -- status=guess src=geonames
 lin swaziland_PN = mkPN "Swaziland" ; -- status=guess src=geonames
 lin sweden_PN = mkPN "Suède" ; -- status=guess src=geonames
+lin swedish_A = mkA "suédois" ;
+lin swedishMasc_N = mkN "suédois" ;
+lin swedishFem_N = mkN "suédoise" ;
 lin swindon_PN = mkPN "Swindon" ; -- status=guess src=geonames
 lin swinton_PN = mkPN "Swinton" ; -- status=guess src=geonames
 lin switzerland_PN = mkPN "Suisse" ; -- status=guess src=geonames
--- a/lib/src/translator/DictionaryGer.gf
+++ b/lib/src/translator/DictionaryGer.gf
@@ -8026,7 +8026,7 @@ lin bulbul_N = variants {};
 lin bulgaria_PN = mkPN "Bulgarien"; -- src=geonames status=guess
 lin bulgarianFem_N = variants {};
 lin bulgarianMasc_N = variants {};
-lin bulgarian_A = variants {};
+lin bulgarian_A = mkA "bulgarisch" ;
 lin bulge_N = mkN "Ausbuchtung" | mkN "Beule" "Beulen" feminine | mkN "Delle" feminine | mkN "Wölbung" feminine ; -- status=guess status=guess status=guess status=guess
 lin bulge_V = mkV "hervorstechen" | mkV "hervortreten" ; -- status=guess, src=wikt status=guess, src=wikt
 lin bulge_V2 = mkV2 (mkV "hervorstechen") | mkV2 (mkV "hervortreten") ; -- status=guess, src=wikt status=guess, src=wikt
@@ -10428,8 +10428,7 @@ lin chincherinchee_N = variants {};
 lin chinchilla_N = mkN "Chinchilla" "Chinchilla" neuter ; -- status=guess
 lin chinchow_PN = mkPN "Chinchow"; -- src=eng status=guess
 lin chine_N = mkN "Kimm" feminine ; -- status=guess
-lin chinese_A = variants {};
-lin chinese_A = variants {};
+lin chinese_A = mkA "chinesisch" ;
 lin chineseMasc_N = variants {};
 lin chineseFem_N = variants {};
 lin chink_N = variants {};
@@ -18162,10 +18161,9 @@ lin dustman_N = variants {};
 lin dustmop_N = variants {};
 lin dustpan_N = mkN "Kehrblech" neuter | mkN "Kehrschaufel" feminine | mkN "Kutterschaufel" "Kutterschaufeln" feminine ; -- status=guess status=guess status=guess
 lin dusty_A = mk3A "staubig" "staubiger" "staubigste" ; -- status=guess
-lin dutch_A = variants {};
-lin dutch_A = variants {};
-lin dutchMasc_N = variants {};
-lin dutchFem_N = variants {};
+lin dutch_A = mkA "holländisch" ;
+lin dutchMasc_N = mkN "Holländer" "Holländer" masculine ;
+lin dutchFem_N = mkN "Holländerin" "Holländerinnen" feminine ;
 lin dutchman_N = variants {};
 lin duteous_A = variants {};
 lin dutiable_A = variants {};
@@ -19248,8 +19246,8 @@ lin engineer_V2 = variants {};
 lin engineering_N = mkN "Ingenieurwissenschaft" "Ingenieurwissenschaften" feminine | mkN "Ingenieurwesen" neuter ; -- status=guess status=guess
 lin enginery_N = variants {};
 lin england_PN = mkPN "England"; -- src=geonames status=guess
-lin english_A = variants {};
-lin englishMasc_N = variants {};
+lin english_A = mkA "englisch" ;
+lin englishMasc_N = mkN "Engländer" "Engländer" masculine ;
 lin englishFem_N = variants {};
 lin englishman_N = variants {};
 lin englishwoman_N = variants {};
@@ -21618,9 +21616,8 @@ lin finn_N = variants {};
 lin finnan_N = variants {};
 lin finnan_haddie_N = variants {};
 lin finnan_haddock_N = variants {};
-lin finnish_A = variants {};
-lin finnish_A = variants {};
-lin finnish_N = variants {};
+lin finnish_A = mkA "finnisch" ;
+lin finnishMasc_N = mkN "Finne" "Finnen" masculine ;
 lin fiona_PN = mkPN "Fiona"; -- src=eng status=guess
 lin fiord_N = variants {};
 lin fipple_N = variants {};
@@ -22884,8 +22881,8 @@ lin freight_V2 = variants {};
 lin freight_train_N = variants {};
 lin freighter_N = variants {};
 lin freightliner_N = variants {};
-lin french_A = variants {};
-lin frenchMasc_N = mkN "Französe" masculine ;
+lin french_A = mkA "französisch" ;
+lin frenchMasc_N = mkN "Französe" "Französen" masculine ;
 lin frenchFem_N = mkN "Französe" masculine ;
 lin frenchman_N = variants {};
 lin frenchwoman_N = variants {};
@@ -23894,9 +23891,9 @@ lin geriatric_A = variants {};
 lin geriatrician_N = variants {};
 lin geriatrics_N = mkN "Geriatrie" feminine ; -- status=guess
 lin germ_N = variants {};
-lin germanFem_N = reg2N "Germanin" "Germaninnen" feminine;
-lin germanMasc_N = reg2N "Germane" "Germanen" masculine;
-lin german_A = variants {};
+lin germanFem_N = reg2N "Germanin" "Germaninnen" feminine; ----
+lin german_A = mkA "deutsch" ;
+lin germanMasc_N = mkN "Deutscher" "Deutscher" masculine | reg2N "Germane" "Germanen" masculine ; ---- split
 lin germander_N = variants {};
 lin germane_A = mk3A "relevant" "relevanter" "relevanteste" ; -- status=guess
 lin germaneness_N = variants {};
@@ -28991,8 +28988,10 @@ lin indexless_A = variants {};
 lin india_PN = mkPN "Indien"; -- src=geonames status=guess
 lin india_rubber_N = variants {};
 lin indiaman_N = variants {};
-lin indian_A = variants {};
+lin indian_A = mkA "indisch" ;
 lin indian_N = variants {};
+lin indianMasc_N = variants {};
+lin indianFem_N = variants {};
 lin indiana_PN = mkPN "Indiana"; -- src=geonames status=guess
 lin indianapolis_PN = mkPN "Indianapolis"; -- src=geonames status=guess
 lin indicate_V2 = mkV2 (prefixV "an" (mkV "zeigen")) | mkV2 (mkV "zeigen") ;
@@ -30332,9 +30331,9 @@ lin istanbul_PN = mkPN "Istanbul"; -- src=eng status=guess
 lin isthmian_A = variants {};
 lin isthmus_N = mkN "Isthmus" "Isthmen" masculine | mkN "Landenge" feminine | mkN "Landbrücke" feminine ; -- status=guess status=guess status=guess
 lin it_Pron = S.it_Pron | let s = Predef.BIND ++ "'s" in M.mkPronPers s s "ihm" "seiner" "sein" R.Neutr R.Sg R.P3 ;
-lin italian_A = variants {};
-lin italianMasc_N = variants {};
-lin italianFem_N = variants {};
+lin italian_A = mkA "italienisch" ;
+lin italianMasc_N = mkN "Italiener" "Italiener" masculine ;
+lin italianFem_N = variants {} ;
 lin italic_A = regA "kursiv" ; -- status=guess
 lin italic_N = mkN "Kursivdruck" masculine ; -- status=guess
 lin italicize_V2 = variants {};
@@ -54033,8 +54032,8 @@ lin spangle_V2 = variants {};
 lin spaniard_N = variants {};
 lin spaniel_N = mkN "Spaniel" masculine ; -- status=guess
 lin spanishFem_N = variants {};
-lin spanishMasc_N = variants {};
-lin spanish_A = variants {};
+lin spanishMasc_N = mkN "Spanier" "Spanier" masculine ;
+lin spanish_A = mkA "spanisch" ;
 lin spank_N = mkN "Klaps" "Klapse" masculine ; -- status=guess
 lin spank_V = junkV (mkV "auf") "das Gesäß schlagen" ; -- status=guess, src=wikt
 lin spank_V2 = mkV2 (junkV (mkV "auf") "das Gesäß schlagen") ; -- status=guess, src=wikt
@@ -56866,8 +56865,8 @@ lin sweatshirt_N = mkN "Sweatshirt" neuter ; -- status=guess
 lin sweatshop_N = variants {};
 lin sweaty_A = variants {};
 lin swedeFem_N = variants {};
-lin swedeMasc_N = variants {};
-lin swede_A = variants {};
+lin swedeMasc_N = mkN "Schwede" "Schweden" masculine ;
+lin swede_A = mkA "schwedisch" ;
 lin sweden_PN = mkPN "Schweden"; -- src=geonames status=guess
 lin swedish_A = variants {};
 lin swedishMasc_N = variants {};
--- a/lib/src/translator/DictionaryIta.gf
+++ b/lib/src/translator/DictionaryIta.gf
@@ -2991,6 +2991,9 @@ lin chimney_N = mkN "fumaiolo" ; -- status=guess
 lin chimpanzee_N = mkN "scimpanzé" masculine ; -- status=guess
 lin chin_N = mkN "mento" ; -- status=guess
 lin china_N = mkN "porcellana" ; -- status=guess
+lin chinese_A = mkA "cinese" ;
+lin chineseMasc_N = mkN "cinese" ;
+lin chineseFem_N = mkN "cinese" feminine ;
 lin chinchilla_N = mkN "cincillà" masculine ; -- status=guess
 lin chinoiserie_N = mkN "cineseria" ; -- status=guess
 lin chip_N = mkN "chip" ; -- status=guess
@@ -4332,7 +4335,7 @@ lin cumulus_N = mkN "cumulo" ; -- status=guess
 lin cunnilingus_N = mkN "cunnilinguo" | mkN "cunnilingus" masculine ; -- status=guess status=guess
 lin cunning_A = mkA "ingegnoso" ; -- status=guess
 lin cunning_N = mkN "furberia" | mkN "furbizia" ; -- status=guess status=guess
-lin cunt_N = mkN "fica" | mkN "figa" | mkN "fregna" ; -- status=guess status=guess status=guess
+lin cunt_N = mkN "fregna" | mkN "figa" | mkN "fica" ; 
 lin cup_N = mkN "coppiere" masculine ; -- status=guess
 lin cupboard_N = mkN "armadio" | mkN "credenza" ; -- status=guess status=guess
 lin cupidity_N = mkN "cupidigia" | mkN "cupidità" feminine ; -- status=guess status=guess
@@ -4982,7 +4985,7 @@ lin dice_N = mkN "biscia tassellata" ; -- status=guess
 lin dice_V = mkV (I.fare_V) "a dadini" | mkV (mkV "tagliare") "a dadini" ; -- status=guess, src=wikt status=guess, src=wikt
 lin dice_V2 = mkV2 (mkV (I.fare_V) "a dadini") | mkV2 (mkV (mkV "tagliare") "a dadini") ; -- status=guess, src=wikt status=guess, src=wikt
 lin dichotomy_N = mkN "dicotomia" ; -- status=guess
-lin dick_N = mkN "pisello" | mkN "cazzo" feminine | mkN "uccello" | mkN "minchia" ; -- status=guess status=guess status=guess status=guess
+lin dick_N = mkN "cazzo" | mkN "pisello" ;
 lin dictate_V = variants{} ; --
 lin dictate_V2 = variants{} ; --
 lin dictate_VS = variants{} ; --
@@ -5531,6 +5534,9 @@ lin dust_N = L.dust_N ;
 lin dust_V2 = mkV2 (mkV "spolverare") ; -- status=guess, src=wikt
 lin dustpan_N = mkN "paletta" | mkN "paletta della spazzatura" ; -- status=guess status=guess
 lin dusty_A = mkA "polveroso" | mkA "impolverato" ; -- status=guess status=guess
+lin dutch_A = mkA "olandese" ;
+lin dutchMasc_N = mkN "olandese" ;
+lin dutchFem_N = mkN "olandese" feminine ;
 lin duty_N = mkN "tassa" | mkN "dazio" ; -- status=guess status=guess
 lin duvet_N = mkN "piumone" masculine ; -- status=guess
 lin dwarf_N = mkN "nana" ; -- status=guess
@@ -19470,6 +19476,9 @@ lin ely_PN = mkPN "Ely" ; -- status=guess src=geonames
 lin emsworth_PN = mkPN "Emsworth" ; -- status=guess src=geonames
 lin enfield_PN = mkPN "Enfield" ; -- status=guess src=geonames
 lin england_PN = mkPN "England" ; -- status=guess src=geonames
+lin english_A = mkA "inglese" ;
+lin englishMasc_N = mkN "inglese" ;
+lin englishFem_N = mkN "inglese" feminine ;
 lin enoch_PN = mkPN "Enoch" ; -- status=guess src=geonames
 lin enschede_PN = mkPN "Enschede" ; -- status=guess src=geonames
 lin epping_PN = mkPN "Epping" ; -- status=guess src=geonames
@@ -19501,6 +19510,9 @@ lin ferryhill_PN = mkPN "Ferryhill" ; -- status=guess src=geonames
 lin fife_PN = mkPN "Fife" ; -- status=guess src=geonames
 lin fiji_PN = mkPN "Figi" ; -- status=guess src=geonames
 lin finland_PN = mkPN "Finlandia" ; -- status=guess src=geonames
+lin finnish_A = mkA "finlandese" ;
+lin finnishMasc_N = mkN "finlandese" ;
+lin finnishFem_N = mkN "finlandese" feminine ;
 lin fleet_PN = mkPN "Fleet" ; -- status=guess src=geonames
 lin fleetwood_PN = mkPN "Fleetwood" ; -- status=guess src=geonames
 lin flint_PN = mkPN "Flint" ; -- status=guess src=geonames
@@ -19544,6 +19556,9 @@ lin george_PN = mkPN "George" ; -- status=guess src=geonames
 lin georgia_PN = mkPN "Georgia" ; -- status=guess src=geonames
 lin gerald_PN = mkPN "Gerald" ; -- status=guess src=geonames
 lin germany_PN = mkPN "Germania" ; -- status=guess src=geonames
+lin german_A = mkA "tedesco" ;
+lin germanMasc_N = mkN "tedesco" ;
+lin germanFem_N = mkN "tedesca" ;
 lin ghana_PN = mkPN "Ghana" ; -- status=guess src=geonames
 lin gibraltar_PN = mkPN "Gibilterra" ; -- status=guess src=geonames
 lin giffnock_PN = mkPN "Giffnock" ; -- status=guess src=geonames
@@ -19695,6 +19710,9 @@ lin isabel_PN = mkPN "Isabel" ; -- status=guess src=geonames
 lin islington_PN = mkPN "Islington" ; -- status=guess src=geonames
 lin israel_PN = mkPN "Israele" ; -- status=guess src=geonames
 lin italy_PN = mkPN "il Bel Paese" ; -- status=guess src=geonames
+lin italian_A = mkA "italiano" ;
+lin italianMasc_N = mkN "italiano" ;
+lin italianFem_N = mkN "italiana" ;
 lin iver_PN = mkPN "Iver" ; -- status=guess src=geonames
 lin jabalpur_PN = mkPN "Jabalpur" ; -- status=guess src=geonames
 lin jacksonville_PN = mkPN "Jacksonville" ; -- status=guess src=geonames
@@ -20302,6 +20320,9 @@ lin southampton_PN = mkPN "Southampton" ; -- status=guess src=geonames
 lin southport_PN = mkPN "Southport" ; -- status=guess src=geonames
 lin spain_PN = mkPN "Spagna" ; -- status=guess src=geonames
 lin spalding_PN = mkPN "Spalding" ; -- status=guess src=geonames
+lin spanish_A = mkA "spagnolo" ;
+lin spanishMasc_N = mkN "spagnolo" ;
+lin spanishFem_N = mkN "spagnola" ;
 lin spennymoor_PN = mkPN "Spennymoor" ; -- status=guess src=geonames
 lin split_PN = mkPN "Spalato" ; -- status=guess src=geonames
 lin springfield_PN = mkPN "Springfield" ; -- status=guess src=geonames
@@ -20346,6 +20367,9 @@ lin swanley_PN = mkPN "Swanley" ; -- status=guess src=geonames
 lin swansea_PN = mkPN "Swansea" ; -- status=guess src=geonames
 lin swaziland_PN = mkPN "Swaziland" ; -- status=guess src=geonames
 lin sweden_PN = mkPN "Svezia" ; -- status=guess src=geonames
+lin swedish_A = mkA "svedese" ;
+lin swedishMasc_N = mkN "svedese" ;
+lin swedishFem_N = mkN "svedese" feminine ;
 lin swindon_PN = mkPN "Swindon" ; -- status=guess src=geonames
 lin swinton_PN = mkPN "Swinton" ; -- status=guess src=geonames
 lin switzerland_PN = mkPN "Svizzera" ; -- status=guess src=geonames
--- a/lib/src/translator/DictionarySpa.gf
+++ b/lib/src/translator/DictionarySpa.gf
@@ -2948,7 +2948,7 @@ lin bronze_V2 = mkV2 (mkV "pavonar") ; -- status=guess, src=wikt
 lin brooch_N = mkN "broche" masculine ; -- status=guess
 lin brood_N = mkN "nidada" masculine ; -- status=guess
 lin brook_N = mkN "arroyo" ; -- status=guess
-lin broom_N = mkN "escoba" | "escobillón" ; -- status=guess status=guess status=guess
+lin broom_N = mkN "escoba" | mkN "escobillón" ; -- status=guess status=guess status=guess
 lin broth_N = mkN "caldo" ; -- status=guess
 lin brothel_N = mkN "casa de citas" | mkN "bulín" | mkN "burdel" | mkN "lupanar" | mkN "prostíbulo" | mkN "mancebía" | mkN "casa de putas" ; -- status=guess status=guess status=guess status=guess status=guess status=guess status=guess
 lin brother_N = mkN "hermano" ;
@@ -8494,8 +8494,8 @@ lin freeze_V = L.freeze_V ;
 lin freeze_V2 = mkV2 (helar_V) ; -- status=guess
 lin freezer_N = mkN "congelador" masculine ; -- status=guess
 lin freight_N = mkN "flete" masculine ; -- status=guess
-lin frenchMasc_N = mkN "patatas fritas" | mkN "papas fritas" | mkN "papitas fritas" ; -- status=guess status=guess status=guess
-lin frenchFem_N = mkN "patatas fritas" | mkN "papas fritas" | mkN "papitas fritas" ; -- status=guess status=guess status=guess
+lin frenchMasc_N = variants {} ;
+lin frenchFem_N = variants {} ;
 lin frenetic_A = mkA "frenético" ; -- status=guess
 lin frenzy_N = mkN "frenesí" masculine | mkN "manía" ; -- status=guess status=guess
 lin frequency_N = mkN "modulación de la frecuencia" ; -- status=guess
@@ -18878,6 +18878,8 @@ lin spam_N = mkN "correo basura" ; -- status=guess
 lin span_N = mkN "cuarta" | mkN "palmo" ; -- status=guess status=guess
 lin span_V2 = mkV2 (mkV "abarcar") ; -- status=guess, src=wikt
 lin spaniel_N = mkN "perro de aguas" ; -- status=guess
+lin spanish_A = mkA "español" ;
+lin spanishMasc_N = mkN "español" ; ---- 
 lin spank_N = mkN "golpe" masculine ; -- status=guess
 lin spank_V = mkV "nalguear" ; -- status=guess, src=wikt
 lin spank_V2 = mkV2 (mkV "nalguear") ; -- status=guess, src=wikt
--- a/lib/src/translator/DictionarySwe.gf
+++ b/lib/src/translator/DictionarySwe.gf
@@ -10359,7 +10359,7 @@ lin chinchilla_N = mkN "chinchilla" ; -- status=guess
 lin chinchow_PN = mkPN "Chinchow"; -- src=eng status=guess
 lin chine_N = mkN "ryggrad" "ryggrader" ; -- comment=5
 lin chinese_A = mkA "kinesisk" ; -- status=guess
-lin chineseMasc_N = mkN "kinesiska" ; -- comment=3
+lin chineseMasc_N = mkN "kines" "kineser" ;
 lin chineseFem_N = mkN "kinesiska" ; -- comment=3
 lin chink_N = mkN "springa" ; -- comment=5
 lin chink_V = mkV "springa" "sprang" "sprungit" ; -- comment=4
@@ -18044,9 +18044,9 @@ lin dustman_N = mkN "sophämtare" utrum; -- status=guess
 lin dustmop_N = variants {} ; -- status=guess
 lin dustpan_N = mkN "sopskyffel" ; -- status=guess
 lin dusty_A = mkA "dammig" ; -- comment=4
-lin dutch_A = mkA "nederländsk" ; -- status=guess
-lin dutchMasc_N = mkN "holländska" ; -- comment=5
-lin dutchFem_N = mkN "holländska" ; -- comment=5
+lin dutch_A = mkA "nederländsk" | mkA "holländsk" ;
+lin dutchMasc_N = mkN "nederlänning" | mkN "hollänning" ;
+lin dutchFem_N = mkN "nederländska" | mkN "holländska" ;
 lin dutchman_N = mkN "nederländare" utrum; -- status=guess
 lin duteous_A = mkA "underdånig" | (mkA "plikttrogen" "plikttroget"); -- status=guess status=guess
 lin dutiable_A = variants {} ; -- status=guess
@@ -19120,7 +19120,7 @@ lin engineering_N = mkN "teknik" "tekniker" ; -- status=guess
 lin enginery_N = variants {} ; -- status=guess
 lin england_PN = mkPN "England" neutrum; -- src=geonames status=guess
 lin english_A = mkA "engelsk" ; -- status=guess
-lin englishMasc_N = mkN "engelska" ; -- comment=2
+lin englishMasc_N = mkN "engelman" "engelsmannen" "engelsmän" "engelsmännen" ;
 lin englishFem_N = mkN "engelska" ; -- comment=2
 lin englishman_N = variants {} ; -- status=guess
 lin englishwoman_N = variants {} ; -- status=guess
@@ -21463,8 +21463,9 @@ lin finn_N = variants {} ; -- status=guess
 lin finnan_N = variants {} ; -- status=guess
 lin finnan_haddie_N = variants {} ; -- status=guess
 lin finnan_haddock_N = variants {} ; -- status=guess
-lin finnish_A = mkA "finsk" ; -- comment=2
-lin finnish_N = mkN "finska" ; -- comment=2
+lin finnish_A = mkA "finsk" | mkA "finländsk" ; 
+lin finnishMasc_N = mkN "finne" "finnar" | mkN "finländare" "finländare" ; 
+lin finnishFem_N = mkN "finska" ; 
 lin fiona_PN = mkPN "Fiona"; -- src=eng status=guess
 lin fiord_N = variants {} ; -- status=guess
 lin fipple_N = variants {} ; -- status=guess
@@ -22724,8 +22725,8 @@ lin freight_train_N = variants {} ; -- status=guess
 lin freighter_N = variants {} ; -- status=guess
 lin freightliner_N = variants {} ; -- status=guess
 lin french_A = mkA "fransk" ; -- status=guess
-lin frenchMasc_N = mkN "franska" ; -- status=guess status=guess
-lin frenchFem_N = mkN "franska" ; -- status=guess status=guess
+lin frenchMasc_N = mkN "fransman" "fransmannen" "fransmän" "fransmännen" ;
+lin frenchFem_N = mkN "fransyska" ; 
 lin frenchman_N = mkN "fransman" "fransmän" ; -- status=guess
 lin frenchwoman_N = mkN "fransyska" ; -- status=guess
 lin frenetic_A = mkA "frenetisk" ; -- status=guess
@@ -23727,7 +23728,7 @@ lin geriatrician_N = variants {} ; -- status=guess
 lin geriatrics_N = mkN "geriatrik" ; -- comment=2
 lin germ_N = mkN "embryo" "embryot" "embryon" "embryona" ; -- comment=8
 lin germanFem_N = mkN "tyska" ; -- comment=3
-lin germanMasc_N = mkN "tyska" ; -- comment=3
+lin germanMasc_N = mkN "tysk" ; -- comment=3
 lin german_A = mkA "tysk" ; -- status=guess
 lin germander_N = variants {} ; -- status=guess
 lin germane_A = mkA "relevant" "relevant" ; -- status=guess
@@ -28782,8 +28783,10 @@ lin indexless_A = variants {} ; -- status=guess
 lin india_PN = mkPN "Indien" neutrum; -- src=geonames status=guess
 lin india_rubber_N = variants {} ; -- status=guess
 lin indiaman_N = variants {} ; -- status=guess
-lin indian_A = variants {} ; -- status=guess
-lin indian_N = variants {} ; -- status=guess
+lin indian_A = mkA "indisk" ;
+lin indian_N = mkN "indian" "indianer" ;
+lin indianMasc_N = mkN "indier" "indiern" "indier" "indierna" ;
+lin indianFem_N = mkN "indiska" ;
 lin indiana_PN = mkPN "Indiana" neutrum; -- src=geonames status=guess
 lin indianapolis_PN = mkPN "Indianapolis" neutrum; -- src=geonames status=guess
 lin indicate_V2 = mkV2 (mkV "indikera") | mkV2 (mkV "visa") | mkV2 (mkV "uppge" "uppgav" "uppgivit") | mkV2 (mkV "ange" "angav" "angivit") ;
@@ -30107,9 +30110,9 @@ lin istanbul_PN = mkPN "Istanbul"; -- src=eng status=guess
 lin isthmian_A = variants {} ; -- status=guess
 lin isthmus_N = mkN "näs" neutrum; -- comment=2
 lin it_Pron = S.it_Pron;
-lin italian_A = mkA "italiensk" ; -- status=guess
-lin italianMasc_N = mkN "italienska" ; -- comment=3
-lin italianFem_N = mkN "italienska" ; -- comment=3
+lin italian_A = mkA "italiensk" ; 
+lin italianMasc_N = mkN "italienare" "italienare" ;
+lin italianFem_N = mkN "italienska" ; 
 lin italic_A = mkA "kursiv" ; -- status=guess
 lin italic_N = mkN "kursiv" "kursiver" ; -- status=guess
 lin italicize_V2 = variants {} ; -- status=guess
@@ -53668,9 +53671,9 @@ lin spangle_N = variants {} ; -- status=guess
 lin spangle_V2 = variants {} ; -- status=guess
 lin spaniard_N = mkN "spanjor" "spanjoren" "spanjorer" "spanjorerna" ; -- status=guess
 lin spaniel_N = variants {} ; -- status=guess
-lin spanishFem_N = mkN "spanska" ; -- status=guess
-lin spanishMasc_N = mkN "spanska" ; -- status=guess
-lin spanish_A = mkA "spansk" ; -- status=guess
+lin spanishFem_N = mkN "spanjorska" ; 
+lin spanishMasc_N = mkN "spanjor" "spanjorer" ; 
+lin spanish_A = mkA "spansk" ; 
 lin spank_N = variants {} ; -- status=guess
 lin spank_V = mkV "daskar" ; -- comment=2
 lin spank_V2 = mkV2 (mkV "smiskar") | mkV2 (mkV "daskar"); -- status=guess, src=wikt status=guess, src=wikt
@@ -56488,7 +56491,7 @@ lin swedeFem_N = mkN "svenska" ; -- status=guess
 lin swedeMasc_N = mkN "svensk" ; -- status=guess
 lin swede_A = mkA "svensk" ; -- status=guess
 lin sweden_PN = mkPN "Sverige" neutrum;
-lin swedish_A = mkA "svensk" ; -- status=guess
+lin swedish_A = mkA "svensk" ; 
 lin swedishMasc_N = mkN "svenska" ; -- comment=3
 lin swedishFem_N = mkN "svenska" ; -- comment=3
 lin sweep_N = mkN "sopa" | mkN "fara" ; -- SaldoWN -- comment=11